diff --git a/openrct2.vcxproj b/openrct2.vcxproj
index 535e087afb..6bb34c1e25 100644
--- a/openrct2.vcxproj
+++ b/openrct2.vcxproj
@@ -151,6 +151,7 @@
+
diff --git a/src/paint/paint.c b/src/paint/paint.c
index e05845e3b7..b0652e590d 100644
--- a/src/paint/paint.c
+++ b/src/paint/paint.c
@@ -524,36 +524,6 @@ paint_struct * sub_98199C(
return ps;
}
-paint_struct * sub_98197C_rotated(
- uint8 direction,
- uint32 image_id,
- sint8 x_offset, sint8 y_offset,
- sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z,
- sint16 z_offset,
- sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z)
-{
- if (direction & 1) {
- return sub_98197C(image_id, x_offset, y_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, get_current_rotation());
- } else {
- return sub_98197C(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, get_current_rotation());
- }
-}
-
-paint_struct * sub_98199C_rotated(
- uint8 direction,
- uint32 image_id,
- sint8 x_offset, sint8 y_offset,
- sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z,
- sint16 z_offset,
- sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z)
-{
- if (direction & 1) {
- return sub_98199C(image_id, x_offset, y_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, get_current_rotation());
- } else {
- return sub_98199C(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, get_current_rotation());
- }
-}
-
/**
* rct2: 0x006881D0
*
diff --git a/src/paint/paint_helpers.c b/src/paint/paint_helpers.c
new file mode 100644
index 0000000000..15ca445c54
--- /dev/null
+++ b/src/paint/paint_helpers.c
@@ -0,0 +1,48 @@
+#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
+/*****************************************************************************
+ * OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
+ *
+ * OpenRCT2 is the work of many authors, a full list can be found in contributors.md
+ * For more information, visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * A full copy of the GNU General Public License can be found in licence.txt
+ *****************************************************************************/
+#pragma endregion
+
+#include "../interface/viewport.h"
+#include "paint.h"
+
+paint_struct * sub_98197C_rotated(
+ uint8 direction,
+ uint32 image_id,
+ sint8 x_offset, sint8 y_offset,
+ sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z,
+ sint16 z_offset,
+ sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z)
+{
+ if (direction & 1) {
+ return sub_98197C(image_id, x_offset, y_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, get_current_rotation());
+ } else {
+ return sub_98197C(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, get_current_rotation());
+ }
+}
+
+paint_struct * sub_98199C_rotated(
+ uint8 direction,
+ uint32 image_id,
+ sint8 x_offset, sint8 y_offset,
+ sint16 bound_box_length_x, sint16 bound_box_length_y, sint8 bound_box_length_z,
+ sint16 z_offset,
+ sint16 bound_box_offset_x, sint16 bound_box_offset_y, sint16 bound_box_offset_z)
+{
+ if (direction & 1) {
+ return sub_98199C(image_id, x_offset, y_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, get_current_rotation());
+ } else {
+ return sub_98199C(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, get_current_rotation());
+ }
+}
diff --git a/test/testpaint/testpaint.vcxproj b/test/testpaint/testpaint.vcxproj
index 15fb0291ce..5cbf078e8b 100644
--- a/test/testpaint/testpaint.vcxproj
+++ b/test/testpaint/testpaint.vcxproj
@@ -86,6 +86,7 @@
+