more room names

2026-06-05 11:18:43 -04:00 · 2022-03-23 19:14:17 +01:00
parent 333709cefe
commit d7fe306a49
11 changed files with 2820 additions and 2799 deletions
@@ -29593,32 +29593,32 @@
    }
  },
  {
-    "path": "data_080D5360/gUnk_additional_9_DarkHyruleCastle_11.bin",
+    "path": "data_080D5360/gUnk_additional_9_DarkHyruleCastle_2FTopRightCornerGhini.bin",
    "start": 966876,
    "size": 16
  },
  {
-    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_17.bin",
+    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_2FLeft.bin",
    "start": 968492,
    "size": 80
  },
  {
-    "path": "data_080D5360/gUnk_additional_9_DarkHyruleCastle_26.bin",
+    "path": "data_080D5360/gUnk_additional_9_DarkHyruleCastle_2FBottomLeftGhini.bin",
    "start": 970500,
    "size": 16
  },
  {
-    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_38.bin",
+    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_1FLoopLeft.bin",
    "start": 972552,
    "size": 24
  },
  {
-    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_39.bin",
+    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_1FLoopRight.bin",
    "start": 972780,
    "size": 224
  },
  {
-    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_52.bin",
+    "path": "data_080D5360/gUnk_additional_8_DarkHyruleCastle_B1Cannons.bin",
    "start": 975432,
    "size": 24
  },
@@ -30095,7 +30095,7 @@
    "size": 16
  },
  {
-    "path": "data_080D5360/gUnk_additional_8_HouseInteriors2_Stockwell.bin",
+    "path": "data_080D5360/gUnk_additional_8_HouseInteriors2_StockwellLakeHouse.bin",
    "start": 995684,
    "size": 16
  },
@@ -30145,12 +30145,12 @@
    "size": 16
  },
  {
-    "path": "data_080D5360/gUnk_additional_a_HouseInteriors4_Mayor.bin",
+    "path": "data_080D5360/gUnk_additional_a_HouseInteriors4_MayorLakeCabin.bin",
    "start": 998244,
    "size": 16
  },
  {
-    "path": "data_080D5360/gUnk_additional_b_HouseInteriors4_Mayor.bin",
+    "path": "data_080D5360/gUnk_additional_b_HouseInteriors4_MayorLakeCabin.bin",
    "start": 998260,
    "size": 80
  },
