diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp
index aab007274d..be5c3420da 100644
--- a/src/openrct2/paint/Paint.cpp
+++ b/src/openrct2/paint/Paint.cpp
@@ -218,17 +218,17 @@ template<uint8_t direction> void PaintSessionGenerateRotate(paint_session* sessi
     for (; numVerticalTiles > 0; --numVerticalTiles)
     {
         tile_element_paint_setup(session, mapTile);
-        sprite_paint_setup(session, mapTile.x, mapTile.y);
+        sprite_paint_setup(session, mapTile);
 
-        auto loc1 = mapTile + adjacentTiles[0];
-        sprite_paint_setup(session, loc1.x, loc1.y);
+        const auto loc1 = mapTile + adjacentTiles[0];
+        sprite_paint_setup(session, loc1);
 
-        auto loc2 = mapTile + adjacentTiles[1];
+        const auto loc2 = mapTile + adjacentTiles[1];
         tile_element_paint_setup(session, loc2);
-        sprite_paint_setup(session, loc2.x, loc2.y);
+        sprite_paint_setup(session, loc2);
 
-        auto loc3 = mapTile + adjacentTiles[2];
-        sprite_paint_setup(session, loc3.x, loc3.y);
+        const auto loc3 = mapTile + adjacentTiles[2];
+        sprite_paint_setup(session, loc3);
 
         mapTile += nextVerticalTile;
     }
diff --git a/src/openrct2/paint/sprite/Paint.Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp
index 93b850cef7..83863d4c0a 100644
--- a/src/openrct2/paint/sprite/Paint.Sprite.cpp
+++ b/src/openrct2/paint/sprite/Paint.Sprite.cpp
@@ -32,7 +32,7 @@
  * Paint Quadrant
  *  rct2: 0x0069E8B0
  */
-void sprite_paint_setup(paint_session* session, int32_t x, int32_t y)
+void sprite_paint_setup(paint_session* session, const CoordsXY& pos)
 {
     if (gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES))
     {
@@ -47,7 +47,7 @@ void sprite_paint_setup(paint_session* session, int32_t x, int32_t y)
 
     const bool highlightPathIssues = (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES);
 
-    for (const auto* spr : EntityTileList({ x, y }))
+    for (const auto* spr : EntityTileList(pos))
     {
         if (highlightPathIssues)
         {
diff --git a/src/openrct2/paint/sprite/Paint.Sprite.h b/src/openrct2/paint/sprite/Paint.Sprite.h
index 87c882871e..68a1d4e8e5 100644
--- a/src/openrct2/paint/sprite/Paint.Sprite.h
+++ b/src/openrct2/paint/sprite/Paint.Sprite.h
@@ -12,8 +12,9 @@
 #include "../../common.h"
 
 struct paint_session;
+struct CoordsXY;
 
-void sprite_paint_setup(paint_session* session, int32_t x, int32_t y);
+void sprite_paint_setup(paint_session* session, const CoordsXY& pos);
 
 template<typename T> void PaintEntity(paint_session* session, const T* entity, int32_t imageDirection);