diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index 9d9d0ddbd..8bf7bc5db 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -2390,33 +2390,33 @@ u8 func100b_lightswitch[] = {
 
 		// Turning lights off
 		set_stage_flag(STAGEFLAG_LIGHTS_OFF)
-		set_lights_state(0x0044, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0039, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003c, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003d, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003e, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003b, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0042, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003f, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003a, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0041, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0040, 0x07, 0x00, 0x00, 0x00)
+		set_lights_state(0x0044, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0039, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003c, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003d, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003e, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003b, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0042, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003f, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003a, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0041, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0040, LIGHTOP_7, 0x00, 0x00, 0x00)
 		reloop(0x04)
 
 		// Turning lights on
 		label(0x06)
 		unset_stage_flag(STAGEFLAG_LIGHTS_OFF)
-		set_lights_state(0x0044, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0039, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003c, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003d, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003e, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003b, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0042, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003f, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003a, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0041, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0040, 0x06, 0x00, 0x00, 0x00)
+		set_lights_state(0x0044, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0039, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003c, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003d, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003e, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003b, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0042, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003f, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003a, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0041, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0040, LIGHTOP_6, 0x00, 0x00, 0x00)
 	endloop(0x04)
 
 	endlist
diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c
index 417ee3213..af89dd20f 100644
--- a/src/files/setup/setupark.c
+++ b/src/files/setup/setupark.c
@@ -739,48 +739,48 @@ u8 func100c_foyer_lights_timer[] = {
 	set_stage_flag(STAGEFLAG_FOYER_LIGHTS_RESTORED)
 	hide_countdown_timer
 	stop_countdown_timer
-	set_lights_state(0x0019, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x001a, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x001b, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x001c, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x001d, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x001e, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x001f, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0020, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0021, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0017, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0018, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0016, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0022, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0023, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0024, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0025, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0026, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0027, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0028, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0029, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x002a, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x002b, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x002c, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x002d, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x002e, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x002f, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0030, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0031, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0032, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0033, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0034, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0035, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0036, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0015, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x000f, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x000e, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0010, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0011, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0012, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0013, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x0014, 0x01, 0x64, 0x00, 0x00)
-	set_lights_state(0x000d, 0x01, 0x64, 0x00, 0x00)
+	set_lights_state(0x0019, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x001a, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x001b, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x001c, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x001d, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x001e, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x001f, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0020, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0021, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0017, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0018, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0016, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0022, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0023, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0024, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0025, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0026, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0027, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0028, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0029, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x002a, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x002b, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x002c, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x002d, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x002e, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x002f, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0030, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0031, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0032, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0033, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0034, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0035, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0036, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0015, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x000f, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x000e, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0010, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0011, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0012, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0013, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x0014, LIGHTOP_1, 0x64, 0x00, 0x00)
+	set_lights_state(0x000d, LIGHTOP_1, 0x64, 0x00, 0x00)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
@@ -2025,17 +2025,17 @@ u8 func040d_cass[] = {
 	endloop(0x2a)
 
 	label(0x20)
-	set_lights_state(0x0044, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x0039, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x003c, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x003d, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x003e, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x003b, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x0042, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x003f, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x003a, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x0041, 0x07, 0x00, 0x00, 0x00)
-	set_lights_state(0x0040, 0x07, 0x00, 0x00, 0x00)
+	set_lights_state(0x0044, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x0039, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x003c, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x003d, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x003e, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x003b, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x0042, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x003f, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x003a, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x0041, LIGHTOP_7, 0x00, 0x00, 0x00)
+	set_lights_state(0x0040, LIGHTOP_7, 0x00, 0x00, 0x00)
 	set_stage_flag(STAGEFLAG_TOP_LIGHTS_OFF)
 	set_stage_flag(STAGEFLAG_TOP_GUARDS_ATTACKING)
 	walk_to_pad(0x000f)
@@ -2129,33 +2129,33 @@ u8 func100a_lightswitch[] = {
 		label(0x20)
 		play_sound(0x00ba, -1)
 		if_stage_flag_eq(STAGEFLAG_TOP_LIGHTS_OFF, TRUE, /*goto*/ 0x00)
-		set_lights_state(0x0044, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0039, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003c, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003d, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003e, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003b, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0042, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003f, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x003a, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0041, 0x07, 0x00, 0x00, 0x00)
-		set_lights_state(0x0040, 0x07, 0x00, 0x00, 0x00)
+		set_lights_state(0x0044, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0039, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003c, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003d, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003e, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003b, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0042, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003f, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x003a, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0041, LIGHTOP_7, 0x00, 0x00, 0x00)
+		set_lights_state(0x0040, LIGHTOP_7, 0x00, 0x00, 0x00)
 		set_stage_flag(STAGEFLAG_TOP_LIGHTS_OFF)
 		reloop(0x1f)
 
 		label(0x00)
 		unset_stage_flag(STAGEFLAG_TOP_LIGHTS_OFF)
-		set_lights_state(0x0044, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0039, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003c, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003d, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003e, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003b, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0042, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003f, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x003a, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0041, 0x06, 0x00, 0x00, 0x00)
-		set_lights_state(0x0040, 0x06, 0x00, 0x00, 0x00)
+		set_lights_state(0x0044, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0039, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003c, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003d, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003e, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003b, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0042, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003f, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x003a, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0041, LIGHTOP_6, 0x00, 0x00, 0x00)
+		set_lights_state(0x0040, LIGHTOP_6, 0x00, 0x00, 0x00)
 	endloop(0x1f)
 
 	endlist
@@ -2192,48 +2192,48 @@ u8 func100c_foyer_lights[] = {
 	endloop(0x21)
 
 	label(0x00)
-	set_lights_state(0x0019, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x001a, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x001b, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x001c, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x001d, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x001e, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x001f, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0020, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0021, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0017, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0018, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0016, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0022, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0023, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0024, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0025, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0026, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0027, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0028, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0029, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x002a, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x002b, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x002c, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x002d, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x002e, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x002f, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0030, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0031, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0032, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0033, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0034, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0035, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0036, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x0015, 0x03, 0x64, 0x02, 0x78)
-	set_lights_state(0x000f, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x000e, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x0010, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x0011, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x0012, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x0013, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x0014, 0x03, 0x64, 0x02, 0xf0)
-	set_lights_state(0x000d, 0x03, 0x64, 0x02, 0xf0)
+	set_lights_state(0x0019, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x001a, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x001b, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x001c, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x001d, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x001e, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x001f, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0020, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0021, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0017, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0018, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0016, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0022, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0023, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0024, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0025, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0026, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0027, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0028, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0029, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x002a, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x002b, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x002c, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x002d, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x002e, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x002f, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0030, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0031, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0032, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0033, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0034, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0035, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0036, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x0015, LIGHTOP_3, 0x64, 0x02, 0x78)
+	set_lights_state(0x000f, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x000e, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x0010, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x0011, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x0012, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x0013, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x0014, LIGHTOP_3, 0x64, 0x02, 0xf0)
+	set_lights_state(0x000d, LIGHTOP_3, 0x64, 0x02, 0xf0)
 	restart_timer
 
 	beginloop(0x22)
@@ -2241,48 +2241,48 @@ u8 func100c_foyer_lights[] = {
 	endloop(0x22)
 
 	label(0x00)
-	set_lights_state(0x0019, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x001a, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x001b, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x001c, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x001d, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x001e, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x001f, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0020, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0021, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0017, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0018, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0016, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0022, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0023, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0024, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0025, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0026, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0027, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0028, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0029, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x002a, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x002b, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x002c, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x002d, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x002e, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x002f, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0030, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0031, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0032, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0033, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0034, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0035, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0036, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0015, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x000f, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x000e, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0010, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0011, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0012, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0013, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x0014, 0x01, 0x02, 0x00, 0x00)
-	set_lights_state(0x000d, 0x01, 0x02, 0x00, 0x00)
+	set_lights_state(0x0019, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x001a, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x001b, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x001c, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x001d, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x001e, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x001f, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0020, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0021, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0017, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0018, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0016, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0022, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0023, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0024, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0025, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0026, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0027, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0028, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0029, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x002a, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x002b, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x002c, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x002d, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x002e, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x002f, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0030, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0031, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0032, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0033, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0034, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0035, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0036, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0015, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x000f, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x000e, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0010, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0011, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0012, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0013, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x0014, LIGHTOP_1, 0x02, 0x00, 0x00)
+	set_lights_state(0x000d, LIGHTOP_1, 0x02, 0x00, 0x00)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c
index accbdbe2b..9b9ab792d 100644
--- a/src/files/setup/setupazt.c
+++ b/src/files/setup/setupazt.c
@@ -1888,21 +1888,21 @@ u8 func0421_starting_area_guard[] = {
 
 u8 func1010_set_cave_lights[] = {
 	yield
-	set_lights_state(0x0064, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0063, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0062, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0061, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0060, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x005f, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x005e, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x005d, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x005c, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x005b, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x005a, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0059, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0053, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0058, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0056, 0x01, 0x06, 0x00, 0x00)
+	set_lights_state(0x0064, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0063, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0062, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0061, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0060, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x005f, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x005e, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x005d, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x005c, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x005b, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x005a, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0059, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0053, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0058, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0056, LIGHTOP_1, 0x06, 0x00, 0x00)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c
index d35739f0b..7e04e7640 100644
--- a/src/files/setup/setupcave.c
+++ b/src/files/setup/setupcave.c
@@ -1789,12 +1789,12 @@ u8 func1007_console_activation[] = {
 	label(0x00) \
 	yield \
 	mute_channel(CHANNEL_6) \
-	set_lights_state(0x0039, 0x03, 0x78, 0xff, 0x3c) \
-	set_lights_state(0x003a, 0x03, 0x78, 0xff, 0x3c) \
-	set_lights_state(0x003b, 0x03, 0x78, 0xff, 0x3c) \
-	set_lights_state(0x0041, 0x03, 0x78, 0xff, 0x3c) \
-	set_lights_state(0x0042, 0x03, 0x78, 0xff, 0x3c) \
-	set_lights_state(0x0043, 0x03, 0x78, 0xff, 0x3c) \
+	set_lights_state(0x0039, LIGHTOP_3, 0x78, 0xff, 0x3c) \
+	set_lights_state(0x003a, LIGHTOP_3, 0x78, 0xff, 0x3c) \
+	set_lights_state(0x003b, LIGHTOP_3, 0x78, 0xff, 0x3c) \
+	set_lights_state(0x0041, LIGHTOP_3, 0x78, 0xff, 0x3c) \
+	set_lights_state(0x0042, LIGHTOP_3, 0x78, 0xff, 0x3c) \
+	set_lights_state(0x0043, LIGHTOP_3, 0x78, 0xff, 0x3c) \
  \
 	beginloop(0x65) \
 		if_stage_flag_eq(STAGEFLAG_SUITCASE_DEPOSITED, TRUE, /*goto*/ 0x08) \
@@ -1808,12 +1808,12 @@ u8 func1007_console_activation[] = {
  \
 	/* In hallway with weapons */ \
 	label(0x31) \
-	set_lights_state(0x0039, 0x04, 0x00, 0xff, 0x3c) \
-	set_lights_state(0x003a, 0x04, 0x00, 0xff, 0x3c) \
-	set_lights_state(0x003b, 0x04, 0x00, 0xff, 0x3c) \
-	set_lights_state(0x0041, 0x04, 0x00, 0xff, 0x3c) \
-	set_lights_state(0x0042, 0x04, 0x00, 0xff, 0x3c) \
-	set_lights_state(0x0043, 0x04, 0x00, 0xff, 0x3c) \
+	set_lights_state(0x0039, LIGHTOP_4, 0x00, 0xff, 0x3c) \
+	set_lights_state(0x003a, LIGHTOP_4, 0x00, 0xff, 0x3c) \
+	set_lights_state(0x003b, LIGHTOP_4, 0x00, 0xff, 0x3c) \
+	set_lights_state(0x0041, LIGHTOP_4, 0x00, 0xff, 0x3c) \
+	set_lights_state(0x0042, LIGHTOP_4, 0x00, 0xff, 0x3c) \
+	set_lights_state(0x0043, LIGHTOP_4, 0x00, 0xff, 0x3c) \
 	play_sound(0x04ac, CHANNEL_6) \
 	restart_timer \
  \
@@ -1833,12 +1833,12 @@ u8 func1007_console_activation[] = {
 	/* In hallway with weapons for over 60 frames */ \
 	label(0x02) \
 	restart_timer \
-	set_lights_state(0x0039, 0x04, 0x00, 0xff, 0x32) \
-	set_lights_state(0x003a, 0x04, 0x00, 0xff, 0x32) \
-	set_lights_state(0x003b, 0x04, 0x00, 0xff, 0x32) \
-	set_lights_state(0x0041, 0x04, 0x00, 0xff, 0x32) \
-	set_lights_state(0x0042, 0x04, 0x00, 0xff, 0x32) \
-	set_lights_state(0x0043, 0x04, 0x00, 0xff, 0x32) \
+	set_lights_state(0x0039, LIGHTOP_4, 0x00, 0xff, 0x32) \
+	set_lights_state(0x003a, LIGHTOP_4, 0x00, 0xff, 0x32) \
+	set_lights_state(0x003b, LIGHTOP_4, 0x00, 0xff, 0x32) \
+	set_lights_state(0x0041, LIGHTOP_4, 0x00, 0xff, 0x32) \
+	set_lights_state(0x0042, LIGHTOP_4, 0x00, 0xff, 0x32) \
+	set_lights_state(0x0043, LIGHTOP_4, 0x00, 0xff, 0x32) \
  \
 	beginloop(0x05) \
 		if_timer_gt(40, /*goto*/ 0x02) \
@@ -1856,12 +1856,12 @@ u8 func1007_console_activation[] = {
 	/* In hallway with weapons for over 100 frames */ \
 	label(0x02) \
 	restart_timer \
-	set_lights_state(0x0039, 0x04, 0x00, 0xff, 0x28) \
-	set_lights_state(0x003a, 0x04, 0x00, 0xff, 0x28) \
-	set_lights_state(0x003b, 0x04, 0x00, 0xff, 0x28) \
-	set_lights_state(0x0041, 0x04, 0x00, 0xff, 0x28) \
-	set_lights_state(0x0042, 0x04, 0x00, 0xff, 0x28) \
-	set_lights_state(0x0043, 0x04, 0x00, 0xff, 0x28) \
+	set_lights_state(0x0039, LIGHTOP_4, 0x00, 0xff, 0x28) \
+	set_lights_state(0x003a, LIGHTOP_4, 0x00, 0xff, 0x28) \
+	set_lights_state(0x003b, LIGHTOP_4, 0x00, 0xff, 0x28) \
+	set_lights_state(0x0041, LIGHTOP_4, 0x00, 0xff, 0x28) \
+	set_lights_state(0x0042, LIGHTOP_4, 0x00, 0xff, 0x28) \
+	set_lights_state(0x0043, LIGHTOP_4, 0x00, 0xff, 0x28) \
  \
 	beginloop(0x06) \
 		if_timer_gt(1, /*goto*/ 0x02) \
@@ -1879,12 +1879,12 @@ u8 func1007_console_activation[] = {
 	/* In hallway with weapons for over 101 frames */ \
 	label(0x02) \
 	restart_timer \
-	set_lights_state(0x0039, 0x04, 0x00, 0xff, 0x1e) \
-	set_lights_state(0x003a, 0x04, 0x00, 0xff, 0x1e) \
-	set_lights_state(0x003b, 0x04, 0x00, 0xff, 0x1e) \
-	set_lights_state(0x0041, 0x04, 0x00, 0xff, 0x1e) \
-	set_lights_state(0x0042, 0x04, 0x00, 0xff, 0x1e) \
-	set_lights_state(0x0043, 0x04, 0x00, 0xff, 0x1e) \
+	set_lights_state(0x0039, LIGHTOP_4, 0x00, 0xff, 0x1e) \
+	set_lights_state(0x003a, LIGHTOP_4, 0x00, 0xff, 0x1e) \
+	set_lights_state(0x003b, LIGHTOP_4, 0x00, 0xff, 0x1e) \
+	set_lights_state(0x0041, LIGHTOP_4, 0x00, 0xff, 0x1e) \
+	set_lights_state(0x0042, LIGHTOP_4, 0x00, 0xff, 0x1e) \
+	set_lights_state(0x0043, LIGHTOP_4, 0x00, 0xff, 0x1e) \
  \
 	beginloop(0x07) \
 		yield \
diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c
index 9b9c4ea0e..c9b3393b5 100644
--- a/src/files/setup/setupdam.c
+++ b/src/files/setup/setupdam.c
@@ -1123,7 +1123,7 @@ u8 func100a_reactor_switch[] = {
 	mute_channel(CHANNEL_1)
 	assign_sound(0x8147, CHANNEL_0)
 	control_sound_from_object(CHANNEL_0, OBJ_REACTOR_SWITCH, TRUE)
-	set_lights_state(0x007f, 0x03, 0xff, 0x06, 0x78)
+	set_lights_state(0x007f, LIGHTOP_3, 0xff, 0x06, 0x78)
 	set_object_image(OBJ_REACTOR_SWITCH, 0x00, 0x12)
 	set_object_image(OBJ_REACTOR_SWITCH, 0x01, 0x12)
 	set_object_image(OBJ_REACTOR_SWITCH, 0x02, 0x12)
diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c
index 0f33449f5..2949866c3 100644
--- a/src/files/setup/setupdepo.c
+++ b/src/files/setup/setupdepo.c
@@ -2409,28 +2409,28 @@ u8 func101b_cloak2_entry[] = {
 	if_stage_flag_eq(STAGEFLAG_LIGHTS_OFF, TRUE, /*goto*/ 0x2c)
 	play_sound(0x8147, -1)
 	restart_timer
-	set_lights_state(0x000b, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x000c, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x000d, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x000e, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0010, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x000f, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0011, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0012, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0013, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0014, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0015, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0017, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0018, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0001, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0003, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0004, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0005, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0006, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0007, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0008, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x0009, 0x03, 0xff, 0x06, 0x78)
-	set_lights_state(0x000a, 0x03, 0xff, 0x06, 0x78)
+	set_lights_state(0x000b, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x000c, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x000d, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x000e, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0010, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x000f, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0011, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0012, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0013, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0014, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0015, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0017, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0018, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0001, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0003, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0004, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0005, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0006, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0007, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0008, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x0009, LIGHTOP_3, 0xff, 0x06, 0x78)
+	set_lights_state(0x000a, LIGHTOP_3, 0xff, 0x06, 0x78)
 
 	// Wait 2 seconds
 	beginloop(0x09)
@@ -2438,54 +2438,54 @@ u8 func101b_cloak2_entry[] = {
 	endloop(0x09)
 
 	label(0x06)
-	set_lights_state(0x000b, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x000c, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x000d, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x000e, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0010, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x000f, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0011, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0012, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0013, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0014, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0015, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0017, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0018, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0001, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0003, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0004, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0005, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0006, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0007, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0008, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x0009, 0x01, 0x0a, 0x00, 0x00)
-	set_lights_state(0x000a, 0x01, 0x0a, 0x00, 0x00)
+	set_lights_state(0x000b, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x000c, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x000d, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x000e, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0010, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x000f, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0011, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0012, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0013, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0014, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0015, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0017, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0018, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0001, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0003, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0004, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0005, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0006, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0007, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0008, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x0009, LIGHTOP_1, 0x0a, 0x00, 0x00)
+	set_lights_state(0x000a, LIGHTOP_1, 0x0a, 0x00, 0x00)
 	goto_next(0x07)
 
 	label(0x2c)
 	play_sound(0x8148, -1)
-	set_lights_state(0x000b, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x000c, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x000d, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x000e, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0010, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x000f, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0011, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0012, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0013, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0014, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0015, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0017, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0018, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0001, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0003, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0004, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0005, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0006, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0007, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0008, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0009, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x000a, 0x03, 0x06, 0xff, 0x78)
+	set_lights_state(0x000b, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x000c, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x000d, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x000e, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0010, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x000f, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0011, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0012, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0013, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0014, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0015, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0017, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0018, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0001, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0003, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0004, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0005, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0006, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0007, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0008, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0009, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x000a, LIGHTOP_3, 0x06, 0xff, 0x78)
 
 	// Wait 2 seconds
 	restart_timer
@@ -2495,28 +2495,28 @@ u8 func101b_cloak2_entry[] = {
 	endloop(0x0a)
 
 	label(0x06)
-	set_lights_state(0x000b, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x000c, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x000d, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x000e, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0010, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x000f, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0011, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0012, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0013, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0014, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0015, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0017, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0018, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0001, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0003, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0004, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0005, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0006, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0007, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0008, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0009, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x000a, 0x01, 0xff, 0x00, 0x00)
+	set_lights_state(0x000b, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x000c, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x000d, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x000e, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0010, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x000f, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0011, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0012, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0013, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0014, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0015, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0017, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0018, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0001, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0003, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0004, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0005, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0006, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0007, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0008, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0009, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x000a, LIGHTOP_1, 0xff, 0x00, 0x00)
 
 	label(0x07)
 	unset_chr_chrflag(CHR_CLOAK_2A, CHRCFLAG_HIDDEN)
@@ -2730,28 +2730,28 @@ u8 func1022_light_switch[] = {
 		yield
 		set_object_image(OBJ_LIGHTSWITCH, 0x00, 0x14)
 		play_sound(0x8147, -1)
-		set_lights_state(0x000b, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x000c, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x000d, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x000e, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0010, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x000f, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0011, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0012, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0013, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0014, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0015, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0017, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0018, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0001, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0003, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0004, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0005, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0006, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0007, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0008, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x0009, 0x03, 0xff, 0x06, 0x78)
-		set_lights_state(0x000a, 0x03, 0xff, 0x06, 0x78)
+		set_lights_state(0x000b, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x000c, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x000d, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x000e, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0010, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x000f, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0011, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0012, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0013, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0014, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0015, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0017, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0018, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0001, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0003, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0004, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0005, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0006, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0007, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0008, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x0009, LIGHTOP_3, 0xff, 0x06, 0x78)
+		set_lights_state(0x000a, LIGHTOP_3, 0xff, 0x06, 0x78)
 
 		restart_timer
 
@@ -2760,28 +2760,28 @@ u8 func1022_light_switch[] = {
 		endloop(0x09)
 
 		label(0x06)
-		set_lights_state(0x000b, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x000c, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x000d, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x000e, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0010, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x000f, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0011, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0012, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0013, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0014, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0015, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0017, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0018, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0001, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0003, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0004, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0005, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0006, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0007, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0008, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x0009, 0x01, 0x0a, 0x00, 0x00)
-		set_lights_state(0x000a, 0x01, 0x0a, 0x00, 0x00)
+		set_lights_state(0x000b, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x000c, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x000d, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x000e, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0010, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x000f, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0011, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0012, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0013, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0014, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0015, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0017, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0018, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0001, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0003, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0004, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0005, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0006, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0007, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0008, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x0009, LIGHTOP_1, 0x0a, 0x00, 0x00)
+		set_lights_state(0x000a, LIGHTOP_1, 0x0a, 0x00, 0x00)
 		goto_first(0x04)
 
 		// Turning lights on
@@ -2792,28 +2792,28 @@ u8 func1022_light_switch[] = {
 		yield
 		play_sound(0x8148, -1)
 		set_object_image(0x3d, 0x00, 0x06)
-		set_lights_state(0x000b, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x000c, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x000d, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x000e, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0010, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x000f, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0011, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0012, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0013, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0014, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0015, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0017, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0018, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0001, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0003, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0004, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0005, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0006, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0007, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0008, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x0009, 0x03, 0x06, 0xff, 0x78)
-		set_lights_state(0x000a, 0x03, 0x06, 0xff, 0x78)
+		set_lights_state(0x000b, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x000c, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x000d, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x000e, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0010, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x000f, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0011, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0012, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0013, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0014, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0015, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0017, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0018, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0001, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0003, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0004, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0005, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0006, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0007, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0008, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x0009, LIGHTOP_3, 0x06, 0xff, 0x78)
+		set_lights_state(0x000a, LIGHTOP_3, 0x06, 0xff, 0x78)
 
 		restart_timer
 
@@ -2822,28 +2822,28 @@ u8 func1022_light_switch[] = {
 		endloop(0x0a)
 
 		label(0x06)
-		set_lights_state(0x000b, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x000c, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x000d, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x000e, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0010, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x000f, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0011, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0012, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0013, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0014, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0015, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0017, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0018, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0001, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0003, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0004, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0005, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0006, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0007, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0008, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x0009, 0x01, 0xff, 0x00, 0x00)
-		set_lights_state(0x000a, 0x01, 0xff, 0x00, 0x00)
+		set_lights_state(0x000b, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x000c, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x000d, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x000e, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0010, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x000f, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0011, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0012, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0013, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0014, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0015, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0017, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0018, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0001, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0003, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0004, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0005, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0006, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0007, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0008, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x0009, LIGHTOP_1, 0xff, 0x00, 0x00)
+		set_lights_state(0x000a, LIGHTOP_1, 0xff, 0x00, 0x00)
 	endloop(0x04)
 
 	endlist
diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c
index 8ec77db0f..1308bfaa7 100644
--- a/src/files/setup/setupdish.c
+++ b/src/files/setup/setupdish.c
@@ -910,14 +910,14 @@ u8 func1003_devicetraining_nightvision[] = {
 	endloop(0x08)
 
 	label(0x81)
-	set_lights_state(0x0030, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x002e, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x002f, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x0020, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x0024, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x0025, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x0026, 0x01, 0x00, 0x00, 0x00)
-	set_lights_state(0x0022, 0x01, 0x00, 0x00, 0x00)
+	set_lights_state(0x0030, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x002e, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x002f, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x0020, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x0024, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x0025, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x0026, LIGHTOP_1, 0x00, 0x00, 0x00)
+	set_lights_state(0x0022, LIGHTOP_1, 0x00, 0x00, 0x00)
 	set_stage_flag(STAGEFLAG_IN_TRAINING)
 	lock_door(0x31, 0x40)
 	lock_door(0x8a, 0x40)
@@ -988,14 +988,14 @@ u8 func1003_devicetraining_nightvision[] = {
 
 	label(0x2f)
 	play_sound(0x00ba, -1)
-	set_lights_state(0x0030, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x002e, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x002f, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0020, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0024, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0025, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0026, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0022, 0x01, 0xff, 0x00, 0x00)
+	set_lights_state(0x0030, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x002e, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x002f, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0020, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0024, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0025, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0026, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0022, LIGHTOP_1, 0xff, 0x00, 0x00)
 	remove_hudmsgs
 	show_hudmsg(CHR_BOND, L_DISH(23)) // "Lights have been reactivated."
 	restart_timer
@@ -1013,14 +1013,14 @@ u8 func1003_devicetraining_nightvision[] = {
 	set_savefile_flag(SAVEFILEFLAG_CI_NIGHTVISION_DONE)
 	dprint 'd','o','n','e',0,
 	set_stage_flag(STAGEFLAG_TRIGGER_DEVICE_SUCCESS)
-	set_lights_state(0x0030, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x002e, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x002f, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0020, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0024, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0025, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0026, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0022, 0x01, 0xff, 0x00, 0x00)
+	set_lights_state(0x0030, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x002e, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x002f, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0020, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0024, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0025, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0026, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0022, LIGHTOP_1, 0xff, 0x00, 0x00)
 	yield
 	label(0x84)
 	if_chr_in_room(CHR_BOND, 0x00, 0x001e, /*goto*/ 0x90)
@@ -2732,14 +2732,14 @@ u8 func100e_training_unlockables[] = {
 	endloop(0x0a)
 
 	label(0x2f)
-	set_lights_state(0x0030, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x002e, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x002f, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0020, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0024, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0025, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0026, 0x01, 0xff, 0x00, 0x00)
-	set_lights_state(0x0022, 0x01, 0xff, 0x00, 0x00)
+	set_lights_state(0x0030, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x002e, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x002f, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0020, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0024, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0025, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0026, LIGHTOP_1, 0xff, 0x00, 0x00)
+	set_lights_state(0x0022, LIGHTOP_1, 0xff, 0x00, 0x00)
 
 	beginloop(0x0b)
 		if_savefile_flag_is_set(SAVEFILEFLAG_CI_DOORDECODER_DONE, /*goto*/ 0x2f)
@@ -5934,10 +5934,10 @@ s32 path00[] = {
 u8 func1032_setup_lifts[] = {
 	activate_lift(1, 0x43)
 	activate_lift(2, 0x44)
-	set_lights_state(0x0007, 0x01, 0x32, 0x00, 0x00)
-	set_lights_state(0x0008, 0x01, 0x32, 0x00, 0x00)
-	set_lights_state(0x0009, 0x01, 0x32, 0x00, 0x00)
-	set_lights_state(0x000a, 0x01, 0x19, 0x00, 0x00)
+	set_lights_state(0x0007, LIGHTOP_1, 0x32, 0x00, 0x00)
+	set_lights_state(0x0008, LIGHTOP_1, 0x32, 0x00, 0x00)
+	set_lights_state(0x0009, LIGHTOP_1, 0x32, 0x00, 0x00)
+	set_lights_state(0x000a, LIGHTOP_1, 0x19, 0x00, 0x00)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c
index 3254eb2fb..f66f78b5b 100644
--- a/src/files/setup/setuplee.c
+++ b/src/files/setup/setuplee.c
@@ -1901,7 +1901,7 @@ u8 func100b_msg_getshieldsdown[] = {
 };
 
 u8 func100c_engineroom[] = {
-	set_lights_state(0x0067, 0x04, 0x46, 0xff, 0xfa)
+	set_lights_state(0x0067, LIGHTOP_4, 0x46, 0xff, 0xfa)
 
 	// Wait until both engines destroyed
 	beginloop(0x04)
diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c
index 3c6e206df..34a2536ee 100644
--- a/src/files/setup/setuplip.c
+++ b/src/files/setup/setuplip.c
@@ -2089,14 +2089,14 @@ u8 func041b_labtech_keycardguy[] = {
 };
 
 u8 func100c_keycardguy_lights[] = {
-	set_lights_state(0x0088, 0x01, 0x00, 0x00, 0x00)
+	set_lights_state(0x0088, LIGHTOP_1, 0x00, 0x00, 0x00)
 
 	beginloop(0x04)
 		if_stage_flag_eq(STAGEFLAG_KEYCARDGUY_ANGRY, TRUE, /*goto*/ 0x2d)
 	endloop(0x04)
 
 	label(0x2d)
-	set_lights_state(0x0088, 0x01, 0x64, 0x00, 0x00)
+	set_lights_state(0x0088, LIGHTOP_1, 0x64, 0x00, 0x00)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index c35b3ee36..51baf7bb1 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -2169,7 +2169,7 @@ u8 func1010_bunker_lighting[] = {
 	yield
 	assign_sound(0x04ac, CHANNEL_0)
 	play_sound_from_object(CHANNEL_0, 0x10, 0x0320, 0x044c)
-	set_lights_state(0x0009, 0x03, 0xff, 0x32, 0x78)
+	set_lights_state(0x0009, LIGHTOP_3, 0xff, 0x32, 0x78)
 	if_difficulty_lt(DIFF_SA, /*goto*/ 0x0e)
 	restart_timer
 
diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c
index 1d6e09491..58c9b1a89 100644
--- a/src/files/setup/setuppam.c
+++ b/src/files/setup/setuppam.c
@@ -902,7 +902,7 @@ u8 func0402_elvis_follow_and_reactive_teleportals[] = {
 	set_stage_flag(STAGEFLAG_TELEPORTALS_ACTIVATED)
 	set_self_chrflag(CHRCFLAG_01000000)
 	play_sound(0x8148, -1)
-	set_lights_state(0x003c, 0x04, 0x00, 0xff, 0xb4)
+	set_lights_state(0x003c, LIGHTOP_4, 0x00, 0xff, 0xb4)
 	set_chr_chrflag(0x14, CHRCFLAG_00040000)
 	set_chr_chrflag(0x15, CHRCFLAG_00040000)
 	set_chr_chrflag(0x16, CHRCFLAG_00040000)
@@ -1065,7 +1065,7 @@ u8 func0404_elvis_follow_and_do_agent_megaweapon[] = {
 	show_hudmsg(CHR_BOND, L_PAM(20)) // "Cetan megaweapon has been disabled."
 	set_stage_flag(STAGEFLAG_AGENT_MEGAWEAPON_DISABLED)
 	set_stage_flag(STAGEFLAG_MEGAWEAPON_DISABLED)
-	set_lights_state(0x006c, 0x03, 0x64, 0xff, 0x78)
+	set_lights_state(0x006c, LIGHTOP_3, 0x64, 0xff, 0x78)
 	assign_sound(0x8148, CHANNEL_7)
 	play_sound_from_entity(CHANNEL_7, CHR_SELF, 0x0bb8, 0x1770, 0x01)
 	unlock_door(0xb7, 0x02)
@@ -3675,17 +3675,17 @@ u8 func041e_init_sa_megaweapon_miniskedar[] = {
 
 
 u8 func1013_pa_doorcylinder1[] = {
-	set_lights_state(0x00a1, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00a9, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00ac, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00b4, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00b7, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00bf, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00c0, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00c1, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00c2, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x00c3, 0x04, 0x00, 0xff, 0xb4)
-	set_lights_state(0x006c, 0x04, 0x00, 0xff, 0xf0)
+	set_lights_state(0x00a1, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00a9, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00ac, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00b4, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00b7, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00bf, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00c0, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00c1, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00c2, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x00c3, LIGHTOP_4, 0x00, 0xff, 0xb4)
+	set_lights_state(0x006c, LIGHTOP_4, 0x00, 0xff, 0xf0)
 
 	doorcylinder_logic(0x11, 0x12, 0x13, 0x9c, STAGEFLAG_PA_EARLYDOORCYLINDER1_DESTROYED)
 	endlist
@@ -3734,12 +3734,12 @@ u8 func0408_check_pa_earlydoorcylinders_destroyed[] = {
 	endloop(0x08)
 
 	label(0x06)
-	set_lights_state(0x008b, 0x03, 0xff, 0x0a, 0x78)
-	set_lights_state(0x00bf, 0x03, 0xff, 0x0a, 0x78)
-	set_lights_state(0x00c0, 0x03, 0xff, 0x0a, 0x78)
-	set_lights_state(0x00c1, 0x03, 0xff, 0x0a, 0x78)
-	set_lights_state(0x00c2, 0x03, 0xff, 0x0a, 0x78)
-	set_lights_state(0x00c3, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x008b, LIGHTOP_3, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00bf, LIGHTOP_3, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00c0, LIGHTOP_3, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00c1, LIGHTOP_3, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00c2, LIGHTOP_3, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00c3, LIGHTOP_3, 0xff, 0x0a, 0x78)
 	open_door(0x09)
 	open_door(0x0a)
 	goto_first(0x08)
@@ -3808,7 +3808,7 @@ u8 func0408_check_pa_earlydoorcylinders_destroyed[] = {
 u8 func1018_pa_door1[] = {
 	pa_cylinder(0x20, 0xa1)
 	set_stage_flag(STAGEFLAG_PA_MIDDOORCYLINDER_DESTROYED)
-	set_lights_state(0x00a1, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00a1, LIGHTOP_3, 0xff, 0x0a, 0x78)
 
 	beginloop(0x08)
 		if_door_state(0x0b, (DOORSTATE_CLOSED | DOORSTATE_CLOSING), /*goto*/ 0x06)
@@ -3855,7 +3855,7 @@ u8 func0409_check_pa_latedoorcylinders_destroyed[] = {
 
 u8 func1019_pa_door2[] = {
 	pa_cylinder(0x2c, 0xa2)
-	set_lights_state(0x00a9, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00a9, LIGHTOP_3, 0xff, 0x0a, 0x78)
 	label(0x08)
 	set_stage_flag(STAGEFLAG_PA_LATEDOORCYLINDER1_DESTROYED)
 	set_ailist(CHR_SELF, 0x0409)
@@ -3864,7 +3864,7 @@ u8 func1019_pa_door2[] = {
 
 u8 func101a_pa_door3[] = {
 	pa_cylinder(0x38, 0xa3)
-	set_lights_state(0x00ac, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00ac, LIGHTOP_3, 0xff, 0x0a, 0x78)
 	label(0x08)
 	set_stage_flag(STAGEFLAG_PA_LATEDOORCYLINDER2_DESTROYED)
 	set_ailist(CHR_SELF, 0x0409)
@@ -3873,7 +3873,7 @@ u8 func101a_pa_door3[] = {
 
 u8 func101b_pa_door4[] = {
 	pa_cylinder(0x44, 0xa4)
-	set_lights_state(0x00b4, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00b4, LIGHTOP_3, 0xff, 0x0a, 0x78)
 	label(0x08)
 	set_stage_flag(STAGEFLAG_PA_LATEDOORCYLINDER3_DESTROYED)
 	set_ailist(CHR_SELF, 0x0409)
@@ -3939,7 +3939,7 @@ u8 func101c_pa_door5[] = {
 	destroy_object(0x59)
 	destroy_object(0x5a)
 
-	set_lights_state(0x00b7, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00b7, LIGHTOP_3, 0xff, 0x0a, 0x78)
 	label(0x08)
 	set_stage_flag(STAGEFLAG_PA_LATEDOORCYLINDER4_DESTROYED)
 	set_ailist(CHR_SELF, 0x0409)
@@ -3974,7 +3974,7 @@ u8 func040a_check_pa_canisters_destroyed[] = {
 	// Both canisters destroyed
 	label(0x2e)
 	set_object_flag(0x0f, OBJFLAG_DOOR_KEEPOPEN)
-	set_lights_state(0x00bc, 0x03, 0xff, 0x0a, 0x78)
+	set_lights_state(0x00bc, LIGHTOP_3, 0xff, 0x0a, 0x78)
 
 	beginloop(0x08)
 		if_door_state(0x0f, (DOORSTATE_CLOSED | DOORSTATE_CLOSING), /*goto*/ 0x06)
@@ -4545,7 +4545,7 @@ u8 func0432_dead_skedar[] = {
 };
 
 u8 unregistered_function2[] = {
-	set_lights_state(0x0009, 0x04, 0x00, 0xff, 0xfa)
+	set_lights_state(0x0009, LIGHTOP_4, 0x00, 0xff, 0xfa)
 
 	beginloop(0x08)
 	endloop(0x08)
diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c
index f822d6b4e..820fd81f9 100644
--- a/src/files/setup/setupsho.c
+++ b/src/files/setup/setupsho.c
@@ -1510,38 +1510,38 @@ u8 func1009_altar[] = {
 	label(0x0f)
 	unlock_door(0x09, 0x02)
 	unlock_door(0x0a, 0x02)
-	set_lights_state(0x0060, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0061, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0062, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0063, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0064, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0065, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0066, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0067, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0068, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0069, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x006a, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x006b, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x006c, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x006d, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x006e, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x006f, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0070, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0071, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0072, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0073, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0074, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0075, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0076, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0077, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0078, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x0079, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x007a, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x007b, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x007c, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x007d, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x007e, 0x03, 0x06, 0x80, 0x78)
-	set_lights_state(0x007f, 0x03, 0x06, 0x80, 0x78)
+	set_lights_state(0x0060, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0061, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0062, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0063, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0064, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0065, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0066, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0067, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0068, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0069, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x006a, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x006b, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x006c, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x006d, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x006e, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x006f, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0070, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0071, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0072, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0073, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0074, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0075, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0076, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0077, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0078, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x0079, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x007a, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x007b, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x007c, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x007d, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x007e, LIGHTOP_3, 0x06, 0x80, 0x78)
+	set_lights_state(0x007f, LIGHTOP_3, 0x06, 0x80, 0x78)
 	restart_timer
 
 	beginloop(0x0e)
@@ -1566,36 +1566,36 @@ u8 func101c_setup_corridor_lighting[] = {
 	label(0x04)
 	yield
 	label(0x2d)
-	set_lights_state(0x0060, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0061, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0062, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0063, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0064, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0065, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0066, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0067, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0068, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0069, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x006a, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x006b, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x006c, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x006d, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x006e, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x006f, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0070, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0071, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0072, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0073, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0074, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0076, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0078, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0079, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x007a, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x007b, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x007c, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x007d, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x007e, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x007f, 0x01, 0x06, 0x00, 0x00)
+	set_lights_state(0x0060, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0061, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0062, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0063, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0064, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0065, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0066, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0067, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0068, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0069, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x006a, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x006b, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x006c, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x006d, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x006e, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x006f, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0070, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0071, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0072, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0073, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0074, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0076, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0078, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0079, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x007a, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x007b, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x007c, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x007d, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x007e, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x007f, LIGHTOP_1, 0x06, 0x00, 0x00)
 	yield
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 
@@ -1607,38 +1607,38 @@ u8 func101c_setup_corridor_lighting[] = {
 	endloop(0x08)
 
 	label(0x2d)
-	set_lights_state(0x0060, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0061, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0062, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0063, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0064, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0065, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0066, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0067, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0068, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0069, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x006a, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x006b, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x006c, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x006d, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x006e, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x006f, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0070, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0071, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0072, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0073, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0074, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0075, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0076, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0077, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0078, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0079, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x007a, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x007b, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x007c, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x007d, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x007e, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x007f, 0x03, 0x06, 0xff, 0x78)
+	set_lights_state(0x0060, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0061, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0062, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0063, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0064, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0065, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0066, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0067, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0068, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0069, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x006a, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x006b, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x006c, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x006d, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x006e, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x006f, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0070, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0071, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0072, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0073, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0074, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0075, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0076, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0077, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0078, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0079, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x007a, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x007b, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x007c, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x007d, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x007e, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x007f, LIGHTOP_3, 0x06, 0xff, 0x78)
 	goto_first(0x59)
 
 	set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -1820,8 +1820,8 @@ u8 func0409_reaper_slayer_skedar[] = {
 
 u8 func100a_army_room[] = {
 	yield
-	set_lights_state(0x0082, 0x01, 0x06, 0x00, 0x00)
-	set_lights_state(0x0087, 0x01, 0x06, 0x00, 0x00)
+	set_lights_state(0x0082, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(0x0087, LIGHTOP_1, 0x06, 0x00, 0x00)
 
 	beginloop(0x04)
 		chr_toggle_p1p2(CHR_SELF)
@@ -1849,8 +1849,8 @@ u8 func100a_army_room[] = {
 	endloop(0x08)
 
 	label(0x06)
-	set_lights_state(0x0082, 0x03, 0x06, 0xff, 0x78)
-	set_lights_state(0x0087, 0x03, 0x06, 0xff, 0x78)
+	set_lights_state(0x0082, LIGHTOP_3, 0x06, 0xff, 0x78)
+	set_lights_state(0x0087, LIGHTOP_3, 0x06, 0xff, 0x78)
 	set_stage_flag(STAGEFLAG_TRIGGER_SKEDAR_ARMY)
 	play_x_music(CHANNEL_10, 60)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c
index c7ee50075..7aced715b 100644
--- a/src/files/setup/setupwax.c
+++ b/src/files/setup/setupwax.c
@@ -1170,33 +1170,33 @@ u8 func1002_lightswitch[] = {
 
 		// Turning lights off
 		set_stage_flag(STAGEFLAG_LIGHTS_OFF)
-		set_lights_state(0x0044, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x0039, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x003c, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x003d, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x003e, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x003b, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x0042, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x003f, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x003a, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x0041, 0x01, 0x00, 0x00, 0x00)
-		set_lights_state(0x0040, 0x01, 0x00, 0x00, 0x00)
+		set_lights_state(0x0044, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x0039, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x003c, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x003d, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x003e, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x003b, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x0042, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x003f, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x003a, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x0041, LIGHTOP_1, 0x00, 0x00, 0x00)
+		set_lights_state(0x0040, LIGHTOP_1, 0x00, 0x00, 0x00)
 		reloop(0x04)
 
 		// Turning lights on
 		label(0x06)
 		unset_stage_flag(STAGEFLAG_LIGHTS_OFF)
-		set_lights_state(0x0044, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x0039, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x003c, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x003d, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x003e, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x003b, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x0042, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x003f, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x003a, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x0041, 0x01, 0x64, 0x00, 0x00)
-		set_lights_state(0x0040, 0x01, 0x64, 0x00, 0x00)
+		set_lights_state(0x0044, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x0039, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x003c, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x003d, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x003e, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x003b, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x0042, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x003f, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x003a, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x0041, LIGHTOP_1, 0x64, 0x00, 0x00)
+		set_lights_state(0x0040, LIGHTOP_1, 0x64, 0x00, 0x00)
 	endloop(0x04)
 
 	endlist
@@ -1517,7 +1517,7 @@ u8 func1006_lift_disabling[] = {
 
 	// Disable player's lift
 	label(0x06)
-	set_lights_state(0x0082, 0x02, 0x00, 0x78, 0x00)
+	set_lights_state(0x0082, LIGHTOP_2, 0x00, 0x78, 0x00)
 	play_sound(0x8147, -1)
 	set_object_flag(OBJ_BLONDE_LIFT, OBJFLAG_DEACTIVATED)
 	unlock_door(0x50, 0x40)
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 580d8666b..59d175ffc 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -6170,19 +6170,19 @@ bool aiNoOp0101(void)
 bool aiSetLights(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
-	u16 room_id = cmd[3] | (cmd[2] << 8);
-	s32 thing = chrGetPadRoom(g_Vars.chrdata, room_id);
+	u16 padnum = cmd[3] | (cmd[2] << 8);
+	s32 roomnum = chrGetPadRoom(g_Vars.chrdata, padnum);
 
-	if (thing >= 0) {
+	if (roomnum >= 0) {
 		switch (cmd[4]) {
 		case 7:
-			func0f002b58(thing, false);
+			func0f002b58(roomnum, false);
 			break;
 		case 6:
-			func0f002b58(thing, true);
+			func0f002b58(roomnum, true);
 			break;
 		default:
-			func0f002c28(thing, cmd[4], cmd[5], cmd[6], cmd[7]);
+			roomSetLighting(roomnum, cmd[4], cmd[5], cmd[6], cmd[7]);
 		}
 	}
 
diff --git a/src/game/dlights.c b/src/game/dlights.c
index 40b24f92b..9e105ea1a 100644
--- a/src/game/dlights.c
+++ b/src/game/dlights.c
@@ -2595,18 +2595,18 @@ glabel func0f002b58
 );
 
 GLOBAL_ASM(
-glabel func0f002c28
+glabel roomSetLighting
 .late_rodata
 glabel var7f1a7d98
-.word func0f002c28+0x98 # f002cc0
+.word roomSetLighting+0x98 # f002cc0
 glabel var7f1a7d9c
-.word func0f002c28+0xd0 # f002cf8
+.word roomSetLighting+0xd0 # f002cf8
 glabel var7f1a7da0
-.word func0f002c28+0x174 # f002d9c
+.word roomSetLighting+0x174 # f002d9c
 glabel var7f1a7da4
-.word func0f002c28+0x21c # f002e44
+.word roomSetLighting+0x21c # f002e44
 glabel var7f1a7da8
-.word func0f002c28+0x2c0 # f002ee8
+.word roomSetLighting+0x2c0 # f002ee8
 glabel var7f1a7dac
 .word 0x3c23d70a
 glabel var7f1a7db0
@@ -3536,7 +3536,7 @@ glabel var7f1a7dd4
 /*  f003920:	00003825 */ 	or	$a3,$zero,$zero
 /*  f003924:	35090100 */ 	ori	$t1,$t0,0x100
 /*  f003928:	a6090000 */ 	sh	$t1,0x0($s0)
-/*  f00392c:	0fc00b0a */ 	jal	func0f002c28
+/*  f00392c:	0fc00b0a */ 	jal	roomSetLighting
 /*  f003930:	afa00010 */ 	sw	$zero,0x10($sp)
 /*  f003934:	8e6a0000 */ 	lw	$t2,0x0($s3)
 /*  f003938:	100000a5 */ 	b	.L0f003bd0
@@ -3637,7 +3637,7 @@ glabel var7f1a7dd4
 .L0f003aa4:
 /*  f003aa4:	00002825 */ 	or	$a1,$zero,$zero
 /*  f003aa8:	00003825 */ 	or	$a3,$zero,$zero
-/*  f003aac:	0fc00b0a */ 	jal	func0f002c28
+/*  f003aac:	0fc00b0a */ 	jal	roomSetLighting
 /*  f003ab0:	afa00010 */ 	sw	$zero,0x10($sp)
 /*  f003ab4:	8e790000 */ 	lw	$t9,0x0($s3)
 /*  f003ab8:	03328021 */ 	addu	$s0,$t9,$s2
diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c
index 716a0d6e8..52a54787e 100644
--- a/src/game/game_17f930.c
+++ b/src/game/game_17f930.c
@@ -1467,7 +1467,7 @@ glabel scenarioCtcReset
 /*  f181398:	00003025 */ 	or	$a2,$zero,$zero
 /*  f18139c:	11040004 */ 	beq	$t0,$a0,.L0f1813b0
 /*  f1813a0:	00003825 */ 	or	$a3,$zero,$zero
-/*  f1813a4:	0fc00b0a */ 	jal	func0f002c28
+/*  f1813a4:	0fc00b0a */ 	jal	roomSetLighting
 /*  f1813a8:	afa00010 */ 	sw	$zero,0x10($sp)
 /*  f1813ac:	2408ffff */ 	addiu	$t0,$zero,-1
 .L0f1813b0:
@@ -1842,7 +1842,7 @@ void scenarioKohReset(void)
 	g_ScenarioData.koh.hillpos.z = pad.pos.z;
 	g_ScenarioData.koh.hillpos.y = func0002a36c(&g_ScenarioData.koh.hillpos, &g_ScenarioData.koh.hillroom, 0, 0);
 	g_ScenarioData.koh.unk08 = 0;
-	func0f002c28(g_ScenarioData.koh.hillroom, 5, 0, 0, 0);
+	roomSetLighting(g_ScenarioData.koh.hillroom, LIGHTOP_5, 0, 0, 0);
 }
 
 GLOBAL_ASM(
@@ -1903,7 +1903,7 @@ glabel var7f1b8950
 /*  f181d8c:	4500003b */ 	bc1f	.L0f181e7c
 /*  f181d90:	00000000 */ 	nop
 /*  f181d94:	8664000e */ 	lh	$a0,0xe($s3)
-/*  f181d98:	0fc00b0a */ 	jal	func0f002c28
+/*  f181d98:	0fc00b0a */ 	jal	roomSetLighting
 /*  f181d9c:	afa00010 */ 	sw	$zero,0x10($sp)
 /*  f181da0:	8679000c */ 	lh	$t9,0xc($s3)
 /*  f181da4:	00002025 */ 	or	$a0,$zero,$zero
@@ -1956,7 +1956,7 @@ glabel var7f1b8950
 /*  f181e54:	24050005 */ 	addiu	$a1,$zero,0x5
 /*  f181e58:	00003025 */ 	or	$a2,$zero,$zero
 /*  f181e5c:	00003825 */ 	or	$a3,$zero,$zero
-/*  f181e60:	0fc00b0a */ 	jal	func0f002c28
+/*  f181e60:	0fc00b0a */ 	jal	roomSetLighting
 /*  f181e64:	afa00010 */ 	sw	$zero,0x10($sp)
 /*  f181e68:	240effff */ 	addiu	$t6,$zero,-1
 /*  f181e6c:	a66e0004 */ 	sh	$t6,0x4($s3)
diff --git a/src/game/training.c b/src/game/training.c
index 51bc65faf..27392f752 100644
--- a/src/game/training.c
+++ b/src/game/training.c
@@ -388,7 +388,7 @@ glabel func0f19d338
 /*  f19d368:	02002025 */ 	or	$a0,$s0,$zero
 /*  f19d36c:	24050003 */ 	addiu	$a1,$zero,0x3
 /*  f19d370:	24060032 */ 	addiu	$a2,$zero,0x32
-/*  f19d374:	0fc00b0a */ 	jal	func0f002c28
+/*  f19d374:	0fc00b0a */ 	jal	roomSetLighting
 /*  f19d378:	24070064 */ 	addiu	$a3,$zero,0x64
 /*  f19d37c:	26100001 */ 	addiu	$s0,$s0,0x1
 /*  f19d380:	5611fff8 */ 	bnel	$s0,$s1,.L0f19d364
@@ -398,7 +398,7 @@ glabel func0f19d338
 /*  f19d390:	2404000a */ 	addiu	$a0,$zero,0xa
 /*  f19d394:	24050003 */ 	addiu	$a1,$zero,0x3
 /*  f19d398:	24060019 */ 	addiu	$a2,$zero,0x19
-/*  f19d39c:	0fc00b0a */ 	jal	func0f002c28
+/*  f19d39c:	0fc00b0a */ 	jal	roomSetLighting
 /*  f19d3a0:	24070064 */ 	addiu	$a3,$zero,0x64
 /*  f19d3a4:	3c09800b */ 	lui	$t1,%hi(g_FiringRangeData+0x465)
 /*  f19d3a8:	912ad185 */ 	lbu	$t2,%lo(g_FiringRangeData+0x465)($t1)
@@ -431,65 +431,22 @@ glabel func0f19d338
 /*  f19d410:	27bd0030 */ 	addiu	$sp,$sp,0x30
 );
 
-GLOBAL_ASM(
-glabel func0f19d414
-/*  f19d414:	3c0e800b */ 	lui	$t6,%hi(g_FiringRangeData+0x464)
-/*  f19d418:	8dced184 */ 	lw	$t6,%lo(g_FiringRangeData+0x464)($t6)
-/*  f19d41c:	27bdffd0 */ 	addiu	$sp,$sp,-48
-/*  f19d420:	24010001 */ 	addiu	$at,$zero,0x1
-/*  f19d424:	000e7ac0 */ 	sll	$t7,$t6,0xb
-/*  f19d428:	000fc7c2 */ 	srl	$t8,$t7,0x1f
-/*  f19d42c:	afbf002c */ 	sw	$ra,0x2c($sp)
-/*  f19d430:	afb10028 */ 	sw	$s1,0x28($sp)
-/*  f19d434:	17010028 */ 	bne	$t8,$at,.L0f19d4d8
-/*  f19d438:	afb00024 */ 	sw	$s0,0x24($sp)
-/*  f19d43c:	24100007 */ 	addiu	$s0,$zero,0x7
-/*  f19d440:	2411000a */ 	addiu	$s1,$zero,0xa
-/*  f19d444:	24190008 */ 	addiu	$t9,$zero,0x8
-.L0f19d448:
-/*  f19d448:	afb90010 */ 	sw	$t9,0x10($sp)
-/*  f19d44c:	02002025 */ 	or	$a0,$s0,$zero
-/*  f19d450:	24050003 */ 	addiu	$a1,$zero,0x3
-/*  f19d454:	24060064 */ 	addiu	$a2,$zero,0x64
-/*  f19d458:	0fc00b0a */ 	jal	func0f002c28
-/*  f19d45c:	24070032 */ 	addiu	$a3,$zero,0x32
-/*  f19d460:	26100001 */ 	addiu	$s0,$s0,0x1
-/*  f19d464:	5611fff8 */ 	bnel	$s0,$s1,.L0f19d448
-/*  f19d468:	24190008 */ 	addiu	$t9,$zero,0x8
-/*  f19d46c:	24080008 */ 	addiu	$t0,$zero,0x8
-/*  f19d470:	afa80010 */ 	sw	$t0,0x10($sp)
-/*  f19d474:	2404000a */ 	addiu	$a0,$zero,0xa
-/*  f19d478:	24050003 */ 	addiu	$a1,$zero,0x3
-/*  f19d47c:	24060064 */ 	addiu	$a2,$zero,0x64
-/*  f19d480:	0fc00b0a */ 	jal	func0f002c28
-/*  f19d484:	24070019 */ 	addiu	$a3,$zero,0x19
-/*  f19d488:	3c09800b */ 	lui	$t1,%hi(g_FiringRangeData+0x465)
-/*  f19d48c:	9129d185 */ 	lbu	$t1,%lo(g_FiringRangeData+0x465)($t1)
-/*  f19d490:	3c01800b */ 	lui	$at,%hi(g_FiringRangeData+0x465)
-/*  f19d494:	3c048009 */ 	lui	$a0,%hi(var80095200)
-/*  f19d498:	312affef */ 	andi	$t2,$t1,0xffef
-/*  f19d49c:	a02ad185 */ 	sb	$t2,%lo(g_FiringRangeData+0x465)($at)
-/*  f19d4a0:	3c01bf80 */ 	lui	$at,0xbf80
-/*  f19d4a4:	44812000 */ 	mtc1	$at,$f4
-/*  f19d4a8:	240bffff */ 	addiu	$t3,$zero,-1
-/*  f19d4ac:	240cffff */ 	addiu	$t4,$zero,-1
-/*  f19d4b0:	240dffff */ 	addiu	$t5,$zero,-1
-/*  f19d4b4:	afad001c */ 	sw	$t5,0x1c($sp)
-/*  f19d4b8:	afac0018 */ 	sw	$t4,0x18($sp)
-/*  f19d4bc:	afab0010 */ 	sw	$t3,0x10($sp)
-/*  f19d4c0:	8c845200 */ 	lw	$a0,%lo(var80095200)($a0)
-/*  f19d4c4:	240505d6 */ 	addiu	$a1,$zero,0x5d6
-/*  f19d4c8:	00003025 */ 	or	$a2,$zero,$zero
-/*  f19d4cc:	2407ffff */ 	addiu	$a3,$zero,-1
-/*  f19d4d0:	0c004241 */ 	jal	audioStart
-/*  f19d4d4:	e7a40014 */ 	swc1	$f4,0x14($sp)
-.L0f19d4d8:
-/*  f19d4d8:	8fbf002c */ 	lw	$ra,0x2c($sp)
-/*  f19d4dc:	8fb00024 */ 	lw	$s0,0x24($sp)
-/*  f19d4e0:	8fb10028 */ 	lw	$s1,0x28($sp)
-/*  f19d4e4:	03e00008 */ 	jr	$ra
-/*  f19d4e8:	27bd0030 */ 	addiu	$sp,$sp,0x30
-);
+void frRestoreLighting(void)
+{
+	if (g_FiringRangeData.unk465_03 == 1) {
+		s32 roomnum;
+
+		for (roomnum = 7; roomnum < 10; roomnum++) {
+			roomSetLighting(roomnum, LIGHTOP_3, 100, 50, 8);
+		}
+
+		roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 100, 25, 8);
+
+		g_FiringRangeData.unk465_03 = 0;
+
+		audioStart(var80095200, 0x5d6, NULL, -1, -1, -1, -1, -1);
+	}
+}
 
 void func0f19d4ec(void)
 {
@@ -2075,7 +2032,7 @@ void frEndSession(bool hidetargets)
 
 		g_FrIsValidWeapon = 0;
 
-		func0f19d414();
+		frRestoreLighting();
 
 		if (hidetargets) {
 			frHideAllTargets();
diff --git a/src/include/commands.h b/src/include/commands.h
index c0973f107..7921e29b3 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -2257,9 +2257,9 @@
 	mkshort(0x0101), \
 	u1,
 
-#define set_lights_state(room, operation, u1, u2, u3) \
+#define set_lights_state(pad, operation, u1, u2, u3) \
 	mkshort(0x0102), \
-	mkshort(room), \
+	mkshort(pad), \
 	operation, \
 	u1, \
 	u2, \
diff --git a/src/include/constants.h b/src/include/constants.h
index 0620e046d..d302e4d26 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -914,6 +914,14 @@
 #define LANGUAGE_ENGLISH  0
 #define LANGUAGE_JAPANESE 1
 
+#define LIGHTOP_1 1
+#define LIGHTOP_2 2
+#define LIGHTOP_3 3
+#define LIGHTOP_4 4
+#define LIGHTOP_5 5
+#define LIGHTOP_6 6
+#define LIGHTOP_7 7
+
 // These actions are assigned to chr->myaction
 #define MA_NONE            0
 #define MA_NORMAL          1
diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h
index 9d0e3d552..34ad3af84 100644
--- a/src/include/game/dlights.h
+++ b/src/include/game/dlights.h
@@ -32,7 +32,7 @@ u32 func0f00259c(void);
 u32 func0f002844(void);
 u32 func0f002a98(void);
 void func0f002b58(s32 roomthing, bool enable);
-void func0f002c28(s32 room_id, s32 operation, s32 arg2, s32 arg3, s32 arg4);
+void roomSetLighting(s32 room_id, s32 operation, s32 arg2, s32 arg3, s32 arg4);
 u32 func0f002ef8(void);
 void func0f0033b0(void);
 u32 func0f003444(void);
diff --git a/src/include/game/training.h b/src/include/game/training.h
index d46d88e71..1cc419a5c 100644
--- a/src/include/game/training.h
+++ b/src/include/game/training.h
@@ -23,7 +23,7 @@ void frSetSlot(s32 slot);
 u32 frGetWeaponBySlot(s32 slot);
 s32 frGetNumWeaponsAvailable(void);
 u32 func0f19d338(void);
-void func0f19d414(void);
+void frRestoreLighting(void);
 void func0f19d4ec(void);
 void *frLoadRomData(u32 len);
 void frSetDifficulty(s32 difficulty);