diff --git a/src/assets/jpn-final/tiles/dish.json b/src/assets/jpn-final/tiles/dish.json
index e45bf48e6..2c899622b 100644
--- a/src/assets/jpn-final/tiles/dish.json
+++ b/src/assets/jpn-final/tiles/dish.json
@@ -12608,7 +12608,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_000A": [
+        "ROOM_DISH_FIRINGRANGE": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -26774,7 +26774,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0016": [
+        "ROOM_DISH_HOLO1": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -27722,7 +27722,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0017": [
+        "ROOM_DISH_HOLO2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -28534,7 +28534,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0018": [
+        "ROOM_DISH_HOLO3": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -29035,7 +29035,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0019": [
+        "ROOM_DISH_HOLO4": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -33590,7 +33590,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_001E": [
+        "ROOM_DISH_DEVICELAB": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/assets/ntsc-1.0/tiles/dish.json b/src/assets/ntsc-1.0/tiles/dish.json
index e45bf48e6..2c899622b 100644
--- a/src/assets/ntsc-1.0/tiles/dish.json
+++ b/src/assets/ntsc-1.0/tiles/dish.json
@@ -12608,7 +12608,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_000A": [
+        "ROOM_DISH_FIRINGRANGE": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -26774,7 +26774,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0016": [
+        "ROOM_DISH_HOLO1": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -27722,7 +27722,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0017": [
+        "ROOM_DISH_HOLO2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -28534,7 +28534,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0018": [
+        "ROOM_DISH_HOLO3": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -29035,7 +29035,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0019": [
+        "ROOM_DISH_HOLO4": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -33590,7 +33590,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_001E": [
+        "ROOM_DISH_DEVICELAB": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/assets/ntsc-beta/tiles/azt.json b/src/assets/ntsc-beta/tiles/azt.json
index 522200aef..d23367ded 100644
--- a/src/assets/ntsc-beta/tiles/azt.json
+++ b/src/assets/ntsc-beta/tiles/azt.json
@@ -187075,7 +187075,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_003D": [
+        "ROOM_AZT_003C_2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -187267,7 +187267,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_003E": [
+        "ROOM_AZT_003D": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -188693,7 +188693,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_003F": [
+        "ROOM_AZT_003E": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -188927,7 +188927,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0040": [
+        "ROOM_AZT_003F": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -189351,7 +189351,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0041": [
+        "ROOM_AZT_0040": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -191292,7 +191292,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0042": [
+        "ROOM_AZT_0041": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -192330,7 +192330,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0043": [
+        "ROOM_AZT_0042": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -192892,7 +192892,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0044": [
+        "ROOM_AZT_0043": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -194453,7 +194453,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0045": [
+        "ROOM_AZT_0044": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -196133,7 +196133,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0046": [
+        "ROOM_AZT_0045": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -196885,7 +196885,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0047": [
+        "ROOM_AZT_0046": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -197820,7 +197820,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0048": [
+        "ROOM_AZT_0047": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -199034,7 +199034,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0049": [
+        "ROOM_AZT_0048": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -200359,7 +200359,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_004A": [
+        "ROOM_AZT_0049": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -200983,7 +200983,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_004B": [
+        "ROOM_AZT_004A": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -202764,7 +202764,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_004C": [
+        "ROOM_AZT_004B": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -204024,7 +204024,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_004D": [
+        "ROOM_AZT_004C": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -207968,7 +207968,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_004E": [
+        "ROOM_AZT_004D": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -213033,7 +213033,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_004F": [
+        "ROOM_AZT_004E": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -213610,7 +213610,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0050": [
+        "ROOM_AZT_004F": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -214742,7 +214742,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0051": [
+        "ROOM_AZT_0050": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -216180,7 +216180,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0052": [
+        "ROOM_AZT_0051": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -217667,7 +217667,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0053": [
+        "ROOM_AZT_0052": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -219522,7 +219522,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0054": [
+        "ROOM_AZT_0053": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -221806,7 +221806,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0055": [
+        "ROOM_AZT_0054": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -226063,7 +226063,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0056": [
+        "ROOM_AZT_0055": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -228675,7 +228675,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0057": [
+        "ROOM_AZT_0056": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -233154,7 +233154,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0058": [
+        "ROOM_AZT_0057": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -236486,7 +236486,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0059": [
+        "ROOM_AZT_0058": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -238972,7 +238972,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_005A": [
+        "ROOM_AZT_0059": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -239174,7 +239174,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_005B": [
+        "ROOM_AZT_005A": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -242050,7 +242050,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_005C": [
+        "ROOM_AZT_005B": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -244102,7 +244102,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_005D": [
+        "ROOM_AZT_005C": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -247634,7 +247634,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_005E": [
+        "ROOM_AZT_005D": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -248221,7 +248221,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_005F": [
+        "ROOM_AZT_005E": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -248956,7 +248956,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0060": [
+        "ROOM_AZT_005F": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -250293,7 +250293,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0061": [
+        "ROOM_AZT_0060": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -251741,7 +251741,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0062": [
+        "ROOM_AZT_0061": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -252587,7 +252587,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0063": [
+        "ROOM_AZT_0062": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -254605,7 +254605,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0064": [
+        "ROOM_AZT_0063": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -255974,7 +255974,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0065": [
+        "ROOM_AZT_0064": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -257861,7 +257861,7 @@
                 ]
             }
         ],
