diff --git a/src/addresses.h b/src/addresses.h
index 38bfa24779..68a4bcacef 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -423,11 +423,7 @@
 
 #define RCT2_ADDRESS_COMMON_FORMAT_ARGS             0x013CE952
 
-#define RCT2_ADDRESS_STAFF_MODE_ARRAY          0x013CA672
-
-#define RCT2_STAFF_MODE_NONE 0
-#define RCT2_STAFF_MODE_NORMAL 1
-#define RCT2_STAFF_MODE_PATROL 3
+#define RCT2_ADDRESS_STAFF_MODE_ARRAY               0x013CA672
 
 static void RCT2_CALLPROC_EBPSAFE(int address)
 {
diff --git a/src/editor.c b/src/editor.c
index 5a3265e873..138eeb1162 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -183,10 +183,10 @@ static void set_all_land_owned()
 */
 void sub_6BD3A4() {
 	for (short i = 0; i < 200; i++) {
-		RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = RCT2_STAFF_MODE_NONE;
+		RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = STAFF_MODE_NONE;
 	}
 	for (short i = 200; i < 204; i++) {
-		RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = RCT2_STAFF_MODE_NORMAL;
+		RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[i] = STAFF_MODE_WALK;
 	}
 	//RCT2_CALLPROC_EBPSAFE(0x006C0C3F);
 	sub_6C0C3F();
diff --git a/src/staff.c b/src/staff.c
index a5e00f758d..3871dfb080 100644
--- a/src/staff.c
+++ b/src/staff.c
@@ -222,7 +222,7 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx,
 
 		newPeep->staff_id = newStaffId;
 
-		RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[newStaffId] = RCT2_STAFF_MODE_NORMAL;
+		RCT2_ADDRESS(RCT2_ADDRESS_STAFF_MODE_ARRAY, uint8)[newStaffId] = STAFF_MODE_WALK;
 
 		for (int edi = 0; edi < 0x80; edi++) {
 			int addr = 0x013B0E72 + (newStaffId << 9) + edi * 4;
diff --git a/src/staff.h b/src/staff.h
index fbe54902a0..b8ef29af0c 100644
--- a/src/staff.h
+++ b/src/staff.h
@@ -26,6 +26,12 @@
 #define STAFF_MAX_COUNT 0xC8
 #define STAFF_TYPE_COUNT 0x04
 
+enum STAFF_MODE {
+	STAFF_MODE_NONE,
+	STAFF_MODE_WALK,
+	STAFF_MODE_PATROL = 3
+};
+
 enum STAFF_TYPE {
 	STAFF_TYPE_HANDYMAN,
 	STAFF_TYPE_MECHANIC,