diff --git a/src/paint/paint.c b/src/paint/paint.c
index eaba398525..f7af917533 100644
--- a/src/paint/paint.c
+++ b/src/paint/paint.c
@@ -35,6 +35,7 @@ paint_string_struct *pss2;
 uint32 _F1AD0C;
 
 #ifdef NO_RCT2
+uint32 _F1AD10;
 static paint_struct *_paint_structs[512];
 void *g_currently_drawn_item;
 paint_struct * g_ps_EE7880;
@@ -43,6 +44,7 @@ support_height gSupportSegments[9] = { 0 };
 support_height gSupport;
 #else
 #define _paint_structs (RCT2_ADDRESS(0x00F1A50C, paint_struct*))
+#define _F1AD10 RCT2_GLOBAL(0xF1AD10, uint32)
 #endif
 
 static const uint8 BoundBoxDebugColours[] = {
@@ -75,7 +77,7 @@ void painter_setup() {
 		_paint_structs[i] = NULL;
 	}
 	_F1AD0C = -1;
-	RCT2_GLOBAL(0xF1AD10, uint32) = 0;
+	_F1AD10 = 0;
 	pss1 = NULL;
 	pss2 = NULL;
 }
@@ -328,8 +330,8 @@ paint_struct * sub_98196C(
 		_F1AD0C = edi;
 	}
 
-	if ((uint16)edi > RCT2_GLOBAL(0x00F1AD10, uint32)) {
-		RCT2_GLOBAL(0x00F1AD10, uint32) = edi;
+	if ((uint16)edi > _F1AD10) {
+		_F1AD10 = edi;
 	}
 
 	unk_EE7888 ++;
@@ -412,8 +414,8 @@ paint_struct * sub_98197C(
 		_F1AD0C = di;
 	}
 
-	if ((uint16)di > RCT2_GLOBAL(0x00F1AD10, uint32)) {
-		RCT2_GLOBAL(0x00F1AD10, uint32) = di;
+	if ((uint16)di > _F1AD10) {
+		_F1AD10 = di;
 	}
 
 	unk_EE7888++;
@@ -882,7 +884,7 @@ void sub_688217()
 				ps_next = ps_next->next_quadrant_ps;
 			} while (ps_next != NULL);
 		}
-	} while (++edi <= RCT2_GLOBAL(0x00F1AD10, uint32));
+	} while (++edi <= _F1AD10);
 
 	uint32 eax = _F1AD0C;
 
@@ -890,7 +892,7 @@ void sub_688217()
 
 	eax = _F1AD0C;
 
-	while (++eax < RCT2_GLOBAL(0x00F1AD10, uint32))
+	while (++eax < _F1AD10)
 		sub_688217_helper(eax & 0xFFFF, 0);
 }