-        "ROOM_AZT_0066": [
+        "ROOM_AZT_0065": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/assets/ntsc-beta/tiles/dish.json b/src/assets/ntsc-beta/tiles/dish.json
index 9aabd5e96..5020c11f0 100644
--- a/src/assets/ntsc-beta/tiles/dish.json
+++ b/src/assets/ntsc-beta/tiles/dish.json
@@ -12608,7 +12608,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_000A": [
+        "ROOM_DISH_FIRINGRANGE": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -26774,7 +26774,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0016": [
+        "ROOM_DISH_HOLO1": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -27722,7 +27722,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0017": [
+        "ROOM_DISH_HOLO2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -28534,7 +28534,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0018": [
+        "ROOM_DISH_HOLO3": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -29035,7 +29035,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0019": [
+        "ROOM_DISH_HOLO4": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -33590,7 +33590,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_001E": [
+        "ROOM_DISH_DEVICELAB": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/assets/ntsc-final/tiles/dish.json b/src/assets/ntsc-final/tiles/dish.json
index e45bf48e6..2c899622b 100644
--- a/src/assets/ntsc-final/tiles/dish.json
+++ b/src/assets/ntsc-final/tiles/dish.json
@@ -12608,7 +12608,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_000A": [
+        "ROOM_DISH_FIRINGRANGE": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -26774,7 +26774,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0016": [
+        "ROOM_DISH_HOLO1": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -27722,7 +27722,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0017": [
+        "ROOM_DISH_HOLO2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -28534,7 +28534,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0018": [
+        "ROOM_DISH_HOLO3": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -29035,7 +29035,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0019": [
+        "ROOM_DISH_HOLO4": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -33590,7 +33590,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_001E": [
+        "ROOM_DISH_DEVICELAB": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/assets/pal-beta/tiles/dish.json b/src/assets/pal-beta/tiles/dish.json
index e45bf48e6..2c899622b 100644
--- a/src/assets/pal-beta/tiles/dish.json
+++ b/src/assets/pal-beta/tiles/dish.json
@@ -12608,7 +12608,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_000A": [
+        "ROOM_DISH_FIRINGRANGE": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -26774,7 +26774,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0016": [
+        "ROOM_DISH_HOLO1": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -27722,7 +27722,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0017": [
+        "ROOM_DISH_HOLO2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -28534,7 +28534,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0018": [
+        "ROOM_DISH_HOLO3": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -29035,7 +29035,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0019": [
+        "ROOM_DISH_HOLO4": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -33590,7 +33590,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_001E": [
+        "ROOM_DISH_DEVICELAB": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/assets/pal-final/tiles/dish.json b/src/assets/pal-final/tiles/dish.json
index e45bf48e6..2c899622b 100644
--- a/src/assets/pal-final/tiles/dish.json
+++ b/src/assets/pal-final/tiles/dish.json
@@ -12608,7 +12608,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_000A": [
+        "ROOM_DISH_FIRINGRANGE": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -26774,7 +26774,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0016": [
+        "ROOM_DISH_HOLO1": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -27722,7 +27722,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0017": [
+        "ROOM_DISH_HOLO2": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -28534,7 +28534,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0018": [
+        "ROOM_DISH_HOLO3": [
             {
                 "flag0001": false,
                 "flag0002": false,
@@ -29035,7 +29035,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_0019": [
+        "ROOM_DISH_HOLO4": [
             {
                 "flag0001": true,
                 "flag0002": true,
@@ -33590,7 +33590,7 @@
                 ]
             }
         ],
-        "ROOM_DISH_001E": [
+        "ROOM_DISH_DEVICELAB": [
             {
                 "flag0001": false,
                 "flag0002": false,
diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c
index 82ab60ec4..1704c726e 100644
--- a/src/files/setup/setupazt.c
+++ b/src/files/setup/setupazt.c
@@ -1739,10 +1739,10 @@ u8 func100e_check_robots_left[] = {
 		if_chr_death_animation_finished(CHR_ROBOT1, /*goto*/ 0x31)
 		if_chr_dead(CHR_ROBOT1, /*goto*/ 0x31)
 		if_chr_knockedout(CHR_ROBOT1, /*goto*/ 0x31)
-		if_chr_in_room(CHR_ROBOT1, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004a : 0x004b, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT1, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004b : 0x004c, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT1, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004c : 0x004d, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT1, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004d : 0x004e, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT1, 0x00, ROOM_AZT_004A, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT1, 0x00, ROOM_AZT_004B, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT1, 0x00, ROOM_AZT_004C, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT1, 0x00, ROOM_AZT_004D, /*goto*/ 0x08)
 		goto_next(0x31)
 		label(0x08)
 		reloop(0x06)
@@ -1751,10 +1751,10 @@ u8 func100e_check_robots_left[] = {
 		if_chr_death_animation_finished(CHR_ROBOT2, /*goto*/ 0x31)
 		if_chr_dead(CHR_ROBOT2, /*goto*/ 0x31)
 		if_chr_knockedout(CHR_ROBOT2, /*goto*/ 0x31)
-		if_chr_in_room(CHR_ROBOT2, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004a : 0x004b, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT2, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004b : 0x004c, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT2, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004c : 0x004d, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT2, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004d : 0x004e, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT2, 0x00, ROOM_AZT_004A, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT2, 0x00, ROOM_AZT_004B, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT2, 0x00, ROOM_AZT_004C, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT2, 0x00, ROOM_AZT_004D, /*goto*/ 0x08)
 		goto_next(0x31)
 		label(0x08)
 		reloop(0x06)
@@ -1763,10 +1763,10 @@ u8 func100e_check_robots_left[] = {
 		if_chr_death_animation_finished(CHR_ROBOT3, /*goto*/ 0x31)
 		if_chr_dead(CHR_ROBOT3, /*goto*/ 0x31)
 		if_chr_knockedout(CHR_ROBOT3, /*goto*/ 0x31)
-		if_chr_in_room(CHR_ROBOT3, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004a : 0x004b, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT3, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004b : 0x004c, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT3, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004c : 0x004d, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT3, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004d : 0x004e, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT3, 0x00, ROOM_AZT_004A, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT3, 0x00, ROOM_AZT_004B, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT3, 0x00, ROOM_AZT_004C, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT3, 0x00, ROOM_AZT_004D, /*goto*/ 0x08)
 		goto_next(0x31)
 		label(0x08)
 		reloop(0x06)
@@ -1775,10 +1775,10 @@ u8 func100e_check_robots_left[] = {
 		if_chr_death_animation_finished(CHR_ROBOT4, /*goto*/ 0x31)
 		if_chr_dead(CHR_ROBOT4, /*goto*/ 0x31)
 		if_chr_knockedout(CHR_ROBOT4, /*goto*/ 0x31)
-		if_chr_in_room(CHR_ROBOT4, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004a : 0x004b, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT4, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004b : 0x004c, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT4, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004c : 0x004d, /*goto*/ 0x08)
-		if_chr_in_room(CHR_ROBOT4, 0x00, VERSION >= VERSION_NTSC_1_0 ? 0x004d : 0x004e, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT4, 0x00, ROOM_AZT_004A, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT4, 0x00, ROOM_AZT_004B, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT4, 0x00, ROOM_AZT_004C, /*goto*/ 0x08)
+		if_chr_in_room(CHR_ROBOT4, 0x00, ROOM_AZT_004D, /*goto*/ 0x08)
 		goto_next(0x31)
 		label(0x08)
 		reloop(0x06)
@@ -1975,30 +1975,21 @@ u8 func0421_starting_area_guard[] = {
 
 u8 func1010_set_cave_lights[] = {
 	yield
-#if VERSION < VERSION_NTSC_1_0
-	set_lights_state(0x0065, LIGHTOP_1, 0x06, 0x00, 0x00)
-#endif
-	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)
-#if VERSION >= VERSION_NTSC_1_0
-	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)
-#else
-	set_lights_state(0x0054, LIGHTOP_1, 0x06, 0x00, 0x00)
-	set_lights_state(0x0059, LIGHTOP_1, 0x06, 0x00, 0x00)
-	set_lights_state(0x0057, LIGHTOP_1, 0x06, 0x00, 0x00)
-#endif
+	set_lights_state(ROOM_AZT_0064, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0063, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0062, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0061, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0060, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_005F, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_005E, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_005D, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_005C, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_005B, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_005A, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0059, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0053, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0058, LIGHTOP_1, 0x06, 0x00, 0x00)
+	set_lights_state(ROOM_AZT_0056, LIGHTOP_1, 0x06, 0x00, 0x00)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
@@ -2040,115 +2031,108 @@ u8 func1014_setup_skedar_shuttle[] = {
 
 u8 func1415_setup_environment[] = {
 	yield
-	configure_environment(0x0001, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0001, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0002, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0002, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0003, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0004, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0005, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0006, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0006, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0008, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0009, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0009, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x000a, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x000a, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x000b, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x000b, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x000c, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x000c, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x000d, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x000d, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x000e, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x000e, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x000f, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x000f, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0010, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0010, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0011, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0011, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0012, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0012, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0013, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0013, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0014, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0014, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0015, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0015, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0016, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0016, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0018, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0018, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0019, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0019, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x001a, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x001b, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x001b, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x001c, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x001c, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x001d, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x001e, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x001e, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0025, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0025, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0026, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0026, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0027, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0027, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0028, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0028, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0029, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0029, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x002a, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x002a, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x002b, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x002b, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x002c, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x002c, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x002e, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x002e, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x002f, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x002f, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0030, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0030, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0031, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0031, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0032, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0032, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0033, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0033, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0035, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0035, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0036, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0036, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0038, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0038, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003a, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x003a, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003b, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x003b, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003c, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0001, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0001, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0002, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0002, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0003, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0004, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0005, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0006, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0006, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0008, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0009, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0009, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_000A, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_000A, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_000B, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_000B, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_000C, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_000C, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_000D, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_000D, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_000E, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_000E, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_000F, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_000F, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0010, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0010, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0011, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0011, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0012, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0012, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0013, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0013, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0014, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0014, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0015, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0015, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0016, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0016, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0018, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0018, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0019, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0019, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_001A, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_001B, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_001B, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_001C, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_001C, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_001D, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_001E, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_001E, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0025, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0025, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0026, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0026, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0027, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0027, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0028, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0028, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0029, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0029, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_002A, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_002A, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_002B, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_002B, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_002C, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_002C, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_002E, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_002E, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_002F, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_002F, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0030, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0030, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0031, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0031, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0032, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0032, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0033, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0033, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0035, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0035, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0036, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0036, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_0038, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0038, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003A, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_003A, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003B, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_003B, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003C, AIENVCMD_ROOM_SETAMBIENT, TRUE)
 #if VERSION >= VERSION_NTSC_1_0
-	configure_environment(0x003c, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003d, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x003d, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003e, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003f, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0045, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0065, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0065, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003C, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
 #else
-	configure_environment(0x003d, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x003d, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003e, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x003e, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x003f, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
-	configure_environment(0x0040, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0046, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0066, AIENVCMD_ROOM_SETAMBIENT, TRUE)
-	configure_environment(0x0066, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003C_2, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_003C_2, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
 #endif
+	configure_environment(ROOM_AZT_003D, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_003D, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003E, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
+	configure_environment(ROOM_AZT_003F, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0045, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0065, AIENVCMD_ROOM_SETAMBIENT, TRUE)
+	configure_environment(ROOM_AZT_0065, AIENVCMD_ROOM_SETOUTDOORS, TRUE)
 	set_ailist(CHR_SELF, GAILIST_IDLE)
 	endlist
 };
@@ -2213,9 +2197,3 @@ struct ailist ailists[] = {
 	{ func0422_hide,                    0x0422 },
 	{ NULL, 0 },
 };
-
-
-
-
-
-
diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c
index 7ac41fc02..821b963b4 100644
--- a/src/game/game_0b69d0.c
+++ b/src/game/game_0b69d0.c
@@ -4223,9 +4223,9 @@ void currentPlayerTickPauseMenu(void)
 					&& g_Vars.stagenum == STAGE_CITRAINING) {
 				s32 room = g_Vars.currentplayer->prop->rooms[0];
 
-				if ((room >= CIROOM_HOLOSTART && room <= CIROOM_HOLOEND)
-						|| room == CIROOM_FIRINGRANGE
-						|| room == CIROOM_DEVICEROOM
+				if ((room >= ROOM_DISH_HOLO1 && room <= ROOM_DISH_HOLO4)
+						|| room == ROOM_DISH_FIRINGRANGE
+						|| room == ROOM_DISH_DEVICELAB
 						|| (data && data->intraining)) {
 					return;
 				}
diff --git a/src/game/lv.c b/src/game/lv.c
index 339f58239..142d0354b 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -8314,8 +8314,8 @@ void lvTick(void)
 		if (mainGetStageNum() == STAGE_CITRAINING) {
 			struct trainingdata *trainingdata = dtGetData();
 
-			if ((g_Vars.currentplayer->prop->rooms[0] < CIROOM_HOLOSTART || g_Vars.currentplayer->prop->rooms[0] > CIROOM_HOLOEND)
-					&& g_Vars.currentplayer->prop->rooms[0] != CIROOM_FIRINGRANGE
+			if ((g_Vars.currentplayer->prop->rooms[0] < ROOM_DISH_HOLO1 || g_Vars.currentplayer->prop->rooms[0] > ROOM_DISH_HOLO4)
+					&& g_Vars.currentplayer->prop->rooms[0] != ROOM_DISH_FIRINGRANGE
 					&& (trainingdata == NULL || trainingdata->intraining == false)) {
 				chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
 			}
diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c
index 3db2bb9ee..35b6d25df 100644
--- a/src/game/mainmenu.c
+++ b/src/game/mainmenu.c
@@ -6215,7 +6215,7 @@ bool soloChoosePauseDialog(void)
 				struct trainingdata *dtdata = dtGetData();
 				s32 room = g_Vars.currentplayer->prop->rooms[0];
 
-				if (room >= CIROOM_HOLOSTART && room <= CIROOM_HOLOEND) {
+				if (room >= ROOM_DISH_HOLO1 && room <= ROOM_DISH_HOLO4) {
 					struct trainingdata *htdata = getHoloTrainingData();
 
 					if (htdata->intraining) {
@@ -6227,7 +6227,7 @@ bool soloChoosePauseDialog(void)
 					}
 
 					handled = true;
-				} else if (room == CIROOM_DEVICEROOM) {
+				} else if (room == ROOM_DISH_DEVICELAB) {
 					if (dtdata->intraining) {
 						menuPushRootDialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING);
 					} else if (dtdata->finished) {
@@ -6243,7 +6243,7 @@ bool soloChoosePauseDialog(void)
 				} else if (dtdata->finished) {
 					dtPushEndscreen();
 					handled = true;
-				} else if (room == CIROOM_FIRINGRANGE) {
+				} else if (room == ROOM_DISH_FIRINGRANGE) {
 					if (frIsInTraining()) {
 						menuPushRootDialog(&g_FrTrainingInfoInGameMenuDialog, MENUROOT_TRAINING);
 					} else {
diff --git a/src/game/training/training.c b/src/game/training/training.c
index 64e4d05e6..17228656b 100644
--- a/src/game/training/training.c
+++ b/src/game/training/training.c
@@ -400,7 +400,7 @@ void frInitLighting(void)
 			roomSetLighting(roomnum, LIGHTOP_3, 50, 100, PALDOWN(32));
 		}
 
-		roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 25, 100, PALDOWN(32));
+		roomSetLighting(ROOM_DISH_FIRINGRANGE, LIGHTOP_3, 25, 100, PALDOWN(32));
 
 		g_FrData.donelighting = true;
 
@@ -419,7 +419,7 @@ void frRestoreLighting(void)
 			roomSetLighting(roomnum, LIGHTOP_3, 100, 50, PALDOWN(8));
 		}
 
-		roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 100, 25, PALDOWN(8));
+		roomSetLighting(ROOM_DISH_FIRINGRANGE, LIGHTOP_3, 100, 25, PALDOWN(8));
 
 		g_FrData.donelighting = false;
 
@@ -6434,7 +6434,7 @@ glabel var7f1b94e4
 //
 //	// be8
 //	// End the session if the player slipped through the door before it closed
-//	if (g_Vars.currentplayer->prop->rooms[0] != CIROOM_FIRINGRANGE) {
+//	if (g_Vars.currentplayer->prop->rooms[0] != ROOM_DISH_FIRINGRANGE) {
 //		if (g_FrIsValidWeapon) {
 //			for (i = 0; i < ARRAYCOUNT(g_FrData.targets); i++) {
 //				if (g_FrData.targets[i].inuse
@@ -6965,7 +6965,7 @@ s32 frIsInTraining(void)
 		return true;
 	}
 
-	return g_Vars.currentplayer->prop->rooms[0] == CIROOM_FIRINGRANGE
+	return g_Vars.currentplayer->prop->rooms[0] == ROOM_DISH_FIRINGRANGE
 		&& g_FrIsValidWeapon
 		&& mainGetStageNum() == STAGE_CITRAINING;
 }
diff --git a/src/game/weather/weather.c b/src/game/weather/weather.c
index f2e8fd6d9..2c931f550 100644
--- a/src/game/weather/weather.c
+++ b/src/game/weather/weather.c
@@ -654,59 +654,59 @@ bool weatherIsRoomWeatherProof(s32 room)
 {
 	if (g_StageIndex == STAGEINDEX_CHICAGO) {
 		// Rooms listed do not have weather
-		if (room == 0x62
-				|| room == 0x61
-				|| room == 0x0f
-				|| room == 0x52
-				|| room == 0x45
-				|| room == 0x44
-				|| room == 0x43
-				|| room == 0x3d
-				|| room == 0x0e
-				|| room == 0x0d
-				|| room == 0x0c
-				|| room == 0x0b
-				|| room == 0x0a
-				|| room == 0x09
-				|| room == 0x08
-				|| room == 0x07
-				|| room == 0x06
-				|| room == 0x05
-				|| room == 0x04
-				|| room == 0x37
-				|| room == 0x5b
-				|| room == 0x5f
-				|| room == 0x60
-				|| room == 0x5d
-				|| room == 0x1d
-				|| room == 0x1f
-				|| room == 0x27
-				|| room == 0x50
-				|| room == 0x2c
-				|| room == 0x2f
-				|| room == 0x30
-				|| room == 0x11
-				|| room == 0x24
-				|| room == 0x33
-				|| room == 0x34
-				|| room == 0x35
-				|| room == 0x36
-				|| room == 0x3c
-				|| room == 0x46
-				|| room == 0x47
-				|| room == 0x49
-				|| room == 0x55
-				|| room == 0x56
-				|| room == 0x5e
-				|| room == 0x63
-				|| room == 0x69
-				|| room == 0x03
-				|| room == 0x16
-				|| room == 0x4f
-				|| room == 0x4b
-				|| room == 0x3f
-				|| room == 0x13
-				|| room == 0x19) {
+		if (room == ROOM_PETE_0062
+				|| room == ROOM_PETE_0061
+				|| room == ROOM_PETE_000F
+				|| room == ROOM_PETE_0052
+				|| room == ROOM_PETE_0045
+				|| room == ROOM_PETE_0044
+				|| room == ROOM_PETE_0043
+				|| room == ROOM_PETE_003D
+				|| room == ROOM_PETE_000E
+				|| room == ROOM_PETE_000D
+				|| room == ROOM_PETE_000C
+				|| room == ROOM_PETE_000B
+				|| room == ROOM_PETE_000A
+				|| room == ROOM_PETE_0009
+				|| room == ROOM_PETE_0008
+				|| room == ROOM_PETE_0007
+				|| room == ROOM_PETE_0006
+				|| room == ROOM_PETE_0005
+				|| room == ROOM_PETE_0004
+				|| room == ROOM_PETE_0037
+				|| room == ROOM_PETE_005B
+				|| room == ROOM_PETE_005F
+				|| room == ROOM_PETE_0060
+				|| room == ROOM_PETE_005D
+				|| room == ROOM_PETE_001D
+				|| room == ROOM_PETE_001F
+				|| room == ROOM_PETE_0027
+				|| room == ROOM_PETE_0050
+				|| room == ROOM_PETE_002C
+				|| room == ROOM_PETE_002F
+				|| room == ROOM_PETE_0030
+				|| room == ROOM_PETE_0011
+				|| room == ROOM_PETE_0024
+				|| room == ROOM_PETE_0033
+				|| room == ROOM_PETE_0034
+				|| room == ROOM_PETE_0035
+				|| room == ROOM_PETE_0036
+				|| room == ROOM_PETE_003C
+				|| room == ROOM_PETE_0046
+				|| room == ROOM_PETE_0047
+				|| room == ROOM_PETE_0049
+				|| room == ROOM_PETE_0055
+				|| room == ROOM_PETE_0056
+				|| room == ROOM_PETE_005E
+				|| room == ROOM_PETE_0063
+				|| room == ROOM_PETE_0069
+				|| room == ROOM_PETE_0003
+				|| room == ROOM_PETE_0016
+				|| room == ROOM_PETE_004F
+				|| room == ROOM_PETE_004B
+				|| room == ROOM_PETE_003F
+				|| room == ROOM_PETE_0013
+				|| room == ROOM_PETE_0019) {
 			return true;
 		}
 
@@ -715,25 +715,25 @@ bool weatherIsRoomWeatherProof(s32 room)
 
 	if (g_StageIndex == STAGEINDEX_AIRBASE) {
 		// Rooms listed have weather
-		if (room == 0x88
-				|| room == 0x91
-				|| room == 0x87
-				|| room == 0x90
-				|| room == 0x86
-				|| room == 0x80
-				|| room == 0x83
-				|| room == 0x84
-				|| room == 0x85
-				|| room == 0x7f
-				|| room == 0x7e
-				|| room == 0x82
-				|| room == 0x8f
-				|| room == 0x8e
-				|| room == 0x7b
-				|| room == 0x7c
-				|| room == 0x7d
-				|| room == 0x81
-				|| room == 0x6f) {
+		if (room == ROOM_CAVE_0088
+				|| room == ROOM_CAVE_0091
+				|| room == ROOM_CAVE_0087
+				|| room == ROOM_CAVE_0090
+				|| room == ROOM_CAVE_0086
+				|| room == ROOM_CAVE_0080
+				|| room == ROOM_CAVE_0083
+				|| room == ROOM_CAVE_0084
+				|| room == ROOM_CAVE_0085
+				|| room == ROOM_CAVE_007F
+				|| room == ROOM_CAVE_007E
+				|| room == ROOM_CAVE_0082
+				|| room == ROOM_CAVE_008F
+				|| room == ROOM_CAVE_008E
+				|| room == ROOM_CAVE_007B
+				|| room == ROOM_CAVE_007C
+				|| room == ROOM_CAVE_007D
+				|| room == ROOM_CAVE_0081
+				|| room == ROOM_CAVE_006F) {
 			return false;
 		}
 
@@ -742,62 +742,50 @@ bool weatherIsRoomWeatherProof(s32 room)
 
 	if (g_StageIndex == STAGEINDEX_CRASHSITE) {
 		// Rooms listed do not have weather
-		// Note that ntsc-beta is likely the same actual rooms as the newer
-		// versions; they just have shifted numbers.
-		if (room == 0x1f
-				|| room == 0x20
-				|| room == 0x21
-				|| room == 0x22
-				|| room == 0x23
-				|| room == 0x24
-#if VERSION >= VERSION_NTSC_1_0
-				|| room == 0x51
-#endif
-				|| room == 0x52
-				|| room == 0x53
-				|| room == 0x54
-				|| room == 0x55
-				|| room == 0x56
-				|| room == 0x57
-				|| room == 0x58
-				|| room == 0x59
-				|| room == 0x5a
-				|| room == 0x5b
-				|| room == 0x5c
-				|| room == 0x5d
-				|| room == 0x5e
-				|| room == 0x5f
-				|| room == 0x60
-				|| room == 0x61
-				|| room == 0x62
-				|| room == 0x63
-				|| room == 0x64
-#if VERSION < VERSION_NTSC_1_0
-				|| room == 0x65
-#endif
-				|| room == 0x2d
-#if VERSION >= VERSION_NTSC_1_0
-				|| room == 0x40
-#endif
-				|| room == 0x41
-				|| room == 0x42
-				|| room == 0x43
-				|| room == 0x44
-				|| room == 0x45
-				|| room == 0x46
-				|| room == 0x47
-				|| room == 0x48
-				|| room == 0x49
-				|| room == 0x4a
-				|| room == 0x4b
-				|| room == 0x4c
-				|| room == 0x4d
-				|| room == 0x4e
-				|| room == 0x4f
-				|| room == 0x50
-#if VERSION < VERSION_NTSC_1_0
-				|| room == 0x51
-#endif
+		if (room == ROOM_AZT_001F
+				|| room == ROOM_AZT_0020
+				|| room == ROOM_AZT_0021
+				|| room == ROOM_AZT_0022
+				|| room == ROOM_AZT_0023
+				|| room == ROOM_AZT_0024
+				|| room == ROOM_AZT_0051
+				|| room == ROOM_AZT_0052
+				|| room == ROOM_AZT_0053
+				|| room == ROOM_AZT_0054
+				|| room == ROOM_AZT_0055
+				|| room == ROOM_AZT_0056
+				|| room == ROOM_AZT_0057
+				|| room == ROOM_AZT_0058
+				|| room == ROOM_AZT_0059
+				|| room == ROOM_AZT_005A
+				|| room == ROOM_AZT_005B
+				|| room == ROOM_AZT_005C
+				|| room == ROOM_AZT_005D
+				|| room == ROOM_AZT_005E
+				|| room == ROOM_AZT_005F
+				|| room == ROOM_AZT_0060
+				|| room == ROOM_AZT_0061
+				|| room == ROOM_AZT_0062
+				|| room == ROOM_AZT_0063
+				|| room == ROOM_AZT_0064
+				|| room == ROOM_AZT_002D
+				|| room == ROOM_AZT_0040
+				|| room == ROOM_AZT_0041
+				|| room == ROOM_AZT_0042
+				|| room == ROOM_AZT_0043
+				|| room == ROOM_AZT_0044
+				|| room == ROOM_AZT_0045
+				|| room == ROOM_AZT_0046
+				|| room == ROOM_AZT_0047
+				|| room == ROOM_AZT_0048
+				|| room == ROOM_AZT_0049
+				|| room == ROOM_AZT_004A
+				|| room == ROOM_AZT_004B
+				|| room == ROOM_AZT_004C
+				|| room == ROOM_AZT_004D
+				|| room == ROOM_AZT_004E
+				|| room == ROOM_AZT_004F
+				|| room == ROOM_AZT_0050
 				) {
 			return true;
 		}
diff --git a/src/include/constants.h b/src/include/constants.h
index 599fefa46..65ca2b8b3 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -511,11 +511,6 @@
 #define CIQUIP_ANNOYED  2
 #define CIQUIP_THANKS   3
 
-#define CIROOM_FIRINGRANGE 0x0a
-#define CIROOM_HOLOSTART   0x16
-#define CIROOM_HOLOEND     0x19
-#define CIROOM_DEVICEROOM  0x1e
-
 #define CMD_LABEL 0x0002
 #define CMD_END   0x0004
 #define CMD_PRINT 0x00b5