diff --git a/src/addresses.h b/src/addresses.h
index 921c3d423f..23c3b00716 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -494,6 +494,8 @@
 #define RCT2_ADDRESS_X_END_POINT_GLOBAL				0x9ABDA8	//sint16
 #define RCT2_ADDRESS_X_START_POINT_GLOBAL			0xEDF80C	//sint16
 #define RCT2_ADDRESS_DPI_LINE_LENGTH_GLOBAL			0x9ABDB0	//uint16 width+pitch
+#define RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS 0x009AA00D
+#define RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_CONFIG	0x009AB4C6
 
 #pragma endregion
 
diff --git a/src/config.c b/src/config.c
index 3a451e6e01..52fba7185f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -838,28 +838,29 @@ void config_dat_load()
 			//	return;
 			
 			
-			RCT2_GLOBAL(0x009AB4C6, sint8) = 1; // no idea on what this does
+			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_CONFIG, sint8) = 1; // Marks config as first time loaded
 
 			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) + 2) * 256;
 			if (!(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS))
 				RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) + 1) * 256;
-			RCT2_GLOBAL(0x009AA00D, sint8) = 0;
+			// No longer used (controls first time object load)
+			//RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS, sint8) = 0;
 		}
 	
 	}
 	
 	/* TODO: CLEANUP
 
-			if (RCT2_GLOBAL(0x009AB4C6, sint8) == 1)
+			if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_CONFIG, sint8) == 1)
 				return;
-			RCT2_GLOBAL(0x009AB4C6, sint8) = 1;
+			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_CONFIG, sint8) = 1;
 			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = 0; 
 			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = 1; 
 			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CURRENCY, sint8) = 1;
 			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = 0;
 			if (!(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS))
 				RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) + 1) * 256;
-			RCT2_GLOBAL(0x009AA00D, sint8) = 1;
+			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS, sint8) = 1;
 		}
 	
 	}
@@ -878,7 +879,7 @@ void config_dat_load()
 	RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = 0;
 	if (!(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS))
 		RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) + 1) * 256;
-	RCT2_GLOBAL(0x009AA00D, sint8) = 1;
+	RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS, sint8) = 1;
 }
 
 /**
diff --git a/src/object_list.c b/src/object_list.c
index 09cb0bcf1f..2edf1c88fa 100644
--- a/src/object_list.c
+++ b/src/object_list.c
@@ -194,8 +194,10 @@ void object_list_load()
 
 	// Reload object list
 
-	if (RCT2_GLOBAL(0x9AA00D, uint8) != 0)
-		RCT2_GLOBAL(0x9AA00D, uint8) = 0;
+	// RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS used to control if this was the first time loading objects
+	// and display the starting RCT2 for the first time message.
+	//if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS, uint8) != 0)
+	//	RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS, uint8) = 0;
 
 	sub_6A9FC0();