@@ -9337,43 +9337,43 @@
    "type": "map_layer1"
  },
  {
-    "path": "tilesets/gAreaTileset_DarkHyruleCastle_0_0.4bpp.lz",
+    "path": "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_0.4bpp.lz",
    "start": 5685200,
    "size": 8657,
    "type": "tileset"
  },
  {
-    "path": "tilesets/gAreaTileset_DarkHyruleCastle_0_1.4bpp.lz",
+    "path": "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_1.4bpp.lz",
    "start": 5693860,
    "size": 8806,
    "type": "tileset"
  },
  {
-    "path": "tilesets/gAreaTileset_DarkHyruleCastle_0_2.4bpp.lz",
+    "path": "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_2.4bpp.lz",
    "start": 5702668,
    "size": 8098,
    "type": "tileset"
  },
  {
-    "path": "assets/gAreaMetatiles_DarkHyruleCastle_0.bin",
+    "path": "assets/gAreaMetatiles_DarkHyruleCastle_1FEntrance.bin",
    "start": 5710768,
    "size": 11581,
    "type": "metatiles_tileset2"
  },
  {
-    "path": "assets/gAreaMetatiles_DarkHyruleCastle_1.bin",
+    "path": "assets/gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower.bin",
    "start": 5722352,
    "size": 7796,
    "type": "metatiles_tileset1"
  },
  {
-    "path": "assets/gAreaMetatiles_DarkHyruleCastle_2.bin",
+    "path": "assets/gAreaMetatiles_DarkHyruleCastle_3FTopRightTower.bin",
    "start": 5730148,
    "size": 1413,
    "type": "metatiles_tile_types2"
  },
  {
-    "path": "assets/gAreaMetatiles_DarkHyruleCastle_3.bin",
+    "path": "assets/gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower.bin",
    "start": 5731564,
    "size": 1263,
    "type": "metatiles_tile_types1"
@@ -9547,13 +9547,13 @@
    "type": "metatiles_tile_types1"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_0_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_0.bin",
    "start": 5806552,
    "size": 1154,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_0_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_1.bin",
    "start": 5807708,
    "size": 634,
    "type": "map_layer1"
@@ -9565,13 +9565,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0.bin",
    "start": 5808812,
    "size": 217,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1.bin",
    "start": 5809032,
    "size": 123,
    "type": "map_layer1"
@@ -9583,13 +9583,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0.bin",
    "start": 5809224,
    "size": 221,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1.bin",
    "start": 5809448,
    "size": 142,
    "type": "map_layer1"
@@ -9601,13 +9601,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0.bin",
    "start": 5809660,
    "size": 239,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1.bin",
    "start": 5809900,
    "size": 135,
    "type": "map_layer1"
@@ -9619,13 +9619,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_4_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0.bin",
    "start": 5810104,
    "size": 244,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_4_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1.bin",
    "start": 5810348,
    "size": 138,
    "type": "map_layer1"
@@ -9637,13 +9637,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_5_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0.bin",
    "start": 5810556,
    "size": 546,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_5_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1.bin",
    "start": 5811104,
    "size": 177,
    "type": "map_layer1"
@@ -9655,13 +9655,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_6_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0.bin",
    "start": 5811440,
    "size": 404,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_6_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1.bin",
    "start": 5811844,
    "size": 157,
    "type": "map_layer1"
@@ -9673,13 +9673,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_7_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0.bin",
    "start": 5812100,
    "size": 329,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_7_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1.bin",
    "start": 5812432,
    "size": 192,
    "type": "map_layer1"
@@ -9691,13 +9691,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_8_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0.bin",
    "start": 5812756,
    "size": 477,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_8_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1.bin",
    "start": 5813236,
    "size": 176,
    "type": "map_layer1"
@@ -9709,13 +9709,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_9_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_0.bin",
    "start": 5813544,
    "size": 339,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_9_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_1.bin",
    "start": 5813884,
    "size": 146,
    "type": "map_layer1"
@@ -9727,13 +9727,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_10_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0.bin",
    "start": 5814108,
    "size": 297,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_10_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1.bin",
    "start": 5814408,
    "size": 133,
    "type": "map_layer1"
@@ -9745,13 +9745,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_11_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0.bin",
    "start": 5814612,
    "size": 265,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_11_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1.bin",
    "start": 5814880,
    "size": 91,
    "type": "map_layer1"
@@ -9763,13 +9763,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_12_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0.bin",
    "start": 5815040,
    "size": 271,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_12_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1.bin",
    "start": 5815312,
    "size": 107,
    "type": "map_layer1"
@@ -9781,13 +9781,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_13_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0.bin",
    "start": 5815488,
    "size": 267,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_13_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1.bin",
    "start": 5815756,
    "size": 135,
    "type": "map_layer1"
@@ -9799,13 +9799,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_14_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0.bin",
    "start": 5815960,
    "size": 315,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_14_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1.bin",
    "start": 5816276,
    "size": 158,
    "type": "map_layer1"
@@ -9817,13 +9817,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_15_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_0.bin",
    "start": 5816504,
    "size": 292,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_15_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_1.bin",
    "start": 5816796,
    "size": 125,
    "type": "map_layer1"
@@ -9835,13 +9835,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_16_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0.bin",
    "start": 5816992,
    "size": 306,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_16_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1.bin",
    "start": 5817300,
    "size": 155,
    "type": "map_layer1"
@@ -9853,13 +9853,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_17_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_0.bin",
    "start": 5817524,
    "size": 414,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_17_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_1.bin",
    "start": 5817940,
    "size": 195,
    "type": "map_layer1"
@@ -9871,13 +9871,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_18_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_0.bin",
    "start": 5818236,
    "size": 360,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_18_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_1.bin",
    "start": 5818596,
    "size": 228,
    "type": "map_layer1"
@@ -9889,13 +9889,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_19_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0.bin",
    "start": 5818924,
    "size": 309,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_19_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1.bin",
    "start": 5819236,
    "size": 163,
    "type": "map_layer1"
@@ -9907,13 +9907,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_20_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0.bin",
    "start": 5819468,
    "size": 350,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_20_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1.bin",
    "start": 5819820,
    "size": 152,
    "type": "map_layer1"
@@ -9925,13 +9925,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_21_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0.bin",
    "start": 5820040,
    "size": 296,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_21_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1.bin",
    "start": 5820336,
    "size": 151,
    "type": "map_layer1"
@@ -9943,13 +9943,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_22_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0.bin",
    "start": 5820556,
    "size": 263,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_22_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1.bin",
    "start": 5820820,
    "size": 118,
    "type": "map_layer1"
@@ -9961,13 +9961,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_23_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_0.bin",
    "start": 5821008,
    "size": 450,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_23_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_1.bin",
    "start": 5821460,
    "size": 228,
    "type": "map_layer1"
@@ -9979,13 +9979,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_24_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0.bin",
    "start": 5821820,
    "size": 401,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_24_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1.bin",
    "start": 5822224,
    "size": 161,
    "type": "map_layer1"
@@ -9997,13 +9997,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_25_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0.bin",
    "start": 5822520,
    "size": 232,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_25_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1.bin",
    "start": 5822752,
    "size": 137,
    "type": "map_layer1"
@@ -10015,13 +10015,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_26_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0.bin",
    "start": 5822960,
    "size": 258,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_26_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1.bin",
    "start": 5823220,
    "size": 88,
    "type": "map_layer1"
@@ -10033,13 +10033,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_27_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0.bin",
    "start": 5823376,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_27_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1.bin",
    "start": 5823436,
    "size": 60,
    "type": "map_layer1"
@@ -10051,13 +10051,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_28_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_0.bin",
    "start": 5823564,
    "size": 294,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_28_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_1.bin",
    "start": 5823860,
    "size": 152,
    "type": "map_layer1"
@@ -10069,13 +10069,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_29_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0.bin",
    "start": 5824080,
    "size": 323,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_29_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1.bin",
    "start": 5824404,
    "size": 188,
    "type": "map_layer1"
@@ -10087,13 +10087,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_30_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0.bin",
    "start": 5824724,
    "size": 228,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_30_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1.bin",
    "start": 5824952,
    "size": 124,
    "type": "map_layer1"
@@ -10105,13 +10105,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_31_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0.bin",
    "start": 5825144,
    "size": 335,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_31_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1.bin",
    "start": 5825480,
    "size": 147,
    "type": "map_layer1"
@@ -10123,13 +10123,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_32_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_0.bin",
    "start": 5825696,
    "size": 305,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_32_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_1.bin",
    "start": 5826004,
    "size": 161,
    "type": "map_layer1"
@@ -10141,13 +10141,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_33_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0.bin",
    "start": 5826236,
    "size": 261,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_33_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1.bin",
    "start": 5826500,
    "size": 144,
    "type": "map_layer1"
@@ -10159,13 +10159,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_34_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0.bin",
    "start": 5826712,
    "size": 282,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_34_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1.bin",
    "start": 5826996,
    "size": 149,
    "type": "map_layer1"
@@ -10177,13 +10177,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_35_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0.bin",
    "start": 5827216,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_35_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1.bin",
    "start": 5827276,
    "size": 316,
    "type": "map_layer1"
@@ -10195,13 +10195,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_36_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0.bin",
    "start": 5827660,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_36_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1.bin",
    "start": 5827720,
    "size": 272,
    "type": "map_layer1"
@@ -10213,13 +10213,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_37_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0.bin",
    "start": 5828060,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_37_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1.bin",
    "start": 5828120,
    "size": 295,
    "type": "map_layer1"
@@ -10231,13 +10231,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_38_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0.bin",
    "start": 5828484,
    "size": 300,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_38_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1.bin",
    "start": 5828784,
    "size": 217,
    "type": "map_layer1"
@@ -10249,13 +10249,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_39_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0.bin",
    "start": 5829104,
    "size": 175,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_39_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1.bin",
    "start": 5829280,
    "size": 288,
    "type": "map_layer1"
@@ -10267,13 +10267,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_40_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0.bin",
    "start": 5829668,
    "size": 226,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_40_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1.bin",
    "start": 5829896,
    "size": 144,
    "type": "map_layer1"
@@ -10285,13 +10285,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_41_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0.bin",
    "start": 5830108,
    "size": 187,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_41_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1.bin",
    "start": 5830296,
    "size": 127,
    "type": "map_layer1"
@@ -10303,13 +10303,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_42_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0.bin",
    "start": 5830492,
    "size": 202,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_42_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1.bin",
    "start": 5830696,
    "size": 141,
    "type": "map_layer1"
@@ -10321,13 +10321,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_43_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0.bin",
    "start": 5830908,
    "size": 223,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_43_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1.bin",
    "start": 5831132,
    "size": 128,
    "type": "map_layer1"
@@ -10339,13 +10339,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_44_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0.bin",
    "start": 5831328,
    "size": 216,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_44_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1.bin",
    "start": 5831544,
    "size": 129,
    "type": "map_layer1"
@@ -10357,13 +10357,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_45_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0.bin",
    "start": 5831744,
    "size": 244,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_45_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1.bin",
    "start": 5831988,
    "size": 93,
    "type": "map_layer1"
@@ -10375,13 +10375,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_46_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0.bin",
    "start": 5832152,
    "size": 275,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_46_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1.bin",
    "start": 5832428,
    "size": 110,
    "type": "map_layer1"
@@ -10393,13 +10393,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_47_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0.bin",
    "start": 5832608,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_47_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1.bin",
    "start": 5832668,
    "size": 284,
    "type": "map_layer1"
@@ -10411,13 +10411,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_48_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0.bin",
    "start": 5833020,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_48_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1.bin",
    "start": 5833080,
    "size": 276,
    "type": "map_layer1"
@@ -10429,13 +10429,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_49_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_0.bin",
    "start": 5833424,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_49_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_1.bin",
    "start": 5833484,
    "size": 277,
    "type": "map_layer1"
@@ -10447,13 +10447,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_50_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_0.bin",
    "start": 5833832,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_50_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_1.bin",
    "start": 5833892,
    "size": 302,
    "type": "map_layer1"
@@ -10465,13 +10465,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_51_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0.bin",
    "start": 5834264,
    "size": 87,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_51_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1.bin",
    "start": 5834352,
    "size": 408,
    "type": "map_layer1"
@@ -10483,13 +10483,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_52_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_0.bin",
    "start": 5834860,
    "size": 87,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_52_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_1.bin",
    "start": 5834948,
    "size": 368,
    "type": "map_layer1"
@@ -10501,13 +10501,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_53_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_0.bin",
    "start": 5835416,
    "size": 171,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_53_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_1.bin",
    "start": 5835588,
    "size": 235,
    "type": "map_layer1"
@@ -10519,13 +10519,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_54_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_0.bin",
    "start": 5835892,
    "size": 170,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_54_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_1.bin",
    "start": 5836064,
    "size": 236,
    "type": "map_layer1"
@@ -10537,13 +10537,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_55_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_0.bin",
    "start": 5836368,
    "size": 522,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_55_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_1.bin",
    "start": 5836892,
    "size": 1102,
    "type": "map_layer1"
@@ -10555,13 +10555,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_56_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0.bin",
    "start": 5838336,
    "size": 310,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_56_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1.bin",
    "start": 5838648,
    "size": 116,
    "type": "map_layer1"
@@ -10573,13 +10573,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_57_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_0.bin",
    "start": 5838840,
    "size": 381,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_57_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_1.bin",
    "start": 5839224,
    "size": 180,
    "type": "map_layer1"
@@ -10591,13 +10591,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_58_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0.bin",
    "start": 5839540,
    "size": 243,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_58_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1.bin",
    "start": 5839784,
    "size": 113,
    "type": "map_layer1"
@@ -10609,13 +10609,13 @@
    "type": "unknown"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_59_0.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0.bin",
    "start": 5839992,
    "size": 60,
    "type": "map_layer2"
  },
  {
-    "path": "assets/gAreaRoomMap_DarkHyruleCastle_59_1.bin",
+    "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1.bin",
    "start": 5840052,
    "size": 60,
    "type": "map_layer1"
@@ -4092,25 +4092,25 @@ gAreaRoomMap_SanctuaryEntrance_0_0::
 gAreaRoomMap_SanctuaryEntrance_0_1::
 	.incbin "assets/gAreaRoomMap_SanctuaryEntrance_0_1.bin"
 	.align 2
-gAreaTileset_DarkHyruleCastle_0_0::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_0_0.4bpp.lz"
+gAreaTileset_DarkHyruleCastle_1FEntrance_0::
+	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_0.4bpp.lz"
 	.align 2
-gAreaTileset_DarkHyruleCastle_0_1::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_0_1.4bpp.lz"
+gAreaTileset_DarkHyruleCastle_1FEntrance_1::
+	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_1.4bpp.lz"
 	.align 2
-gAreaTileset_DarkHyruleCastle_0_2::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_0_2.4bpp.lz"
+gAreaTileset_DarkHyruleCastle_1FEntrance_2::
+	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_2.4bpp.lz"
 	.align 2
-gAreaMetatiles_DarkHyruleCastle_0::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_0.bin"
+gAreaMetatiles_DarkHyruleCastle_1FEntrance::
+	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_1FEntrance.bin"
 	.align 2
-gAreaMetatiles_DarkHyruleCastle_1::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_1.bin"
-gAreaMetatiles_DarkHyruleCastle_2::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_2.bin"
+gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower::
+	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower.bin"
+gAreaMetatiles_DarkHyruleCastle_3FTopRightTower::
+	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FTopRightTower.bin"
 	.align 2
-gAreaMetatiles_DarkHyruleCastle_3::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3.bin"
+gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower::
+	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower.bin"
 	.align 2
 gAreaTileset_DarkHyruleCastleBridge_0_0::
 	.incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_0.4bpp.lz"
@@ -4191,464 +4191,464 @@ gAreaMetatiles_VaatisArms_2::
 	.align 2
 gAreaMetatiles_VaatisArms_3::
 	.incbin "assets/gAreaMetatiles_VaatisArms_3.bin"
-gAreaRoomMap_DarkHyruleCastle_0_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_0_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FEntrance_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_0_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_0_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FEntrance_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_1.bin"
 	.align 2
 unknown_188::
 	.incbin "assets/unknown_188.bin"
-gAreaRoomMap_DarkHyruleCastle_1_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_1_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1.bin"
 	.align 2
 unknown_189::
 	.incbin "assets/unknown_189.bin"
-gAreaRoomMap_DarkHyruleCastle_2_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_2_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1.bin"
 	.align 2
 unknown_190::
 	.incbin "assets/unknown_190.bin"
-gAreaRoomMap_DarkHyruleCastle_3_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_3_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1.bin"
 	.align 2
 unknown_191::
 	.incbin "assets/unknown_191.bin"
-gAreaRoomMap_DarkHyruleCastle_4_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_4_0.bin"
-gAreaRoomMap_DarkHyruleCastle_4_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_4_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1.bin"
 	.align 2
 unknown_192::
 	.incbin "assets/unknown_192.bin"
-gAreaRoomMap_DarkHyruleCastle_5_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_5_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_5_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_5_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1.bin"
 	.align 2
 unknown_193::
 	.incbin "assets/unknown_193.bin"
-gAreaRoomMap_DarkHyruleCastle_6_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_6_0.bin"
-gAreaRoomMap_DarkHyruleCastle_6_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_6_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1.bin"
 	.align 2
 unknown_194::
 	.incbin "assets/unknown_194.bin"
-gAreaRoomMap_DarkHyruleCastle_7_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_7_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_7_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_7_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1.bin"
 	.align 2
 unknown_195::
 	.incbin "assets/unknown_195.bin"
-gAreaRoomMap_DarkHyruleCastle_8_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_8_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_8_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_8_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1.bin"
 	.align 2
 unknown_196::
 	.incbin "assets/unknown_196.bin"
-gAreaRoomMap_DarkHyruleCastle_9_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_9_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBossKey_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_9_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_9_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBossKey_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_1.bin"
 	.align 2
 unknown_197::
 	.incbin "assets/unknown_197.bin"
-gAreaRoomMap_DarkHyruleCastle_10_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_10_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_10_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_10_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1.bin"
 	.align 2
 unknown_198::
 	.incbin "assets/unknown_198.bin"
-gAreaRoomMap_DarkHyruleCastle_11_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_11_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_11_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_11_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1.bin"
 	.align 2
 unknown_199::
 	.incbin "assets/unknown_199.bin"
-gAreaRoomMap_DarkHyruleCastle_12_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_12_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_12_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_12_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1.bin"
 	.align 2
 unknown_200::
 	.incbin "assets/unknown_200.bin"
-gAreaRoomMap_DarkHyruleCastle_13_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_13_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_13_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_13_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1.bin"
 	.align 2
 unknown_201::
 	.incbin "assets/unknown_201.bin"
-gAreaRoomMap_DarkHyruleCastle_14_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_14_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_14_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_14_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1.bin"
 	.align 2
 unknown_202::
 	.incbin "assets/unknown_202.bin"
-gAreaRoomMap_DarkHyruleCastle_15_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_15_0.bin"
-gAreaRoomMap_DarkHyruleCastle_15_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_15_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FSparks_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FSparks_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_1.bin"
 	.align 2
 unknown_203::
 	.incbin "assets/unknown_203.bin"
-gAreaRoomMap_DarkHyruleCastle_16_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_16_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_16_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_16_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1.bin"
 	.align 2
 unknown_204::
 	.incbin "assets/unknown_204.bin"
-gAreaRoomMap_DarkHyruleCastle_17_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_17_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FLeft_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_17_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_17_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FLeft_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_1.bin"
 	.align 2
 unknown_205::
 	.incbin "assets/unknown_205.bin"
-gAreaRoomMap_DarkHyruleCastle_18_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_18_0.bin"
-gAreaRoomMap_DarkHyruleCastle_18_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_18_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FRight_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FRight_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_1.bin"
 	.align 2
 unknown_206::
 	.incbin "assets/unknown_206.bin"
-gAreaRoomMap_DarkHyruleCastle_19_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_19_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_19_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_19_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1.bin"
 	.align 2
 unknown_207::
 	.incbin "assets/unknown_207.bin"
-gAreaRoomMap_DarkHyruleCastle_20_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_20_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_20_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_20_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1.bin"
 	.align 2
 unknown_208::
 	.incbin "assets/unknown_208.bin"
-gAreaRoomMap_DarkHyruleCastle_21_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_21_0.bin"
-gAreaRoomMap_DarkHyruleCastle_21_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_21_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1.bin"
 	.align 2
 unknown_209::
 	.incbin "assets/unknown_209.bin"
-gAreaRoomMap_DarkHyruleCastle_22_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_22_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_22_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_22_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1.bin"
 	.align 2
 unknown_210::
 	.incbin "assets/unknown_210.bin"
-gAreaRoomMap_DarkHyruleCastle_23_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_23_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FEntrance_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_23_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_23_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FEntrance_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_1.bin"
 	.align 2
 unknown_211::
 	.incbin "assets/unknown_211.bin"
-gAreaRoomMap_DarkHyruleCastle_24_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_24_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_24_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_24_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1.bin"
 	.align 2
 unknown_212::
 	.incbin "assets/unknown_212.bin"
-gAreaRoomMap_DarkHyruleCastle_25_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_25_0.bin"
-gAreaRoomMap_DarkHyruleCastle_25_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_25_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1.bin"
 	.align 2
 unknown_213::
 	.incbin "assets/unknown_213.bin"
-gAreaRoomMap_DarkHyruleCastle_26_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_26_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_26_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_26_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1.bin"
 	.align 2
 unknown_214::
 	.incbin "assets/unknown_214.bin"
-gAreaRoomMap_DarkHyruleCastle_27_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_27_0.bin"
-gAreaRoomMap_DarkHyruleCastle_27_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_27_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1.bin"
 	.align 2
 unknown_215::
 	.incbin "assets/unknown_215.bin"
-gAreaRoomMap_DarkHyruleCastle_28_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_28_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Entrance_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_28_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_28_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Entrance_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_1.bin"
 	.align 2
 unknown_216::
 	.incbin "assets/unknown_216.bin"
-gAreaRoomMap_DarkHyruleCastle_29_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_29_0.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_29_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_29_1.bin"
+gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1.bin"
 	.align 2
 unknown_217::
 	.incbin "assets/unknown_217.bin"
-gAreaRoomMap_DarkHyruleCastle_30_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_30_0.bin"
-gAreaRoomMap_DarkHyruleCastle_30_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_30_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1.bin"
 	.align 2
 unknown_218::
 	.incbin "assets/unknown_218.bin"
-gAreaRoomMap_DarkHyruleCastle_31_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_31_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_31_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_31_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1.bin"
 	.align 2
 unknown_219::
 	.incbin "assets/unknown_219.bin"
-gAreaRoomMap_DarkHyruleCastle_32_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_32_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FCompass_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_32_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_32_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FCompass_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_1.bin"
 	.align 2
 unknown_220::
 	.incbin "assets/unknown_220.bin"
-gAreaRoomMap_DarkHyruleCastle_33_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_33_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_33_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_33_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1.bin"
 	.align 2
 unknown_221::
 	.incbin "assets/unknown_221.bin"
-gAreaRoomMap_DarkHyruleCastle_34_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_34_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_34_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_34_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1.bin"
 	.align 2
 unknown_222::
 	.incbin "assets/unknown_222.bin"
-gAreaRoomMap_DarkHyruleCastle_35_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_35_0.bin"
-gAreaRoomMap_DarkHyruleCastle_35_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_35_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1.bin"
 	.align 2
 unknown_223::
 	.incbin "assets/unknown_223.bin"
-gAreaRoomMap_DarkHyruleCastle_36_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_36_0.bin"
-gAreaRoomMap_DarkHyruleCastle_36_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_36_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1.bin"
 	.align 2
 unknown_224::
 	.incbin "assets/unknown_224.bin"
-gAreaRoomMap_DarkHyruleCastle_37_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_37_0.bin"
-gAreaRoomMap_DarkHyruleCastle_37_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_37_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1.bin"
 	.align 2
 unknown_225::
 	.incbin "assets/unknown_225.bin"
-gAreaRoomMap_DarkHyruleCastle_38_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_38_0.bin"
-gAreaRoomMap_DarkHyruleCastle_38_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_38_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1.bin"
 	.align 2
 unknown_226::
 	.incbin "assets/unknown_226.bin"
-gAreaRoomMap_DarkHyruleCastle_39_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_39_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_39_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_39_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1.bin"
 	.align 2
 unknown_227::
 	.incbin "assets/unknown_227.bin"
-gAreaRoomMap_DarkHyruleCastle_40_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_40_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_40_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_40_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1.bin"
 	.align 2
 unknown_228::
 	.incbin "assets/unknown_228.bin"
-gAreaRoomMap_DarkHyruleCastle_41_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_41_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_41_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_41_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1.bin"
 	.align 2
 unknown_229::
 	.incbin "assets/unknown_229.bin"
-gAreaRoomMap_DarkHyruleCastle_42_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_42_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_42_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_42_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1.bin"
 	.align 2
 unknown_230::
 	.incbin "assets/unknown_230.bin"
-gAreaRoomMap_DarkHyruleCastle_43_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_43_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_43_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_43_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1.bin"
 	.align 2
 unknown_231::
 	.incbin "assets/unknown_231.bin"
-gAreaRoomMap_DarkHyruleCastle_44_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_44_0.bin"
-gAreaRoomMap_DarkHyruleCastle_44_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_44_1.bin"
+gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0.bin"
+gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1.bin"
 	.align 2
 unknown_232::
 	.incbin "assets/unknown_232.bin"
-gAreaRoomMap_DarkHyruleCastle_45_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_45_0.bin"
-gAreaRoomMap_DarkHyruleCastle_45_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_45_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1.bin"
 	.align 2
 unknown_233::
 	.incbin "assets/unknown_233.bin"
-gAreaRoomMap_DarkHyruleCastle_46_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_46_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_46_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_46_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1.bin"
 	.align 2
 unknown_234::
 	.incbin "assets/unknown_234.bin"
-gAreaRoomMap_DarkHyruleCastle_47_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_47_0.bin"
-gAreaRoomMap_DarkHyruleCastle_47_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_47_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1.bin"
 	.align 2
 unknown_235::
 	.incbin "assets/unknown_235.bin"
-gAreaRoomMap_DarkHyruleCastle_48_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_48_0.bin"
-gAreaRoomMap_DarkHyruleCastle_48_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_48_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1.bin"
 	.align 2
 unknown_236::
 	.incbin "assets/unknown_236.bin"
-gAreaRoomMap_DarkHyruleCastle_49_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_49_0.bin"
-gAreaRoomMap_DarkHyruleCastle_49_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_49_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BombWall_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1BombWall_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_1.bin"
 	.align 2
 unknown_237::
 	.incbin "assets/unknown_237.bin"
-gAreaRoomMap_DarkHyruleCastle_50_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_50_0.bin"
-gAreaRoomMap_DarkHyruleCastle_50_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_50_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Keatons_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Keatons_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_1.bin"
 	.align 2
 unknown_238::
 	.incbin "assets/unknown_238.bin"
-gAreaRoomMap_DarkHyruleCastle_51_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_51_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_51_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_51_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1.bin"
 	.align 2
 unknown_239::
 	.incbin "assets/unknown_239.bin"
-gAreaRoomMap_DarkHyruleCastle_52_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_52_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Cannons_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_52_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_52_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Cannons_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_1.bin"
 	.align 2
 unknown_240::
 	.incbin "assets/unknown_240.bin"
-gAreaRoomMap_DarkHyruleCastle_53_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_53_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Left_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_53_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_53_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Left_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_1.bin"
 	.align 2
 unknown_241::
 	.incbin "assets/unknown_241.bin"
-gAreaRoomMap_DarkHyruleCastle_54_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_54_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Right_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_54_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_54_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Right_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_1.bin"
 	.align 2
 unknown_242::
 	.incbin "assets/unknown_242.bin"
-gAreaRoomMap_DarkHyruleCastle_55_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_55_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Map_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_55_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_55_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Map_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_1.bin"
 	.align 2
 unknown_243::
 	.incbin "assets/unknown_243.bin"
-gAreaRoomMap_DarkHyruleCastle_56_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_56_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_56_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_56_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1.bin"
 	.align 2
 unknown_244::
 	.incbin "assets/unknown_244.bin"
-gAreaRoomMap_DarkHyruleCastle_57_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_57_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B2Prison_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_57_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_57_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B2Prison_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_1.bin"
 	.align 2
 unknown_245::
 	.incbin "assets/unknown_245.bin"
-gAreaRoomMap_DarkHyruleCastle_58_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_58_0.bin"
+gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0.bin"
 	.align 2
-gAreaRoomMap_DarkHyruleCastle_58_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_58_1.bin"
+gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1.bin"
 	.align 2
 unknown_246::
 	.incbin "assets/unknown_246.bin"
-gAreaRoomMap_DarkHyruleCastle_59_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_59_0.bin"
-gAreaRoomMap_DarkHyruleCastle_59_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_59_1.bin"
+gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0.bin"
+gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1::
+	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1.bin"
 	.align 2
 unknown_247::
 	.incbin "assets/unknown_247.bin"
@@ -2701,307 +2701,307 @@ gAreaRoomMap_SanctuaryEntrance_0:: @ 08106A00
 gAreaRoomMaps_SanctuaryEntrance:: @ 08106A18
 	.4byte gAreaRoomMap_SanctuaryEntrance_0

-gAreaRoomMap_DarkHyruleCastle_0:: @ 08106A1C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_0_0, 0xE58, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_0_1, 0xE58, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FEntrance:: @ 08106A1C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FEntrance_0, 0xE58, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FEntrance_1, 0xE58, 1, 1

-gAreaRoomMap_DarkHyruleCastle_1:: @ 08106A34
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower:: @ 08106A34
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_2:: @ 08106A4C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FTopRightTower:: @ 08106A4C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_3:: @ 08106A64
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower:: @ 08106A64
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_4:: @ 08106A7C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_4_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_4_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower:: @ 08106A7C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_5:: @ 08106A94
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_5_0, 0x444, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_5_1, 0x444, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati:: @ 08106A94
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0, 0x444, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1, 0x444, 1, 1

-gAreaRoomMap_DarkHyruleCastle_6:: @ 08106AAC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_6_0, 0x2A0, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_6_1, 0x2A0, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut:: @ 08106AAC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0, 0x2A0, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1, 0x2A0, 1, 1

-gAreaRoomMap_DarkHyruleCastle_7:: @ 08106AC4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_7_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_7_1, 0x374, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower:: @ 08106AC4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1, 0x374, 1, 1

-gAreaRoomMap_DarkHyruleCastle_8:: @ 08106ADC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_8_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_8_1, 0x374, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner:: @ 08106ADC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1, 0x374, 1, 1

-gAreaRoomMap_DarkHyruleCastle_9:: @ 08106AF4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_9_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_9_1, 0x1FE, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBossKey:: @ 08106AF4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBossKey_0, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBossKey_1, 0x1FE, 1, 1

-gAreaRoomMap_DarkHyruleCastle_10:: @ 08106B0C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_10_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_10_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBlueWarp:: @ 08106B0C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_11:: @ 08106B24
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_11_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_11_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini:: @ 08106B24
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_12:: @ 08106B3C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_12_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_12_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches:: @ 08106B3C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_13:: @ 08106B54
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_13_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_13_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopRightTower:: @ 08106B54
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_14:: @ 08106B6C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_14_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_14_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut:: @ 08106B6C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_15:: @ 08106B84
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_15_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_15_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FSparks:: @ 08106B84
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FSparks_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FSparks_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_16:: @ 08106B9C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_16_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_16_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts:: @ 08106B9C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_17:: @ 08106BB4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_17_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_17_1, 0x2A8, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FLeft:: @ 08106BB4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FLeft_0, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FLeft_1, 0x2A8, 1, 1

-gAreaRoomMap_DarkHyruleCastle_18:: @ 08106BCC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_18_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_18_1, 0x2A8, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FRight:: @ 08106BCC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FRight_0, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FRight_1, 0x2A8, 1, 1

-gAreaRoomMap_DarkHyruleCastle_19:: @ 08106BE4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_19_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_19_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 08106BE4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_20:: @ 08106BFC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_20_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_20_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBossDoor:: @ 08106BFC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_21:: @ 08106C14
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_21_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_21_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut:: @ 08106C14
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_22:: @ 08106C2C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_22_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_22_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle:: @ 08106C2C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_23:: @ 08106C44
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_23_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_23_1, 0x374, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FEntrance:: @ 08106C44
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FEntrance_0, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FEntrance_1, 0x374, 1, 1

-gAreaRoomMap_DarkHyruleCastle_24:: @ 08106C5C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_24_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_24_1, 0x374, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner:: @ 08106C5C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1, 0x374, 1, 1

-gAreaRoomMap_DarkHyruleCastle_25:: @ 08106C74
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_25_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_25_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower:: @ 08106C74
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_26:: @ 08106C8C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_26_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_26_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini:: @ 08106C8C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_27:: @ 08106CA4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_27_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_27_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7:: @ 08106CA4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_28:: @ 08106CBC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_28_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_28_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1Entrance:: @ 08106CBC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_29:: @ 08106CD4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_29_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_29_1, 0x374, 1, 1
+gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower:: @ 08106CD4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1, 0x374, 1, 1

-gAreaRoomMap_DarkHyruleCastle_30:: @ 08106CEC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_30_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_30_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower:: @ 08106CEC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_31:: @ 08106D04
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_31_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_31_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FThroneRoom:: @ 08106D04
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_32:: @ 08106D1C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_32_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_32_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FCompass:: @ 08106D1C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FCompass_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FCompass_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_33:: @ 08106D34
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_33_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_33_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FTopRightTower:: @ 08106D34
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_34:: @ 08106D4C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_34_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_34_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone:: @ 08106D4C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_35:: @ 08106D64
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_35_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_35_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft:: @ 08106D64
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_36:: @ 08106D7C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_36_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_36_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopTop:: @ 08106D7C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_37:: @ 08106D94
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_37_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_37_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight:: @ 08106D94
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_38:: @ 08106DAC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_38_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_38_1, 0x2A8, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopLeft:: @ 08106DAC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1, 0x2A8, 1, 1

-gAreaRoomMap_DarkHyruleCastle_39:: @ 08106DC4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_39_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_39_1, 0x2A8, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopRight:: @ 08106DC4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1, 0x2A8, 1, 1

-gAreaRoomMap_DarkHyruleCastle_40:: @ 08106DDC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_40_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_40_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft:: @ 08106DDC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_41:: @ 08106DF4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_41_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_41_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottom:: @ 08106DF4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_42:: @ 08106E0C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_42_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_42_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight:: @ 08106E0C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_43:: @ 08106E24
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_43_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_43_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower:: @ 08106E24
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_44:: @ 08106E3C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_44_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_44_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower:: @ 08106E3C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_45:: @ 08106E54
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_45_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_45_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1BelowThrone:: @ 08106E54
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_46:: @ 08106E6C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_46_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_46_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1BelowCompass:: @ 08106E6C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_47:: @ 08106E84
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_47_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_47_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone:: @ 08106E84
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_48:: @ 08106E9C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_48_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_48_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1ToPrison:: @ 08106E9C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_49:: @ 08106EB4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_49_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_49_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1BombWall:: @ 08106EB4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_50:: @ 08106ECC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_50_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_50_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1Keatons:: @ 08106ECC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_51:: @ 08106EE4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_51_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_51_1, 0x2A8, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar:: @ 08106EE4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1, 0x2A8, 1, 1

-gAreaRoomMap_DarkHyruleCastle_52:: @ 08106EFC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_52_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_52_1, 0x2A8, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1Cannons:: @ 08106EFC
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_0, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_1, 0x2A8, 1, 1

-gAreaRoomMap_DarkHyruleCastle_53:: @ 08106F14
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_53_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_53_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1Left:: @ 08106F14
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Left_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Left_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_54:: @ 08106F2C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_54_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_54_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1Right:: @ 08106F2C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Right_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Right_1, 0x1BA, 1, 1

-gAreaRoomMap_DarkHyruleCastle_55:: @ 08106F44
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_55_0, 0xA5C, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_55_1, 0xA5C, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B1Map:: @ 08106F44
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Map_0, 0xA5C, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Map_1, 0xA5C, 1, 1

-gAreaRoomMap_DarkHyruleCastle_56:: @ 08106F5C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_56_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_56_1, 0x1FE, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B2ToPrison:: @ 08106F5C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1, 0x1FE, 1, 1

-gAreaRoomMap_DarkHyruleCastle_57:: @ 08106F74
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_57_0, 0x3FC, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_57_1, 0x3FC, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B2Prison:: @ 08106F74
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_0, 0x3FC, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_1, 0x3FC, 1, 1

-gAreaRoomMap_DarkHyruleCastle_58:: @ 08106F8C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_58_0, 0x264, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_58_1, 0x264, 1, 1
+gAreaRoomMap_DarkHyruleCastle_B2Dropdown:: @ 08106F8C
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0, 0x264, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1, 0x264, 1, 1

-gAreaRoomMap_DarkHyruleCastle_59:: @ 08106FA4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_59_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_59_1, 0x1BA, 1, 1
+gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9:: @ 08106FA4
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1, 0x1BA, 1, 1

 gAreaRoomMaps_DarkHyruleCastle:: @ 08106FBC
-	.4byte gAreaRoomMap_DarkHyruleCastle_0
-	.4byte gAreaRoomMap_DarkHyruleCastle_1
-	.4byte gAreaRoomMap_DarkHyruleCastle_2
-	.4byte gAreaRoomMap_DarkHyruleCastle_3
-	.4byte gAreaRoomMap_DarkHyruleCastle_4
-	.4byte gAreaRoomMap_DarkHyruleCastle_5
-	.4byte gAreaRoomMap_DarkHyruleCastle_6
-	.4byte gAreaRoomMap_DarkHyruleCastle_7
-	.4byte gAreaRoomMap_DarkHyruleCastle_8
-	.4byte gAreaRoomMap_DarkHyruleCastle_9
-	.4byte gAreaRoomMap_DarkHyruleCastle_10
-	.4byte gAreaRoomMap_DarkHyruleCastle_11
-	.4byte gAreaRoomMap_DarkHyruleCastle_12
-	.4byte gAreaRoomMap_DarkHyruleCastle_13
-	.4byte gAreaRoomMap_DarkHyruleCastle_14
-	.4byte gAreaRoomMap_DarkHyruleCastle_15
-	.4byte gAreaRoomMap_DarkHyruleCastle_16
-	.4byte gAreaRoomMap_DarkHyruleCastle_17
-	.4byte gAreaRoomMap_DarkHyruleCastle_18
-	.4byte gAreaRoomMap_DarkHyruleCastle_19
-	.4byte gAreaRoomMap_DarkHyruleCastle_20
-	.4byte gAreaRoomMap_DarkHyruleCastle_21
-	.4byte gAreaRoomMap_DarkHyruleCastle_22
-	.4byte gAreaRoomMap_DarkHyruleCastle_23
-	.4byte gAreaRoomMap_DarkHyruleCastle_24
-	.4byte gAreaRoomMap_DarkHyruleCastle_25
-	.4byte gAreaRoomMap_DarkHyruleCastle_26
-	.4byte gAreaRoomMap_DarkHyruleCastle_27
-	.4byte gAreaRoomMap_DarkHyruleCastle_28
-	.4byte gAreaRoomMap_DarkHyruleCastle_29
-	.4byte gAreaRoomMap_DarkHyruleCastle_30
-	.4byte gAreaRoomMap_DarkHyruleCastle_31
-	.4byte gAreaRoomMap_DarkHyruleCastle_32
-	.4byte gAreaRoomMap_DarkHyruleCastle_33
-	.4byte gAreaRoomMap_DarkHyruleCastle_34
-	.4byte gAreaRoomMap_DarkHyruleCastle_35
-	.4byte gAreaRoomMap_DarkHyruleCastle_36
-	.4byte gAreaRoomMap_DarkHyruleCastle_37
-	.4byte gAreaRoomMap_DarkHyruleCastle_38
-	.4byte gAreaRoomMap_DarkHyruleCastle_39
-	.4byte gAreaRoomMap_DarkHyruleCastle_40
-	.4byte gAreaRoomMap_DarkHyruleCastle_41
-	.4byte gAreaRoomMap_DarkHyruleCastle_42
-	.4byte gAreaRoomMap_DarkHyruleCastle_43
-	.4byte gAreaRoomMap_DarkHyruleCastle_44
-	.4byte gAreaRoomMap_DarkHyruleCastle_45
-	.4byte gAreaRoomMap_DarkHyruleCastle_46
-	.4byte gAreaRoomMap_DarkHyruleCastle_47
-	.4byte gAreaRoomMap_DarkHyruleCastle_48
-	.4byte gAreaRoomMap_DarkHyruleCastle_49
-	.4byte gAreaRoomMap_DarkHyruleCastle_50
-	.4byte gAreaRoomMap_DarkHyruleCastle_51
-	.4byte gAreaRoomMap_DarkHyruleCastle_52
-	.4byte gAreaRoomMap_DarkHyruleCastle_53
-	.4byte gAreaRoomMap_DarkHyruleCastle_54
-	.4byte gAreaRoomMap_DarkHyruleCastle_55
-	.4byte gAreaRoomMap_DarkHyruleCastle_56
-	.4byte gAreaRoomMap_DarkHyruleCastle_57
-	.4byte gAreaRoomMap_DarkHyruleCastle_58
-	.4byte gAreaRoomMap_DarkHyruleCastle_59
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FEntrance
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FTopRightTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBossKey
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBlueWarp
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopRightTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FSparks
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FLeft
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FRight
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBossDoor
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FEntrance
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1Entrance
+	.4byte gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FThroneRoom
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FCompass
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FTopRightTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopTop
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopLeft
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopRight
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopBottom
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1BelowThrone
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1BelowCompass
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1ToPrison
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1BombWall
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1Keatons
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1Cannons
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1Left
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1Right
+	.4byte gAreaRoomMap_DarkHyruleCastle_B1Map
+	.4byte gAreaRoomMap_DarkHyruleCastle_B2ToPrison
+	.4byte gAreaRoomMap_DarkHyruleCastle_B2Prison
+	.4byte gAreaRoomMap_DarkHyruleCastle_B2Dropdown
+	.4byte gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9

 gAreaRoomMap_DarkHyruleCastleOutside_0:: @ 081070AC
 	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_0_0, 0x2EE, 1
@@ -293,10 +293,10 @@ gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
 	metatile_types_top offset_gAreaMetatiles_SanctuaryEntrance_3, 0x3FC, 1, 1

 gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
-	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastle_0, 0x3FD8, 1
-	metatiles_top offset_gAreaMetatiles_DarkHyruleCastle_1, 0x37C0, 1
-	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastle_2, 0xFF6, 1
-	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastle_3, 0xDF0, 1, 1
+	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastle_1FEntrance, 0x3FD8, 1
+	metatiles_top offset_gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower, 0x37C0, 1
+	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastle_3FTopRightTower, 0xFF6, 1
+	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower, 0xDF0, 1, 1

 gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
 	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastleOutside_0, 0x3340, 1
@@ -903,14 +903,14 @@ gAreaTileset_SanctuaryEntrance_0:: @ 081021F0
 gAreaTilesets_SanctuaryEntrance:: @ 08102220
 	.4byte gAreaTileset_SanctuaryEntrance_0

-gAreaTileset_DarkHyruleCastle_0:: @ 08102224
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_2, 0x6008000, 0x4000, 1
+gAreaTileset_DarkHyruleCastle_1FEntrance:: @ 08102224
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 59, 1

 gAreaTilesets_DarkHyruleCastle:: @ 08102254
-	.4byte gAreaTileset_DarkHyruleCastle_0
+	.4byte gAreaTileset_DarkHyruleCastle_1FEntrance

 gAreaTileset_DarkHyruleCastleOutside_0:: @ 08102258
 	tileset_tiles offset_gAreaTileset_DarkHyruleCastleOutside_0_0, 0x6000000, 0x4000, 1
@@ -93,24 +93,24 @@ typedef enum {
    ROOM_CRENEL_MINISH_PATHS_RAIN,
    ROOM_CRENEL_MINISH_PATHS_MELARI,
    // AREA_DIG_CAVES
-    ROOM_DIG_CAVES_0 = 0,
+    ROOM_DIG_CAVES_EASTERN_HILLS = 0,
    ROOM_DIG_CAVES_1,
    ROOM_DIG_CAVES_2,
-    ROOM_DIG_CAVES_3,
+    ROOM_DIG_CAVES_TRILBY_HIGHLANDS,
    // AREA_CRENEL_DIG_CAVE
    ROOM_CRENEL_DIG_CAVE_0 = 0,
    // AREA_FESTIVAL_TOWN
-    ROOM_FESTIVAL_TOWN_0 = 0,
+    ROOM_FESTIVAL_TOWN_MAIN = 0,
    // AREA_VEIL_FALLS_DIG_CAVE
    ROOM_VEIL_FALLS_DIG_CAVE_0 = 0,
    // AREA_CASTOR_WILDS_DIG_CAVE
    ROOM_CASTOR_WILDS_DIG_CAVE_0 = 0,
    // AREA_OUTER_FORTRESS_OF_WINDS
-    ROOM_OUTER_FORTRESS_OF_WINDS_0 = 0,
-    ROOM_OUTER_FORTRESS_OF_WINDS_1,
-    ROOM_OUTER_FORTRESS_OF_WINDS_2,
-    ROOM_OUTER_FORTRESS_OF_WINDS_3,
-    ROOM_OUTER_FORTRESS_OF_WINDS_4,
+    ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL = 0,
+    ROOM_OUTER_FORTRESS_OF_WINDS_2F,
+    ROOM_OUTER_FORTRESS_OF_WINDS_3F,
+    ROOM_OUTER_FORTRESS_OF_WINDS_MOLE_MITTS,
+    ROOM_OUTER_FORTRESS_OF_WINDS_SMALL_KEY,
    // AREA_HYLIA_DIG_CAVES
    ROOM_HYLIA_DIG_CAVES_0 = 0,
    ROOM_HYLIA_DIG_CAVES_1,
@@ -127,25 +127,25 @@ typedef enum {
    // AREA_NULL_1F
    ROOM_NULL_1F_0 = 0,
    // AREA_MINISH_HOUSE_INTERIORS
-    ROOM_MINISH_HOUSE_INTERIORS_0 = 0,
-    ROOM_MINISH_HOUSE_INTERIORS_1,
-    ROOM_MINISH_HOUSE_INTERIORS_2,
-    ROOM_MINISH_HOUSE_INTERIORS_3,
-    ROOM_MINISH_HOUSE_INTERIORS_4,
-    ROOM_MINISH_HOUSE_INTERIORS_5,
-    ROOM_MINISH_HOUSE_INTERIORS_6,
-    ROOM_MINISH_HOUSE_INTERIORS_7,
-    ROOM_MINISH_HOUSE_INTERIORS_8,
-    ROOM_MINISH_HOUSE_INTERIORS_9,
-    ROOM_MINISH_HOUSE_INTERIORS_a,
-    ROOM_MINISH_HOUSE_INTERIORS_b,
+    ROOM_MINISH_HOUSE_INTERIORS_GENTARI_MAIN = 0,
+    ROOM_MINISH_HOUSE_INTERIORS_GENTARI_EXIT,
+    ROOM_MINISH_HOUSE_INTERIORS_FESTARI,
+    ROOM_MINISH_HOUSE_INTERIORS_RED,
+    ROOM_MINISH_HOUSE_INTERIORS_GREEN,
+    ROOM_MINISH_HOUSE_INTERIORS_BLUE,
+    ROOM_MINISH_HOUSE_INTERIORS_SIDE_AREA,
+    ROOM_MINISH_HOUSE_INTERIORS_SHOE_MINISH,
+    ROOM_MINISH_HOUSE_INTERIORS_POT_MINISH,
+    ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH,
+    ROOM_MINISH_HOUSE_INTERIORS_NULL1,
+    ROOM_MINISH_HOUSE_INTERIORS_NULL2,
    ROOM_MINISH_HOUSE_INTERIORS_c,
    ROOM_MINISH_HOUSE_INTERIORS_d,
    ROOM_MINISH_HOUSE_INTERIORS_e,
    ROOM_MINISH_HOUSE_INTERIORS_f,
-    ROOM_MINISH_HOUSE_INTERIORS_10,
-    ROOM_MINISH_HOUSE_INTERIORS_11,
-    ROOM_MINISH_HOUSE_INTERIORS_12,
+    ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHWEST,
+    ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHEAST,
+    ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_EAST,
    ROOM_MINISH_HOUSE_INTERIORS_13,
    ROOM_MINISH_HOUSE_INTERIORS_14,
    ROOM_MINISH_HOUSE_INTERIORS_15,
@@ -159,28 +159,28 @@ typedef enum {
    ROOM_MINISH_HOUSE_INTERIORS_1d,
    ROOM_MINISH_HOUSE_INTERIORS_1e,
    ROOM_MINISH_HOUSE_INTERIORS_1f,
-    ROOM_MINISH_HOUSE_INTERIORS_20,
-    ROOM_MINISH_HOUSE_INTERIORS_21,
-    ROOM_MINISH_HOUSE_INTERIORS_22,
-    ROOM_MINISH_HOUSE_INTERIORS_23,
-    ROOM_MINISH_HOUSE_INTERIORS_24,
-    ROOM_MINISH_HOUSE_INTERIORS_25,
-    ROOM_MINISH_HOUSE_INTERIORS_26,
-    ROOM_MINISH_HOUSE_INTERIORS_27,
+    ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_SOUTHWEST,
+    ROOM_MINISH_HOUSE_INTERIORS_SOUTH_HYRULE_FIELD,
+    ROOM_MINISH_HOUSE_INTERIORS_NEXT_TO_KNUCKLE,
+    ROOM_MINISH_HOUSE_INTERIORS_LIBRARI,
+    ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_EXIT,
+    ROOM_MINISH_HOUSE_INTERIORS_HYRULE_TOWN,
+    ROOM_MINISH_HOUSE_INTERIORS_MINISH_WOODS_BOMB,
+    ROOM_MINISH_HOUSE_INTERIORS_LAKE_HYLIA_OCARINA,
    // AREA_HOUSE_INTERIORS_1
-    ROOM_HOUSE_INTERIORS_1_0 = 0,
-    ROOM_HOUSE_INTERIORS_1_1,
-    ROOM_HOUSE_INTERIORS_1_2,
-    ROOM_HOUSE_INTERIORS_1_3,
-    ROOM_HOUSE_INTERIORS_1_4,
-    ROOM_HOUSE_INTERIORS_1_5,
-    ROOM_HOUSE_INTERIORS_1_6,
-    ROOM_HOUSE_INTERIORS_1_7,
-    ROOM_HOUSE_INTERIORS_1_8,
-    ROOM_HOUSE_INTERIORS_1_9,
-    ROOM_HOUSE_INTERIORS_1_a,
-    ROOM_HOUSE_INTERIORS_1_b,
-    ROOM_HOUSE_INTERIORS_1_c,
+    ROOM_HOUSE_INTERIORS_1_MAYOR = 0,
+    ROOM_HOUSE_INTERIORS_1_POST_OFFICE,
+    ROOM_HOUSE_INTERIORS_1_LIBRARY_2F,
+    ROOM_HOUSE_INTERIORS_1_LIBRARY_1F,
+    ROOM_HOUSE_INTERIORS_1_INN_1F,
+    ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM,
+    ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM,
+    ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM,
+    ROOM_HOUSE_INTERIORS_1_INN_WEST_2F,
+    ROOM_HOUSE_INTERIORS_1_INN_EAST_2F,
+    ROOM_HOUSE_INTERIORS_1_INN_MINISH_HEART_PIECE,
+    ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST,
+    ROOM_HOUSE_INTERIORS_1_SCHOOL_EAST,
    ROOM_HOUSE_INTERIORS_1_d,
    ROOM_HOUSE_INTERIORS_1_e,
    ROOM_HOUSE_INTERIORS_1_f,
@@ -201,28 +201,28 @@ typedef enum {
    ROOM_HOUSE_INTERIORS_1_1e,
    ROOM_HOUSE_INTERIORS_1_1f,
    // AREA_HOUSE_INTERIORS_2
-    ROOM_HOUSE_INTERIORS_2_0 = 0,
-    ROOM_HOUSE_INTERIORS_2_1,
+    ROOM_HOUSE_INTERIORS_2_STRANGER = 0,
+    ROOM_HOUSE_INTERIORS_2_WEST_ORACLE,
    ROOM_HOUSE_INTERIORS_2_2,
    ROOM_HOUSE_INTERIORS_2_3,
-    ROOM_HOUSE_INTERIORS_2_4,
+    ROOM_HOUSE_INTERIORS_2_DR_LEFT,
    ROOM_HOUSE_INTERIORS_2_5,
-    ROOM_HOUSE_INTERIORS_2_6,
-    ROOM_HOUSE_INTERIORS_2_7,
-    ROOM_HOUSE_INTERIORS_2_8,
-    ROOM_HOUSE_INTERIORS_2_9,
+    ROOM_HOUSE_INTERIORS_2_ROMIO,
+    ROOM_HOUSE_INTERIORS_2_JULIETTA,
+    ROOM_HOUSE_INTERIORS_2_PERCY,
+    ROOM_HOUSE_INTERIORS_2_EAST_ORACLE,
    ROOM_HOUSE_INTERIORS_2_a,
    ROOM_HOUSE_INTERIORS_2_b,
-    ROOM_HOUSE_INTERIORS_2_c,
+    ROOM_HOUSE_INTERIORS_2_CUCCO,
    ROOM_HOUSE_INTERIORS_2_d,
    ROOM_HOUSE_INTERIORS_2_e,
    ROOM_HOUSE_INTERIORS_2_f,
-    ROOM_HOUSE_INTERIORS_2_10,
-    ROOM_HOUSE_INTERIORS_2_11,
-    ROOM_HOUSE_INTERIORS_2_12,
+    ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE,
+    ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_SMITH,
+    ROOM_HOUSE_INTERIORS_2_DAMPE,
    ROOM_HOUSE_INTERIORS_2_13,
-    ROOM_HOUSE_INTERIORS_2_14,
-    ROOM_HOUSE_INTERIORS_2_15,
+    ROOM_HOUSE_INTERIORS_2_STOCKWELL_LAKE_HOUSE,
+    ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_BEDROOM,
    ROOM_HOUSE_INTERIORS_2_16,
    ROOM_HOUSE_INTERIORS_2_17,
    ROOM_HOUSE_INTERIORS_2_18,
@@ -250,15 +250,15 @@ typedef enum {
    ROOM_HOUSE_INTERIORS_2_2e,
    ROOM_HOUSE_INTERIORS_2_2f,
    // AREA_HOUSE_INTERIORS_3
-    ROOM_HOUSE_INTERIORS_3_0 = 0,
-    ROOM_HOUSE_INTERIORS_3_1,
-    ROOM_HOUSE_INTERIORS_3_2,
-    ROOM_HOUSE_INTERIORS_3_3,
-    ROOM_HOUSE_INTERIORS_3_4,
-    ROOM_HOUSE_INTERIORS_3_5,
-    ROOM_HOUSE_INTERIORS_3_6,
-    ROOM_HOUSE_INTERIORS_3_7,
-    ROOM_HOUSE_INTERIORS_3_8,
+    ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP = 0,
+    ROOM_HOUSE_INTERIORS_3_CAFE,
+    ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP,
+    ROOM_HOUSE_INTERIORS_3_BAKERY,
+    ROOM_HOUSE_INTERIORS_3_SIMON,
+    ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE,
+    ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE,
+    ROOM_HOUSE_INTERIORS_3_CARLOV,
+    ROOM_HOUSE_INTERIORS_3_BORLOV,
    ROOM_HOUSE_INTERIORS_3_9,
    ROOM_HOUSE_INTERIORS_3_a,
    ROOM_HOUSE_INTERIORS_3_b,
@@ -267,7 +267,7 @@ typedef enum {
    ROOM_HOUSE_INTERIORS_3_e,
    ROOM_HOUSE_INTERIORS_3_f,
    // AREA_TREE_INTERIORS
-    ROOM_TREE_INTERIORS_0 = 0,
+    ROOM_TREE_INTERIORS_WITCH_HUT = 0,
    ROOM_TREE_INTERIORS_1,
    ROOM_TREE_INTERIORS_2,
    ROOM_TREE_INTERIORS_3,
@@ -283,72 +283,72 @@ typedef enum {
    ROOM_TREE_INTERIORS_d,
    ROOM_TREE_INTERIORS_e,
    ROOM_TREE_INTERIORS_f,
-    ROOM_TREE_INTERIORS_10,
-    ROOM_TREE_INTERIORS_11,
-    ROOM_TREE_INTERIORS_12,
-    ROOM_TREE_INTERIORS_13,
+    ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV,
+    ROOM_TREE_INTERIORS_PERCYS_TREEHOUSE,
+    ROOM_TREE_INTERIORS_SOUTH_HYRULE_FIELD_HEART_PIECE,
+    ROOM_TREE_INTERIORS_WAVEBLADE,
    ROOM_TREE_INTERIORS_14,
-    ROOM_TREE_INTERIORS_15,
-    ROOM_TREE_INTERIORS_16,
-    ROOM_TREE_INTERIORS_17,
-    ROOM_TREE_INTERIORS_18,
-    ROOM_TREE_INTERIORS_19,
-    ROOM_TREE_INTERIORS_1a,
-    ROOM_TREE_INTERIORS_1b,
+    ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST,
+    ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST,
+    ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST,
+    ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST,
+    ROOM_TREE_INTERIORS_WESTERN_WOODS_HEART_PIECE,
+    ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN,
+    ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY,
    ROOM_TREE_INTERIORS_1c,
-    ROOM_TREE_INTERIORS_1d,
+    ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB,
    ROOM_TREE_INTERIORS_1e,
-    ROOM_TREE_INTERIORS_1f,
+    ROOM_TREE_INTERIORS_UNUSED_HEART_CONTAINER,
    // AREA_DOJOS
-    ROOM_DOJOS_0 = 0,
-    ROOM_DOJOS_1,
-    ROOM_DOJOS_2,
-    ROOM_DOJOS_3,
-    ROOM_DOJOS_4,
-    ROOM_DOJOS_5,
-    ROOM_DOJOS_6,
+    ROOM_DOJOS_GRAYBLADE = 0,
+    ROOM_DOJOS_SPLITBLADE,
+    ROOM_DOJOS_GREATBLADE,
+    ROOM_DOJOS_SCARBLADE,
+    ROOM_DOJOS_SWIFTBLADE_I,
+    ROOM_DOJOS_GRIMBLADE,
+    ROOM_DOJOS_WAVEBLADE,
    ROOM_DOJOS_7,
    ROOM_DOJOS_8,
    ROOM_DOJOS_9,
-    ROOM_DOJOS_a,
-    ROOM_DOJOS_b,
-    ROOM_DOJOS_c,
-    ROOM_DOJOS_d,
+    ROOM_DOJOS_TO_GRIMBLADE,
+    ROOM_DOJOS_TO_SPLITBLADE,
+    ROOM_DOJOS_TO_GREATBLADE,
+    ROOM_DOJOS_TO_SCARBLADE,
    ROOM_DOJOS_e,
    ROOM_DOJOS_f,
    // AREA_CRENEL_CAVES
-    ROOM_CRENEL_CAVES_0 = 0,
-    ROOM_CRENEL_CAVES_1,
-    ROOM_CRENEL_CAVES_2,
-    ROOM_CRENEL_CAVES_3,
-    ROOM_CRENEL_CAVES_4,
-    ROOM_CRENEL_CAVES_5,
-    ROOM_CRENEL_CAVES_6,
-    ROOM_CRENEL_CAVES_7,
-    ROOM_CRENEL_CAVES_8,
-    ROOM_CRENEL_CAVES_9,
-    ROOM_CRENEL_CAVES_a,
-    ROOM_CRENEL_CAVES_b,
-    ROOM_CRENEL_CAVES_c,
-    ROOM_CRENEL_CAVES_d,
-    ROOM_CRENEL_CAVES_e,
-    ROOM_CRENEL_CAVES_f,
-    ROOM_CRENEL_CAVES_10,
+    ROOM_CRENEL_CAVES_BLOCK_PUSHING = 0,
+    ROOM_CRENEL_CAVES_PILLAR_CAVE,
+    ROOM_CRENEL_CAVES_BRIDGE_SWITCH,
+    ROOM_CRENEL_CAVES_EXIT_TO_MINES,
+    ROOM_CRENEL_CAVES_GRIP_RING,
+    ROOM_CRENEL_CAVES_FAIRY_FOUNTAIN,
+    ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE,
+    ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST,
+    ROOM_CRENEL_CAVES_WATER_HEART_PIECE,
+    ROOM_CRENEL_CAVES_RUPEE_FAIRY_FOUINTAIN,
+    ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY,
+    ROOM_CRENEL_CAVES_MUSHROOM_KEESE,
+    ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER,
+    ROOM_CRENEL_CAVES_BOMB_BUSINESS_SCRUB,
+    ROOM_CRENEL_CAVES_HERMIT,
+    ROOM_CRENEL_CAVES_HINT_SCRUB,
+    ROOM_CRENEL_CAVES_TO_GRAYBLADE,
    // AREA_MINISH_CRACKS
-    ROOM_MINISH_CRACKS_0 = 0,
-    ROOM_MINISH_CRACKS_1,
-    ROOM_MINISH_CRACKS_2,
-    ROOM_MINISH_CRACKS_3,
-    ROOM_MINISH_CRACKS_4,
+    ROOM_MINISH_CRACKS_LON_LON_RANCH_NORTH = 0,
+    ROOM_MINISH_CRACKS_LAKE_HYLIA_EAST,
+    ROOM_MINISH_CRACKS_HYRULE_CASTLE_GARDEN,
+    ROOM_MINISH_CRACKS_MT_CRENEL,
+    ROOM_MINISH_CRACKS_EAST_HYRULE_CASTLE,
    ROOM_MINISH_CRACKS_5,
-    ROOM_MINISH_CRACKS_6,
-    ROOM_MINISH_CRACKS_7,
-    ROOM_MINISH_CRACKS_8,
-    ROOM_MINISH_CRACKS_9,
-    ROOM_MINISH_CRACKS_a,
-    ROOM_MINISH_CRACKS_b,
-    ROOM_MINISH_CRACKS_c,
-    ROOM_MINISH_CRACKS_d,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_BOW,
+    ROOM_MINISH_CRACKS_RUINS_ENTRANCE,
+    ROOM_MINISH_CRACKS_MINISH_WOODS_SOUTH,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_NORTH,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_WEST,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_MIDDLE,
+    ROOM_MINISH_CRACKS_RUINS_TEKTITE,
+    ROOM_MINISH_CRACKS_CASTOR_WILDS_NEXT_TO_BOW,
    ROOM_MINISH_CRACKS_e,
    ROOM_MINISH_CRACKS_f,
    ROOM_MINISH_CRACKS_10,
@@ -360,12 +360,12 @@ typedef enum {
    ROOM_MINISH_CRACKS_16,
    ROOM_MINISH_CRACKS_17,
    // AREA_HOUSE_INTERIORS_4
-    ROOM_HOUSE_INTERIORS_4_0 = 0,
-    ROOM_HOUSE_INTERIORS_4_1,
-    ROOM_HOUSE_INTERIORS_4_2,
-    ROOM_HOUSE_INTERIORS_4_3,
-    ROOM_HOUSE_INTERIORS_4_4,
-    ROOM_HOUSE_INTERIORS_4_5,
+    ROOM_HOUSE_INTERIORS_4_CARPENTER = 0,
+    ROOM_HOUSE_INTERIORS_4_SWIFTBLADE,
+    ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_WEST,
+    ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_EAST,
+    ROOM_HOUSE_INTERIORS_4_FARM_HOUSE,
+    ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN,
    ROOM_HOUSE_INTERIORS_4_6,
    ROOM_HOUSE_INTERIORS_4_7,
    ROOM_HOUSE_INTERIORS_4_8,
@@ -382,35 +382,35 @@ typedef enum {
    ROOM_GREAT_FAIRIES_CRENEL,
    ROOM_GREAT_FAIRIES_NOT_IMPLEMENTED,
    // AREA_CASTOR_CAVES
-    ROOM_CASTOR_CAVES_0 = 0,
-    ROOM_CASTOR_CAVES_1,
-    ROOM_CASTOR_CAVES_2,
-    ROOM_CASTOR_CAVES_3,
-    ROOM_CASTOR_CAVES_4,
+    ROOM_CASTOR_CAVES_SOUTH = 0,
+    ROOM_CASTOR_CAVES_NORTH,
+    ROOM_CASTOR_CAVES_WIND_RUINS,
+    ROOM_CASTOR_CAVES_DARKNUT,
+    ROOM_CASTOR_CAVES_HEART_PIECE,
    ROOM_CASTOR_CAVES_5,
    ROOM_CASTOR_CAVES_6,
    ROOM_CASTOR_CAVES_7,
    // AREA_CASTOR_DARKNUT
-    ROOM_CASTOR_DARKNUT_0 = 0,
-    ROOM_CASTOR_DARKNUT_1,
+    ROOM_CASTOR_DARKNUT_MAIN = 0,
+    ROOM_CASTOR_DARKNUT_HALL,
    // AREA_ARMOS_INTERIORS
-    ROOM_ARMOS_INTERIORS_0 = 0,
-    ROOM_ARMOS_INTERIORS_1,
-    ROOM_ARMOS_INTERIORS_2,
-    ROOM_ARMOS_INTERIORS_3,
-    ROOM_ARMOS_INTERIORS_4,
-    ROOM_ARMOS_INTERIORS_5,
+    ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_NORTH = 0,
+    ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_SOUTH,
+    ROOM_ARMOS_INTERIORS_RUINS_LEFT,
+    ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_LEFT,
+    ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_RIGHT,
+    ROOM_ARMOS_INTERIORS_RUINS_RIGHT,
    ROOM_ARMOS_INTERIORS_6,
-    ROOM_ARMOS_INTERIORS_7,
+    ROOM_ARMOS_INTERIORS_RUINS_GRASS_PATH,
    ROOM_ARMOS_INTERIORS_8,
-    ROOM_ARMOS_INTERIORS_9,
-    ROOM_ARMOS_INTERIORS_a,
+    ROOM_ARMOS_INTERIORS_FORTRESS_LEFT,
+    ROOM_ARMOS_INTERIORS_FORTRESS_RIGHT,
    // AREA_TOWN_MINISH_HOLES
-    ROOM_TOWN_MINISH_HOLES_0 = 0,
-    ROOM_TOWN_MINISH_HOLES_1,
-    ROOM_TOWN_MINISH_HOLES_2,
-    ROOM_TOWN_MINISH_HOLES_3,
-    ROOM_TOWN_MINISH_HOLES_4,
+    ROOM_TOWN_MINISH_HOLES_MAYORS_HOUSE = 0,
+    ROOM_TOWN_MINISH_HOLES_WEST_ORACLE,
+    ROOM_TOWN_MINISH_HOLES_DR_LEFT,
+    ROOM_TOWN_MINISH_HOLES_CARPENTER,
+    ROOM_TOWN_MINISH_HOLES_CAFE,
    ROOM_TOWN_MINISH_HOLES_5,
    ROOM_TOWN_MINISH_HOLES_6,
    ROOM_TOWN_MINISH_HOLES_7,
@@ -422,61 +422,61 @@ typedef enum {
    ROOM_TOWN_MINISH_HOLES_d,
    ROOM_TOWN_MINISH_HOLES_e,
    ROOM_TOWN_MINISH_HOLES_f,
-    ROOM_TOWN_MINISH_HOLES_10,
-    ROOM_TOWN_MINISH_HOLES_11,
-    ROOM_TOWN_MINISH_HOLES_12,
+    ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKSHELF,
+    ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKS_HOUSE,
+    ROOM_TOWN_MINISH_HOLES_REM_SHOE_SHOP,
    ROOM_TOWN_MINISH_HOLES_13,
    // AREA_MINISH_RAFTERS
-    ROOM_MINISH_RAFTERS_0 = 0,
-    ROOM_MINISH_RAFTERS_1,
-    ROOM_MINISH_RAFTERS_2,
-    ROOM_MINISH_RAFTERS_3,
+    ROOM_MINISH_RAFTERS_CAFE = 0,
+    ROOM_MINISH_RAFTERS_STOCKWELL,
+    ROOM_MINISH_RAFTERS_DR_LEFT,
+    ROOM_MINISH_RAFTERS_BAKERY,
    // AREA_GORON_CAVE
-    ROOM_GORON_CAVE_0 = 0,
-    ROOM_GORON_CAVE_1,
+    ROOM_GORON_CAVE_STAIRS = 0,
+    ROOM_GORON_CAVE_MAIN,
    // AREA_WIND_TRIBE_TOWER
-    ROOM_WIND_TRIBE_TOWER_0 = 0,
-    ROOM_WIND_TRIBE_TOWER_1,
-    ROOM_WIND_TRIBE_TOWER_2,
-    ROOM_WIND_TRIBE_TOWER_3,
+    ROOM_WIND_TRIBE_TOWER_ENTRANCE = 0,
+    ROOM_WIND_TRIBE_TOWER_FLOOR_1,
+    ROOM_WIND_TRIBE_TOWER_FLOOR_2,
+    ROOM_WIND_TRIBE_TOWER_FLOOR_3,
    // AREA_WIND_TRIBE_TOWER_ROOF
    ROOM_WIND_TRIBE_TOWER_ROOF_0 = 0,
    // AREA_CAVES
-    ROOM_CAVES_0 = 0,
-    ROOM_CAVES_1,
+    ROOM_CAVES_BOOMERANG = 0,
+    ROOM_CAVES_TO_GRAVEYARD,
    ROOM_CAVES_2,
    ROOM_CAVES_3,
    ROOM_CAVES_4,
    ROOM_CAVES_5,
    ROOM_CAVES_6,
-    ROOM_CAVES_7,
-    ROOM_CAVES_8,
-    ROOM_CAVES_9,
+    ROOM_CAVES_TRILBY_KEESE_CHEST,
+    ROOM_CAVES_TRILBY_FAIRY_FOUNTAIN,
+    ROOM_CAVES_SOUTH_HYRULE_FIELD_FAIRY_FOUNTAIN,
    ROOM_CAVES_a,
-    ROOM_CAVES_b,
-    ROOM_CAVES_c,
-    ROOM_CAVES_d,
-    ROOM_CAVES_e,
-    ROOM_CAVES_f,
-    ROOM_CAVES_10,
-    ROOM_CAVES_11,
-    ROOM_CAVES_12,
-    ROOM_CAVES_13,
-    ROOM_CAVES_14,
-    ROOM_CAVES_15,
-    ROOM_CAVES_16,
-    ROOM_CAVES_17,
+    ROOM_CAVES_HYRULE_TOWN_WATERFALL,
+    ROOM_CAVES_LON_LON_RANCH,
+    ROOM_CAVES_LON_LON_RANCH_SECRET,
+    ROOM_CAVES_TRILBY_HIGHLANDS,
+    ROOM_CAVES_LON_LON_RANCH_WALLET,
+    ROOM_CAVES_SOUTH_HYRULE_FIELD_RUPEE,
+    ROOM_CAVES_TRILBY_RUPEE,
+    ROOM_CAVES_TRILBY_MITTS_FAIRY_FOUNTAIN,
+    ROOM_CAVES_HILLS_KEESE_CHEST,
+    ROOM_CAVES_BOTTLE_BUSINESS_SCRUB,
+    ROOM_CAVES_HEART_PIECE_HALLWAY,
+    ROOM_CAVES_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN,
+    ROOM_CAVES_KINSTONE_BUSINESS_SCRUB,
    // AREA_VEIL_FALLS_CAVES
-    ROOM_VEIL_FALLS_CAVES_0 = 0,
-    ROOM_VEIL_FALLS_CAVES_1,
-    ROOM_VEIL_FALLS_CAVES_2,
-    ROOM_VEIL_FALLS_CAVES_3,
-    ROOM_VEIL_FALLS_CAVES_4,
-    ROOM_VEIL_FALLS_CAVES_5,
-    ROOM_VEIL_FALLS_CAVES_6,
-    ROOM_VEIL_FALLS_CAVES_7,
-    ROOM_VEIL_FALLS_CAVES_8,
-    ROOM_VEIL_FALLS_CAVES_9,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_2F = 0,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_1F,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_ROOM,
+    ROOM_VEIL_FALLS_CAVES_ENTRANCE,
+    ROOM_VEIL_FALLS_CAVES_EXIT,
+    ROOM_VEIL_FALLS_CAVES_SECRET_CHEST,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH,
+    ROOM_VEIL_FALLS_CAVES_HALLWAY_HEART_PIECE,
    ROOM_VEIL_FALLS_CAVES_a,
    ROOM_VEIL_FALLS_CAVES_b,
    ROOM_VEIL_FALLS_CAVES_c,
@@ -525,8 +525,8 @@ typedef enum {
    ROOM_HYRULE_TOWN_UNDERGROUND_0 = 0,
    ROOM_HYRULE_TOWN_UNDERGROUND_1,
    // AREA_GARDEN_FOUNTAINS
-    ROOM_GARDEN_FOUNTAINS_0 = 0,
-    ROOM_GARDEN_FOUNTAINS_1,
+    ROOM_GARDEN_FOUNTAINS_EAST = 0,
+    ROOM_GARDEN_FOUNTAINS_WEST,
    // AREA_HYRULE_CASTLE_CELLAR
    ROOM_HYRULE_CASTLE_CELLAR_0 = 0,
    ROOM_HYRULE_CASTLE_CELLAR_1,
@@ -539,30 +539,30 @@ typedef enum {
    // AREA_47
    ROOM_47_0 = 0,
    // AREA_DEEPWOOD_SHRINE
-    ROOM_DEEPWOOD_SHRINE_0 = 0,
-    ROOM_DEEPWOOD_SHRINE_1,
-    ROOM_DEEPWOOD_SHRINE_2,
-    ROOM_DEEPWOOD_SHRINE_3,
-    ROOM_DEEPWOOD_SHRINE_4,
-    ROOM_DEEPWOOD_SHRINE_5,
-    ROOM_DEEPWOOD_SHRINE_6,
-    ROOM_DEEPWOOD_SHRINE_7,
-    ROOM_DEEPWOOD_SHRINE_8,
-    ROOM_DEEPWOOD_SHRINE_9,
-    ROOM_DEEPWOOD_SHRINE_a,
-    ROOM_DEEPWOOD_SHRINE_b,
+    ROOM_DEEPWOOD_SHRINE_MADDERPILLAR = 0,
+    ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL,
+    ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1,
+    ROOM_DEEPWOOD_SHRINE_POT_BRIDGE,
+    ROOM_DEEPWOOD_SHRINE_DOUBLE_STATUE,
+    ROOM_DEEPWOOD_SHRINE_MAP,
+    ROOM_DEEPWOOD_SHRINE_BARREL,
+    ROOM_DEEPWOOD_SHRINE_BUTTON,
+    ROOM_DEEPWOOD_SHRINE_MULLDOZER,
+    ROOM_DEEPWOOD_SHRINE_PILLARS,
+    ROOM_DEEPWOOD_SHRINE_LEVER,
+    ROOM_DEEPWOOD_SHRINE_ENTRANCE,
    ROOM_DEEPWOOD_SHRINE_c,
    ROOM_DEEPWOOD_SHRINE_d,
    ROOM_DEEPWOOD_SHRINE_e,
    ROOM_DEEPWOOD_SHRINE_f,
-    ROOM_DEEPWOOD_SHRINE_10,
-    ROOM_DEEPWOOD_SHRINE_11,
-    ROOM_DEEPWOOD_SHRINE_12,
+    ROOM_DEEPWOOD_SHRINE_TORCHES,
+    ROOM_DEEPWOOD_SHRINE_BOSS_KEY,
+    ROOM_DEEPWOOD_SHRINE_COMPASS,
    ROOM_DEEPWOOD_SHRINE_13,
-    ROOM_DEEPWOOD_SHRINE_14,
-    ROOM_DEEPWOOD_SHRINE_15,
+    ROOM_DEEPWOOD_SHRINE_LILY_PAD_WEST,
+    ROOM_DEEPWOOD_SHRINE_LILY_PAD_EAST,
    ROOM_DEEPWOOD_SHRINE_16,
-    ROOM_DEEPWOOD_SHRINE_17,
+    ROOM_DEEPWOOD_SHRINE_BOSS_DOOR,
    ROOM_DEEPWOOD_SHRINE_18,
    ROOM_DEEPWOOD_SHRINE_19,
    ROOM_DEEPWOOD_SHRINE_1a,
@@ -571,11 +571,11 @@ typedef enum {
    ROOM_DEEPWOOD_SHRINE_1d,
    ROOM_DEEPWOOD_SHRINE_1e,
    ROOM_DEEPWOOD_SHRINE_1f,
-    ROOM_DEEPWOOD_SHRINE_20,
+    ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL,
    // AREA_DEEPWOOD_SHRINE_BOSS
-    ROOM_DEEPWOOD_SHRINE_BOSS_0 = 0,
+    ROOM_DEEPWOOD_SHRINE_BOSS_MAIN = 0,
    // AREA_DEEPWOOD_SHRINE_ENTRY
-    ROOM_DEEPWOOD_SHRINE_ENTRY_0 = 0,
+    ROOM_DEEPWOOD_SHRINE_ENTRY_MAIN = 0,
    // AREA_NULL_4B
    ROOM_NULL_4B_0 = 0,
    // AREA_NULL_4C
@@ -587,30 +587,30 @@ typedef enum {
    // AREA_NULL_4F
    ROOM_NULL_4F_0 = 0,
    // AREA_CAVE_OF_FLAMES
-    ROOM_CAVE_OF_FLAMES_0 = 0,
-    ROOM_CAVE_OF_FLAMES_1,
-    ROOM_CAVE_OF_FLAMES_2,
-    ROOM_CAVE_OF_FLAMES_3,
-    ROOM_CAVE_OF_FLAMES_4,
-    ROOM_CAVE_OF_FLAMES_5,
-    ROOM_CAVE_OF_FLAMES_6,
-    ROOM_CAVE_OF_FLAMES_7,
-    ROOM_CAVE_OF_FLAMES_8,
-    ROOM_CAVE_OF_FLAMES_9,
+    ROOM_CAVE_OF_FLAMES_AFTER_CANE = 0,
+    ROOM_CAVE_OF_FLAMES_SPINY_CHU,
+    ROOM_CAVE_OF_FLAMES_CART_TO_SPINY_CHU,
+    ROOM_CAVE_OF_FLAMES_ENTRANCE,
+    ROOM_CAVE_OF_FLAMES_MAIN_CART,
+    ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE,
+    ROOM_CAVE_OF_FLAMES_CART_WEST,
+    ROOM_CAVE_OF_FLAMES_HELMASAUR_FIGHT,
+    ROOM_CAVE_OF_FLAMES_ROLLOBITE_LAVA_ROOM,
+    ROOM_CAVE_OF_FLAMES_MINISH_LAVA_ROOM,
    ROOM_CAVE_OF_FLAMES_a,
    ROOM_CAVE_OF_FLAMES_b,
    ROOM_CAVE_OF_FLAMES_c,
    ROOM_CAVE_OF_FLAMES_d,
    ROOM_CAVE_OF_FLAMES_e,
    ROOM_CAVE_OF_FLAMES_f,
-    ROOM_CAVE_OF_FLAMES_10,
-    ROOM_CAVE_OF_FLAMES_11,
-    ROOM_CAVE_OF_FLAMES_12,
-    ROOM_CAVE_OF_FLAMES_13,
-    ROOM_CAVE_OF_FLAMES_14,
-    ROOM_CAVE_OF_FLAMES_15,
-    ROOM_CAVE_OF_FLAMES_16,
-    ROOM_CAVE_OF_FLAMES_17,
+    ROOM_CAVE_OF_FLAMES_MINISH_SPIKES,
+    ROOM_CAVE_OF_FLAMES_TOMPAS_DOOM,
+    ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK,
+    ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH1,
+    ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH2,
+    ROOM_CAVE_OF_FLAMES_COMPASS,
+    ROOM_CAVE_OF_FLAMES_BOB_OMB_WALL,
+    ROOM_CAVE_OF_FLAMES_BOSS_DOOR,
    ROOM_CAVE_OF_FLAMES_18,
    ROOM_CAVE_OF_FLAMES_19,
    ROOM_CAVE_OF_FLAMES_1a,
@@ -635,11 +635,11 @@ typedef enum {
    // AREA_57
    ROOM_57_0 = 0,
    // AREA_FORTRESS_OF_WINDS
-    ROOM_FORTRESS_OF_WINDS_0 = 0,
-    ROOM_FORTRESS_OF_WINDS_1,
-    ROOM_FORTRESS_OF_WINDS_2,
-    ROOM_FORTRESS_OF_WINDS_3,
-    ROOM_FORTRESS_OF_WINDS_4,
+    ROOM_FORTRESS_OF_WINDS_DOUBLE_EYEGORE = 0,
+    ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL,
+    ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER,
+    ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS,
+    ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER,
    ROOM_FORTRESS_OF_WINDS_5,
    ROOM_FORTRESS_OF_WINDS_6,
    ROOM_FORTRESS_OF_WINDS_7,
@@ -651,35 +651,35 @@ typedef enum {
    ROOM_FORTRESS_OF_WINDS_d,
    ROOM_FORTRESS_OF_WINDS_e,
    ROOM_FORTRESS_OF_WINDS_f,
-    ROOM_FORTRESS_OF_WINDS_10,
-    ROOM_FORTRESS_OF_WINDS_11,
-    ROOM_FORTRESS_OF_WINDS_12,
-    ROOM_FORTRESS_OF_WINDS_13,
-    ROOM_FORTRESS_OF_WINDS_14,
-    ROOM_FORTRESS_OF_WINDS_15,
-    ROOM_FORTRESS_OF_WINDS_16,
-    ROOM_FORTRESS_OF_WINDS_17,
-    ROOM_FORTRESS_OF_WINDS_18,
-    ROOM_FORTRESS_OF_WINDS_19,
-    ROOM_FORTRESS_OF_WINDS_1a,
-    ROOM_FORTRESS_OF_WINDS_1b,
-    ROOM_FORTRESS_OF_WINDS_1c,
-    ROOM_FORTRESS_OF_WINDS_1d,
+    ROOM_FORTRESS_OF_WINDS_DARKNUT_ROOM,
+    ROOM_FORTRESS_OF_WINDS_ARROW_EYE_BRIDGE,
+    ROOM_FORTRESS_OF_WINDS_NORTH_SPLIT_PATH_PIT,
+    ROOM_FORTRESS_OF_WINDS_WALLMASTER_MINISH_PORTAL,
+    ROOM_FORTRESS_OF_WINDS_PILLAR_CLONE_BUTTONS,
+    ROOM_FORTRESS_OF_WINDS_ROTATING_SPIKE_TRAPS,
+    ROOM_FORTRESS_OF_WINDS_MAZAAL,
+    ROOM_FORTRESS_OF_WINDS_STALFOS,
+    ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS,
+    ROOM_FORTRESS_OF_WINDS_MAIN_2F,
+    ROOM_FORTRESS_OF_WINDS_MINISH_HOLE,
+    ROOM_FORTRESS_OF_WINDS_BOSS_KEY,
+    ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F,
+    ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F,
    ROOM_FORTRESS_OF_WINDS_1e,
    ROOM_FORTRESS_OF_WINDS_1f,
-    ROOM_FORTRESS_OF_WINDS_20,
-    ROOM_FORTRESS_OF_WINDS_21,
-    ROOM_FORTRESS_OF_WINDS_22,
-    ROOM_FORTRESS_OF_WINDS_23,
-    ROOM_FORTRESS_OF_WINDS_24,
+    ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F,
+    ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F,
+    ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F,
+    ROOM_FORTRESS_OF_WINDS_WIZZROBE,
+    ROOM_FORTRESS_OF_WINDS_HEART_PIECE,
    ROOM_FORTRESS_OF_WINDS_25,
    ROOM_FORTRESS_OF_WINDS_26,
    ROOM_FORTRESS_OF_WINDS_27,
    // AREA_FORTRESS_OF_WINDS_TOP
-    ROOM_FORTRESS_OF_WINDS_TOP_0 = 0,
+    ROOM_FORTRESS_OF_WINDS_TOP_MAIN = 0,
    // AREA_INNER_MAZAAL
-    ROOM_INNER_MAZAAL_0 = 0,
-    ROOM_INNER_MAZAAL_1,
+    ROOM_INNER_MAZAAL_MAIN = 0,
+    ROOM_INNER_MAZAAL_PHASE_1,
    // AREA_NULL_5B
    ROOM_NULL_5B_0 = 0,
    // AREA_NULL_5C
@@ -691,24 +691,24 @@ typedef enum {
    // AREA_5F
    ROOM_5F_0 = 0,
    // AREA_TEMPLE_OF_DROPLETS
-    ROOM_TEMPLE_OF_DROPLETS_0 = 0,
-    ROOM_TEMPLE_OF_DROPLETS_1,
-    ROOM_TEMPLE_OF_DROPLETS_2,
-    ROOM_TEMPLE_OF_DROPLETS_3,
-    ROOM_TEMPLE_OF_DROPLETS_4,
-    ROOM_TEMPLE_OF_DROPLETS_5,
-    ROOM_TEMPLE_OF_DROPLETS_6,
-    ROOM_TEMPLE_OF_DROPLETS_7,
-    ROOM_TEMPLE_OF_DROPLETS_8,
-    ROOM_TEMPLE_OF_DROPLETS_9,
-    ROOM_TEMPLE_OF_DROPLETS_a,
-    ROOM_TEMPLE_OF_DROPLETS_b,
-    ROOM_TEMPLE_OF_DROPLETS_c,
-    ROOM_TEMPLE_OF_DROPLETS_d,
-    ROOM_TEMPLE_OF_DROPLETS_e,
-    ROOM_TEMPLE_OF_DROPLETS_f,
-    ROOM_TEMPLE_OF_DROPLETS_10,
-    ROOM_TEMPLE_OF_DROPLETS_11,
+    ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE = 0,
+    ROOM_TEMPLE_OF_DROPLETS_NORTH_SPLIT_ROOM,
+    ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE,
+    ROOM_TEMPLE_OF_DROPLETS_ENTRANCE,
+    ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS,
+    ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS,
+    ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHWEST,
+    ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST,
+    ROOM_TEMPLE_OF_DROPLETS_ELEMENT,
+    ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER,
+    ROOM_TEMPLE_OF_DROPLETS_ICE_PIT_MAZE,
+    ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHEAST,
+    ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST,
+    ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO,
+    ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU,
+    ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU,
+    ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY,
    ROOM_TEMPLE_OF_DROPLETS_12,
    ROOM_TEMPLE_OF_DROPLETS_13,
    ROOM_TEMPLE_OF_DROPLETS_14,
@@ -723,29 +723,29 @@ typedef enum {
    ROOM_TEMPLE_OF_DROPLETS_1d,
    ROOM_TEMPLE_OF_DROPLETS_1e,
    ROOM_TEMPLE_OF_DROPLETS_1f,
-    ROOM_TEMPLE_OF_DROPLETS_20,
-    ROOM_TEMPLE_OF_DROPLETS_21,
-    ROOM_TEMPLE_OF_DROPLETS_22,
-    ROOM_TEMPLE_OF_DROPLETS_23,
-    ROOM_TEMPLE_OF_DROPLETS_24,
-    ROOM_TEMPLE_OF_DROPLETS_25,
-    ROOM_TEMPLE_OF_DROPLETS_26,
-    ROOM_TEMPLE_OF_DROPLETS_27,
-    ROOM_TEMPLE_OF_DROPLETS_28,
+    ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_BUTTON_PUZZLE,
+    ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_PUZZLE,
+    ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE,
+    ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS,
+    ROOM_TEMPLE_OF_DROPLETS_SPIKE_BAR_FLIPPER_ROOM,
+    ROOM_TEMPLE_OF_DROPLETS_9_LANTERNS,
+    ROOM_TEMPLE_OF_DROPLETS_LILYPAD_ICE_BLOCKS,
    ROOM_TEMPLE_OF_DROPLETS_29,
-    ROOM_TEMPLE_OF_DROPLETS_2a,
-    ROOM_TEMPLE_OF_DROPLETS_2b,
-    ROOM_TEMPLE_OF_DROPLETS_2c,
-    ROOM_TEMPLE_OF_DROPLETS_2d,
-    ROOM_TEMPLE_OF_DROPLETS_2e,
-    ROOM_TEMPLE_OF_DROPLETS_2f,
-    ROOM_TEMPLE_OF_DROPLETS_30,
-    ROOM_TEMPLE_OF_DROPLETS_31,
-    ROOM_TEMPLE_OF_DROPLETS_32,
-    ROOM_TEMPLE_OF_DROPLETS_33,
-    ROOM_TEMPLE_OF_DROPLETS_34,
-    ROOM_TEMPLE_OF_DROPLETS_35,
-    ROOM_TEMPLE_OF_DROPLETS_36,
+    ROOM_TEMPLE_OF_DROPLETS_MULLDOZERS_FIRE_BARS,
+    ROOM_TEMPLE_OF_DROPLETS_DARK_MAZE,
+    ROOM_TEMPLE_OF_DROPLETS_TWIN_MADDERPILLARS,
+    ROOM_TEMPLE_OF_DROPLETS_AFTER_TWIN_MADDERPILLARS,
+    ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER,
+    ROOM_TEMPLE_OF_DROPLETS_MULLDOZER_KEY,
+    ROOM_TEMPLE_OF_DROPLETS_BEFORE_TWIN_MADDERPILLARS,
+    ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST,
+    ROOM_TEMPLE_OF_DROPLETS_COMPASS,
+    ROOM_TEMPLE_OF_DROPLETS_DARK_SCISSOR_BEETLES,
+    ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_MIDDLE,
+    ROOM_TEMPLE_OF_DROPLETS_ICE_MADDERPILLAR,
+    ROOM_TEMPLE_OF_DROPLETS_FLAMEBAR_BLOCK_PUZZLE,
    ROOM_TEMPLE_OF_DROPLETS_37,
    ROOM_TEMPLE_OF_DROPLETS_38,
    ROOM_TEMPLE_OF_DROPLETS_39,
@@ -771,14 +771,14 @@ typedef enum {
    ROOM_67_0 = 0,
    // AREA_ROYAL_CRYPT
    ROOM_ROYAL_CRYPT_0 = 0,
-    ROOM_ROYAL_CRYPT_1,
-    ROOM_ROYAL_CRYPT_2,
+    ROOM_ROYAL_CRYPT_WATER_ROPE,
+    ROOM_ROYAL_CRYPT_GIBDO,
    ROOM_ROYAL_CRYPT_3,
-    ROOM_ROYAL_CRYPT_4,
+    ROOM_ROYAL_CRYPT_KEY_BLOCK,
    ROOM_ROYAL_CRYPT_5,
    ROOM_ROYAL_CRYPT_6,
-    ROOM_ROYAL_CRYPT_7,
-    ROOM_ROYAL_CRYPT_8,
+    ROOM_ROYAL_CRYPT_MUSHROOM_PIT,
+    ROOM_ROYAL_CRYPT_ENTRANCE,
    // AREA_NULL_69
    ROOM_NULL_69_0 = 0,
    // AREA_NULL_6A
@@ -902,79 +902,79 @@ typedef enum {
    // AREA_87
    ROOM_87_0 = 0,
    // AREA_DARK_HYRULE_CASTLE
-    ROOM_DARK_HYRULE_CASTLE_0 = 0,
-    ROOM_DARK_HYRULE_CASTLE_1,
-    ROOM_DARK_HYRULE_CASTLE_2,
-    ROOM_DARK_HYRULE_CASTLE_3,
-    ROOM_DARK_HYRULE_CASTLE_4,
-    ROOM_DARK_HYRULE_CASTLE_5,
-    ROOM_DARK_HYRULE_CASTLE_6,
-    ROOM_DARK_HYRULE_CASTLE_7,
-    ROOM_DARK_HYRULE_CASTLE_8,
-    ROOM_DARK_HYRULE_CASTLE_9,
-    ROOM_DARK_HYRULE_CASTLE_a,
-    ROOM_DARK_HYRULE_CASTLE_b,
-    ROOM_DARK_HYRULE_CASTLE_c,
-    ROOM_DARK_HYRULE_CASTLE_d,
-    ROOM_DARK_HYRULE_CASTLE_e,
-    ROOM_DARK_HYRULE_CASTLE_f,
-    ROOM_DARK_HYRULE_CASTLE_10,
-    ROOM_DARK_HYRULE_CASTLE_11,
-    ROOM_DARK_HYRULE_CASTLE_12,
-    ROOM_DARK_HYRULE_CASTLE_13,
-    ROOM_DARK_HYRULE_CASTLE_14,
-    ROOM_DARK_HYRULE_CASTLE_15,
-    ROOM_DARK_HYRULE_CASTLE_16,
-    ROOM_DARK_HYRULE_CASTLE_17,
-    ROOM_DARK_HYRULE_CASTLE_18,
-    ROOM_DARK_HYRULE_CASTLE_19,
-    ROOM_DARK_HYRULE_CASTLE_1a,
+    ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE = 0,
+    ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI,
+    ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_CORNER,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOSS_KEY,
+    ROOM_DARK_HYRULE_CASTLE_2F_BLUE_WARP,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_GHINI,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_TORCHES,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT,
+    ROOM_DARK_HYRULE_CASTLE_2F_SPARKS,
+    ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS,
+    ROOM_DARK_HYRULE_CASTLE_2F_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_2F_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_CORNER_PUZZLE,
+    ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_CORNER,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI,
    ROOM_DARK_HYRULE_CASTLE_1b,
-    ROOM_DARK_HYRULE_CASTLE_1c,
-    ROOM_DARK_HYRULE_CASTLE_1d,
-    ROOM_DARK_HYRULE_CASTLE_1e,
-    ROOM_DARK_HYRULE_CASTLE_1f,
-    ROOM_DARK_HYRULE_CASTLE_20,
-    ROOM_DARK_HYRULE_CASTLE_21,
-    ROOM_DARK_HYRULE_CASTLE_22,
-    ROOM_DARK_HYRULE_CASTLE_23,
-    ROOM_DARK_HYRULE_CASTLE_24,
-    ROOM_DARK_HYRULE_CASTLE_25,
-    ROOM_DARK_HYRULE_CASTLE_26,
-    ROOM_DARK_HYRULE_CASTLE_27,
-    ROOM_DARK_HYRULE_CASTLE_28,
-    ROOM_DARK_HYRULE_CASTLE_29,
-    ROOM_DARK_HYRULE_CASTLE_2a,
-    ROOM_DARK_HYRULE_CASTLE_2b,
-    ROOM_DARK_HYRULE_CASTLE_2c,
-    ROOM_DARK_HYRULE_CASTLE_2d,
-    ROOM_DARK_HYRULE_CASTLE_2e,
-    ROOM_DARK_HYRULE_CASTLE_2f,
-    ROOM_DARK_HYRULE_CASTLE_30,
-    ROOM_DARK_HYRULE_CASTLE_31,
-    ROOM_DARK_HYRULE_CASTLE_32,
-    ROOM_DARK_HYRULE_CASTLE_33,
-    ROOM_DARK_HYRULE_CASTLE_34,
-    ROOM_DARK_HYRULE_CASTLE_35,
-    ROOM_DARK_HYRULE_CASTLE_36,
-    ROOM_DARK_HYRULE_CASTLE_37,
-    ROOM_DARK_HYRULE_CASTLE_38,
-    ROOM_DARK_HYRULE_CASTLE_39,
-    ROOM_DARK_HYRULE_CASTLE_3a,
+    ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE,
+    ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM,
+    ROOM_DARK_HYRULE_CASTLE_1F_COMPASS,
+    ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM,
+    ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER,
+    ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE,
+    ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS,
+    ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE,
+    ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON,
+    ROOM_DARK_HYRULE_CASTLE_B1_BOMB_WALL,
+    ROOM_DARK_HYRULE_CASTLE_B1_KEATONS,
+    ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON_FIREBAR,
+    ROOM_DARK_HYRULE_CASTLE_B1_CANNONS,
+    ROOM_DARK_HYRULE_CASTLE_B1_LEFT,
+    ROOM_DARK_HYRULE_CASTLE_B1_RIGHT,
+    ROOM_DARK_HYRULE_CASTLE_B1_MAP,
+    ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON,
+    ROOM_DARK_HYRULE_CASTLE_B2_PRISON,
+    ROOM_DARK_HYRULE_CASTLE_B2_DROPDOWN,
    ROOM_DARK_HYRULE_CASTLE_3b,
    ROOM_DARK_HYRULE_CASTLE_3c,
    ROOM_DARK_HYRULE_CASTLE_3d,
    ROOM_DARK_HYRULE_CASTLE_3e,
    ROOM_DARK_HYRULE_CASTLE_3f,
    // AREA_DARK_HYRULE_CASTLE_OUTSIDE
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_0 = 0,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_2,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_3,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_5,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6,
-    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_7,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_ZELDA_STATUE_PLATFORM = 0,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHWEST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHEAST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHWEST,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH,
+    ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHEAST,
    // AREA_VAATIS_ARMS
    ROOM_VAATIS_ARMS_FIRST = 0,
    ROOM_VAATIS_ARMS_SECOND,
@@ -983,7 +983,7 @@ typedef enum {
    // AREA_VAATI_2
    ROOM_VAATI_2_0 = 0,
    // AREA_DARK_HYRULE_CASTLE_BRIDGE
-    ROOM_DARK_HYRULE_CASTLE_BRIDGE_0 = 0,
+    ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN = 0,
    // AREA_NULL_8E
    ROOM_NULL_8E_0 = 0,
    // AREA_8F
@@ -921,11 +921,11 @@ u32 sub_unk3_Dojos_ToScarblade(void) {
 void sub_StateChange_Dojos_ToScarblade(void) {
 }

-u32 sub_unk3_GoronCave_StairsToCave(void) {
+u32 sub_unk3_GoronCave_Stairs(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave(void) {
+void sub_StateChange_GoronCave_Stairs(void) {
 }

 u32 sub_unk3_GoronCave_Main(void) {
@@ -1515,11 +1515,11 @@ void sub_StateChange_MinishHouseInteriors_HyruleFieldSouthwest(void) {
    sub_0801AFE4();
 }

-u32 sub_unk3_MinishHouseInteriors_HyruleFieldOutsideLinksHouse(void) {
+u32 sub_unk3_MinishHouseInteriors_SouthHyruleField(void) {
    return 1;
 }

-void sub_StateChange_MinishHouseInteriors_HyruleFieldOutsideLinksHouse(void) {
+void sub_StateChange_MinishHouseInteriors_SouthHyruleField(void) {
    sub_0801AFE4();
 }

@@ -1891,13 +1891,13 @@ u32 sub_unk3_MinishCracks_5(void) {
 void sub_StateChange_MinishCracks_5(void) {
 }

-u32 sub_unk3_MinishCracks_CastleWildsBowHole(void) {
+u32 sub_unk3_MinishCracks_CastorWildsBow(void) {
    return 1;
 }

 extern EntityData gUnk_080DCB10;

-void sub_StateChange_MinishCracks_CastleWildsBowHole(void) {
+void sub_StateChange_MinishCracks_CastorWildsBow(void) {
    if (!GetInventoryValue(ITEM_BOW)) {
        LoadRoomEntityList(&gUnk_080DCB10);
    }
@@ -3779,7 +3779,7 @@ void sub_StateChange_Dojos_ToGrimblade6(void) {
 extern u32 gUnk_080EB604;
 extern u32 gUnk_080EB5D4;

-u32 sub_unk3_DarkHyruleCastle_0(void) {
+u32 sub_unk3_DarkHyruleCastle_1FEntrance(void) {
    if (CheckGlobalFlag(ENDING)) {
        gRoomVars.field_0x6c[0] = &gUnk_080EB604;
        gRoomVars.field_0x6c[2] = 0;
@@ -3796,7 +3796,7 @@ u32 sub_unk3_DarkHyruleCastle_0(void) {
    return 1;
 }

-void sub_StateChange_DarkHyruleCastle_0(void) {
+void sub_StateChange_DarkHyruleCastle_1FEntrance(void) {
    if (CheckGlobalFlag(ENDING)) {
        gArea.queued_bgm = gArea.bgm;
    }
@@ -3816,42 +3816,42 @@ static void sub_0804D9B0(void) {
    gArea.queued_bgm = gArea.bgm;
 }

-u32 sub_unk3_DarkHyruleCastle_1(void) {
+u32 sub_unk3_DarkHyruleCastle_3FTopLeftTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGrimblade7(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_2(void) {
+u32 sub_unk3_DarkHyruleCastle_3FTopRightTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGrimblade8(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_3(void) {
+u32 sub_unk3_DarkHyruleCastle_3FBottomLeftTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGrimblade9(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_4(void) {
+u32 sub_unk3_DarkHyruleCastle_3FBottomRightTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade0(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_5(void) {
+u32 sub_unk3_DarkHyruleCastle_3FKeatonHallToVaati(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade1(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_6(void) {
+u32 sub_unk3_DarkHyruleCastle_3FTripleDarknut(void) {
    if (!CheckLocalFlag(0x77)) {
        gRoomVars.field_0x6c[0] = 0;
        gRoomVars.field_0x6c[2] = 0;
@@ -3863,7 +3863,7 @@ extern EntityData gUnk_080EB9F4;
 extern EntityData gUnk_080EBAA4;
 extern EntityData gUnk_080EBAF4;

-void sub_StateChange_DarkHyruleCastle_6(void) {
+void sub_StateChange_DarkHyruleCastle_3FTripleDarknut(void) {
    if (!CheckLocalFlag(0x77)) {
        LoadRoomEntityList(&gUnk_080EB9F4);
    } else {
@@ -3878,173 +3878,173 @@ void sub_StateChange_DarkHyruleCastle_6(void) {
    }
 }

-u32 sub_unk3_DarkHyruleCastle_7(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopLeftTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade2(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_8(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopLeftCorner(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade3(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_9(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBossKey(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade4(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_10(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBlueWarp(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade5(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_11(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopRightCornerGhini(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade6(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_12(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopRightCornerTorches(void) {
    return 1;
 }
 void sub_StateChange_Dojos_ToSplitblade7(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_13(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopRightTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade8(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_14(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopLeftDarknut(void) {
    return 1;
 }

 extern EntityData gUnk_080EC2CC;

-void sub_StateChange_DarkHyruleCastle_14(void) {
+void sub_StateChange_DarkHyruleCastle_2FTopLeftDarknut(void) {
    if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x4c)) {
        LoadRoomEntityList(&gUnk_080EC2CC);
    }
 }

-u32 sub_unk3_DarkHyruleCastle_15(void) {
+u32 sub_unk3_DarkHyruleCastle_2FSparks(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToSplitblade9(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_16(void) {
+u32 sub_unk3_DarkHyruleCastle_2FTopRightDarknuts(void) {
    return 1;
 }

 extern EntityData gUnk_080EC4E8;

-void sub_StateChange_DarkHyruleCastle_16(void) {
+void sub_StateChange_DarkHyruleCastle_2FTopRightDarknuts(void) {
    if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x4d)) {
        LoadRoomEntityList(&gUnk_080EC4E8);
    }
 }

-u32 sub_unk3_DarkHyruleCastle_17(void) {
+u32 sub_unk3_DarkHyruleCastle_2FLeft(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade0(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_18(void) {
+u32 sub_unk3_DarkHyruleCastle_2FRight(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade1(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_19(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomLeftDarknuts(void) {
    return 1;
 }

 extern EntityData gUnk_080EC820;

-void sub_StateChange_DarkHyruleCastle_19(void) {
+void sub_StateChange_DarkHyruleCastle_2FBottomLeftDarknuts(void) {
    if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x53)) {
        LoadRoomEntityList(&gUnk_080EC820);
    }
 }

-u32 sub_unk3_DarkHyruleCastle_20(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBossDoor(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade2(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_21(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomRightDarknut(void) {
    return 1;
 }

 extern EntityData gUnk_080ECA60;

-void sub_StateChange_DarkHyruleCastle_21(void) {
+void sub_StateChange_DarkHyruleCastle_2FBottomRightDarknut(void) {
    if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x56)) {
        LoadRoomEntityList(&gUnk_080ECA60);
    }
 }

-u32 sub_unk3_DarkHyruleCastle_22(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomLeftCornerPuzzle(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade3(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_23(void) {
+u32 sub_unk3_DarkHyruleCastle_2FEntrance(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade4(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_24(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomLeftCorner(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade5(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_25(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomLeftTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade6(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_26(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomLeftGhini(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade7(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_27(void) {
+u32 sub_unk3_DarkHyruleCastle_3FTopRightTower7(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade8(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_28(void) {
+u32 sub_unk3_DarkHyruleCastle_B1Entrance(void) {
    if (CheckLocalFlag(0x79)) {
        gRoomVars.field_0x6c[2] = 0;
    }
@@ -4053,7 +4053,7 @@ u32 sub_unk3_DarkHyruleCastle_28(void) {

 extern EntityData gUnk_080ECFCC;

-void sub_StateChange_DarkHyruleCastle_28(void) {
+void sub_StateChange_DarkHyruleCastle_B1Entrance(void) {
    if (CheckLocalFlag(0x79)) {
        sub_0807BB98(0x90, 1, 1, 5);
        LoadRoomEntityList(&gUnk_080ECFCC);
@@ -4061,14 +4061,14 @@ void sub_StateChange_DarkHyruleCastle_28(void) {
    }
 }

-u32 sub_unk3_DarkHyruleCastle_29(void) {
+u32 sub_unk3_DarkHyruleCastle_2FBottomRightTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToGreatblade9(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_30(void) {
+u32 sub_unk3_DarkHyruleCastle_1FTopLeftTower(void) {
    return 1;
 }

@@ -4077,7 +4077,7 @@ void sub_StateChange_Dojos_ToScarblade0(void) {

 extern u32 gUnk_080ED1E4;

-u32 sub_unk3_DarkHyruleCastle_31(void) {
+u32 sub_unk3_DarkHyruleCastle_1FThroneRoom(void) {
    if (CheckGlobalFlag(ENDING)) {
        gRoomVars.field_0x6c[0] = &gUnk_080ED1E4;
        gRoomVars.field_0x6c[2] = 0;
@@ -4085,160 +4085,160 @@ u32 sub_unk3_DarkHyruleCastle_31(void) {
    return 1;
 }

-void sub_StateChange_DarkHyruleCastle_31(void) {
+void sub_StateChange_DarkHyruleCastle_1FThroneRoom(void) {
    if (CheckGlobalFlag(ENDING)) {
        gArea.queued_bgm = gArea.bgm;
    }
 }

-u32 sub_unk3_DarkHyruleCastle_32(void) {
+u32 sub_unk3_DarkHyruleCastle_1FCompass(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade1(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_33(void) {
+u32 sub_unk3_DarkHyruleCastle_1FTopRightTower(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade2(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_34(void) {
+u32 sub_unk3_DarkHyruleCastle_1FBeforeThrone(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade3(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_35(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopTopLeft(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade4(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_36(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopTop(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade5(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_37(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopTopRight(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade6(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_38(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopLeft(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade7(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_39(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopRight(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade8(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_40(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopBottomLeft(void) {
    return 1;
 }

 void sub_StateChange_Dojos_ToScarblade9(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_41(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopBottom(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave0(void) {
+void sub_StateChange_GoronCave_Stairs0(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_42(void) {
+u32 sub_unk3_DarkHyruleCastle_1FLoopBottomRight(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave1(void) {
+void sub_StateChange_GoronCave_Stairs1(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_43(void) {
+u32 sub_unk3_DarkHyruleCastle_1FBottomLeftTower(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave2(void) {
+void sub_StateChange_GoronCave_Stairs2(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_44(void) {
+u32 sub_unk3_DarkHyruleCastle_1FBottomRightTower(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave3(void) {
+void sub_StateChange_GoronCave_Stairs3(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_45(void) {
+u32 sub_unk3_DarkHyruleCastle_B1BelowThrone(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave4(void) {
+void sub_StateChange_GoronCave_Stairs4(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_46(void) {
+u32 sub_unk3_DarkHyruleCastle_B1BelowCompass(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave5(void) {
+void sub_StateChange_GoronCave_Stairs5(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_47(void) {
+u32 sub_unk3_DarkHyruleCastle_B1BeforeThrone(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave6(void) {
+void sub_StateChange_GoronCave_Stairs6(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_48(void) {
+u32 sub_unk3_DarkHyruleCastle_B1ToPrison(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave7(void) {
+void sub_StateChange_GoronCave_Stairs7(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_49(void) {
+u32 sub_unk3_DarkHyruleCastle_B1BombWall(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave8(void) {
+void sub_StateChange_GoronCave_Stairs8(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_50(void) {
+u32 sub_unk3_DarkHyruleCastle_B1Keatons(void) {
    return 1;
 }

-void sub_StateChange_GoronCave_StairsToCave9(void) {
+void sub_StateChange_GoronCave_Stairs9(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_51(void) {
+u32 sub_unk3_DarkHyruleCastle_B1ToPrisonFirebar(void) {
    return 1;
 }

 void sub_StateChange_Ruins_Beanstalk0(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_52(void) {
+u32 sub_unk3_DarkHyruleCastle_B1Cannons(void) {
    return 1;
 }

 void sub_StateChange_Ruins_Beanstalk1(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_53(void) {
+u32 sub_unk3_DarkHyruleCastle_B1Left(void) {
    if (CheckLocalFlag(0x79)) {
        gRoomVars.field_0x6c[2] = 0;
        gRoomVars.field_0x6c[0] = 0;
@@ -4248,7 +4248,7 @@ u32 sub_unk3_DarkHyruleCastle_53(void) {

 extern EntityData gUnk_080EE314;

-void sub_StateChange_DarkHyruleCastle_53(void) {
+void sub_StateChange_DarkHyruleCastle_B1Left(void) {
    if (CheckLocalFlag(0x79)) {
        sub_0807BB98(3, 2, 5, 1);
        LoadRoomEntityList(&gUnk_080EE314);
@@ -4256,14 +4256,14 @@ void sub_StateChange_DarkHyruleCastle_53(void) {
    }
 }

-u32 sub_unk3_DarkHyruleCastle_54(void) {
+u32 sub_unk3_DarkHyruleCastle_B1Right(void) {
    return 1;
 }

 void sub_StateChange_Ruins_Beanstalk2(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_55(void) {
+u32 sub_unk3_DarkHyruleCastle_B1Map(void) {
    if (CheckLocalFlag(0x79)) {
        gRoomVars.field_0x6c[2] = 0;
    }
@@ -4272,7 +4272,7 @@ u32 sub_unk3_DarkHyruleCastle_55(void) {

 extern EntityData gUnk_080EE5DC;

-void sub_StateChange_DarkHyruleCastle_55(void) {
+void sub_StateChange_DarkHyruleCastle_B1Map(void) {
    if (CheckLocalFlag(0x79)) {
        sub_0807BB98(0x392, 2, 2, 5);
        LoadRoomEntityList(&gUnk_080EE5DC);
@@ -4280,26 +4280,26 @@ void sub_StateChange_DarkHyruleCastle_55(void) {
    }
 }

-u32 sub_unk3_DarkHyruleCastle_56(void) {
+u32 sub_unk3_DarkHyruleCastle_B2ToPrison(void) {
    return 1;
 }

 void sub_StateChange_Ruins_Beanstalk3(void) {
 }

-u32 sub_unk3_DarkHyruleCastle_57(void) {
+u32 sub_unk3_DarkHyruleCastle_B2Prison(void) {
    return 1;
 }

 extern EntityData gUnk_080EE71C;

-void sub_StateChange_DarkHyruleCastle_57(void) {
+void sub_StateChange_DarkHyruleCastle_B2Prison(void) {
    if (CheckLocalFlag(1)) {
        LoadRoomEntityList(&gUnk_080EE71C);
    }
 }

-u32 sub_unk3_DarkHyruleCastle_58(void) {
+u32 sub_unk3_DarkHyruleCastle_B2Dropdown(void) {
    return 1;
 }

@@ -4950,13 +4950,13 @@ void sub_StateChange_HouseInteriors2_Dampe(void) {
    }
 }

-u32 sub_unk3_HouseInteriors2_Stockwell(void) {
+u32 sub_unk3_HouseInteriors2_StockwellLakeHouse(void) {
    return 1;
 }

 extern EntityData gUnk_080F30CC;

-void sub_StateChange_HouseInteriors2_Stockwell(void) {
+void sub_StateChange_HouseInteriors2_StockwellLakeHouse(void) {
    if ((GetInventoryValue(ITEM_QST_DOGFOOD) == 1) && !CheckGlobalFlag(BIN_DOGFOOD) &&
        (gPlayerState.flags & PL_MINISH) == 0) {
        LoadRoomEntityList(&gUnk_080F30CC);
@@ -5053,13 +5053,13 @@ u32 sub_unk3_HouseInteriors4_FarmHouse(void) {
 void sub_StateChange_Ruins_LadderToTektites0(void) {
 }

-u32 sub_unk3_HouseInteriors4_Mayor(void) {
+u32 sub_unk3_HouseInteriors4_MayorLakeCabin(void) {
    return 1;
 }

 extern EntityData gUnk_080F3A48;

-void sub_StateChange_HouseInteriors4_Mayor(void) {
+void sub_StateChange_HouseInteriors4_MayorLakeCabin(void) {
    if (!GetInventoryValue(ITEM_FLIPPERS) && CheckGlobalFlag(MIZUKAKI_START) && !GetInventoryValue(ITEM_QST_BOOK3)) {
        LoadRoomEntityList(&gUnk_080F3A48);
    }
@@ -6133,25 +6133,25 @@ u32 sub_unk3_Caves_6(void) {
 void sub_StateChange_Caves_6(void) {
 }

-u32 sub_unk3_Caves_KeeseChest(void) {
+u32 sub_unk3_Caves_TrilbyKeeseChest(void) {
    return 1;
 }

-void sub_StateChange_Caves_KeeseChest(void) {
+void sub_StateChange_Caves_TrilbyKeeseChest(void) {
 }

-u32 sub_unk3_Caves_FairyFountainTrilbyHighlands(void) {
+u32 sub_unk3_Caves_TrilbyFairyFountain(void) {
    return 1;
 }

-void sub_StateChange_Caves_FairyFountainTrilbyHighlands(void) {
+void sub_StateChange_Caves_TrilbyFairyFountain(void) {
 }

-u32 sub_unk3_Caves_FairyFountainLinksHouse(void) {
+u32 sub_unk3_Caves_SouthHyruleFieldFairyFountain(void) {
    return 1;
 }

-void sub_StateChange_Caves_FairyFountainLinksHouse(void) {
+void sub_StateChange_Caves_SouthHyruleFieldFairyFountain(void) {
 }

 u32 sub_unk3_Caves_A(void) {
@@ -6204,31 +6204,31 @@ u32 sub_unk3_Caves_LonLonRanchWallet(void) {
 void sub_StateChange_Caves_LonLonRanchWallet(void) {
 }

-u32 sub_unk3_Caves_RupeeLinksHouse(void) {
+u32 sub_unk3_Caves_SouthHyruleFieldRupee(void) {
    return 1;
 }

-void sub_StateChange_Caves_RupeeLinksHouse(void) {
+void sub_StateChange_Caves_SouthHyruleFieldRupee(void) {
 }

-u32 sub_unk3_Caves_RupeeTrilbyHighlands(void) {
+u32 sub_unk3_Caves_TrilbyRupee(void) {
    return 1;
 }

-void sub_StateChange_Caves_RupeeTrilbyHighlands(void) {
+void sub_StateChange_Caves_TrilbyRupee(void) {
 }

-u32 sub_unk3_Caves_FairyFountainMoleMitts(void) {
+u32 sub_unk3_Caves_TrilbyMittsFairyFountain(void) {
    return 1;
 }

-void sub_StateChange_Caves_FairyFountainMoleMitts(void) {
+void sub_StateChange_Caves_TrilbyMittsFairyFountain(void) {
 }

-u32 sub_unk3_Caves_KeeseChestSoutheastHyrule(void) {
+u32 sub_unk3_Caves_HillsKeeseChest(void) {
    return 1;
 }
-void sub_StateChange_Caves_KeeseChestSoutheastHyrule(void) {
+void sub_StateChange_Caves_HillsKeeseChest(void) {
 }

 u32 sub_unk3_Caves_BottleBusinessScrub(void) {
@@ -6245,11 +6245,11 @@ u32 sub_unk3_Caves_HeartPieceHallway(void) {
 void sub_StateChange_Caves_HeartPieceHallway(void) {
 }

-u32 sub_unk3_Caves_FairyFountainBoomerang(void) {
+u32 sub_unk3_Caves_NorthHyruleFieldFairyFountain(void) {
    return 1;
 }

-void sub_StateChange_Caves_FairyFountainBoomerang(void) {
+void sub_StateChange_Caves_NorthHyruleFieldFairyFountain(void) {
 }

 u32 sub_unk3_Caves_KinstoneBusinessScrub(void) {
@@ -6542,11 +6542,11 @@ u32 sub_unk3_TreeInteriors_HeartPiece(void) {
 void sub_StateChange_TreeInteriors_HeartPiece(void) {
 }

-u32 sub_unk3_TreeInteriors_StairsToBladeBrother(void) {
+u32 sub_unk3_TreeInteriors_Waveblade(void) {
    return 1;
 }

-void sub_StateChange_TreeInteriors_StairsToBladeBrother(void) {
+void sub_StateChange_TreeInteriors_Waveblade(void) {
 }

 u32 sub_unk3_TreeInteriors_14(void) {
@@ -6584,25 +6584,25 @@ u32 sub_unk3_TreeInteriors_BoomerangSoutheast(void) {
 void sub_StateChange_TreeInteriors_BoomerangSoutheast(void) {
 }

-u32 sub_unk3_TreeInteriors_HeartPieceSouthwestField(void) {
+u32 sub_unk3_TreeInteriors_WesternWoodsHeartPiece(void) {
    return 1;
 }

-void sub_StateChange_TreeInteriors_HeartPieceSouthwestField(void) {
+void sub_StateChange_TreeInteriors_WesternWoodsHeartPiece(void) {
 }

-u32 sub_unk3_TreeInteriors_StairsToFairyFountain(void) {
+u32 sub_unk3_TreeInteriors_NorthHyruleFieldFairyFountain(void) {
    return 1;
 }

-void sub_StateChange_TreeInteriors_StairsToFairyFountain(void) {
+void sub_StateChange_TreeInteriors_NorthHyruleFieldFairyFountain(void) {
 }

-u32 sub_unk3_TreeInteriors_StairsToWalletFairy(void) {
+u32 sub_unk3_TreeInteriors_MinishWoodsGreatFairy(void) {
    return 1;
 }

-void sub_StateChange_TreeInteriors_StairsToWalletFairy(void) {
+void sub_StateChange_TreeInteriors_MinishWoodsGreatFairy(void) {
 }

 u32 sub_unk3_TreeInteriors_1C(void) {
@@ -6612,11 +6612,11 @@ u32 sub_unk3_TreeInteriors_1C(void) {
 void sub_StateChange_TreeInteriors_1C(void) {
 }

-u32 sub_unk3_TreeInteriors_StairsToBusinessScrub(void) {
+u32 sub_unk3_TreeInteriors_MinishWoodsBusinessScrub(void) {
    return 1;
 }

-void sub_StateChange_TreeInteriors_StairsToBusinessScrub(void) {
+void sub_StateChange_TreeInteriors_MinishWoodsBusinessScrub(void) {
 }

 u32 sub_unk3_TreeInteriors_1E(void) {
@@ -6626,11 +6626,11 @@ u32 sub_unk3_TreeInteriors_1E(void) {
 void sub_StateChange_TreeInteriors_1E(void) {
 }

-u32 sub_unk3_TreeInteriors_1F(void) {
+u32 sub_unk3_TreeInteriors_UnusedHeartContainer(void) {
    return 1;
 }

-void sub_StateChange_TreeInteriors_1F(void) {
+void sub_StateChange_TreeInteriors_UnusedHeartContainer(void) {
 }

 extern u32 gUnk_080FAD48;
@@ -6793,11 +6793,11 @@ u32 sub_unk3_CrenelCaves_MushroomKeese(void) {
 void sub_StateChange_CrenelCaves_MushroomKeese(void) {
 }

-u32 sub_unk3_CrenelCaves_LadderToGreenWater(void) {
+u32 sub_unk3_CrenelCaves_LadderToSpringWater(void) {
    return 1;
 }

-void sub_StateChange_CrenelCaves_LadderToGreenWater(void) {
+void sub_StateChange_CrenelCaves_LadderToSpringWater(void) {
 }

 u32 sub_unk3_CrenelCaves_BombBusinessScrub(void) {
@@ -79,7 +79,7 @@ static const SaveFile gDemoSave = {
    .name = "\x97\x7f\xdd",
    .saved_status = {
        .area_next = AREA_DEEPWOOD_SHRINE,
-        .room_next = ROOM_DEEPWOOD_SHRINE_b,
+        .room_next = ROOM_DEEPWOOD_SHRINE_ENTRANCE,
        .start_pos_x = 0xa8,
        .start_pos_y = 0xc8,
        .layer = 1,