diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 0840c9adc9..4dc580c18e 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -1329,16 +1329,12 @@ void viewport_ride_entrance_exit_paint_setup(uint8 direction, int height, rct_ma
 	// Each entrance is split into 2 images for drawing
 	// Certain entrance styles have another 2 images to draw for coloured windows
 
-	uint16 word_9DEA52 = 2;
-	uint16 word_9DEA54 = 2;
-	uint16 word_9DEA56 = height;
-
 	sint8 ah = is_exit ? 0x23 : 0x33;
 
 	sint16 lengthY = (direction & 1) ? 28 : 2;
 	sint16 lengthX = (direction & 1) ? 2 : 28;
 
-	sub_98197C(image_id, 0, 0, lengthX, lengthY, ah, height, get_current_rotation(), word_9DEA52, word_9DEA54, word_9DEA56);
+	sub_98197C(image_id, 0, 0, lengthX, lengthY, ah, height, get_current_rotation(), 2, 2, height);
 
 	if (transparant_image_id){
 		if (is_exit){
@@ -1353,11 +1349,7 @@ void viewport_ride_entrance_exit_paint_setup(uint8 direction, int height, rct_ma
 
 	image_id += 4;
 
-	word_9DEA52 = (direction & 1) ? 28 : 2;
-	word_9DEA54 = (direction & 1) ? 2 : 28;
-	word_9DEA56 = height;
-
-	sub_98197C(image_id, 0, 0, lengthX, lengthY, ah, height, get_current_rotation(), word_9DEA52, word_9DEA54, word_9DEA56);
+	sub_98197C(image_id, 0, 0, lengthX, lengthY, ah, height, get_current_rotation(), (direction & 1) ? 28 : 2, (direction & 1) ? 2 : 28, height);
 
 	if (transparant_image_id){
 		transparant_image_id += 4;
diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c
index 5c5a2cdae0..7d318c3a31 100644
--- a/src/ride/track_paint.c
+++ b/src/ride/track_paint.c
@@ -608,10 +608,7 @@ static void top_spin_paint_tile_6(uint8 rideIndex, uint8 trackSequence, uint8 di
 
 	image_id = 22135 | RCT2_GLOBAL(0x00F44198, uint32);
 
-	uint16 word_9DEA52 = 0;
-	uint16 word_9DEA54 = 0;
-	uint16 word_9DEA56 = height;
-	sub_98197C(image_id, 0, 0, 32, 32, 1, height, get_current_rotation(), word_9DEA52, word_9DEA54, word_9DEA56);
+	sub_98197C(image_id, 0, 0, 32, 32, 1, height, get_current_rotation(), 0, 0, height);
 
 	sint16 x = RCT2_GLOBAL(0x009DE56A, sint16), y = RCT2_GLOBAL(0x009DE56E, sint16);
 	uint16 entranceLoc =
@@ -635,11 +632,8 @@ static void top_spin_paint_tile_6(uint8 rideIndex, uint8 trackSequence, uint8 di
 	if (ride->entrances[entranceId] != entranceLoc && ride->exits[entranceId] != entranceLoc) {
 
 		image_id = 22140 | RCT2_GLOBAL(0x00F441A0, uint32);
-		word_9DEA52 = 30;
-		word_9DEA54 = 2;
-		word_9DEA56 = height + 2;
 
-		sub_98197C(image_id, 0, 0, 1, 32, 7, height, get_current_rotation(), word_9DEA52, word_9DEA54, word_9DEA56);
+		sub_98197C(image_id, 0, 0, 1, 32, 7, height, get_current_rotation(), 30, 2, height + 2);
 	}
 
 	top_spin_paint_vehicle(-32, 32, rideIndex, direction, height, mapElement);