From d7fe306a49d47109795bd0bc1087eaf967fbf21b Mon Sep 17 00:00:00 2001 From: Henny022p Date: Wed, 23 Mar 2022 19:14:17 +0100 Subject: [PATCH] more room names --- assets/assets.json | 18 +- assets/map.json | 254 +++--- data/map/entity_headers.s | 1674 +++++++++++++++++----------------- data/map/map_data.s | 508 +++++------ data/map/map_headers.s | 480 +++++----- data/map/metatile_headers.s | 8 +- data/map/tileset_headers.s | 10 +- include/roomid.h | 738 +++++++-------- src/data/transitions.c | 1687 ++++++++++++++++++----------------- src/roomInit.c | 240 ++--- src/title.c | 2 +- 11 files changed, 2820 insertions(+), 2799 deletions(-) diff --git a/assets/assets.json b/assets/assets.json index 72c618ca..6a887b13 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -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 }, diff --git a/assets/map.json b/assets/map.json index 62baa1cc..e958e3a3 100644 --- a/assets/map.json +++ b/assets/map.json @@ -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" diff --git a/data/map/entity_headers.s b/data/map/entity_headers.s index 7fd2f64c..44ee72f9 100644 --- a/data/map/entity_headers.s +++ b/data/map/entity_headers.s @@ -608,65 +608,65 @@ Area_SanctuaryEntrance:: @ 080D48F0 .4byte Room_SanctuaryEntrance_Main Area_DarkHyruleCastle:: @ 080D48F4 - .4byte Room_DarkHyruleCastle_0 - .4byte Room_DarkHyruleCastle_1 - .4byte Room_DarkHyruleCastle_2 - .4byte Room_DarkHyruleCastle_3 - .4byte Room_DarkHyruleCastle_4 - .4byte Room_DarkHyruleCastle_5 - .4byte Room_DarkHyruleCastle_6 - .4byte Room_DarkHyruleCastle_7 - .4byte Room_DarkHyruleCastle_8 - .4byte Room_DarkHyruleCastle_9 - .4byte Room_DarkHyruleCastle_10 - .4byte Room_DarkHyruleCastle_11 - .4byte Room_DarkHyruleCastle_12 - .4byte Room_DarkHyruleCastle_13 - .4byte Room_DarkHyruleCastle_14 - .4byte Room_DarkHyruleCastle_15 - .4byte Room_DarkHyruleCastle_16 - .4byte Room_DarkHyruleCastle_17 - .4byte Room_DarkHyruleCastle_18 - .4byte Room_DarkHyruleCastle_19 - .4byte Room_DarkHyruleCastle_20 - .4byte Room_DarkHyruleCastle_21 - .4byte Room_DarkHyruleCastle_22 - .4byte Room_DarkHyruleCastle_23 - .4byte Room_DarkHyruleCastle_24 - .4byte Room_DarkHyruleCastle_25 - .4byte Room_DarkHyruleCastle_26 - .4byte Room_DarkHyruleCastle_27 - .4byte Room_DarkHyruleCastle_28 - .4byte Room_DarkHyruleCastle_29 - .4byte Room_DarkHyruleCastle_30 - .4byte Room_DarkHyruleCastle_31 - .4byte Room_DarkHyruleCastle_32 - .4byte Room_DarkHyruleCastle_33 - .4byte Room_DarkHyruleCastle_34 - .4byte Room_DarkHyruleCastle_35 - .4byte Room_DarkHyruleCastle_36 - .4byte Room_DarkHyruleCastle_37 - .4byte Room_DarkHyruleCastle_38 - .4byte Room_DarkHyruleCastle_39 - .4byte Room_DarkHyruleCastle_40 - .4byte Room_DarkHyruleCastle_41 - .4byte Room_DarkHyruleCastle_42 - .4byte Room_DarkHyruleCastle_43 - .4byte Room_DarkHyruleCastle_44 - .4byte Room_DarkHyruleCastle_45 - .4byte Room_DarkHyruleCastle_46 - .4byte Room_DarkHyruleCastle_47 - .4byte Room_DarkHyruleCastle_48 - .4byte Room_DarkHyruleCastle_49 - .4byte Room_DarkHyruleCastle_50 - .4byte Room_DarkHyruleCastle_51 - .4byte Room_DarkHyruleCastle_52 - .4byte Room_DarkHyruleCastle_53 - .4byte Room_DarkHyruleCastle_54 - .4byte Room_DarkHyruleCastle_55 - .4byte Room_DarkHyruleCastle_56 - .4byte Room_DarkHyruleCastle_57 - .4byte Room_DarkHyruleCastle_58 + .4byte Room_DarkHyruleCastle_1FEntrance + .4byte Room_DarkHyruleCastle_3FTopLeftTower + .4byte Room_DarkHyruleCastle_3FTopRightTower + .4byte Room_DarkHyruleCastle_3FBottomLeftTower + .4byte Room_DarkHyruleCastle_3FBottomRightTower + .4byte Room_DarkHyruleCastle_3FKeatonHallToVaati + .4byte Room_DarkHyruleCastle_3FTripleDarknut + .4byte Room_DarkHyruleCastle_2FTopLeftTower + .4byte Room_DarkHyruleCastle_2FTopLeftCorner + .4byte Room_DarkHyruleCastle_2FBossKey + .4byte Room_DarkHyruleCastle_2FBlueWarp + .4byte Room_DarkHyruleCastle_2FTopRightCornerGhini + .4byte Room_DarkHyruleCastle_2FTopRightCornerTorches + .4byte Room_DarkHyruleCastle_2FTopRightTower + .4byte Room_DarkHyruleCastle_2FTopLeftDarknut + .4byte Room_DarkHyruleCastle_2FSparks + .4byte Room_DarkHyruleCastle_2FTopRightDarknuts + .4byte Room_DarkHyruleCastle_2FLeft + .4byte Room_DarkHyruleCastle_2FRight + .4byte Room_DarkHyruleCastle_2FBottomLeftDarknuts + .4byte Room_DarkHyruleCastle_2FBossDoor + .4byte Room_DarkHyruleCastle_2FBottomRightDarknut + .4byte Room_DarkHyruleCastle_2FBottomLeftCornerPuzzle + .4byte Room_DarkHyruleCastle_2FEntrance + .4byte Room_DarkHyruleCastle_2FBottomLeftCorner + .4byte Room_DarkHyruleCastle_2FBottomLeftTower + .4byte Room_DarkHyruleCastle_2FBottomLeftGhini + .4byte Room_DarkHyruleCastle_3FTopRightTower7 + .4byte Room_DarkHyruleCastle_B1Entrance + .4byte Room_DarkHyruleCastle_2FBottomRightTower + .4byte Room_DarkHyruleCastle_1FTopLeftTower + .4byte Room_DarkHyruleCastle_1FThroneRoom + .4byte Room_DarkHyruleCastle_1FCompass + .4byte Room_DarkHyruleCastle_1FTopRightTower + .4byte Room_DarkHyruleCastle_1FBeforeThrone + .4byte Room_DarkHyruleCastle_1FLoopTopLeft + .4byte Room_DarkHyruleCastle_1FLoopTop + .4byte Room_DarkHyruleCastle_1FLoopTopRight + .4byte Room_DarkHyruleCastle_1FLoopLeft + .4byte Room_DarkHyruleCastle_1FLoopRight + .4byte Room_DarkHyruleCastle_1FLoopBottomLeft + .4byte Room_DarkHyruleCastle_1FLoopBottom + .4byte Room_DarkHyruleCastle_1FLoopBottomRight + .4byte Room_DarkHyruleCastle_1FBottomLeftTower + .4byte Room_DarkHyruleCastle_1FBottomRightTower + .4byte Room_DarkHyruleCastle_B1BelowThrone + .4byte Room_DarkHyruleCastle_B1BelowCompass + .4byte Room_DarkHyruleCastle_B1BeforeThrone + .4byte Room_DarkHyruleCastle_B1ToPrison + .4byte Room_DarkHyruleCastle_B1BombWall + .4byte Room_DarkHyruleCastle_B1Keatons + .4byte Room_DarkHyruleCastle_B1ToPrisonFirebar + .4byte Room_DarkHyruleCastle_B1Cannons + .4byte Room_DarkHyruleCastle_B1Left + .4byte Room_DarkHyruleCastle_B1Right + .4byte Room_DarkHyruleCastle_B1Map + .4byte Room_DarkHyruleCastle_B2ToPrison + .4byte Room_DarkHyruleCastle_B2Prison + .4byte Room_DarkHyruleCastle_B2Dropdown Area_VaatisArms:: @ 080D49E0 .4byte Room_VaatisArms_First @@ -787,7 +787,7 @@ Area_MinishHouseInteriors:: @ 080D4ABC .4byte 0x0 .4byte 0x0 .4byte Room_MinishHouseInteriors_HyruleFieldSouthwest - .4byte Room_MinishHouseInteriors_HyruleFieldOutsideLinksHouse + .4byte Room_MinishHouseInteriors_SouthHyruleField .4byte Room_MinishHouseInteriors_NextToKnuckle .4byte Room_MinishHouseInteriors_Librari .4byte Room_MinishHouseInteriors_HyruleFieldExit @@ -910,7 +910,7 @@ Area_HouseInteriors2:: @ 080D4CBC .4byte Room_HouseInteriors2_LinksHouseSmith .4byte Room_HouseInteriors2_Dampe .4byte 0x0 - .4byte Room_HouseInteriors2_Stockwell + .4byte Room_HouseInteriors2_StockwellLakeHouse .4byte Room_HouseInteriors2_LinksHouseBedroom .4byte 0x0 .4byte 0x0 @@ -945,7 +945,7 @@ Area_HouseInteriors4:: @ 080D4D7C .4byte Room_HouseInteriors4_RanchHouseWest .4byte Room_HouseInteriors4_RanchHouseEast .4byte Room_HouseInteriors4_FarmHouse - .4byte Room_HouseInteriors4_Mayor + .4byte Room_HouseInteriors4_MayorLakeCabin .4byte 0x0 .4byte 0x0 .4byte 0x0 @@ -977,19 +977,19 @@ Area_TreeInteriors:: @ 080D4DBC .4byte Room_TreeInteriors_StairsToCarlov .4byte Room_TreeInteriors_PercysTreehouse .4byte Room_TreeInteriors_HeartPiece - .4byte Room_TreeInteriors_StairsToBladeBrother + .4byte Room_TreeInteriors_Waveblade .4byte Room_TreeInteriors_14 .4byte Room_TreeInteriors_BoomerangNorthwest .4byte Room_TreeInteriors_BoomerangNortheast .4byte Room_TreeInteriors_BoomerangSouthwest .4byte Room_TreeInteriors_BoomerangSoutheast - .4byte Room_TreeInteriors_HeartPieceSouthwestField - .4byte Room_TreeInteriors_StairsToFairyFountain - .4byte Room_TreeInteriors_StairsToWalletFairy + .4byte Room_TreeInteriors_WesternWoodsHeartPiece + .4byte Room_TreeInteriors_NorthHyruleFieldFairyFountain + .4byte Room_TreeInteriors_MinishWoodsGreatFairy .4byte Room_TreeInteriors_1C - .4byte Room_TreeInteriors_StairsToBusinessScrub + .4byte Room_TreeInteriors_MinishWoodsBusinessScrub .4byte Room_TreeInteriors_1E - .4byte Room_TreeInteriors_1F + .4byte Room_TreeInteriors_UnusedHeartContainer Area_Dojos:: @ 080D4E3C .4byte Room_Dojos_Grayblade @@ -1022,7 +1022,7 @@ Area_CrenelCaves:: @ 080D4E7C .4byte Room_CrenelCaves_RupeeFairyFountain .4byte Room_CrenelCaves_HelmasaurHallway .4byte Room_CrenelCaves_MushroomKeese - .4byte Room_CrenelCaves_LadderToGreenWater + .4byte Room_CrenelCaves_LadderToSpringWater .4byte Room_CrenelCaves_BombBusinessScrub .4byte Room_CrenelCaves_Hermit .4byte Room_CrenelCaves_HintScrub @@ -1035,7 +1035,7 @@ Area_MinishCracks:: @ 080D4EC0 .4byte Room_MinishCracks_MtCrenel .4byte Room_MinishCracks_EastHyruleCastle .4byte Room_MinishCracks_5 - .4byte Room_MinishCracks_CastleWildsBowHole + .4byte Room_MinishCracks_CastorWildsBow .4byte Room_MinishCracks_RuinsEntrance .4byte Room_MinishCracks_MinishWoodsSouth .4byte Room_MinishCracks_CastorWildsNorth @@ -1073,7 +1073,7 @@ Area_WindTribeTowerRoof:: @ 080D4F44 .4byte Area_WindTribeTowerRoof_Main Area_GoronCave:: @ 080D4F48 - .4byte Room_GoronCave_StairsToCave + .4byte Room_GoronCave_Stairs .4byte Room_GoronCave_Main Area_Caves:: @ 080D4F50 @@ -1084,22 +1084,22 @@ Area_Caves:: @ 080D4F50 .4byte Room_Caves_4 .4byte Room_Caves_5 .4byte Room_Caves_6 - .4byte Room_Caves_KeeseChest - .4byte Room_Caves_FairyFountainTrilbyHighlands - .4byte Room_Caves_FairyFountainLinksHouse + .4byte Room_Caves_TrilbyKeeseChest + .4byte Room_Caves_TrilbyFairyFountain + .4byte Room_Caves_SouthHyruleFieldFairyFountain .4byte Room_Caves_A .4byte Room_Caves_HyruleTownWaterfall .4byte Room_Caves_LonLonRanch .4byte Room_Caves_LonLonRanchSecret .4byte Room_Caves_TrilbyHighlands .4byte Room_Caves_LonLonRanchWallet - .4byte Room_Caves_RupeeLinksHouse - .4byte Room_Caves_RupeeTrilbyHighlands - .4byte Room_Caves_FairyFountainMoleMitts - .4byte Room_Caves_KeeseChestSoutheastHyrule + .4byte Room_Caves_SouthHyruleFieldRupee + .4byte Room_Caves_TrilbyRupee + .4byte Room_Caves_TrilbyMittsFairyFountain + .4byte Room_Caves_HillsKeeseChest .4byte Room_Caves_BottleBusinessScrub .4byte Room_Caves_HeartPieceHallway - .4byte Room_Caves_FairyFountainBoomerang + .4byte Room_Caves_NorthHyruleFieldFairyFountain .4byte Room_Caves_KinstoneBusinessScrub Area_VeilFallsCaves:: @ 080D4FB0 @@ -3404,24 +3404,24 @@ Room_Dojos_ToScarblade:: @ 080D895C .4byte sub_unk3_Dojos_ToScarblade .4byte sub_StateChange_Dojos_ToScarblade -Entities_GoronCave_StairsToCave_0:: @ 080D897C +Entities_GoronCave_Stairs_0:: @ 080D897C entity_list_end -Enemies_GoronCave_StairsToCave:: @ 080D898C +Enemies_GoronCave_Stairs:: @ 080D898C entity_list_end -TileEntities_GoronCave_StairsToCave:: @ 080D899C +TileEntities_GoronCave_Stairs:: @ 080D899C tile_entity_list_end -Room_GoronCave_StairsToCave:: @ 080D89A4 - .4byte Entities_GoronCave_StairsToCave_0 +Room_GoronCave_Stairs:: @ 080D89A4 + .4byte Entities_GoronCave_Stairs_0 .4byte 0x00000000 - .4byte Enemies_GoronCave_StairsToCave - .4byte TileEntities_GoronCave_StairsToCave + .4byte Enemies_GoronCave_Stairs + .4byte TileEntities_GoronCave_Stairs .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_GoronCave_StairsToCave - .4byte sub_StateChange_GoronCave_StairsToCave + .4byte sub_unk3_GoronCave_Stairs + .4byte sub_StateChange_GoronCave_Stairs Entities_GoronCave_Main_0:: @ 080D89C4 object_raw subtype=0xc, x=0x78, y=0x28, paramA=0x4, paramB=0x76 @@ -4825,29 +4825,29 @@ Room_MinishHouseInteriors_HyruleFieldSouthwest:: @ 080DB118 .4byte sub_unk3_MinishHouseInteriors_HyruleFieldSouthwest .4byte sub_StateChange_MinishHouseInteriors_HyruleFieldSouthwest -Entities_MinishHouseInteriors_HyruleFieldOutsideLinksHouse_0:: @ 080DB138 +Entities_MinishHouseInteriors_SouthHyruleField_0:: @ 080DB138 npc_raw subtype=0x3, x=0x78, y=0x48, unknown=0xf, paramB=0x20d, script=0x0 entity_list_end -Entities_MinishHouseInteriors_HyruleFieldOutsideLinksHouse_1:: @ 080DB158 +Entities_MinishHouseInteriors_SouthHyruleField_1:: @ 080DB158 object_raw subtype=0x6f, x=0x78, y=0x90 entity_list_end -Enemies_MinishHouseInteriors_HyruleFieldOutsideLinksHouse:: @ 080DB178 +Enemies_MinishHouseInteriors_SouthHyruleField:: @ 080DB178 entity_list_end -TileEntities_MinishHouseInteriors_HyruleFieldOutsideLinksHouse:: @ 080DB188 +TileEntities_MinishHouseInteriors_SouthHyruleField:: @ 080DB188 tile_entity_list_end -Room_MinishHouseInteriors_HyruleFieldOutsideLinksHouse:: @ 080DB190 - .4byte Entities_MinishHouseInteriors_HyruleFieldOutsideLinksHouse_0 - .4byte Entities_MinishHouseInteriors_HyruleFieldOutsideLinksHouse_1 - .4byte Enemies_MinishHouseInteriors_HyruleFieldOutsideLinksHouse - .4byte TileEntities_MinishHouseInteriors_HyruleFieldOutsideLinksHouse +Room_MinishHouseInteriors_SouthHyruleField:: @ 080DB190 + .4byte Entities_MinishHouseInteriors_SouthHyruleField_0 + .4byte Entities_MinishHouseInteriors_SouthHyruleField_1 + .4byte Enemies_MinishHouseInteriors_SouthHyruleField + .4byte TileEntities_MinishHouseInteriors_SouthHyruleField .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_MinishHouseInteriors_HyruleFieldOutsideLinksHouse - .4byte sub_StateChange_MinishHouseInteriors_HyruleFieldOutsideLinksHouse + .4byte sub_unk3_MinishHouseInteriors_SouthHyruleField + .4byte sub_StateChange_MinishHouseInteriors_SouthHyruleField Entities_MinishHouseInteriors_NextToKnuckle_0:: @ 080DB1B0 npc_raw subtype=0x3, x=0x78, y=0x48, unknown=0xf, paramB=0x20e, script=0x0 @@ -5876,7 +5876,7 @@ Room_MinishCracks_5:: @ 080DCAD0 .4byte sub_unk3_MinishCracks_5 .4byte sub_StateChange_MinishCracks_5 -Entities_MinishCracks_CastleWildsBowHole_0:: @ 080DCAF0 +Entities_MinishCracks_CastorWildsBow_0:: @ 080DCAF0 object_raw subtype=0xc, x=0x78, y=0x48, paramA=0x2, paramB=0x10, paramC=0x80000000 entity_list_end @@ -5885,11 +5885,11 @@ gUnk_080DCB10:: @ 080DCB10 manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x80008001 entity_list_end -Entities_MinishCracks_CastleWildsBowHole_1:: @ 080DCB40 +Entities_MinishCracks_CastorWildsBow_1:: @ 080DCB40 object_raw subtype=0x4d, x=0x98, y=0x28, collision=1, paramA=0xb entity_list_end -gUnk_additional_8_MinishCracks_CastleWildsBowHole:: @ 080DCB60 +gUnk_additional_8_MinishCracks_CastorWildsBow:: @ 080DCB60 enemy_raw subtype=0x32, x=0x78, y=0x48, collision=1, paramA=0x1 enemy_raw subtype=0x32, x=0x78, y=0x48, collision=1, paramA=0x1 enemy_raw subtype=0x32, x=0x78, y=0x48, collision=1, paramA=0x1 @@ -5897,21 +5897,21 @@ gUnk_additional_8_MinishCracks_CastleWildsBowHole:: @ 080DCB60 enemy_raw subtype=0x32, x=0x78, y=0x48, collision=1, paramA=0x1 entity_list_end -TileEntities_MinishCracks_CastleWildsBowHole:: @ 080DCBC0 +TileEntities_MinishCracks_CastorWildsBow:: @ 080DCBC0 tile_entity type=0x3, paramA=0x10, paramB=0x9, paramC=0x78, paramD=0x48 tile_entity type=0x7, paramB=0x1700 tile_entity_list_end -Room_MinishCracks_CastleWildsBowHole:: @ 080DCBD8 - .4byte Entities_MinishCracks_CastleWildsBowHole_0 - .4byte Entities_MinishCracks_CastleWildsBowHole_1 +Room_MinishCracks_CastorWildsBow:: @ 080DCBD8 + .4byte Entities_MinishCracks_CastorWildsBow_0 + .4byte Entities_MinishCracks_CastorWildsBow_1 .4byte 0x00000000 - .4byte TileEntities_MinishCracks_CastleWildsBowHole + .4byte TileEntities_MinishCracks_CastorWildsBow .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_MinishCracks_CastleWildsBowHole - .4byte sub_StateChange_MinishCracks_CastleWildsBowHole - .4byte gUnk_additional_8_MinishCracks_CastleWildsBowHole + .4byte sub_unk3_MinishCracks_CastorWildsBow + .4byte sub_StateChange_MinishCracks_CastorWildsBow + .4byte gUnk_additional_8_MinishCracks_CastorWildsBow Entities_MinishCracks_RuinsEntrance_0:: @ 080DCBFC npc_raw subtype=0x3, x=0xa8, y=0x48, unknown=0xf, paramB=0x215, script=0x0 @@ -13496,7 +13496,7 @@ Room_DarkHyruleCastleOutside_8:: @ 080EB568 .4byte gUnk_additional_9_DarkHyruleCastleOutside_8 .4byte gUnk_additional_a_DarkHyruleCastleOutside_8 -Entities_DarkHyruleCastle_0_0:: @ 080EB594 +Entities_DarkHyruleCastle_1FEntrance_0:: @ 080EB594 object_raw subtype=0x8, x=0x228, y=0xd8, paramA=0x8, paramC=0x3dffff object_raw subtype=0x34, x=0x1c8, y=0x1c8, paramA=0x1, paramB=0x1488, paramC=0x8b0188 object_raw subtype=0x34, x=0x168, y=0x1c8, paramB=0xa88, paramC=0x480188 @@ -13515,10 +13515,10 @@ gUnk_080EB604:: @ 080EB604 object_raw subtype=0x6a, x=0x1d8, y=0x198, collision=1, paramA=0x5, paramB=0x302 entity_list_end -Enemies_DarkHyruleCastle_0:: @ 080EB664 +Enemies_DarkHyruleCastle_1FEntrance:: @ 080EB664 entity_list_end -TileEntities_DarkHyruleCastle_0:: @ 080EB674 +TileEntities_DarkHyruleCastle_1FEntrance:: @ 080EB674 tile_entity type=0x1, paramA=0x1 tile_entity_list_end @@ -13532,101 +13532,101 @@ gUnk_080EB684:: @ 080EB684 object_raw subtype=0x6a, x=0x200, y=0x158, collision=1, paramA=0x5, paramB=0x102 entity_list_end -Room_DarkHyruleCastle_0:: @ 080EB704 - .4byte Entities_DarkHyruleCastle_0_0 +Room_DarkHyruleCastle_1FEntrance:: @ 080EB704 + .4byte Entities_DarkHyruleCastle_1FEntrance_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_0 - .4byte TileEntities_DarkHyruleCastle_0 + .4byte Enemies_DarkHyruleCastle_1FEntrance + .4byte TileEntities_DarkHyruleCastle_1FEntrance .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_0 - .4byte sub_StateChange_DarkHyruleCastle_0 + .4byte sub_unk3_DarkHyruleCastle_1FEntrance + .4byte sub_StateChange_DarkHyruleCastle_1FEntrance -Entities_DarkHyruleCastle_1_0:: @ 080EB724 +Entities_DarkHyruleCastle_3FTopLeftTower_0:: @ 080EB724 entity_list_end -Enemies_DarkHyruleCastle_1:: @ 080EB734 +Enemies_DarkHyruleCastle_3FTopLeftTower:: @ 080EB734 entity_list_end -TileEntities_DarkHyruleCastle_1:: @ 080EB744 +TileEntities_DarkHyruleCastle_3FTopLeftTower:: @ 080EB744 tile_entity type=0x2, paramA=0x3e, paramB=0x53, paramC=0x1c8 tile_entity type=0x1, paramA=0x2 tile_entity_list_end -Room_DarkHyruleCastle_1:: @ 080EB75C - .4byte Entities_DarkHyruleCastle_1_0 +Room_DarkHyruleCastle_3FTopLeftTower:: @ 080EB75C + .4byte Entities_DarkHyruleCastle_3FTopLeftTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_1 - .4byte TileEntities_DarkHyruleCastle_1 + .4byte Enemies_DarkHyruleCastle_3FTopLeftTower + .4byte TileEntities_DarkHyruleCastle_3FTopLeftTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_1 + .4byte sub_unk3_DarkHyruleCastle_3FTopLeftTower .4byte sub_StateChange_Dojos_ToGrimblade7 -Entities_DarkHyruleCastle_2_0:: @ 080EB77C +Entities_DarkHyruleCastle_3FTopRightTower_0:: @ 080EB77C entity_list_end -Enemies_DarkHyruleCastle_2:: @ 080EB78C +Enemies_DarkHyruleCastle_3FTopRightTower:: @ 080EB78C entity_list_end -TileEntities_DarkHyruleCastle_2:: @ 080EB79C +TileEntities_DarkHyruleCastle_3FTopRightTower:: @ 080EB79C tile_entity type=0x2, paramA=0x3f, paramB=0x53, paramC=0x1c8 tile_entity type=0x1, paramA=0x3 tile_entity_list_end -Room_DarkHyruleCastle_2:: @ 080EB7B4 - .4byte Entities_DarkHyruleCastle_2_0 +Room_DarkHyruleCastle_3FTopRightTower:: @ 080EB7B4 + .4byte Entities_DarkHyruleCastle_3FTopRightTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_2 - .4byte TileEntities_DarkHyruleCastle_2 + .4byte Enemies_DarkHyruleCastle_3FTopRightTower + .4byte TileEntities_DarkHyruleCastle_3FTopRightTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_2 + .4byte sub_unk3_DarkHyruleCastle_3FTopRightTower .4byte sub_StateChange_Dojos_ToGrimblade8 -Entities_DarkHyruleCastle_3_0:: @ 080EB7D4 +Entities_DarkHyruleCastle_3FBottomLeftTower_0:: @ 080EB7D4 entity_list_end -Enemies_DarkHyruleCastle_3:: @ 080EB7E4 +Enemies_DarkHyruleCastle_3FBottomLeftTower:: @ 080EB7E4 entity_list_end -TileEntities_DarkHyruleCastle_3:: @ 080EB7F4 +TileEntities_DarkHyruleCastle_3FBottomLeftTower:: @ 080EB7F4 tile_entity type=0x2, paramA=0x40, paramB=0x53, paramC=0x1c8 tile_entity type=0x1, paramA=0x4 tile_entity_list_end -Room_DarkHyruleCastle_3:: @ 080EB80C - .4byte Entities_DarkHyruleCastle_3_0 +Room_DarkHyruleCastle_3FBottomLeftTower:: @ 080EB80C + .4byte Entities_DarkHyruleCastle_3FBottomLeftTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_3 - .4byte TileEntities_DarkHyruleCastle_3 + .4byte Enemies_DarkHyruleCastle_3FBottomLeftTower + .4byte TileEntities_DarkHyruleCastle_3FBottomLeftTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_3 + .4byte sub_unk3_DarkHyruleCastle_3FBottomLeftTower .4byte sub_StateChange_Dojos_ToGrimblade9 -Entities_DarkHyruleCastle_4_0:: @ 080EB82C +Entities_DarkHyruleCastle_3FBottomRightTower_0:: @ 080EB82C entity_list_end -Enemies_DarkHyruleCastle_4:: @ 080EB83C +Enemies_DarkHyruleCastle_3FBottomRightTower:: @ 080EB83C entity_list_end -TileEntities_DarkHyruleCastle_4:: @ 080EB84C +TileEntities_DarkHyruleCastle_3FBottomRightTower:: @ 080EB84C tile_entity type=0x2, paramA=0x41, paramB=0x53, paramC=0x1c8 tile_entity type=0x1, paramA=0x5 tile_entity_list_end -Room_DarkHyruleCastle_4:: @ 080EB864 - .4byte Entities_DarkHyruleCastle_4_0 +Room_DarkHyruleCastle_3FBottomRightTower:: @ 080EB864 + .4byte Entities_DarkHyruleCastle_3FBottomRightTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_4 - .4byte TileEntities_DarkHyruleCastle_4 + .4byte Enemies_DarkHyruleCastle_3FBottomRightTower + .4byte TileEntities_DarkHyruleCastle_3FBottomRightTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_4 + .4byte sub_unk3_DarkHyruleCastle_3FBottomRightTower .4byte sub_StateChange_Dojos_ToSplitblade0 -Entities_DarkHyruleCastle_5_0:: @ 080EB884 +Entities_DarkHyruleCastle_3FKeatonHallToVaati_0:: @ 080EB884 object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69KeatonsRoom object_raw subtype=0x3, x=0x78, y=0x48, paramA=0x1, paramC=0x80000001 object_raw subtype=0x3, x=0x98, y=0x48, paramA=0x1, paramC=0x80010001 @@ -13636,7 +13636,7 @@ Entities_DarkHyruleCastle_5_0:: @ 080EB884 object_raw subtype=0x8, x=0xa8, y=0x188, paramA=0x12, paramC=0xffff entity_list_end -Enemies_DarkHyruleCastle_5:: @ 080EB904 +Enemies_DarkHyruleCastle_3FKeatonHallToVaati:: @ 080EB904 enemy_raw subtype=0x30, x=0x98, y=0x58, paramA=0x1, paramB=0x1c0e0000, paramC=0x300070 enemy_raw subtype=0x30, x=0xb8, y=0x58, paramA=0x1, paramB=0x1c0e0000, paramC=0x300070 enemy_raw subtype=0x30, x=0x88, y=0x88, paramA=0x1, paramB=0x1c0e0000, paramC=0x300070 @@ -13649,21 +13649,21 @@ Enemies_DarkHyruleCastle_5:: @ 080EB904 enemy_raw subtype=0x30, x=0xb8, y=0xe8, paramA=0x1, paramB=0x1c0e0000, paramC=0x300070 entity_list_end -TileEntities_DarkHyruleCastle_5:: @ 080EB9B4 +TileEntities_DarkHyruleCastle_3FKeatonHallToVaati:: @ 080EB9B4 tile_entity type=0x1, paramA=0x6 tile_entity_list_end -Room_DarkHyruleCastle_5:: @ 080EB9C4 - .4byte Entities_DarkHyruleCastle_5_0 +Room_DarkHyruleCastle_3FKeatonHallToVaati:: @ 080EB9C4 + .4byte Entities_DarkHyruleCastle_3FKeatonHallToVaati_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_5 - .4byte TileEntities_DarkHyruleCastle_5 + .4byte Enemies_DarkHyruleCastle_3FKeatonHallToVaati + .4byte TileEntities_DarkHyruleCastle_3FKeatonHallToVaati .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_5 + .4byte sub_unk3_DarkHyruleCastle_3FKeatonHallToVaati .4byte sub_StateChange_Dojos_ToSplitblade1 -Entities_DarkHyruleCastle_6_0:: @ 080EB9E4 +Entities_DarkHyruleCastle_3FTripleDarknut_0:: @ 080EB9E4 entity_list_end gUnk_080EB9F4:: @ 080EB9F4 @@ -13694,7 +13694,7 @@ gUnk_080EBAF4:: @ 080EBAF4 object_raw subtype=0x39, x=0xa8, y=0xd8, paramA=0x6, paramC=0x80000000 entity_list_end -Enemies_DarkHyruleCastle_6:: @ 080EBB34 +Enemies_DarkHyruleCastle_3FTripleDarknut:: @ 080EBB34 enemy_raw subtype=0x4a, x=0xa8, y=0x58, paramB=0x10120000, paramC=0x380050 .ifndef EU object_raw subtype=0x5, x=0x38, y=0x38, paramA=0x5f @@ -13705,11 +13705,11 @@ Enemies_DarkHyruleCastle_6:: @ 080EBB34 ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0b, flag=0x0 entity_list_end -TileEntities_DarkHyruleCastle_6:: @ 080EBBA4 +TileEntities_DarkHyruleCastle_3FTripleDarknut:: @ 080EBBA4 tile_entity type=0x1, paramA=0x7 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_6:: @ 080EBBB4 +gUnk_additional_8_DarkHyruleCastle_3FTripleDarknut:: @ 080EBBB4 enemy_raw subtype=0x5, x=0x88, y=0x58, unknown=0x2f, paramA=0x2 enemy_raw subtype=0x5, x=0xa8, y=0x58, unknown=0x2f, paramA=0x3 enemy_raw subtype=0x5, x=0xc8, y=0x58, unknown=0x2f, paramA=0x2 @@ -13717,41 +13717,41 @@ gUnk_additional_8_DarkHyruleCastle_6:: @ 080EBBB4 object_raw subtype=0x39, x=0xa8, y=0xd8, paramA=0x6, paramC=0xffff entity_list_end -Room_DarkHyruleCastle_6:: @ 080EBC14 - .4byte Entities_DarkHyruleCastle_6_0 +Room_DarkHyruleCastle_3FTripleDarknut:: @ 080EBC14 + .4byte Entities_DarkHyruleCastle_3FTripleDarknut_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_6 - .4byte TileEntities_DarkHyruleCastle_6 + .4byte Enemies_DarkHyruleCastle_3FTripleDarknut + .4byte TileEntities_DarkHyruleCastle_3FTripleDarknut .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_6 - .4byte sub_StateChange_DarkHyruleCastle_6 - .4byte gUnk_additional_8_DarkHyruleCastle_6 + .4byte sub_unk3_DarkHyruleCastle_3FTripleDarknut + .4byte sub_StateChange_DarkHyruleCastle_3FTripleDarknut + .4byte gUnk_additional_8_DarkHyruleCastle_3FTripleDarknut -Entities_DarkHyruleCastle_7_0:: @ 080EBC38 +Entities_DarkHyruleCastle_2FTopLeftTower_0:: @ 080EBC38 manager subtype=0x1a, unknown=0x8, paramA=0x34 object_raw subtype=0x3, x=0x58, y=0x78, paramC=0x420001 object_raw subtype=0x8, x=0x88, y=0xb8, paramA=0x2, paramC=0x42ffff entity_list_end -Enemies_DarkHyruleCastle_7:: @ 080EBC78 +Enemies_DarkHyruleCastle_2FTopLeftTower:: @ 080EBC78 entity_list_end -TileEntities_DarkHyruleCastle_7:: @ 080EBC88 +TileEntities_DarkHyruleCastle_2FTopLeftTower:: @ 080EBC88 tile_entity type=0x1, paramA=0x8 tile_entity_list_end -Room_DarkHyruleCastle_7:: @ 080EBC98 - .4byte Entities_DarkHyruleCastle_7_0 +Room_DarkHyruleCastle_2FTopLeftTower:: @ 080EBC98 + .4byte Entities_DarkHyruleCastle_2FTopLeftTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_7 - .4byte TileEntities_DarkHyruleCastle_7 + .4byte Enemies_DarkHyruleCastle_2FTopLeftTower + .4byte TileEntities_DarkHyruleCastle_2FTopLeftTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_7 + .4byte sub_unk3_DarkHyruleCastle_2FTopLeftTower .4byte sub_StateChange_Dojos_ToSplitblade2 -Entities_DarkHyruleCastle_8_0:: @ 080EBCB8 +Entities_DarkHyruleCastle_2FTopLeftCorner_0:: @ 080EBCB8 object_raw subtype=0x23, x=0x58, y=0x28, paramB=0xaa00, paramC=0x80000080 object_raw subtype=0x23, x=0x78, y=0x28, paramB=0xaa00, paramC=0x80010080 object_raw subtype=0x23, x=0x98, y=0x28, paramB=0xaa00, paramC=0x80020080 @@ -13769,7 +13769,7 @@ Entities_DarkHyruleCastle_8_0:: @ 080EBCB8 object_raw subtype=0x5, x=0xd8, y=0x158, paramA=0x5e entity_list_end -Enemies_DarkHyruleCastle_8:: @ 080EBDB8 +Enemies_DarkHyruleCastle_2FTopLeftCorner:: @ 080EBDB8 enemy_raw subtype=0x42, x=0x78, y=0x108, paramA=0x1 enemy_raw subtype=0x42, x=0x98, y=0x108, paramA=0x1 enemy_raw subtype=0x42, x=0x78, y=0x128, paramA=0x1 @@ -13778,21 +13778,21 @@ Enemies_DarkHyruleCastle_8:: @ 080EBDB8 enemy_raw subtype=0x1a, paramB=0x20160302, paramC=0x500030 entity_list_end -TileEntities_DarkHyruleCastle_8:: @ 080EBE28 +TileEntities_DarkHyruleCastle_2FTopLeftCorner:: @ 080EBE28 tile_entity type=0x1, paramA=0x9 tile_entity_list_end -Room_DarkHyruleCastle_8:: @ 080EBE38 - .4byte Entities_DarkHyruleCastle_8_0 +Room_DarkHyruleCastle_2FTopLeftCorner:: @ 080EBE38 + .4byte Entities_DarkHyruleCastle_2FTopLeftCorner_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_8 - .4byte TileEntities_DarkHyruleCastle_8 + .4byte Enemies_DarkHyruleCastle_2FTopLeftCorner + .4byte TileEntities_DarkHyruleCastle_2FTopLeftCorner .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_8 + .4byte sub_unk3_DarkHyruleCastle_2FTopLeftCorner .4byte sub_StateChange_Dojos_ToSplitblade3 -Entities_DarkHyruleCastle_9_0:: @ 080EBE58 +Entities_DarkHyruleCastle_2FBossKey_0:: @ 080EBE58 object_raw subtype=0xc, x=0x88, y=0x28, paramA=0x4, paramB=0x43 object_raw subtype=0x5, x=0x38, y=0x28 object_raw subtype=0x5, x=0x38, y=0x38 @@ -13804,10 +13804,10 @@ Entities_DarkHyruleCastle_9_0:: @ 080EBE58 object_raw subtype=0x5, x=0xd8, y=0x58 entity_list_end -Enemies_DarkHyruleCastle_9:: @ 080EBEF8 +Enemies_DarkHyruleCastle_2FBossKey:: @ 080EBEF8 entity_list_end -TileEntities_DarkHyruleCastle_9:: @ 080EBF08 +TileEntities_DarkHyruleCastle_2FBossKey:: @ 080EBF08 tile_entity type=0x3, paramA=0x43, paramB=0x52, paramC=0x88, paramD=0x28 tile_entity type=0xa, paramA=0x1, paramB=0x44, paramC=0x186, paramD=0x26 tile_entity type=0xa, paramA=0x1, paramB=0x45, paramC=0x1c6, paramD=0x26 @@ -13816,32 +13816,32 @@ TileEntities_DarkHyruleCastle_9:: @ 080EBF08 tile_entity type=0x1, paramA=0xa tile_entity_list_end -Room_DarkHyruleCastle_9:: @ 080EBF40 - .4byte Entities_DarkHyruleCastle_9_0 +Room_DarkHyruleCastle_2FBossKey:: @ 080EBF40 + .4byte Entities_DarkHyruleCastle_2FBossKey_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_9 - .4byte TileEntities_DarkHyruleCastle_9 + .4byte Enemies_DarkHyruleCastle_2FBossKey + .4byte TileEntities_DarkHyruleCastle_2FBossKey .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_9 + .4byte sub_unk3_DarkHyruleCastle_2FBossKey .4byte sub_StateChange_Dojos_ToSplitblade4 -Entities_DarkHyruleCastle_10_0:: @ 080EBF60 +Entities_DarkHyruleCastle_2FBlueWarp_0:: @ 080EBF60 manager subtype=0x1e, x=0x30, y=0x50, paramB=0x2000b0, paramC=0x80000000 manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x488000 manager subtype=0x2e, unknown=0x0, paramB=0x3c00, paramC=0x480086 object_raw subtype=0x34, x=0x88, y=0x68, paramB=0x88, paramC=0x480716 entity_list_end -Enemies_DarkHyruleCastle_10:: @ 080EBFB0 +Enemies_DarkHyruleCastle_2FBlueWarp:: @ 080EBFB0 entity_list_end -TileEntities_DarkHyruleCastle_10:: @ 080EBFC0 +TileEntities_DarkHyruleCastle_2FBlueWarp:: @ 080EBFC0 tile_entity type=0xd, paramB=0x2e00 tile_entity type=0x1, paramA=0xb tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_10:: @ 080EBFD8 +gUnk_additional_8_DarkHyruleCastle_2FBlueWarp:: @ 080EBFD8 enemy_raw subtype=0x5, x=0x88, y=0x38, unknown=0x2f, paramA=0x3, paramB=0xe160000, paramC=0x300030 object_raw subtype=0x8, x=0x88, y=0xa8, paramA=0x12, paramC=0x86ffff object_raw subtype=0x39, x=0x88, y=0x28, paramA=0x4, paramC=0x86ffff @@ -13849,50 +13849,50 @@ gUnk_additional_8_DarkHyruleCastle_10:: @ 080EBFD8 ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0a, flag=0x86 entity_list_end -Room_DarkHyruleCastle_10:: @ 080EC038 - .4byte Entities_DarkHyruleCastle_10_0 +Room_DarkHyruleCastle_2FBlueWarp:: @ 080EC038 + .4byte Entities_DarkHyruleCastle_2FBlueWarp_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_10 - .4byte TileEntities_DarkHyruleCastle_10 + .4byte Enemies_DarkHyruleCastle_2FBlueWarp + .4byte TileEntities_DarkHyruleCastle_2FBlueWarp .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_10 + .4byte sub_unk3_DarkHyruleCastle_2FBlueWarp .4byte sub_StateChange_Dojos_ToSplitblade5 - .4byte gUnk_additional_8_DarkHyruleCastle_10 + .4byte gUnk_additional_8_DarkHyruleCastle_2FBlueWarp -Entities_DarkHyruleCastle_11_0:: @ 080EC05C +Entities_DarkHyruleCastle_2FTopRightCornerGhini_0:: @ 080EC05C manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x490000 manager subtype=0x2e, unknown=0x0, paramB=0x3c00, paramC=0x490087 object_raw subtype=0x8, x=0xe8, y=0x58, paramA=0x1, paramC=0x87ffff entity_list_end -Enemies_DarkHyruleCastle_11:: @ 080EC09C +Enemies_DarkHyruleCastle_2FTopRightCornerGhini:: @ 080EC09C entity_list_end -TileEntities_DarkHyruleCastle_11:: @ 080EC0AC +TileEntities_DarkHyruleCastle_2FTopRightCornerGhini:: @ 080EC0AC tile_entity type=0x1, paramA=0xc tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_11:: @ 080EC0BC +gUnk_additional_8_DarkHyruleCastle_2FTopRightCornerGhini:: @ 080EC0BC enemy_raw subtype=0x50, paramB=0xe160900, paramC=0x300030 entity_list_end -gUnk_additional_9_DarkHyruleCastle_11:: @ 080EC0DC - .incbin "data_080D5360/gUnk_additional_9_DarkHyruleCastle_11.bin" +gUnk_additional_9_DarkHyruleCastle_2FTopRightCornerGhini:: @ 080EC0DC + .incbin "data_080D5360/gUnk_additional_9_DarkHyruleCastle_2FTopRightCornerGhini.bin" -Room_DarkHyruleCastle_11:: @ 080EC0EC - .4byte Entities_DarkHyruleCastle_11_0 +Room_DarkHyruleCastle_2FTopRightCornerGhini:: @ 080EC0EC + .4byte Entities_DarkHyruleCastle_2FTopRightCornerGhini_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_11 - .4byte TileEntities_DarkHyruleCastle_11 + .4byte Enemies_DarkHyruleCastle_2FTopRightCornerGhini + .4byte TileEntities_DarkHyruleCastle_2FTopRightCornerGhini .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_11 + .4byte sub_unk3_DarkHyruleCastle_2FTopRightCornerGhini .4byte sub_StateChange_Dojos_ToSplitblade6 - .4byte gUnk_additional_8_DarkHyruleCastle_11 - .4byte gUnk_additional_9_DarkHyruleCastle_11 + .4byte gUnk_additional_8_DarkHyruleCastle_2FTopRightCornerGhini + .4byte gUnk_additional_9_DarkHyruleCastle_2FTopRightCornerGhini -Entities_DarkHyruleCastle_12_0:: @ 080EC114 +Entities_DarkHyruleCastle_2FTopRightCornerTorches_0:: @ 080EC114 object_raw subtype=0x8, x=0x88, y=0x28, paramC=0x4bffff manager subtype=0x23, x=0x58, y=0x38, paramA=0x3, paramB=0x71001, paramC=0x8000004a manager subtype=0x23, x=0x48, y=0x58, paramA=0x3, paramB=0x71001, paramC=0x8001004a @@ -13908,47 +13908,47 @@ Entities_DarkHyruleCastle_12_0:: @ 080EC114 object_raw subtype=0x98, x=0x88, y=0x68, unknown=0x3, paramB=0x30402 entity_list_end -Enemies_DarkHyruleCastle_12:: @ 080EC1F4 +Enemies_DarkHyruleCastle_2FTopRightCornerTorches:: @ 080EC1F4 entity_list_end -TileEntities_DarkHyruleCastle_12:: @ 080EC204 +TileEntities_DarkHyruleCastle_2FTopRightCornerTorches:: @ 080EC204 tile_entity type=0x9, paramB=0x8000 tile_entity type=0x1, paramA=0xd tile_entity_list_end -Room_DarkHyruleCastle_12:: @ 080EC21C - .4byte Entities_DarkHyruleCastle_12_0 +Room_DarkHyruleCastle_2FTopRightCornerTorches:: @ 080EC21C + .4byte Entities_DarkHyruleCastle_2FTopRightCornerTorches_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_12 - .4byte TileEntities_DarkHyruleCastle_12 + .4byte Enemies_DarkHyruleCastle_2FTopRightCornerTorches + .4byte TileEntities_DarkHyruleCastle_2FTopRightCornerTorches .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_12 + .4byte sub_unk3_DarkHyruleCastle_2FTopRightCornerTorches .4byte sub_StateChange_Dojos_ToSplitblade7 -Entities_DarkHyruleCastle_13_0:: @ 080EC23C +Entities_DarkHyruleCastle_2FTopRightTower_0:: @ 080EC23C entity_list_end -Enemies_DarkHyruleCastle_13:: @ 080EC24C +Enemies_DarkHyruleCastle_2FTopRightTower:: @ 080EC24C object_raw subtype=0x8, x=0x18, y=0x58, paramA=0x3, paramC=0x4bffff enemy_raw subtype=0x1c, x=0xb8, y=0x78, paramB=0x810 entity_list_end -TileEntities_DarkHyruleCastle_13:: @ 080EC27C +TileEntities_DarkHyruleCastle_2FTopRightTower:: @ 080EC27C tile_entity type=0x1, paramA=0xe tile_entity_list_end -Room_DarkHyruleCastle_13:: @ 080EC28C - .4byte Entities_DarkHyruleCastle_13_0 +Room_DarkHyruleCastle_2FTopRightTower:: @ 080EC28C + .4byte Entities_DarkHyruleCastle_2FTopRightTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_13 - .4byte TileEntities_DarkHyruleCastle_13 + .4byte Enemies_DarkHyruleCastle_2FTopRightTower + .4byte TileEntities_DarkHyruleCastle_2FTopRightTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_13 + .4byte sub_unk3_DarkHyruleCastle_2FTopRightTower .4byte sub_StateChange_Dojos_ToSplitblade8 -Entities_DarkHyruleCastle_14_0:: @ 080EC2AC +Entities_DarkHyruleCastle_2FTopLeftDarknut_0:: @ 080EC2AC object_raw subtype=0x39, x=0x88, y=0x28, paramA=0x4, paramC=0x88ffff entity_list_end @@ -13962,40 +13962,40 @@ gUnk_080EC2CC:: @ 080EC2CC manager subtype=0x35, x=0x88, y=0x28, paramB=0x3c1e00, paramC=0x4c0088 entity_list_end -Enemies_DarkHyruleCastle_14:: @ 080EC34C +Enemies_DarkHyruleCastle_2FTopLeftDarknut:: @ 080EC34C entity_list_end -TileEntities_DarkHyruleCastle_14:: @ 080EC35C +TileEntities_DarkHyruleCastle_2FTopLeftDarknut:: @ 080EC35C tile_entity type=0xd, paramB=0x2d00 tile_entity type=0x1, paramA=0xf tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_14:: @ 080EC374 +gUnk_additional_8_DarkHyruleCastle_2FTopLeftDarknut:: @ 080EC374 enemy_raw subtype=0x5, x=0x88, y=0x68, paramA=0x2 object_raw subtype=0x8, x=0x88, y=0xa8, paramA=0x12, paramC=0x4cffff object_raw subtype=0x8, x=0xe8, y=0x68, paramA=0x11, paramC=0x4cffff ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0f, flag=0x4c entity_list_end -Room_DarkHyruleCastle_14:: @ 080EC3C4 - .4byte Entities_DarkHyruleCastle_14_0 +Room_DarkHyruleCastle_2FTopLeftDarknut:: @ 080EC3C4 + .4byte Entities_DarkHyruleCastle_2FTopLeftDarknut_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_14 - .4byte TileEntities_DarkHyruleCastle_14 + .4byte Enemies_DarkHyruleCastle_2FTopLeftDarknut + .4byte TileEntities_DarkHyruleCastle_2FTopLeftDarknut .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_14 - .4byte sub_StateChange_DarkHyruleCastle_14 - .4byte gUnk_additional_8_DarkHyruleCastle_14 + .4byte sub_unk3_DarkHyruleCastle_2FTopLeftDarknut + .4byte sub_StateChange_DarkHyruleCastle_2FTopLeftDarknut + .4byte gUnk_additional_8_DarkHyruleCastle_2FTopLeftDarknut -Entities_DarkHyruleCastle_15_0:: @ 080EC3E8 +Entities_DarkHyruleCastle_2FSparks_0:: @ 080EC3E8 object_raw subtype=0x5, x=0x38, y=0x98 object_raw subtype=0x5, x=0x48, y=0x98 object_raw subtype=0x5, x=0xc8, y=0x98 object_raw subtype=0x5, x=0xd8, y=0x98 entity_list_end -Enemies_DarkHyruleCastle_15:: @ 080EC438 +Enemies_DarkHyruleCastle_2FSparks:: @ 080EC438 enemy_raw subtype=0x1c, x=0x68, y=0x78, paramB=0x810 enemy_raw subtype=0x1c, x=0x78, y=0x78, paramB=0x810 enemy_raw subtype=0x1c, x=0x88, y=0x78, paramB=0x810 @@ -14003,21 +14003,21 @@ Enemies_DarkHyruleCastle_15:: @ 080EC438 enemy_raw subtype=0x1c, x=0xa8, y=0x78, paramB=0x810 entity_list_end -TileEntities_DarkHyruleCastle_15:: @ 080EC498 +TileEntities_DarkHyruleCastle_2FSparks:: @ 080EC498 tile_entity type=0x1, paramA=0x10 tile_entity_list_end -Room_DarkHyruleCastle_15:: @ 080EC4A8 - .4byte Entities_DarkHyruleCastle_15_0 +Room_DarkHyruleCastle_2FSparks:: @ 080EC4A8 + .4byte Entities_DarkHyruleCastle_2FSparks_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_15 - .4byte TileEntities_DarkHyruleCastle_15 + .4byte Enemies_DarkHyruleCastle_2FSparks + .4byte TileEntities_DarkHyruleCastle_2FSparks .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_15 + .4byte sub_unk3_DarkHyruleCastle_2FSparks .4byte sub_StateChange_Dojos_ToSplitblade9 -Entities_DarkHyruleCastle_16_0:: @ 080EC4C8 +Entities_DarkHyruleCastle_2FTopRightDarknuts_0:: @ 080EC4C8 object_raw subtype=0x39, x=0x88, y=0x28, paramA=0x4, paramC=0x89ffff entity_list_end @@ -14031,15 +14031,15 @@ gUnk_080EC4E8:: @ 080EC4E8 manager subtype=0x35, x=0x88, y=0x28, paramB=0x3c1e00, paramC=0x4d0089 entity_list_end -Enemies_DarkHyruleCastle_16:: @ 080EC568 +Enemies_DarkHyruleCastle_2FTopRightDarknuts:: @ 080EC568 entity_list_end -TileEntities_DarkHyruleCastle_16:: @ 080EC578 +TileEntities_DarkHyruleCastle_2FTopRightDarknuts:: @ 080EC578 tile_entity type=0xd, paramB=0x2d00 tile_entity type=0x1, paramA=0x11 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_16:: @ 080EC590 +gUnk_additional_8_DarkHyruleCastle_2FTopRightDarknuts:: @ 080EC590 enemy_raw subtype=0x5, x=0x70, y=0x68, paramA=0x1 enemy_raw subtype=0x5, x=0xa0, y=0x68 manager subtype=0x28, unknown=0x3, paramB=0x8 @@ -14048,18 +14048,18 @@ gUnk_additional_8_DarkHyruleCastle_16:: @ 080EC590 ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0f, flag=0x4d entity_list_end -Room_DarkHyruleCastle_16:: @ 080EC600 - .4byte Entities_DarkHyruleCastle_16_0 +Room_DarkHyruleCastle_2FTopRightDarknuts:: @ 080EC600 + .4byte Entities_DarkHyruleCastle_2FTopRightDarknuts_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_16 - .4byte TileEntities_DarkHyruleCastle_16 + .4byte Enemies_DarkHyruleCastle_2FTopRightDarknuts + .4byte TileEntities_DarkHyruleCastle_2FTopRightDarknuts .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_16 - .4byte sub_StateChange_DarkHyruleCastle_16 - .4byte gUnk_additional_8_DarkHyruleCastle_16 + .4byte sub_unk3_DarkHyruleCastle_2FTopRightDarknuts + .4byte sub_StateChange_DarkHyruleCastle_2FTopRightDarknuts + .4byte gUnk_additional_8_DarkHyruleCastle_2FTopRightDarknuts -Entities_DarkHyruleCastle_17_0:: @ 080EC624 +Entities_DarkHyruleCastle_2FLeft_0:: @ 080EC624 object_raw subtype=0x9d, x=0x40, y=0x20, paramA=0x1, paramC=0x8000004e object_raw subtype=0x9d, x=0xd0, y=0x20, paramA=0x1, paramC=0x8001004f manager subtype=0x11, paramC=0x8000004e @@ -14074,52 +14074,52 @@ Entities_DarkHyruleCastle_17_0:: @ 080EC624 object_raw subtype=0x5, x=0x98, y=0x38, paramA=0x5e entity_list_end -Enemies_DarkHyruleCastle_17:: @ 080EC6F4 +Enemies_DarkHyruleCastle_2FLeft:: @ 080EC6F4 entity_list_end -TileEntities_DarkHyruleCastle_17:: @ 080EC704 +TileEntities_DarkHyruleCastle_2FLeft:: @ 080EC704 tile_entity type=0xa, paramA=0x1, paramB=0x50, paramC=0x287, paramD=0x26 tile_entity type=0xa, paramA=0x1, paramB=0x51, paramC=0x288, paramD=0x26 tile_entity type=0xa, paramA=0x1, paramB=0x52, paramC=0x289, paramD=0x26 tile_entity type=0x1, paramA=0x13 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_17:: @ 080EC72C - .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_17.bin" +gUnk_additional_8_DarkHyruleCastle_2FLeft:: @ 080EC72C + .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_2FLeft.bin" -Room_DarkHyruleCastle_17:: @ 080EC77C - .4byte Entities_DarkHyruleCastle_17_0 +Room_DarkHyruleCastle_2FLeft:: @ 080EC77C + .4byte Entities_DarkHyruleCastle_2FLeft_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_17 - .4byte TileEntities_DarkHyruleCastle_17 + .4byte Enemies_DarkHyruleCastle_2FLeft + .4byte TileEntities_DarkHyruleCastle_2FLeft .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_17 + .4byte sub_unk3_DarkHyruleCastle_2FLeft .4byte sub_StateChange_Dojos_ToGreatblade0 - .4byte gUnk_additional_8_DarkHyruleCastle_17 + .4byte gUnk_additional_8_DarkHyruleCastle_2FLeft -Entities_DarkHyruleCastle_18_0:: @ 080EC7A0 +Entities_DarkHyruleCastle_2FRight_0:: @ 080EC7A0 object_raw subtype=0x98, x=0x78, y=0x88, unknown=0x3, paramB=0x10302 entity_list_end -Enemies_DarkHyruleCastle_18:: @ 080EC7C0 +Enemies_DarkHyruleCastle_2FRight:: @ 080EC7C0 entity_list_end -TileEntities_DarkHyruleCastle_18:: @ 080EC7D0 +TileEntities_DarkHyruleCastle_2FRight:: @ 080EC7D0 tile_entity type=0x1, paramA=0x13 tile_entity_list_end -Room_DarkHyruleCastle_18:: @ 080EC7E0 - .4byte Entities_DarkHyruleCastle_18_0 +Room_DarkHyruleCastle_2FRight:: @ 080EC7E0 + .4byte Entities_DarkHyruleCastle_2FRight_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_18 - .4byte TileEntities_DarkHyruleCastle_18 + .4byte Enemies_DarkHyruleCastle_2FRight + .4byte TileEntities_DarkHyruleCastle_2FRight .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_18 + .4byte sub_unk3_DarkHyruleCastle_2FRight .4byte sub_StateChange_Dojos_ToGreatblade1 -Entities_DarkHyruleCastle_19_0:: @ 080EC800 +Entities_DarkHyruleCastle_2FBottomLeftDarknuts_0:: @ 080EC800 object_raw subtype=0x39, x=0x88, y=0xa8, paramA=0x6, paramC=0x8affff entity_list_end @@ -14133,15 +14133,15 @@ gUnk_080EC820:: @ 080EC820 manager subtype=0x35, x=0x88, y=0xa8, paramB=0x3c1e00, paramC=0x53008a entity_list_end -Enemies_DarkHyruleCastle_19:: @ 080EC8A0 +Enemies_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 080EC8A0 entity_list_end -TileEntities_DarkHyruleCastle_19:: @ 080EC8B0 +TileEntities_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 080EC8B0 tile_entity type=0xd, paramB=0x2d00 tile_entity type=0x1, paramA=0x14 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_19:: @ 080EC8C8 +gUnk_additional_8_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 080EC8C8 enemy_raw subtype=0x5, x=0x70, y=0x68 enemy_raw subtype=0x5, x=0xa0, y=0x68, paramA=0x1 manager subtype=0x28, unknown=0x3, paramB=0x8 @@ -14150,18 +14150,18 @@ gUnk_additional_8_DarkHyruleCastle_19:: @ 080EC8C8 ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0f, flag=0x53 entity_list_end -Room_DarkHyruleCastle_19:: @ 080EC938 - .4byte Entities_DarkHyruleCastle_19_0 +Room_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 080EC938 + .4byte Entities_DarkHyruleCastle_2FBottomLeftDarknuts_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_19 - .4byte TileEntities_DarkHyruleCastle_19 + .4byte Enemies_DarkHyruleCastle_2FBottomLeftDarknuts + .4byte TileEntities_DarkHyruleCastle_2FBottomLeftDarknuts .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_19 - .4byte sub_StateChange_DarkHyruleCastle_19 - .4byte gUnk_additional_8_DarkHyruleCastle_19 + .4byte sub_unk3_DarkHyruleCastle_2FBottomLeftDarknuts + .4byte sub_StateChange_DarkHyruleCastle_2FBottomLeftDarknuts + .4byte gUnk_additional_8_DarkHyruleCastle_2FBottomLeftDarknuts -Entities_DarkHyruleCastle_20_0:: @ 080EC95C +Entities_DarkHyruleCastle_2FBossDoor_0:: @ 080EC95C object_raw subtype=0x39, x=0x88, y=0x28, paramC=0x55ffff manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x540000 manager subtype=0x2e, unknown=0x0, paramB=0x3c00, paramC=0x54008b @@ -14170,30 +14170,30 @@ Entities_DarkHyruleCastle_20_0:: @ 080EC95C object_raw subtype=0x34, x=0x88, y=0x68, paramA=0x1, paramB=0x88, paramC=0x8b071c entity_list_end -Enemies_DarkHyruleCastle_20:: @ 080EC9CC +Enemies_DarkHyruleCastle_2FBossDoor:: @ 080EC9CC entity_list_end -TileEntities_DarkHyruleCastle_20:: @ 080EC9DC +TileEntities_DarkHyruleCastle_2FBossDoor:: @ 080EC9DC tile_entity type=0x1, paramA=0x15 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_20:: @ 080EC9EC +gUnk_additional_8_DarkHyruleCastle_2FBossDoor:: @ 080EC9EC enemy_raw subtype=0x4c, x=0x78, y=0x58, paramB=0xa120000, paramC=0x400040 enemy_raw subtype=0x4c, x=0x98, y=0x58, paramB=0xa120000, paramC=0x400040 entity_list_end -Room_DarkHyruleCastle_20:: @ 080ECA1C - .4byte Entities_DarkHyruleCastle_20_0 +Room_DarkHyruleCastle_2FBossDoor:: @ 080ECA1C + .4byte Entities_DarkHyruleCastle_2FBossDoor_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_20 - .4byte TileEntities_DarkHyruleCastle_20 + .4byte Enemies_DarkHyruleCastle_2FBossDoor + .4byte TileEntities_DarkHyruleCastle_2FBossDoor .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_20 + .4byte sub_unk3_DarkHyruleCastle_2FBossDoor .4byte sub_StateChange_Dojos_ToGreatblade2 - .4byte gUnk_additional_8_DarkHyruleCastle_20 + .4byte gUnk_additional_8_DarkHyruleCastle_2FBossDoor -Entities_DarkHyruleCastle_21_0:: @ 080ECA40 +Entities_DarkHyruleCastle_2FBottomRightDarknut_0:: @ 080ECA40 object_raw subtype=0x39, x=0x88, y=0xa8, paramA=0x6, paramC=0x8cffff entity_list_end @@ -14207,32 +14207,32 @@ gUnk_080ECA60:: @ 080ECA60 manager subtype=0x35, x=0x88, y=0xa8, paramB=0x3c1e00, paramC=0x56008c entity_list_end -Enemies_DarkHyruleCastle_21:: @ 080ECAE0 +Enemies_DarkHyruleCastle_2FBottomRightDarknut:: @ 080ECAE0 entity_list_end -TileEntities_DarkHyruleCastle_21:: @ 080ECAF0 +TileEntities_DarkHyruleCastle_2FBottomRightDarknut:: @ 080ECAF0 tile_entity type=0x1, paramA=0x16 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_21:: @ 080ECB00 +gUnk_additional_8_DarkHyruleCastle_2FBottomRightDarknut:: @ 080ECB00 enemy_raw subtype=0x5, x=0x88, y=0x68, paramA=0x2 object_raw subtype=0x8, x=0x88, y=0x28, paramA=0x10, paramC=0x56ffff object_raw subtype=0x8, x=0x28, y=0x68, paramA=0x13, paramC=0x56ffff ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0f, flag=0x4c entity_list_end -Room_DarkHyruleCastle_21:: @ 080ECB50 - .4byte Entities_DarkHyruleCastle_21_0 +Room_DarkHyruleCastle_2FBottomRightDarknut:: @ 080ECB50 + .4byte Entities_DarkHyruleCastle_2FBottomRightDarknut_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_21 - .4byte TileEntities_DarkHyruleCastle_21 + .4byte Enemies_DarkHyruleCastle_2FBottomRightDarknut + .4byte TileEntities_DarkHyruleCastle_2FBottomRightDarknut .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_21 - .4byte sub_StateChange_DarkHyruleCastle_21 - .4byte gUnk_additional_8_DarkHyruleCastle_21 + .4byte sub_unk3_DarkHyruleCastle_2FBottomRightDarknut + .4byte sub_StateChange_DarkHyruleCastle_2FBottomRightDarknut + .4byte gUnk_additional_8_DarkHyruleCastle_2FBottomRightDarknut -Entities_DarkHyruleCastle_22_0:: @ 080ECB74 +Entities_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0:: @ 080ECB74 manager subtype=0x30, x=0x38, y=0x58, paramB=0x6082101, paramC=0x80018000 manager subtype=0x11, paramC=0x80000057 object_raw subtype=0x3, x=0x38, y=0x38, paramA=0x1, paramC=0x80010001 @@ -14245,24 +14245,24 @@ Entities_DarkHyruleCastle_22_0:: @ 080ECB74 object_raw subtype=0x5, x=0xd8, y=0x68, paramA=0x5f entity_list_end -Enemies_DarkHyruleCastle_22:: @ 080ECC24 +Enemies_DarkHyruleCastle_2FBottomLeftCornerPuzzle:: @ 080ECC24 entity_list_end -TileEntities_DarkHyruleCastle_22:: @ 080ECC34 +TileEntities_DarkHyruleCastle_2FBottomLeftCornerPuzzle:: @ 080ECC34 tile_entity type=0x1, paramA=0x17 tile_entity_list_end -Room_DarkHyruleCastle_22:: @ 080ECC44 - .4byte Entities_DarkHyruleCastle_22_0 +Room_DarkHyruleCastle_2FBottomLeftCornerPuzzle:: @ 080ECC44 + .4byte Entities_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_22 - .4byte TileEntities_DarkHyruleCastle_22 + .4byte Enemies_DarkHyruleCastle_2FBottomLeftCornerPuzzle + .4byte TileEntities_DarkHyruleCastle_2FBottomLeftCornerPuzzle .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_22 + .4byte sub_unk3_DarkHyruleCastle_2FBottomLeftCornerPuzzle .4byte sub_StateChange_Dojos_ToGreatblade3 -Entities_DarkHyruleCastle_23_0:: @ 080ECC64 +Entities_DarkHyruleCastle_2FEntrance_0:: @ 080ECC64 object_raw subtype=0x9d, x=0x78, y=0x58, paramA=0x1, paramC=0x80000058 object_raw subtype=0x9d, x=0x98, y=0x58, paramA=0x1, paramC=0x80010058 object_raw subtype=0x9d, x=0x68, y=0x88, paramA=0x1, paramC=0x80020058 @@ -14273,24 +14273,24 @@ Entities_DarkHyruleCastle_23_0:: @ 080ECC64 object_raw subtype=0x39, x=0x88, y=0x38, paramA=0x4, paramC=0x59ffff entity_list_end -Enemies_DarkHyruleCastle_23:: @ 080ECCF4 +Enemies_DarkHyruleCastle_2FEntrance:: @ 080ECCF4 entity_list_end -TileEntities_DarkHyruleCastle_23:: @ 080ECD04 +TileEntities_DarkHyruleCastle_2FEntrance:: @ 080ECD04 tile_entity type=0x1, paramA=0x18 tile_entity_list_end -Room_DarkHyruleCastle_23:: @ 080ECD14 - .4byte Entities_DarkHyruleCastle_23_0 +Room_DarkHyruleCastle_2FEntrance:: @ 080ECD14 + .4byte Entities_DarkHyruleCastle_2FEntrance_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_23 - .4byte TileEntities_DarkHyruleCastle_23 + .4byte Enemies_DarkHyruleCastle_2FEntrance + .4byte TileEntities_DarkHyruleCastle_2FEntrance .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_23 + .4byte sub_unk3_DarkHyruleCastle_2FEntrance .4byte sub_StateChange_Dojos_ToGreatblade4 -Entities_DarkHyruleCastle_24_0:: @ 080ECD34 +Entities_DarkHyruleCastle_2FBottomLeftCorner_0:: @ 080ECD34 object_raw subtype=0x9d, x=0x68, y=0x128, paramA=0x1, paramC=0x8000005a object_raw subtype=0x9d, x=0x88, y=0x108, paramA=0x1, paramC=0x8001005a object_raw subtype=0x9d, x=0x88, y=0x148, paramA=0x1, paramC=0x8002005a @@ -14304,103 +14304,103 @@ Entities_DarkHyruleCastle_24_0:: @ 080ECD34 object_raw subtype=0x98, x=0xb8, y=0xa8, unknown=0x3, paramB=0x10302 entity_list_end -Enemies_DarkHyruleCastle_24:: @ 080ECDF4 +Enemies_DarkHyruleCastle_2FBottomLeftCorner:: @ 080ECDF4 entity_list_end -TileEntities_DarkHyruleCastle_24:: @ 080ECE04 +TileEntities_DarkHyruleCastle_2FBottomLeftCorner:: @ 080ECE04 tile_entity type=0x1, paramA=0x19 tile_entity_list_end -Room_DarkHyruleCastle_24:: @ 080ECE14 - .4byte Entities_DarkHyruleCastle_24_0 +Room_DarkHyruleCastle_2FBottomLeftCorner:: @ 080ECE14 + .4byte Entities_DarkHyruleCastle_2FBottomLeftCorner_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_24 - .4byte TileEntities_DarkHyruleCastle_24 + .4byte Enemies_DarkHyruleCastle_2FBottomLeftCorner + .4byte TileEntities_DarkHyruleCastle_2FBottomLeftCorner .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_24 + .4byte sub_unk3_DarkHyruleCastle_2FBottomLeftCorner .4byte sub_StateChange_Dojos_ToGreatblade5 -Entities_DarkHyruleCastle_25_0:: @ 080ECE34 +Entities_DarkHyruleCastle_2FBottomLeftTower_0:: @ 080ECE34 entity_list_end -Enemies_DarkHyruleCastle_25:: @ 080ECE44 +Enemies_DarkHyruleCastle_2FBottomLeftTower:: @ 080ECE44 entity_list_end -TileEntities_DarkHyruleCastle_25:: @ 080ECE54 +TileEntities_DarkHyruleCastle_2FBottomLeftTower:: @ 080ECE54 tile_entity type=0x1, paramA=0x1a tile_entity_list_end -Room_DarkHyruleCastle_25:: @ 080ECE64 - .4byte Entities_DarkHyruleCastle_25_0 +Room_DarkHyruleCastle_2FBottomLeftTower:: @ 080ECE64 + .4byte Entities_DarkHyruleCastle_2FBottomLeftTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_25 - .4byte TileEntities_DarkHyruleCastle_25 + .4byte Enemies_DarkHyruleCastle_2FBottomLeftTower + .4byte TileEntities_DarkHyruleCastle_2FBottomLeftTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_25 + .4byte sub_unk3_DarkHyruleCastle_2FBottomLeftTower .4byte sub_StateChange_Dojos_ToGreatblade6 -Entities_DarkHyruleCastle_26_0:: @ 080ECE84 +Entities_DarkHyruleCastle_2FBottomLeftGhini_0:: @ 080ECE84 manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x5b0000 manager subtype=0x2e, unknown=0x0, paramB=0x3c00, paramC=0x5b008d object_raw subtype=0x8, x=0x88, y=0xa8, paramA=0x2, paramC=0x8dffff entity_list_end -Enemies_DarkHyruleCastle_26:: @ 080ECEC4 +Enemies_DarkHyruleCastle_2FBottomLeftGhini:: @ 080ECEC4 entity_list_end -TileEntities_DarkHyruleCastle_26:: @ 080ECED4 +TileEntities_DarkHyruleCastle_2FBottomLeftGhini:: @ 080ECED4 tile_entity type=0x1, paramA=0x1b tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_26:: @ 080ECEE4 +gUnk_additional_8_DarkHyruleCastle_2FBottomLeftGhini:: @ 080ECEE4 enemy_raw subtype=0x50, paramB=0xa160900, paramC=0x300030 entity_list_end -gUnk_additional_9_DarkHyruleCastle_26:: @ 080ECF04 - .incbin "data_080D5360/gUnk_additional_9_DarkHyruleCastle_26.bin" +gUnk_additional_9_DarkHyruleCastle_2FBottomLeftGhini:: @ 080ECF04 + .incbin "data_080D5360/gUnk_additional_9_DarkHyruleCastle_2FBottomLeftGhini.bin" -Room_DarkHyruleCastle_26:: @ 080ECF14 - .4byte Entities_DarkHyruleCastle_26_0 +Room_DarkHyruleCastle_2FBottomLeftGhini:: @ 080ECF14 + .4byte Entities_DarkHyruleCastle_2FBottomLeftGhini_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_26 - .4byte TileEntities_DarkHyruleCastle_26 + .4byte Enemies_DarkHyruleCastle_2FBottomLeftGhini + .4byte TileEntities_DarkHyruleCastle_2FBottomLeftGhini .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_26 + .4byte sub_unk3_DarkHyruleCastle_2FBottomLeftGhini .4byte sub_StateChange_Dojos_ToGreatblade7 - .4byte gUnk_additional_8_DarkHyruleCastle_26 - .4byte gUnk_additional_9_DarkHyruleCastle_26 + .4byte gUnk_additional_8_DarkHyruleCastle_2FBottomLeftGhini + .4byte gUnk_additional_9_DarkHyruleCastle_2FBottomLeftGhini -Entities_DarkHyruleCastle_27_0:: @ 080ECF3C +Entities_DarkHyruleCastle_3FTopRightTower7_0:: @ 080ECF3C entity_list_end -Enemies_DarkHyruleCastle_27:: @ 080ECF4C +Enemies_DarkHyruleCastle_3FTopRightTower7:: @ 080ECF4C entity_list_end -TileEntities_DarkHyruleCastle_27:: @ 080ECF5C +TileEntities_DarkHyruleCastle_3FTopRightTower7:: @ 080ECF5C tile_entity type=0x1, paramA=0x1c tile_entity_list_end -Room_DarkHyruleCastle_27:: @ 080ECF6C - .4byte Entities_DarkHyruleCastle_27_0 +Room_DarkHyruleCastle_3FTopRightTower7:: @ 080ECF6C + .4byte Entities_DarkHyruleCastle_3FTopRightTower7_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_27 - .4byte TileEntities_DarkHyruleCastle_27 + .4byte Enemies_DarkHyruleCastle_3FTopRightTower7 + .4byte TileEntities_DarkHyruleCastle_3FTopRightTower7 .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_27 + .4byte sub_unk3_DarkHyruleCastle_3FTopRightTower7 .4byte sub_StateChange_Dojos_ToGreatblade8 -Entities_DarkHyruleCastle_28_0:: @ 080ECF8C +Entities_DarkHyruleCastle_B1Entrance_0:: @ 080ECF8C ezlo_hint x=0x0, y=0x6, rx=0x11, ry=0x8, msg=0xb1b, flag=0x5c entity_list_end -Enemies_DarkHyruleCastle_28:: @ 080ECFAC +Enemies_DarkHyruleCastle_B1Entrance:: @ 080ECFAC entity_list_end -TileEntities_DarkHyruleCastle_28:: @ 080ECFBC +TileEntities_DarkHyruleCastle_B1Entrance:: @ 080ECFBC tile_entity type=0x1, paramA=0x1d tile_entity_list_end @@ -14410,17 +14410,17 @@ gUnk_080ECFCC:: @ 080ECFCC object_raw subtype=0x6a, x=0x108, y=0x70, collision=1, paramA=0x5, paramB=0x102 entity_list_end -Room_DarkHyruleCastle_28:: @ 080ED00C - .4byte Entities_DarkHyruleCastle_28_0 +Room_DarkHyruleCastle_B1Entrance:: @ 080ED00C + .4byte Entities_DarkHyruleCastle_B1Entrance_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_28 - .4byte TileEntities_DarkHyruleCastle_28 + .4byte Enemies_DarkHyruleCastle_B1Entrance + .4byte TileEntities_DarkHyruleCastle_B1Entrance .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_28 - .4byte sub_StateChange_DarkHyruleCastle_28 + .4byte sub_unk3_DarkHyruleCastle_B1Entrance + .4byte sub_StateChange_DarkHyruleCastle_B1Entrance -Entities_DarkHyruleCastle_29_0:: @ 080ED02C +Entities_DarkHyruleCastle_2FBottomRightTower_0:: @ 080ED02C object_raw subtype=0x8, x=0x68, y=0x108, paramC=0x5dffff object_raw subtype=0x3, x=0xb8, y=0x148, paramC=0x5d0001 object_raw subtype=0x5, x=0x58, y=0x168 @@ -14430,12 +14430,12 @@ Entities_DarkHyruleCastle_29_0:: @ 080ED02C manager subtype=0x1a, unknown=0x8, paramA=0x35 entity_list_end -Enemies_DarkHyruleCastle_29:: @ 080ED0AC +Enemies_DarkHyruleCastle_2FBottomRightTower:: @ 080ED0AC enemy_raw subtype=0x28, x=0x68, y=0x128, paramB=0x60e0000, paramC=0x1100050 enemy_raw subtype=0x28, x=0xa8, y=0x128, paramB=0x60e0000, paramC=0x1100050 entity_list_end -TileEntities_DarkHyruleCastle_29:: @ 080ED0DC +TileEntities_DarkHyruleCastle_2FBottomRightTower:: @ 080ED0DC tile_entity type=0x1, paramA=0x1e tile_entity_list_end@ unaccounted bytes .byte 255 @@ -14456,40 +14456,40 @@ TileEntities_DarkHyruleCastle_29:: @ 080ED0DC .byte 0 -Room_DarkHyruleCastle_29:: @ 080ED0FC - .4byte Entities_DarkHyruleCastle_29_0 +Room_DarkHyruleCastle_2FBottomRightTower:: @ 080ED0FC + .4byte Entities_DarkHyruleCastle_2FBottomRightTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_29 - .4byte TileEntities_DarkHyruleCastle_29 + .4byte Enemies_DarkHyruleCastle_2FBottomRightTower + .4byte TileEntities_DarkHyruleCastle_2FBottomRightTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_29 + .4byte sub_unk3_DarkHyruleCastle_2FBottomRightTower .4byte sub_StateChange_Dojos_ToGreatblade9 -Entities_DarkHyruleCastle_30_0:: @ 080ED11C +Entities_DarkHyruleCastle_1FTopLeftTower_0:: @ 080ED11C entity_list_end -Enemies_DarkHyruleCastle_30:: @ 080ED12C +Enemies_DarkHyruleCastle_1FTopLeftTower:: @ 080ED12C enemy_raw subtype=0x3b, x=0x58, y=0x68 enemy_raw subtype=0x3b, x=0xb8, y=0x68 entity_list_end -TileEntities_DarkHyruleCastle_30:: @ 080ED15C +TileEntities_DarkHyruleCastle_1FTopLeftTower:: @ 080ED15C tile_entity type=0x9, paramB=0x8000 tile_entity type=0x1, paramA=0x1f tile_entity_list_end -Room_DarkHyruleCastle_30:: @ 080ED174 - .4byte Entities_DarkHyruleCastle_30_0 +Room_DarkHyruleCastle_1FTopLeftTower:: @ 080ED174 + .4byte Entities_DarkHyruleCastle_1FTopLeftTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_30 - .4byte TileEntities_DarkHyruleCastle_30 + .4byte Enemies_DarkHyruleCastle_1FTopLeftTower + .4byte TileEntities_DarkHyruleCastle_1FTopLeftTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_30 + .4byte sub_unk3_DarkHyruleCastle_1FTopLeftTower .4byte sub_StateChange_Dojos_ToScarblade0 -Entities_DarkHyruleCastle_31_0:: @ 080ED194 +Entities_DarkHyruleCastle_1FThroneRoom_0:: @ 080ED194 manager subtype=0x1e, x=0x20, y=0x70, paramB=0x2000d0, paramC=0x80000000 manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x5e8000 manager subtype=0x2e, unknown=0x0, paramB=0x3c00, paramC=0x5e008e @@ -14503,99 +14503,99 @@ gUnk_080ED1E4:: @ 080ED1E4 object_raw subtype=0x6a, x=0x50, y=0x60, collision=1, paramA=0x5, paramB=0x302 entity_list_end -Entities_DarkHyruleCastle_31_1:: @ 080ED234 +Entities_DarkHyruleCastle_1FThroneRoom_1:: @ 080ED234 object_raw subtype=0x5f, x=0x88, y=0x48, paramA=0x1, paramC=0x5e0000 entity_list_end -Enemies_DarkHyruleCastle_31:: @ 080ED254 +Enemies_DarkHyruleCastle_1FThroneRoom:: @ 080ED254 entity_list_end -TileEntities_DarkHyruleCastle_31:: @ 080ED264 +TileEntities_DarkHyruleCastle_1FThroneRoom:: @ 080ED264 tile_entity type=0xd, paramB=0x2d00 tile_entity type=0x1, paramA=0x20 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_31:: @ 080ED27C +gUnk_additional_8_DarkHyruleCastle_1FThroneRoom:: @ 080ED27C enemy_raw subtype=0x5, x=0x88, y=0x68, unknown=0x2f, paramA=0x2 object_raw subtype=0x39, x=0x88, y=0xa8, paramA=0x6, paramC=0x8effff entity_list_end -Room_DarkHyruleCastle_31:: @ 080ED2AC - .4byte Entities_DarkHyruleCastle_31_0 - .4byte Entities_DarkHyruleCastle_31_1 - .4byte Enemies_DarkHyruleCastle_31 - .4byte TileEntities_DarkHyruleCastle_31 +Room_DarkHyruleCastle_1FThroneRoom:: @ 080ED2AC + .4byte Entities_DarkHyruleCastle_1FThroneRoom_0 + .4byte Entities_DarkHyruleCastle_1FThroneRoom_1 + .4byte Enemies_DarkHyruleCastle_1FThroneRoom + .4byte TileEntities_DarkHyruleCastle_1FThroneRoom .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_31 - .4byte sub_StateChange_DarkHyruleCastle_31 - .4byte gUnk_additional_8_DarkHyruleCastle_31 + .4byte sub_unk3_DarkHyruleCastle_1FThroneRoom + .4byte sub_StateChange_DarkHyruleCastle_1FThroneRoom + .4byte gUnk_additional_8_DarkHyruleCastle_1FThroneRoom -Entities_DarkHyruleCastle_32_0:: @ 080ED2D0 +Entities_DarkHyruleCastle_1FCompass_0:: @ 080ED2D0 object_raw subtype=0xc, x=0x50, y=0x28, collision=1, paramA=0x4, paramB=0x5f entity_list_end -Enemies_DarkHyruleCastle_32:: @ 080ED2F0 +Enemies_DarkHyruleCastle_1FCompass:: @ 080ED2F0 entity_list_end -TileEntities_DarkHyruleCastle_32:: @ 080ED300 +TileEntities_DarkHyruleCastle_1FCompass:: @ 080ED300 tile_entity type=0x3, paramA=0x5f, paramB=0x51, paramC=0x50, paramD=0x28 tile_entity type=0x1, paramA=0x21 tile_entity_list_end -Room_DarkHyruleCastle_32:: @ 080ED318 - .4byte Entities_DarkHyruleCastle_32_0 +Room_DarkHyruleCastle_1FCompass:: @ 080ED318 + .4byte Entities_DarkHyruleCastle_1FCompass_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_32 - .4byte TileEntities_DarkHyruleCastle_32 + .4byte Enemies_DarkHyruleCastle_1FCompass + .4byte TileEntities_DarkHyruleCastle_1FCompass .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_32 + .4byte sub_unk3_DarkHyruleCastle_1FCompass .4byte sub_StateChange_Dojos_ToScarblade1 -Entities_DarkHyruleCastle_33_0:: @ 080ED338 +Entities_DarkHyruleCastle_1FTopRightTower_0:: @ 080ED338 entity_list_end -Enemies_DarkHyruleCastle_33:: @ 080ED348 +Enemies_DarkHyruleCastle_1FTopRightTower:: @ 080ED348 enemy_raw subtype=0xd, x=0x68, y=0x78 enemy_raw subtype=0xd, x=0xa8, y=0x78 entity_list_end -TileEntities_DarkHyruleCastle_33:: @ 080ED378 +TileEntities_DarkHyruleCastle_1FTopRightTower:: @ 080ED378 tile_entity type=0x1, paramA=0x22 tile_entity_list_end -Room_DarkHyruleCastle_33:: @ 080ED388 - .4byte Entities_DarkHyruleCastle_33_0 +Room_DarkHyruleCastle_1FTopRightTower:: @ 080ED388 + .4byte Entities_DarkHyruleCastle_1FTopRightTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_33 - .4byte TileEntities_DarkHyruleCastle_33 + .4byte Enemies_DarkHyruleCastle_1FTopRightTower + .4byte TileEntities_DarkHyruleCastle_1FTopRightTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_33 + .4byte sub_unk3_DarkHyruleCastle_1FTopRightTower .4byte sub_StateChange_Dojos_ToScarblade2 -Entities_DarkHyruleCastle_34_0:: @ 080ED3A8 +Entities_DarkHyruleCastle_1FBeforeThrone_0:: @ 080ED3A8 entity_list_end -Enemies_DarkHyruleCastle_34:: @ 080ED3B8 +Enemies_DarkHyruleCastle_1FBeforeThrone:: @ 080ED3B8 entity_list_end -TileEntities_DarkHyruleCastle_34:: @ 080ED3C8 +TileEntities_DarkHyruleCastle_1FBeforeThrone:: @ 080ED3C8 tile_entity type=0x1, paramA=0x23 tile_entity_list_end -Room_DarkHyruleCastle_34:: @ 080ED3D8 - .4byte Entities_DarkHyruleCastle_34_0 +Room_DarkHyruleCastle_1FBeforeThrone:: @ 080ED3D8 + .4byte Entities_DarkHyruleCastle_1FBeforeThrone_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_34 - .4byte TileEntities_DarkHyruleCastle_34 + .4byte Enemies_DarkHyruleCastle_1FBeforeThrone + .4byte TileEntities_DarkHyruleCastle_1FBeforeThrone .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_34 + .4byte sub_unk3_DarkHyruleCastle_1FBeforeThrone .4byte sub_StateChange_Dojos_ToScarblade3 -Entities_DarkHyruleCastle_35_0:: @ 080ED3F8 +Entities_DarkHyruleCastle_1FLoopTopLeft_0:: @ 080ED3F8 enemy_raw subtype=0x3a, x=0x38, y=0x38 enemy_raw subtype=0x3a, x=0x38, y=0x48 enemy_raw subtype=0x3a, x=0x38, y=0x58 @@ -14604,66 +14604,66 @@ Entities_DarkHyruleCastle_35_0:: @ 080ED3F8 enemy_raw subtype=0x3a, x=0x38, y=0x88 entity_list_end -Entities_DarkHyruleCastle_35_1:: @ 080ED468 +Entities_DarkHyruleCastle_1FLoopTopLeft_1:: @ 080ED468 object_raw subtype=0x4f, x=0x100, y=0x48, paramA=0x21, paramB=0x1 entity_list_end -Enemies_DarkHyruleCastle_35:: @ 080ED488 +Enemies_DarkHyruleCastle_1FLoopTopLeft:: @ 080ED488 enemy_raw subtype=0x23, x=0x58, y=0x38, paramB=0xc160000, paramC=0x300030 enemy_raw subtype=0x23, x=0xc8, y=0x88, paramB=0xc160000, paramC=0x400080 entity_list_end -TileEntities_DarkHyruleCastle_35:: @ 080ED4B8 +TileEntities_DarkHyruleCastle_1FLoopTopLeft:: @ 080ED4B8 tile_entity type=0x1, paramA=0x24 tile_entity_list_end -Room_DarkHyruleCastle_35:: @ 080ED4C8 - .4byte Entities_DarkHyruleCastle_35_0 - .4byte Entities_DarkHyruleCastle_35_1 - .4byte Enemies_DarkHyruleCastle_35 - .4byte TileEntities_DarkHyruleCastle_35 +Room_DarkHyruleCastle_1FLoopTopLeft:: @ 080ED4C8 + .4byte Entities_DarkHyruleCastle_1FLoopTopLeft_0 + .4byte Entities_DarkHyruleCastle_1FLoopTopLeft_1 + .4byte Enemies_DarkHyruleCastle_1FLoopTopLeft + .4byte TileEntities_DarkHyruleCastle_1FLoopTopLeft .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_35 + .4byte sub_unk3_DarkHyruleCastle_1FLoopTopLeft .4byte sub_StateChange_Dojos_ToScarblade4 -Entities_DarkHyruleCastle_36_0:: @ 080ED4E8 +Entities_DarkHyruleCastle_1FLoopTop_0:: @ 080ED4E8 manager subtype=0x30, x=0x78, y=0x38, paramB=0x6051702, paramC=0x80018000 manager subtype=0x11, paramC=0x80000060 object_raw subtype=0x3, x=0x48, y=0x78, paramA=0x1, paramC=0x80010002 object_raw subtype=0x8, x=0xe8, y=0x58, paramA=0x1, paramC=0x60ffff entity_list_end -Entities_DarkHyruleCastle_36_1:: @ 080ED538 +Entities_DarkHyruleCastle_1FLoopTop_1:: @ 080ED538 object_raw subtype=0x4f, x=0x10, y=0x48, paramA=0x21, paramB=0x3 object_raw subtype=0x4f, x=0x100, y=0x58, paramA=0x21, paramB=0x1 entity_list_end -Enemies_DarkHyruleCastle_36:: @ 080ED568 +Enemies_DarkHyruleCastle_1FLoopTop:: @ 080ED568 entity_list_end -TileEntities_DarkHyruleCastle_36:: @ 080ED578 +TileEntities_DarkHyruleCastle_1FLoopTop:: @ 080ED578 tile_entity type=0x1, paramA=0x25 tile_entity_list_end -Room_DarkHyruleCastle_36:: @ 080ED588 - .4byte Entities_DarkHyruleCastle_36_0 - .4byte Entities_DarkHyruleCastle_36_1 - .4byte Enemies_DarkHyruleCastle_36 - .4byte TileEntities_DarkHyruleCastle_36 +Room_DarkHyruleCastle_1FLoopTop:: @ 080ED588 + .4byte Entities_DarkHyruleCastle_1FLoopTop_0 + .4byte Entities_DarkHyruleCastle_1FLoopTop_1 + .4byte Enemies_DarkHyruleCastle_1FLoopTop + .4byte TileEntities_DarkHyruleCastle_1FLoopTop .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_36 + .4byte sub_unk3_DarkHyruleCastle_1FLoopTop .4byte sub_StateChange_Dojos_ToScarblade5 -Entities_DarkHyruleCastle_37_0:: @ 080ED5A8 +Entities_DarkHyruleCastle_1FLoopTopRight_0:: @ 080ED5A8 entity_list_end -Entities_DarkHyruleCastle_37_1:: @ 080ED5B8 +Entities_DarkHyruleCastle_1FLoopTopRight_1:: @ 080ED5B8 object_raw subtype=0x4f, x=0x10, y=0x58, paramA=0x21, paramB=0x3 entity_list_end -Enemies_DarkHyruleCastle_37:: @ 080ED5D8 +Enemies_DarkHyruleCastle_1FLoopTopRight:: @ 080ED5D8 enemy_raw subtype=0x15, x=0x88, y=0x78, paramA=0x1 enemy_raw subtype=0x15, x=0xa8, y=0x48, paramA=0x1 enemy_raw subtype=0x8, x=0x58, y=0x18, paramB=0x14140000, paramC=0x100030 @@ -14671,21 +14671,21 @@ Enemies_DarkHyruleCastle_37:: @ 080ED5D8 enemy_raw subtype=0x8, x=0x98, y=0x18, paramB=0x14140000, paramC=0x100030 entity_list_end -TileEntities_DarkHyruleCastle_37:: @ 080ED638 +TileEntities_DarkHyruleCastle_1FLoopTopRight:: @ 080ED638 tile_entity type=0x1, paramA=0x26 tile_entity_list_end -Room_DarkHyruleCastle_37:: @ 080ED648 - .4byte Entities_DarkHyruleCastle_37_0 - .4byte Entities_DarkHyruleCastle_37_1 - .4byte Enemies_DarkHyruleCastle_37 - .4byte TileEntities_DarkHyruleCastle_37 +Room_DarkHyruleCastle_1FLoopTopRight:: @ 080ED648 + .4byte Entities_DarkHyruleCastle_1FLoopTopRight_0 + .4byte Entities_DarkHyruleCastle_1FLoopTopRight_1 + .4byte Enemies_DarkHyruleCastle_1FLoopTopRight + .4byte TileEntities_DarkHyruleCastle_1FLoopTopRight .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_37 + .4byte sub_unk3_DarkHyruleCastle_1FLoopTopRight .4byte sub_StateChange_Dojos_ToScarblade6 -Entities_DarkHyruleCastle_38_0:: @ 080ED668 +Entities_DarkHyruleCastle_1FLoopLeft_0:: @ 080ED668 manager subtype=0x2b, paramA=0x8, paramC=0x610000 manager subtype=0x35, x=0x90, y=0x58, paramB=0x3c1e00, paramC=0x610062 object_raw subtype=0x33, x=0x78, y=0x58, paramA=0x5, paramC=0x620000 @@ -14695,28 +14695,28 @@ Entities_DarkHyruleCastle_38_0:: @ 080ED668 ezlo_hint x=0x10, y=0xc, rx=0x1, ry=0x5, msg=0xb4a, flag=0x63 entity_list_end -Enemies_DarkHyruleCastle_38:: @ 080ED6E8 +Enemies_DarkHyruleCastle_1FLoopLeft:: @ 080ED6E8 entity_list_end -TileEntities_DarkHyruleCastle_38:: @ 080ED6F8 +TileEntities_DarkHyruleCastle_1FLoopLeft:: @ 080ED6F8 tile_entity type=0x1, paramA=0x27 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_38:: @ 080ED708 - .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_38.bin" +gUnk_additional_8_DarkHyruleCastle_1FLoopLeft:: @ 080ED708 + .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_1FLoopLeft.bin" -Room_DarkHyruleCastle_38:: @ 080ED720 - .4byte Entities_DarkHyruleCastle_38_0 +Room_DarkHyruleCastle_1FLoopLeft:: @ 080ED720 + .4byte Entities_DarkHyruleCastle_1FLoopLeft_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_38 - .4byte TileEntities_DarkHyruleCastle_38 + .4byte Enemies_DarkHyruleCastle_1FLoopLeft + .4byte TileEntities_DarkHyruleCastle_1FLoopLeft .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_38 + .4byte sub_unk3_DarkHyruleCastle_1FLoopLeft .4byte sub_StateChange_Dojos_ToScarblade7 - .4byte gUnk_additional_8_DarkHyruleCastle_38 + .4byte gUnk_additional_8_DarkHyruleCastle_1FLoopLeft -Entities_DarkHyruleCastle_39_0:: @ 080ED744 +Entities_DarkHyruleCastle_1FLoopRight_0:: @ 080ED744 object_raw subtype=0x3, x=0x38, y=0xc8, paramA=0x1, paramC=0x80000002 object_raw subtype=0x3, x=0x48, y=0xc8, paramA=0x1, paramC=0x80010002 object_raw subtype=0x3, x=0x98, y=0xc8, paramA=0x1, paramC=0x80020002 @@ -14725,55 +14725,55 @@ Entities_DarkHyruleCastle_39_0:: @ 080ED744 object_raw subtype=0xc, x=0x78, y=0xd8, paramA=0x1, paramC=0x640000 entity_list_end -Enemies_DarkHyruleCastle_39:: @ 080ED7B4 +Enemies_DarkHyruleCastle_1FLoopRight:: @ 080ED7B4 enemy_raw subtype=0x2f, x=0x68, y=0x68, paramA=0x8 entity_list_end -TileEntities_DarkHyruleCastle_39:: @ 080ED7D4 +TileEntities_DarkHyruleCastle_1FLoopRight:: @ 080ED7D4 tile_entity type=0x2, paramA=0x65, paramB=0x53, paramC=0x347, paramD=0x1 tile_entity type=0x1, paramA=0x28 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_39:: @ 080ED7EC - .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_39.bin" +gUnk_additional_8_DarkHyruleCastle_1FLoopRight:: @ 080ED7EC + .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_1FLoopRight.bin" -Room_DarkHyruleCastle_39:: @ 080ED8CC - .4byte Entities_DarkHyruleCastle_39_0 +Room_DarkHyruleCastle_1FLoopRight:: @ 080ED8CC + .4byte Entities_DarkHyruleCastle_1FLoopRight_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_39 - .4byte TileEntities_DarkHyruleCastle_39 + .4byte Enemies_DarkHyruleCastle_1FLoopRight + .4byte TileEntities_DarkHyruleCastle_1FLoopRight .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_39 + .4byte sub_unk3_DarkHyruleCastle_1FLoopRight .4byte sub_StateChange_Dojos_ToScarblade8 - .4byte gUnk_additional_8_DarkHyruleCastle_39 + .4byte gUnk_additional_8_DarkHyruleCastle_1FLoopRight -Entities_DarkHyruleCastle_40_0:: @ 080ED8F0 +Entities_DarkHyruleCastle_1FLoopBottomLeft_0:: @ 080ED8F0 entity_list_end -Enemies_DarkHyruleCastle_40:: @ 080ED900 +Enemies_DarkHyruleCastle_1FLoopBottomLeft:: @ 080ED900 enemy_raw subtype=0x27, x=0x68, y=0x48, paramB=0xa180000, paramC=0x200050 enemy_raw subtype=0x27, x=0xa8, y=0x68, paramB=0xa180000, paramC=0x200050 entity_list_end -TileEntities_DarkHyruleCastle_40:: @ 080ED930 +TileEntities_DarkHyruleCastle_1FLoopBottomLeft:: @ 080ED930 tile_entity type=0x1, paramA=0x29 tile_entity_list_end -Room_DarkHyruleCastle_40:: @ 080ED940 - .4byte Entities_DarkHyruleCastle_40_0 +Room_DarkHyruleCastle_1FLoopBottomLeft:: @ 080ED940 + .4byte Entities_DarkHyruleCastle_1FLoopBottomLeft_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_40 - .4byte TileEntities_DarkHyruleCastle_40 + .4byte Enemies_DarkHyruleCastle_1FLoopBottomLeft + .4byte TileEntities_DarkHyruleCastle_1FLoopBottomLeft .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_40 + .4byte sub_unk3_DarkHyruleCastle_1FLoopBottomLeft .4byte sub_StateChange_Dojos_ToScarblade9 -Entities_DarkHyruleCastle_41_0:: @ 080ED960 +Entities_DarkHyruleCastle_1FLoopBottom_0:: @ 080ED960 entity_list_end -Enemies_DarkHyruleCastle_41:: @ 080ED970 +Enemies_DarkHyruleCastle_1FLoopBottom:: @ 080ED970 enemy_raw subtype=0x15, x=0x38, y=0x48, paramA=0x1 enemy_raw subtype=0x15, x=0xc8, y=0x48, paramA=0x1 enemy_raw subtype=0x8, x=0x58, y=0x8, paramB=0xe1a0000 @@ -14782,44 +14782,44 @@ Enemies_DarkHyruleCastle_41:: @ 080ED970 enemy_raw subtype=0x8, x=0xb8, y=0x8, paramB=0xe1a0000 entity_list_end -TileEntities_DarkHyruleCastle_41:: @ 080ED9E0 +TileEntities_DarkHyruleCastle_1FLoopBottom:: @ 080ED9E0 tile_entity type=0x1, paramA=0x2a tile_entity_list_end -Room_DarkHyruleCastle_41:: @ 080ED9F0 - .4byte Entities_DarkHyruleCastle_41_0 +Room_DarkHyruleCastle_1FLoopBottom:: @ 080ED9F0 + .4byte Entities_DarkHyruleCastle_1FLoopBottom_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_41 - .4byte TileEntities_DarkHyruleCastle_41 + .4byte Enemies_DarkHyruleCastle_1FLoopBottom + .4byte TileEntities_DarkHyruleCastle_1FLoopBottom .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_41 - .4byte sub_StateChange_GoronCave_StairsToCave0 + .4byte sub_unk3_DarkHyruleCastle_1FLoopBottom + .4byte sub_StateChange_GoronCave_Stairs0 -Entities_DarkHyruleCastle_42_0:: @ 080EDA10 +Entities_DarkHyruleCastle_1FLoopBottomRight_0:: @ 080EDA10 entity_list_end -Enemies_DarkHyruleCastle_42:: @ 080EDA20 +Enemies_DarkHyruleCastle_1FLoopBottomRight:: @ 080EDA20 enemy_raw subtype=0x46, x=0x78, y=0x48, paramA=0x1 enemy_raw subtype=0x8, x=0xc8, y=0x38, paramB=0xa180000, paramC=0x200010 enemy_raw subtype=0x8, x=0xc8, y=0x58, paramB=0xa180000, paramC=0x200010 entity_list_end -TileEntities_DarkHyruleCastle_42:: @ 080EDA60 +TileEntities_DarkHyruleCastle_1FLoopBottomRight:: @ 080EDA60 tile_entity type=0x1, paramA=0x2b tile_entity_list_end -Room_DarkHyruleCastle_42:: @ 080EDA70 - .4byte Entities_DarkHyruleCastle_42_0 +Room_DarkHyruleCastle_1FLoopBottomRight:: @ 080EDA70 + .4byte Entities_DarkHyruleCastle_1FLoopBottomRight_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_42 - .4byte TileEntities_DarkHyruleCastle_42 + .4byte Enemies_DarkHyruleCastle_1FLoopBottomRight + .4byte TileEntities_DarkHyruleCastle_1FLoopBottomRight .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_42 - .4byte sub_StateChange_GoronCave_StairsToCave1 + .4byte sub_unk3_DarkHyruleCastle_1FLoopBottomRight + .4byte sub_StateChange_GoronCave_Stairs1 -Entities_DarkHyruleCastle_43_0:: @ 080EDA90 +Entities_DarkHyruleCastle_1FBottomLeftTower_0:: @ 080EDA90 object_raw subtype=0x5, x=0x78, y=0x68, paramA=0x5d object_raw subtype=0x5, x=0x78, y=0x78, paramA=0x5d object_raw subtype=0x5, x=0x98, y=0x68, paramA=0x5d @@ -14828,200 +14828,200 @@ Entities_DarkHyruleCastle_43_0:: @ 080EDA90 object_raw subtype=0x5, x=0x98, y=0x78, paramA=0x5e entity_list_end -Enemies_DarkHyruleCastle_43:: @ 080EDB00 +Enemies_DarkHyruleCastle_1FBottomLeftTower:: @ 080EDB00 entity_list_end -TileEntities_DarkHyruleCastle_43:: @ 080EDB10 +TileEntities_DarkHyruleCastle_1FBottomLeftTower:: @ 080EDB10 tile_entity type=0x1, paramA=0x2c tile_entity_list_end -Room_DarkHyruleCastle_43:: @ 080EDB20 - .4byte Entities_DarkHyruleCastle_43_0 +Room_DarkHyruleCastle_1FBottomLeftTower:: @ 080EDB20 + .4byte Entities_DarkHyruleCastle_1FBottomLeftTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_43 - .4byte TileEntities_DarkHyruleCastle_43 + .4byte Enemies_DarkHyruleCastle_1FBottomLeftTower + .4byte TileEntities_DarkHyruleCastle_1FBottomLeftTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_43 - .4byte sub_StateChange_GoronCave_StairsToCave2 + .4byte sub_unk3_DarkHyruleCastle_1FBottomLeftTower + .4byte sub_StateChange_GoronCave_Stairs2 -Entities_DarkHyruleCastle_44_0:: @ 080EDB40 +Entities_DarkHyruleCastle_1FBottomRightTower_0:: @ 080EDB40 entity_list_end -Enemies_DarkHyruleCastle_44:: @ 080EDB50 +Enemies_DarkHyruleCastle_1FBottomRightTower:: @ 080EDB50 enemy_raw subtype=0x3b, x=0x68, y=0x88 enemy_raw subtype=0x3b, x=0x88, y=0x98 enemy_raw subtype=0x3b, x=0xa8, y=0x88 entity_list_end -TileEntities_DarkHyruleCastle_44:: @ 080EDB90 +TileEntities_DarkHyruleCastle_1FBottomRightTower:: @ 080EDB90 tile_entity type=0x9, paramB=0x8000 tile_entity type=0x1, paramA=0x2d tile_entity_list_end -Room_DarkHyruleCastle_44:: @ 080EDBA8 - .4byte Entities_DarkHyruleCastle_44_0 +Room_DarkHyruleCastle_1FBottomRightTower:: @ 080EDBA8 + .4byte Entities_DarkHyruleCastle_1FBottomRightTower_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_44 - .4byte TileEntities_DarkHyruleCastle_44 + .4byte Enemies_DarkHyruleCastle_1FBottomRightTower + .4byte TileEntities_DarkHyruleCastle_1FBottomRightTower .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_44 - .4byte sub_StateChange_GoronCave_StairsToCave3 + .4byte sub_unk3_DarkHyruleCastle_1FBottomRightTower + .4byte sub_StateChange_GoronCave_Stairs3 -Entities_DarkHyruleCastle_45_0:: @ 080EDBC8 +Entities_DarkHyruleCastle_B1BelowThrone_0:: @ 080EDBC8 entity_list_end -Enemies_DarkHyruleCastle_45:: @ 080EDBD8 +Enemies_DarkHyruleCastle_B1BelowThrone:: @ 080EDBD8 enemy_raw subtype=0x3b, x=0xb8, y=0x98 enemy_raw subtype=0x8, x=0x98, y=0x68, paramB=0x14140000, paramC=0x100050 enemy_raw subtype=0x8, x=0x88, y=0x78, paramB=0x14140000, paramC=0x100050 enemy_raw subtype=0x8, x=0xa8, y=0x78, paramB=0x14140000, paramC=0x100050 entity_list_end -TileEntities_DarkHyruleCastle_45:: @ 080EDC28 +TileEntities_DarkHyruleCastle_B1BelowThrone:: @ 080EDC28 tile_entity type=0x9, paramB=0x8000 tile_entity type=0x1, paramA=0x2e tile_entity_list_end -Room_DarkHyruleCastle_45:: @ 080EDC40 - .4byte Entities_DarkHyruleCastle_45_0 +Room_DarkHyruleCastle_B1BelowThrone:: @ 080EDC40 + .4byte Entities_DarkHyruleCastle_B1BelowThrone_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_45 - .4byte TileEntities_DarkHyruleCastle_45 + .4byte Enemies_DarkHyruleCastle_B1BelowThrone + .4byte TileEntities_DarkHyruleCastle_B1BelowThrone .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_45 - .4byte sub_StateChange_GoronCave_StairsToCave4 + .4byte sub_unk3_DarkHyruleCastle_B1BelowThrone + .4byte sub_StateChange_GoronCave_Stairs4 -Entities_DarkHyruleCastle_46_0:: @ 080EDC60 +Entities_DarkHyruleCastle_B1BelowCompass_0:: @ 080EDC60 entity_list_end -Enemies_DarkHyruleCastle_46:: @ 080EDC70 +Enemies_DarkHyruleCastle_B1BelowCompass:: @ 080EDC70 enemy_raw subtype=0x3b, x=0x68, y=0x88 enemy_raw subtype=0x3b, x=0x98, y=0x98 entity_list_end -TileEntities_DarkHyruleCastle_46:: @ 080EDCA0 +TileEntities_DarkHyruleCastle_B1BelowCompass:: @ 080EDCA0 tile_entity type=0x9, paramB=0x8000 tile_entity type=0x1, paramA=0x2f tile_entity_list_end -Room_DarkHyruleCastle_46:: @ 080EDCB8 - .4byte Entities_DarkHyruleCastle_46_0 +Room_DarkHyruleCastle_B1BelowCompass:: @ 080EDCB8 + .4byte Entities_DarkHyruleCastle_B1BelowCompass_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_46 - .4byte TileEntities_DarkHyruleCastle_46 + .4byte Enemies_DarkHyruleCastle_B1BelowCompass + .4byte TileEntities_DarkHyruleCastle_B1BelowCompass .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_46 - .4byte sub_StateChange_GoronCave_StairsToCave5 + .4byte sub_unk3_DarkHyruleCastle_B1BelowCompass + .4byte sub_StateChange_GoronCave_Stairs5 -Entities_DarkHyruleCastle_47_0:: @ 080EDCD8 +Entities_DarkHyruleCastle_B1BeforeThrone_0:: @ 080EDCD8 entity_list_end -Entities_DarkHyruleCastle_47_1:: @ 080EDCE8 +Entities_DarkHyruleCastle_B1BeforeThrone_1:: @ 080EDCE8 object_raw subtype=0x4f, x=0x88, y=0xc0, paramA=0x21, paramB=0x2 entity_list_end -Enemies_DarkHyruleCastle_47:: @ 080EDD08 +Enemies_DarkHyruleCastle_B1BeforeThrone:: @ 080EDD08 enemy_raw subtype=0x1f, x=0x58, y=0x38, paramA=0x2, paramC=0x280028 enemy_raw subtype=0x1f, x=0xb8, y=0x38, paramA=0x2, paramC=0x280028 enemy_raw subtype=0x1f, x=0x58, y=0x98, paramA=0x2, paramC=0x280028 enemy_raw subtype=0x1f, x=0xb8, y=0x98, paramA=0x2, paramC=0x280028 entity_list_end -TileEntities_DarkHyruleCastle_47:: @ 080EDD58 +TileEntities_DarkHyruleCastle_B1BeforeThrone:: @ 080EDD58 tile_entity type=0x1, paramA=0x30 tile_entity_list_end -Room_DarkHyruleCastle_47:: @ 080EDD68 - .4byte Entities_DarkHyruleCastle_47_0 - .4byte Entities_DarkHyruleCastle_47_1 - .4byte Enemies_DarkHyruleCastle_47 - .4byte TileEntities_DarkHyruleCastle_47 +Room_DarkHyruleCastle_B1BeforeThrone:: @ 080EDD68 + .4byte Entities_DarkHyruleCastle_B1BeforeThrone_0 + .4byte Entities_DarkHyruleCastle_B1BeforeThrone_1 + .4byte Enemies_DarkHyruleCastle_B1BeforeThrone + .4byte TileEntities_DarkHyruleCastle_B1BeforeThrone .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_47 - .4byte sub_StateChange_GoronCave_StairsToCave6 + .4byte sub_unk3_DarkHyruleCastle_B1BeforeThrone + .4byte sub_StateChange_GoronCave_Stairs6 -Entities_DarkHyruleCastle_48_0:: @ 080EDD88 +Entities_DarkHyruleCastle_B1ToPrison_0:: @ 080EDD88 enemy_raw subtype=0x43, x=0x68, y=0x68, paramA=0x2 enemy_raw subtype=0x43, x=0x88, y=0x68, paramA=0x3 enemy_raw subtype=0x43, x=0xa8, y=0x68, paramA=0x2 entity_list_end -Entities_DarkHyruleCastle_48_1:: @ 080EDDC8 +Entities_DarkHyruleCastle_B1ToPrison_1:: @ 080EDDC8 object_raw subtype=0x4f, x=0x58, y=0x10, paramA=0x21 object_raw subtype=0x4f, x=0xb8, y=0x10, paramA=0x21 object_raw subtype=0x4f, x=0x108, y=0x88, paramA=0x21, paramB=0x5 entity_list_end -Enemies_DarkHyruleCastle_48:: @ 080EDE08 +Enemies_DarkHyruleCastle_B1ToPrison:: @ 080EDE08 enemy_raw subtype=0x9, x=0xb8, y=0x30, paramA=0x4 enemy_raw subtype=0x34, x=0x88, y=0x88 enemy_raw subtype=0x34, x=0x98, y=0x88, paramA=0x1 entity_list_end -TileEntities_DarkHyruleCastle_48:: @ 080EDE48 +TileEntities_DarkHyruleCastle_B1ToPrison:: @ 080EDE48 tile_entity type=0x4, paramA=0x66, paramB=0x2, paramC=0xe8, paramD=0x88 tile_entity type=0x1, paramA=0x31 tile_entity_list_end -Room_DarkHyruleCastle_48:: @ 080EDE60 - .4byte Entities_DarkHyruleCastle_48_0 - .4byte Entities_DarkHyruleCastle_48_1 - .4byte Enemies_DarkHyruleCastle_48 - .4byte TileEntities_DarkHyruleCastle_48 +Room_DarkHyruleCastle_B1ToPrison:: @ 080EDE60 + .4byte Entities_DarkHyruleCastle_B1ToPrison_0 + .4byte Entities_DarkHyruleCastle_B1ToPrison_1 + .4byte Enemies_DarkHyruleCastle_B1ToPrison + .4byte TileEntities_DarkHyruleCastle_B1ToPrison .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_48 - .4byte sub_StateChange_GoronCave_StairsToCave7 + .4byte sub_unk3_DarkHyruleCastle_B1ToPrison + .4byte sub_StateChange_GoronCave_Stairs7 -Entities_DarkHyruleCastle_49_0:: @ 080EDE80 +Entities_DarkHyruleCastle_B1BombWall_0:: @ 080EDE80 object_raw subtype=0x74, x=0x48, y=0x48, collision=2, paramC=0xffff0000 manager subtype=0x3, x=0x48, y=0x48, unknown=0x0, paramA=0x3, paramB=0x202 entity_list_end -Entities_DarkHyruleCastle_49_1:: @ 080EDEB0 +Entities_DarkHyruleCastle_B1BombWall_1:: @ 080EDEB0 object_raw subtype=0x4f, x=0x88, y=0x10, paramA=0x21 object_raw subtype=0x4f, x=0x8, y=0x88, paramA=0x21, paramB=0x5 object_raw subtype=0x4f, x=0x108, y=0x88, paramA=0x21, paramB=0x5 entity_list_end -Enemies_DarkHyruleCastle_49:: @ 080EDEF0 +Enemies_DarkHyruleCastle_B1BombWall:: @ 080EDEF0 projectile_raw subtype=0x1d, x=0x78, y=0x88, unknown=0x3 projectile_raw subtype=0x1d, x=0xd8, y=0x48, unknown=0x3 entity_list_end -TileEntities_DarkHyruleCastle_49:: @ 080EDF20 +TileEntities_DarkHyruleCastle_B1BombWall:: @ 080EDF20 tile_entity type=0x4, paramA=0x66, paramB=0x2, paramC=0x28, paramD=0x88 tile_entity type=0x4, paramA=0x67, paramB=0x2, paramC=0xe8, paramD=0x88 tile_entity type=0x1, paramA=0x32 tile_entity_list_end -Room_DarkHyruleCastle_49:: @ 080EDF40 - .4byte Entities_DarkHyruleCastle_49_0 - .4byte Entities_DarkHyruleCastle_49_1 - .4byte Enemies_DarkHyruleCastle_49 - .4byte TileEntities_DarkHyruleCastle_49 +Room_DarkHyruleCastle_B1BombWall:: @ 080EDF40 + .4byte Entities_DarkHyruleCastle_B1BombWall_0 + .4byte Entities_DarkHyruleCastle_B1BombWall_1 + .4byte Enemies_DarkHyruleCastle_B1BombWall + .4byte TileEntities_DarkHyruleCastle_B1BombWall .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_49 - .4byte sub_StateChange_GoronCave_StairsToCave8 + .4byte sub_unk3_DarkHyruleCastle_B1BombWall + .4byte sub_StateChange_GoronCave_Stairs8 -Entities_DarkHyruleCastle_50_0:: @ 080EDF60 +Entities_DarkHyruleCastle_B1Keatons_0:: @ 080EDF60 object_raw subtype=0x5, x=0xb8, y=0x38 object_raw subtype=0x5, x=0xc8, y=0x38 object_raw subtype=0x5, x=0x38, y=0x38 object_raw subtype=0x5, x=0x48, y=0x38 entity_list_end -Entities_DarkHyruleCastle_50_1:: @ 080EDFB0 +Entities_DarkHyruleCastle_B1Keatons_1:: @ 080EDFB0 object_raw subtype=0x4f, x=0x8, y=0x88, paramA=0x21, paramB=0x5 entity_list_end -Enemies_DarkHyruleCastle_50:: @ 080EDFD0 +Enemies_DarkHyruleCastle_B1Keatons:: @ 080EDFD0 enemy_raw subtype=0x30, x=0x48, y=0x48, paramA=0x1 enemy_raw subtype=0x30, x=0x68, y=0x48, paramA=0x1 enemy_raw subtype=0x30, x=0x88, y=0x48, paramA=0x1 @@ -15032,22 +15032,22 @@ Enemies_DarkHyruleCastle_50:: @ 080EDFD0 enemy_raw subtype=0x30, x=0xa8, y=0x68, paramA=0x1 entity_list_end -TileEntities_DarkHyruleCastle_50:: @ 080EE060 +TileEntities_DarkHyruleCastle_B1Keatons:: @ 080EE060 tile_entity type=0x4, paramA=0x67, paramB=0x2, paramC=0x28, paramD=0x88 tile_entity type=0x1, paramA=0x33 tile_entity_list_end -Room_DarkHyruleCastle_50:: @ 080EE078 - .4byte Entities_DarkHyruleCastle_50_0 - .4byte Entities_DarkHyruleCastle_50_1 - .4byte Enemies_DarkHyruleCastle_50 - .4byte TileEntities_DarkHyruleCastle_50 +Room_DarkHyruleCastle_B1Keatons:: @ 080EE078 + .4byte Entities_DarkHyruleCastle_B1Keatons_0 + .4byte Entities_DarkHyruleCastle_B1Keatons_1 + .4byte Enemies_DarkHyruleCastle_B1Keatons + .4byte TileEntities_DarkHyruleCastle_B1Keatons .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_50 - .4byte sub_StateChange_GoronCave_StairsToCave9 + .4byte sub_unk3_DarkHyruleCastle_B1Keatons + .4byte sub_StateChange_GoronCave_Stairs9 -Entities_DarkHyruleCastle_51_0:: @ 080EE098 +Entities_DarkHyruleCastle_B1ToPrisonFirebar_0:: @ 080EE098 object_raw subtype=0x98, x=0xa8, y=0x78, unknown=0x3, paramB=0x602 object_raw subtype=0x98, x=0xa8, y=0x78, unknown=0x3, paramB=0x20602 object_raw subtype=0x98, x=0xa8, y=0x78, unknown=0x3, paramB=0x10602 @@ -15059,24 +15059,24 @@ Entities_DarkHyruleCastle_51_0:: @ 080EE098 manager subtype=0x1a, unknown=0x8, paramA=0x36 entity_list_end -Enemies_DarkHyruleCastle_51:: @ 080EE138 +Enemies_DarkHyruleCastle_B1ToPrisonFirebar:: @ 080EE138 entity_list_end -TileEntities_DarkHyruleCastle_51:: @ 080EE148 +TileEntities_DarkHyruleCastle_B1ToPrisonFirebar:: @ 080EE148 tile_entity type=0x1, paramA=0x34 tile_entity_list_end -Room_DarkHyruleCastle_51:: @ 080EE158 - .4byte Entities_DarkHyruleCastle_51_0 +Room_DarkHyruleCastle_B1ToPrisonFirebar:: @ 080EE158 + .4byte Entities_DarkHyruleCastle_B1ToPrisonFirebar_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_51 - .4byte TileEntities_DarkHyruleCastle_51 + .4byte Enemies_DarkHyruleCastle_B1ToPrisonFirebar + .4byte TileEntities_DarkHyruleCastle_B1ToPrisonFirebar .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_51 + .4byte sub_unk3_DarkHyruleCastle_B1ToPrisonFirebar .4byte sub_StateChange_Ruins_Beanstalk0 -Entities_DarkHyruleCastle_52_0:: @ 080EE178 +Entities_DarkHyruleCastle_B1Cannons_0:: @ 080EE178 manager subtype=0x2b, paramA=0x8, paramC=0x680000 manager subtype=0x35, x=0x88, y=0x30, paramB=0x3c1e00, paramC=0x680069 object_raw subtype=0x33, x=0x68, y=0x38, paramA=0x5, paramC=0x690000 @@ -15089,42 +15089,42 @@ Entities_DarkHyruleCastle_52_0:: @ 080EE178 enemy_raw subtype=0x43, x=0x98, y=0x108, paramA=0x2 entity_list_end -Enemies_DarkHyruleCastle_52:: @ 080EE228 +Enemies_DarkHyruleCastle_B1Cannons:: @ 080EE228 entity_list_end -TileEntities_DarkHyruleCastle_52:: @ 080EE238 +TileEntities_DarkHyruleCastle_B1Cannons:: @ 080EE238 tile_entity type=0x1, paramA=0x35 tile_entity_list_end -gUnk_additional_8_DarkHyruleCastle_52:: @ 080EE248 - .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_52.bin" +gUnk_additional_8_DarkHyruleCastle_B1Cannons:: @ 080EE248 + .incbin "data_080D5360/gUnk_additional_8_DarkHyruleCastle_B1Cannons.bin" -Room_DarkHyruleCastle_52:: @ 080EE260 - .4byte Entities_DarkHyruleCastle_52_0 +Room_DarkHyruleCastle_B1Cannons:: @ 080EE260 + .4byte Entities_DarkHyruleCastle_B1Cannons_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_52 - .4byte TileEntities_DarkHyruleCastle_52 + .4byte Enemies_DarkHyruleCastle_B1Cannons + .4byte TileEntities_DarkHyruleCastle_B1Cannons .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_52 + .4byte sub_unk3_DarkHyruleCastle_B1Cannons .4byte sub_StateChange_Ruins_Beanstalk1 - .4byte gUnk_additional_8_DarkHyruleCastle_52 + .4byte gUnk_additional_8_DarkHyruleCastle_B1Cannons -Entities_DarkHyruleCastle_53_0:: @ 080EE284 +Entities_DarkHyruleCastle_B1Left_0:: @ 080EE284 object_raw subtype=0x8, x=0x58, y=0xa8, paramA=0xa, paramC=0x6affff entity_list_end -Entities_DarkHyruleCastle_53_1:: @ 080EE2A4 +Entities_DarkHyruleCastle_B1Left_1:: @ 080EE2A4 object_raw subtype=0x4f, x=0x58, y=0xc0, paramA=0x21, paramB=0x2 object_raw subtype=0x4f, x=0x10, y=0x48, paramA=0x21, paramB=0x3 entity_list_end -Enemies_DarkHyruleCastle_53:: @ 080EE2D4 +Enemies_DarkHyruleCastle_B1Left:: @ 080EE2D4 enemy_raw subtype=0x9, x=0x30, y=0x48, paramA=0x7 enemy_raw subtype=0x15, x=0x58, y=0x48, paramA=0x1 entity_list_end -TileEntities_DarkHyruleCastle_53:: @ 080EE304 +TileEntities_DarkHyruleCastle_B1Left:: @ 080EE304 tile_entity type=0x1, paramA=0x36 tile_entity_list_end @@ -15134,45 +15134,45 @@ gUnk_080EE314:: @ 080EE314 object_raw subtype=0x6a, x=0x78, y=0x8, collision=2, paramA=0x5, paramB=0x102 entity_list_end -Room_DarkHyruleCastle_53:: @ 080EE354 - .4byte Entities_DarkHyruleCastle_53_0 - .4byte Entities_DarkHyruleCastle_53_1 - .4byte Enemies_DarkHyruleCastle_53 - .4byte TileEntities_DarkHyruleCastle_53 +Room_DarkHyruleCastle_B1Left:: @ 080EE354 + .4byte Entities_DarkHyruleCastle_B1Left_0 + .4byte Entities_DarkHyruleCastle_B1Left_1 + .4byte Enemies_DarkHyruleCastle_B1Left + .4byte TileEntities_DarkHyruleCastle_B1Left .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_53 - .4byte sub_StateChange_DarkHyruleCastle_53 + .4byte sub_unk3_DarkHyruleCastle_B1Left + .4byte sub_StateChange_DarkHyruleCastle_B1Left -Entities_DarkHyruleCastle_54_0:: @ 080EE374 +Entities_DarkHyruleCastle_B1Right_0:: @ 080EE374 entity_list_end -Entities_DarkHyruleCastle_54_1:: @ 080EE384 +Entities_DarkHyruleCastle_B1Right_1:: @ 080EE384 object_raw subtype=0x4f, x=0xb8, y=0xc0, paramA=0x21, paramB=0x2 entity_list_end -Enemies_DarkHyruleCastle_54:: @ 080EE3A4 +Enemies_DarkHyruleCastle_B1Right:: @ 080EE3A4 enemy_raw subtype=0x8, x=0xf8, y=0x28, paramB=0x101e0000, paramC=0x200010 enemy_raw subtype=0x8, x=0xf8, y=0x48, paramB=0x101e0000, paramC=0x200010 enemy_raw subtype=0x8, x=0xf8, y=0x68, paramB=0x101e0000, paramC=0x200010 enemy_raw subtype=0x8, x=0xf8, y=0x88, paramB=0x101e0000, paramC=0x200010 entity_list_end -TileEntities_DarkHyruleCastle_54:: @ 080EE3F4 +TileEntities_DarkHyruleCastle_B1Right:: @ 080EE3F4 tile_entity type=0x1, paramA=0x37 tile_entity_list_end -Room_DarkHyruleCastle_54:: @ 080EE404 - .4byte Entities_DarkHyruleCastle_54_0 - .4byte Entities_DarkHyruleCastle_54_1 - .4byte Enemies_DarkHyruleCastle_54 - .4byte TileEntities_DarkHyruleCastle_54 +Room_DarkHyruleCastle_B1Right:: @ 080EE404 + .4byte Entities_DarkHyruleCastle_B1Right_0 + .4byte Entities_DarkHyruleCastle_B1Right_1 + .4byte Enemies_DarkHyruleCastle_B1Right + .4byte TileEntities_DarkHyruleCastle_B1Right .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_54 + .4byte sub_unk3_DarkHyruleCastle_B1Right .4byte sub_StateChange_Ruins_Beanstalk2 -Entities_DarkHyruleCastle_55_0:: @ 080EE424 +Entities_DarkHyruleCastle_B1Map_0:: @ 080EE424 object_raw subtype=0x5, x=0x168, y=0x38, paramA=0x60 object_raw subtype=0x5, x=0x168, y=0x48, paramA=0x60 object_raw subtype=0x5, x=0x168, y=0x58, paramA=0x5e @@ -15182,14 +15182,14 @@ Entities_DarkHyruleCastle_55_0:: @ 080EE424 object_raw subtype=0xc, x=0x198, y=0x98, paramA=0x4, paramB=0x6b entity_list_end -Entities_DarkHyruleCastle_55_1:: @ 080EE4A4 +Entities_DarkHyruleCastle_B1Map_1:: @ 080EE4A4 object_raw subtype=0x4f, x=0x58, y=0x10, paramA=0x21 object_raw subtype=0x4f, x=0x108, y=0xc0, paramA=0x21 object_raw subtype=0x4f, x=0x228, y=0xc0, paramA=0x21 object_raw subtype=0x4f, x=0x2d8, y=0x10, paramA=0x21 entity_list_end -Enemies_DarkHyruleCastle_55:: @ 080EE4F4 +Enemies_DarkHyruleCastle_B1Map:: @ 080EE4F4 enemy_raw subtype=0x27, x=0x38, y=0x58, paramB=0x8100000, paramC=0x300030 enemy_raw subtype=0x27, x=0xa8, y=0x58, paramB=0x8100000, paramC=0x300030 enemy_raw subtype=0x27, x=0x88, y=0x108, paramB=0x8180000, paramC=0xe00070 @@ -15204,7 +15204,7 @@ Enemies_DarkHyruleCastle_55:: @ 080EE4F4 enemy_raw subtype=0x42, x=0x298, y=0xa8 entity_list_end -TileEntities_DarkHyruleCastle_55:: @ 080EE5C4 +TileEntities_DarkHyruleCastle_B1Map:: @ 080EE5C4 tile_entity type=0x3, paramA=0x6b, paramB=0x50, paramC=0x198, paramD=0x98 tile_entity type=0x1, paramA=0x38 tile_entity_list_end @@ -15215,37 +15215,37 @@ gUnk_080EE5DC:: @ 080EE5DC object_raw subtype=0x6a, x=0x128, y=0x130, collision=2, paramA=0x5, paramB=0x102 entity_list_end -Room_DarkHyruleCastle_55:: @ 080EE61C - .4byte Entities_DarkHyruleCastle_55_0 - .4byte Entities_DarkHyruleCastle_55_1 - .4byte Enemies_DarkHyruleCastle_55 - .4byte TileEntities_DarkHyruleCastle_55 +Room_DarkHyruleCastle_B1Map:: @ 080EE61C + .4byte Entities_DarkHyruleCastle_B1Map_0 + .4byte Entities_DarkHyruleCastle_B1Map_1 + .4byte Enemies_DarkHyruleCastle_B1Map + .4byte TileEntities_DarkHyruleCastle_B1Map .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_55 - .4byte sub_StateChange_DarkHyruleCastle_55 + .4byte sub_unk3_DarkHyruleCastle_B1Map + .4byte sub_StateChange_DarkHyruleCastle_B1Map -Entities_DarkHyruleCastle_56_0:: @ 080EE63C +Entities_DarkHyruleCastle_B2ToPrison_0:: @ 080EE63C entity_list_end -Enemies_DarkHyruleCastle_56:: @ 080EE64C +Enemies_DarkHyruleCastle_B2ToPrison:: @ 080EE64C entity_list_end -TileEntities_DarkHyruleCastle_56:: @ 080EE65C +TileEntities_DarkHyruleCastle_B2ToPrison:: @ 080EE65C tile_entity type=0x1, paramA=0x39 tile_entity_list_end -Room_DarkHyruleCastle_56:: @ 080EE66C - .4byte Entities_DarkHyruleCastle_56_0 +Room_DarkHyruleCastle_B2ToPrison:: @ 080EE66C + .4byte Entities_DarkHyruleCastle_B2ToPrison_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_56 - .4byte TileEntities_DarkHyruleCastle_56 + .4byte Enemies_DarkHyruleCastle_B2ToPrison + .4byte TileEntities_DarkHyruleCastle_B2ToPrison .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_56 + .4byte sub_unk3_DarkHyruleCastle_B2ToPrison .4byte sub_StateChange_Ruins_Beanstalk3 -Entities_DarkHyruleCastle_57_0:: @ 080EE68C +Entities_DarkHyruleCastle_B2Prison_0:: @ 080EE68C object_raw subtype=0x74, x=0x88, y=0x38, collision=1, paramC=0xffff0000 manager subtype=0x3, x=0x88, y=0x38, unknown=0x0, paramA=0x3, paramB=0x103 object_raw subtype=0x3, x=0xa8, y=0x28, paramC=0x6d0001 @@ -15262,10 +15262,10 @@ gUnk_080EE71C:: @ 080EE71C npc_raw subtype=0x15, x=0x168, y=0x88, paramB=0x25, script=script_GuardCellRight entity_list_end -Enemies_DarkHyruleCastle_57:: @ 080EE75C +Enemies_DarkHyruleCastle_B2Prison:: @ 080EE75C entity_list_end -TileEntities_DarkHyruleCastle_57:: @ 080EE76C +TileEntities_DarkHyruleCastle_B2Prison:: @ 080EE76C tile_entity type=0x1, paramA=0x3a tile_entity_list_end@ unaccounted bytes .byte 255 @@ -15286,35 +15286,35 @@ TileEntities_DarkHyruleCastle_57:: @ 080EE76C .byte 0 -Room_DarkHyruleCastle_57:: @ 080EE78C - .4byte Entities_DarkHyruleCastle_57_0 +Room_DarkHyruleCastle_B2Prison:: @ 080EE78C + .4byte Entities_DarkHyruleCastle_B2Prison_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_57 - .4byte TileEntities_DarkHyruleCastle_57 + .4byte Enemies_DarkHyruleCastle_B2Prison + .4byte TileEntities_DarkHyruleCastle_B2Prison .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_57 - .4byte sub_StateChange_DarkHyruleCastle_57 + .4byte sub_unk3_DarkHyruleCastle_B2Prison + .4byte sub_StateChange_DarkHyruleCastle_B2Prison -Entities_DarkHyruleCastle_58_0:: @ 080EE7AC +Entities_DarkHyruleCastle_B2Dropdown_0:: @ 080EE7AC entity_list_end -Enemies_DarkHyruleCastle_58:: @ 080EE7BC +Enemies_DarkHyruleCastle_B2Dropdown:: @ 080EE7BC enemy_raw subtype=0x1c, x=0x48, y=0x58, paramB=0x810 entity_list_end -TileEntities_DarkHyruleCastle_58:: @ 080EE7DC +TileEntities_DarkHyruleCastle_B2Dropdown:: @ 080EE7DC tile_entity type=0x1, paramA=0x3b tile_entity_list_end -Room_DarkHyruleCastle_58:: @ 080EE7EC - .4byte Entities_DarkHyruleCastle_58_0 +Room_DarkHyruleCastle_B2Dropdown:: @ 080EE7EC + .4byte Entities_DarkHyruleCastle_B2Dropdown_0 .4byte 0x00000000 - .4byte Enemies_DarkHyruleCastle_58 - .4byte TileEntities_DarkHyruleCastle_58 + .4byte Enemies_DarkHyruleCastle_B2Dropdown + .4byte TileEntities_DarkHyruleCastle_B2Dropdown .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_DarkHyruleCastle_58 + .4byte sub_unk3_DarkHyruleCastle_B2Dropdown .4byte sub_StateChange_Ruins_Beanstalk4 Entities_HyruleTown_0_0:: @ 080EE80C @@ -17334,7 +17334,7 @@ Room_HouseInteriors2_Dampe:: @ 080F307C .4byte sub_unk3_HouseInteriors2_Dampe .4byte sub_StateChange_HouseInteriors2_Dampe -Entities_HouseInteriors2_Stockwell_0:: @ 080F309C +Entities_HouseInteriors2_StockwellLakeHouse_0:: @ 080F309C manager subtype=0x26, paramA=0x8, paramB=0xff npc_raw subtype=0x35, x=0x68, y=0x48, script=script_ShopwellsDog entity_list_end @@ -17343,7 +17343,7 @@ gUnk_080F30CC:: @ 080F30CC object_raw subtype=0x6a, x=0x98, y=0x58, paramA=0x6 entity_list_end -Entities_HouseInteriors2_Stockwell_1:: @ 080F30EC +Entities_HouseInteriors2_StockwellLakeHouse_1:: @ 080F30EC object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x20, paramB=0x2 object_raw subtype=0x4d, x=0x4c, y=0x28, collision=1, paramA=0x3 object_raw subtype=0x4d, x=0x78, y=0x28, collision=1, paramA=0x1 @@ -17351,25 +17351,25 @@ Entities_HouseInteriors2_Stockwell_1:: @ 080F30EC object_raw subtype=0x38, x=0xc0, y=0x3e, unknown=0x0, paramA=0x45 entity_list_end -Enemies_HouseInteriors2_Stockwell:: @ 080F314C +Enemies_HouseInteriors2_StockwellLakeHouse:: @ 080F314C entity_list_end -TileEntities_HouseInteriors2_Stockwell:: @ 080F315C +TileEntities_HouseInteriors2_StockwellLakeHouse:: @ 080F315C tile_entity_list_end -gUnk_additional_8_HouseInteriors2_Stockwell:: @ 080F3164 - .incbin "data_080D5360/gUnk_additional_8_HouseInteriors2_Stockwell.bin" +gUnk_additional_8_HouseInteriors2_StockwellLakeHouse:: @ 080F3164 + .incbin "data_080D5360/gUnk_additional_8_HouseInteriors2_StockwellLakeHouse.bin" -Room_HouseInteriors2_Stockwell:: @ 080F3174 - .4byte Entities_HouseInteriors2_Stockwell_0 - .4byte Entities_HouseInteriors2_Stockwell_1 - .4byte Enemies_HouseInteriors2_Stockwell - .4byte TileEntities_HouseInteriors2_Stockwell +Room_HouseInteriors2_StockwellLakeHouse:: @ 080F3174 + .4byte Entities_HouseInteriors2_StockwellLakeHouse_0 + .4byte Entities_HouseInteriors2_StockwellLakeHouse_1 + .4byte Enemies_HouseInteriors2_StockwellLakeHouse + .4byte TileEntities_HouseInteriors2_StockwellLakeHouse .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_HouseInteriors2_Stockwell - .4byte sub_StateChange_HouseInteriors2_Stockwell - .4byte gUnk_additional_8_HouseInteriors2_Stockwell + .4byte sub_unk3_HouseInteriors2_StockwellLakeHouse + .4byte sub_StateChange_HouseInteriors2_StockwellLakeHouse + .4byte gUnk_additional_8_HouseInteriors2_StockwellLakeHouse Entities_HouseInteriors2_LinksHouseBedroom_0:: @ 080F3198 ezlo_hint x=0x4, y=0x6, rx=0x7, ry=0x1, msg=0xb52, flag=0xc9 @@ -17622,7 +17622,7 @@ Room_HouseInteriors4_FarmHouse:: @ 080F39F4 .4byte sub_StateChange_Ruins_LadderToTektites0 .4byte gUnk_additional_8_HouseInteriors4_FarmHouse -Entities_HouseInteriors4_Mayor_0:: @ 080F3A18 +Entities_HouseInteriors4_MayorLakeCabin_0:: @ 080F3A18 manager subtype=0x26, paramA=0xa, paramB=0x28ff object_raw subtype=0x73, x=0xa8, y=0x58, paramB=0xb entity_list_end @@ -17631,7 +17631,7 @@ gUnk_080F3A48:: @ 080F3A48 object_raw subtype=0x8c, x=0x78, y=0x36, collision=1, paramA=0x2, paramC=0x720000 entity_list_end -Entities_HouseInteriors4_Mayor_1:: @ 080F3A68 +Entities_HouseInteriors4_MayorLakeCabin_1:: @ 080F3A68 object_raw subtype=0x4f, x=0xb8, y=0x30, paramA=0x18 object_raw subtype=0x4f, x=0x78, y=0xb8, paramA=0x10, paramB=0x2 object_raw subtype=0x5, x=0xb8, y=0x98 @@ -17644,40 +17644,40 @@ Entities_HouseInteriors4_Mayor_1:: @ 080F3A68 object_raw subtype=0x5a, x=0x30, y=0x80, collision=1, paramA=0x2, paramB=0x1 entity_list_end -Enemies_HouseInteriors4_Mayor:: @ 080F3B18 +Enemies_HouseInteriors4_MayorLakeCabin:: @ 080F3B18 entity_list_end -TileEntities_HouseInteriors4_Mayor:: @ 080F3B28 +TileEntities_HouseInteriors4_MayorLakeCabin:: @ 080F3B28 tile_entity type=0x5, paramB=0x1d00, paramC=0x202, paramD=0x61d tile_entity type=0x5, paramB=0x1d00, paramC=0x203, paramD=0x61d tile_entity_list_end -gUnk_additional_8_HouseInteriors4_Mayor:: @ 080F3B40 +gUnk_additional_8_HouseInteriors4_MayorLakeCabin:: @ 080F3B40 exit_region_raw centerX=0xb0, centerY=0x38, halfWidth=0x10, halfHeight=0x2, exitIndex=0x9, bitfield=0x1 exit_region_list_end -gUnk_additional_9_HouseInteriors4_Mayor:: @ 080F3B50 +gUnk_additional_9_HouseInteriors4_MayorLakeCabin:: @ 080F3B50 exit_raw transition=0x1, destX=0x78, destY=0x318, destArea=0x11, destRoom=0x4, unknownA=0x1 -gUnk_additional_a_HouseInteriors4_Mayor:: @ 080F3B64 - .incbin "data_080D5360/gUnk_additional_a_HouseInteriors4_Mayor.bin" +gUnk_additional_a_HouseInteriors4_MayorLakeCabin:: @ 080F3B64 + .incbin "data_080D5360/gUnk_additional_a_HouseInteriors4_MayorLakeCabin.bin" -gUnk_additional_b_HouseInteriors4_Mayor:: @ 080F3B74 - .incbin "data_080D5360/gUnk_additional_b_HouseInteriors4_Mayor.bin" +gUnk_additional_b_HouseInteriors4_MayorLakeCabin:: @ 080F3B74 + .incbin "data_080D5360/gUnk_additional_b_HouseInteriors4_MayorLakeCabin.bin" -Room_HouseInteriors4_Mayor:: @ 080F3BC4 - .4byte Entities_HouseInteriors4_Mayor_0 - .4byte Entities_HouseInteriors4_Mayor_1 - .4byte Enemies_HouseInteriors4_Mayor - .4byte TileEntities_HouseInteriors4_Mayor +Room_HouseInteriors4_MayorLakeCabin:: @ 080F3BC4 + .4byte Entities_HouseInteriors4_MayorLakeCabin_0 + .4byte Entities_HouseInteriors4_MayorLakeCabin_1 + .4byte Enemies_HouseInteriors4_MayorLakeCabin + .4byte TileEntities_HouseInteriors4_MayorLakeCabin .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_HouseInteriors4_Mayor - .4byte sub_StateChange_HouseInteriors4_Mayor - .4byte gUnk_additional_8_HouseInteriors4_Mayor - .4byte gUnk_additional_9_HouseInteriors4_Mayor - .4byte gUnk_additional_a_HouseInteriors4_Mayor - .4byte gUnk_additional_b_HouseInteriors4_Mayor + .4byte sub_unk3_HouseInteriors4_MayorLakeCabin + .4byte sub_StateChange_HouseInteriors4_MayorLakeCabin + .4byte gUnk_additional_8_HouseInteriors4_MayorLakeCabin + .4byte gUnk_additional_9_HouseInteriors4_MayorLakeCabin + .4byte gUnk_additional_a_HouseInteriors4_MayorLakeCabin + .4byte gUnk_additional_b_HouseInteriors4_MayorLakeCabin Entities_LakeHylia_Main_0:: @ 080F3BF4 manager subtype=0x4 @@ -20458,10 +20458,10 @@ Room_Caves_6:: @ 080F88BC .4byte sub_unk3_Caves_6 .4byte sub_StateChange_Caves_6 -Entities_Caves_KeeseChest_0:: @ 080F88DC +Entities_Caves_TrilbyKeeseChest_0:: @ 080F88DC entity_list_end -Enemies_Caves_KeeseChest:: @ 080F88EC +Enemies_Caves_TrilbyKeeseChest:: @ 080F88EC enemy_raw subtype=0x8, x=0x68, y=0x38, paramB=0x6080000, paramC=0x300050 enemy_raw subtype=0x8, x=0x78, y=0x48, paramB=0x6080000, paramC=0x300050 enemy_raw subtype=0x8, x=0x88, y=0x38, paramB=0x6080000, paramC=0x300050 @@ -20470,65 +20470,65 @@ Enemies_Caves_KeeseChest:: @ 080F88EC enemy_raw subtype=0x8, x=0xb8, y=0x58 entity_list_end -TileEntities_Caves_KeeseChest:: @ 080F895C +TileEntities_Caves_TrilbyKeeseChest:: @ 080F895C tile_entity type=0x2, paramA=0xd, paramB=0x705c, paramC=0x107 tile_entity_list_end -Room_Caves_KeeseChest:: @ 080F896C - .4byte Entities_Caves_KeeseChest_0 +Room_Caves_TrilbyKeeseChest:: @ 080F896C + .4byte Entities_Caves_TrilbyKeeseChest_0 .4byte 0x00000000 - .4byte Enemies_Caves_KeeseChest - .4byte TileEntities_Caves_KeeseChest + .4byte Enemies_Caves_TrilbyKeeseChest + .4byte TileEntities_Caves_TrilbyKeeseChest .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_KeeseChest - .4byte sub_StateChange_Caves_KeeseChest + .4byte sub_unk3_Caves_TrilbyKeeseChest + .4byte sub_StateChange_Caves_TrilbyKeeseChest -Entities_Caves_FairyFountainTrilbyHighlands_0:: @ 080F898C +Entities_Caves_TrilbyFairyFountain_0:: @ 080F898C object_raw subtype=0x40, x=0x58, y=0x38, paramA=0x60, paramB=0x1 object_raw subtype=0x40, x=0x88, y=0x38, paramA=0x60, paramB=0x1 object_raw subtype=0x40, x=0x78, y=0x48, paramA=0x60, paramB=0x1 entity_list_end -Enemies_Caves_FairyFountainTrilbyHighlands:: @ 080F89CC +Enemies_Caves_TrilbyFairyFountain:: @ 080F89CC entity_list_end -TileEntities_Caves_FairyFountainTrilbyHighlands:: @ 080F89DC +TileEntities_Caves_TrilbyFairyFountain:: @ 080F89DC tile_entity type=0x7, paramB=0x3a00 tile_entity_list_end -Room_Caves_FairyFountainTrilbyHighlands:: @ 080F89EC - .4byte Entities_Caves_FairyFountainTrilbyHighlands_0 +Room_Caves_TrilbyFairyFountain:: @ 080F89EC + .4byte Entities_Caves_TrilbyFairyFountain_0 .4byte 0x00000000 - .4byte Enemies_Caves_FairyFountainTrilbyHighlands - .4byte TileEntities_Caves_FairyFountainTrilbyHighlands + .4byte Enemies_Caves_TrilbyFairyFountain + .4byte TileEntities_Caves_TrilbyFairyFountain .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_FairyFountainTrilbyHighlands - .4byte sub_StateChange_Caves_FairyFountainTrilbyHighlands + .4byte sub_unk3_Caves_TrilbyFairyFountain + .4byte sub_StateChange_Caves_TrilbyFairyFountain -Entities_Caves_FairyFountainLinksHouse_0:: @ 080F8A0C +Entities_Caves_SouthHyruleFieldFairyFountain_0:: @ 080F8A0C object_raw subtype=0x40, x=0x58, y=0x38, paramA=0x60, paramB=0x1 object_raw subtype=0x40, x=0x88, y=0x38, paramA=0x60, paramB=0x1 object_raw subtype=0x40, x=0x78, y=0x48, paramA=0x60, paramB=0x1 entity_list_end -Enemies_Caves_FairyFountainLinksHouse:: @ 080F8A4C +Enemies_Caves_SouthHyruleFieldFairyFountain:: @ 080F8A4C entity_list_end -TileEntities_Caves_FairyFountainLinksHouse:: @ 080F8A5C +TileEntities_Caves_SouthHyruleFieldFairyFountain:: @ 080F8A5C tile_entity type=0x7, paramB=0x3a00 tile_entity_list_end -Room_Caves_FairyFountainLinksHouse:: @ 080F8A6C - .4byte Entities_Caves_FairyFountainLinksHouse_0 +Room_Caves_SouthHyruleFieldFairyFountain:: @ 080F8A6C + .4byte Entities_Caves_SouthHyruleFieldFairyFountain_0 .4byte 0x00000000 - .4byte Enemies_Caves_FairyFountainLinksHouse - .4byte TileEntities_Caves_FairyFountainLinksHouse + .4byte Enemies_Caves_SouthHyruleFieldFairyFountain + .4byte TileEntities_Caves_SouthHyruleFieldFairyFountain .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_FairyFountainLinksHouse - .4byte sub_StateChange_Caves_FairyFountainLinksHouse + .4byte sub_unk3_Caves_SouthHyruleFieldFairyFountain + .4byte sub_StateChange_Caves_SouthHyruleFieldFairyFountain Entities_Caves_A_0:: @ 080F8A8C entity_list_end @@ -20659,7 +20659,7 @@ Room_Caves_LonLonRanchWallet:: @ 080F8CD4 .4byte sub_unk3_Caves_LonLonRanchWallet .4byte sub_StateChange_Caves_LonLonRanchWallet -Entities_Caves_RupeeLinksHouse_0:: @ 080F8CF4 +Entities_Caves_SouthHyruleFieldRupee_0:: @ 080F8CF4 .ifdef EU_JP object_raw subtype=0x0, x=0x58, y=0x38, collision=1, paramA=0x55, paramB=0x400, paramC=0x150000 object_raw subtype=0x0, x=0x68, y=0x38, collision=1, paramA=0x55, paramB=0x400, paramC=0x160000 @@ -20697,23 +20697,23 @@ Entities_Caves_RupeeLinksHouse_0:: @ 080F8CF4 entity_list_end .endif -Enemies_Caves_RupeeLinksHouse:: @ 080F8E04 +Enemies_Caves_SouthHyruleFieldRupee:: @ 080F8E04 entity_list_end -TileEntities_Caves_RupeeLinksHouse:: @ 080F8E14 +TileEntities_Caves_SouthHyruleFieldRupee:: @ 080F8E14 tile_entity_list_end -Room_Caves_RupeeLinksHouse:: @ 080F8E1C - .4byte Entities_Caves_RupeeLinksHouse_0 +Room_Caves_SouthHyruleFieldRupee:: @ 080F8E1C + .4byte Entities_Caves_SouthHyruleFieldRupee_0 .4byte 0x00000000 - .4byte Enemies_Caves_RupeeLinksHouse - .4byte TileEntities_Caves_RupeeLinksHouse + .4byte Enemies_Caves_SouthHyruleFieldRupee + .4byte TileEntities_Caves_SouthHyruleFieldRupee .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_RupeeLinksHouse - .4byte sub_StateChange_Caves_RupeeLinksHouse + .4byte sub_unk3_Caves_SouthHyruleFieldRupee + .4byte sub_StateChange_Caves_SouthHyruleFieldRupee -Entities_Caves_RupeeTrilbyHighlands_0:: @ 080F8E3C +Entities_Caves_TrilbyRupee_0:: @ 080F8E3C .ifdef EU_JP object_raw subtype=0x0, x=0x58, y=0x38, collision=1, paramA=0x55, paramB=0x400, paramC=0x240000 object_raw subtype=0x0, x=0x68, y=0x38, collision=1, paramA=0x55, paramB=0x400, paramC=0x250000 @@ -20751,23 +20751,23 @@ Entities_Caves_RupeeTrilbyHighlands_0:: @ 080F8E3C entity_list_end .endif -Enemies_Caves_RupeeTrilbyHighlands:: @ 080F8F4C +Enemies_Caves_TrilbyRupee:: @ 080F8F4C entity_list_end -TileEntities_Caves_RupeeTrilbyHighlands:: @ 080F8F5C +TileEntities_Caves_TrilbyRupee:: @ 080F8F5C tile_entity_list_end -Room_Caves_RupeeTrilbyHighlands:: @ 080F8F64 - .4byte Entities_Caves_RupeeTrilbyHighlands_0 +Room_Caves_TrilbyRupee:: @ 080F8F64 + .4byte Entities_Caves_TrilbyRupee_0 .4byte 0x00000000 - .4byte Enemies_Caves_RupeeTrilbyHighlands - .4byte TileEntities_Caves_RupeeTrilbyHighlands + .4byte Enemies_Caves_TrilbyRupee + .4byte TileEntities_Caves_TrilbyRupee .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_RupeeTrilbyHighlands - .4byte sub_StateChange_Caves_RupeeTrilbyHighlands + .4byte sub_unk3_Caves_TrilbyRupee + .4byte sub_StateChange_Caves_TrilbyRupee -Entities_Caves_FairyFountainMoleMitts_0:: @ 080F8F84 +Entities_Caves_TrilbyMittsFairyFountain_0:: @ 080F8F84 .ifdef EU_JP object_raw subtype=0x41, x=0xb8, y=0x18 object_raw subtype=0x40, x=0x58, y=0x38, paramA=0x60, paramB=0x1 @@ -20783,44 +20783,44 @@ Entities_Caves_FairyFountainMoleMitts_0:: @ 080F8F84 entity_list_end .endif -Enemies_Caves_FairyFountainMoleMitts:: @ 080F8FE4 +Enemies_Caves_TrilbyMittsFairyFountain:: @ 080F8FE4 entity_list_end -TileEntities_Caves_FairyFountainMoleMitts:: @ 080F8FF4 +TileEntities_Caves_TrilbyMittsFairyFountain:: @ 080F8FF4 tile_entity type=0x7, paramB=0x3a00 tile_entity_list_end -Room_Caves_FairyFountainMoleMitts:: @ 080F9004 - .4byte Entities_Caves_FairyFountainMoleMitts_0 +Room_Caves_TrilbyMittsFairyFountain:: @ 080F9004 + .4byte Entities_Caves_TrilbyMittsFairyFountain_0 .4byte 0x00000000 - .4byte Enemies_Caves_FairyFountainMoleMitts - .4byte TileEntities_Caves_FairyFountainMoleMitts + .4byte Enemies_Caves_TrilbyMittsFairyFountain + .4byte TileEntities_Caves_TrilbyMittsFairyFountain .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_FairyFountainMoleMitts - .4byte sub_StateChange_Caves_FairyFountainMoleMitts + .4byte sub_unk3_Caves_TrilbyMittsFairyFountain + .4byte sub_StateChange_Caves_TrilbyMittsFairyFountain -Entities_Caves_KeeseChestSoutheastHyrule_0:: @ 080F9024 +Entities_Caves_HillsKeeseChest_0:: @ 080F9024 entity_list_end -Enemies_Caves_KeeseChestSoutheastHyrule:: @ 080F9034 +Enemies_Caves_HillsKeeseChest:: @ 080F9034 enemy_raw subtype=0x8, x=0x48, y=0x48, paramB=0x141e0000 enemy_raw subtype=0x8, x=0xb8, y=0x38, paramB=0x141e0000 entity_list_end -TileEntities_Caves_KeeseChestSoutheastHyrule:: @ 080F9064 +TileEntities_Caves_HillsKeeseChest:: @ 080F9064 tile_entity type=0x2, paramA=0x33, paramB=0x143f, paramC=0x87 tile_entity_list_end -Room_Caves_KeeseChestSoutheastHyrule:: @ 080F9074 - .4byte Entities_Caves_KeeseChestSoutheastHyrule_0 +Room_Caves_HillsKeeseChest:: @ 080F9074 + .4byte Entities_Caves_HillsKeeseChest_0 .4byte 0x00000000 - .4byte Enemies_Caves_KeeseChestSoutheastHyrule - .4byte TileEntities_Caves_KeeseChestSoutheastHyrule + .4byte Enemies_Caves_HillsKeeseChest + .4byte TileEntities_Caves_HillsKeeseChest .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_KeeseChestSoutheastHyrule - .4byte sub_StateChange_Caves_KeeseChestSoutheastHyrule + .4byte sub_unk3_Caves_HillsKeeseChest + .4byte sub_StateChange_Caves_HillsKeeseChest Entities_Caves_BottleBusinessScrub_0:: @ 080F9094 entity_list_end @@ -20865,7 +20865,7 @@ Room_Caves_HeartPieceHallway:: @ 080F9154 .4byte sub_unk3_Caves_HeartPieceHallway .4byte sub_StateChange_Caves_HeartPieceHallway -Entities_Caves_FairyFountainBoomerang_0:: @ 080F9174 +Entities_Caves_NorthHyruleFieldFairyFountain_0:: @ 080F9174 .ifdef EU_JP object_raw subtype=0x40, x=0x48, y=0x38, paramA=0x60, paramB=0x1 object_raw subtype=0x40, x=0x38, y=0x58, paramA=0x60, paramB=0x1 @@ -20879,22 +20879,22 @@ Entities_Caves_FairyFountainBoomerang_0:: @ 080F9174 entity_list_end .endif -Enemies_Caves_FairyFountainBoomerang:: @ 080F91C4 +Enemies_Caves_NorthHyruleFieldFairyFountain:: @ 080F91C4 entity_list_end -TileEntities_Caves_FairyFountainBoomerang:: @ 080F91D4 +TileEntities_Caves_NorthHyruleFieldFairyFountain:: @ 080F91D4 tile_entity type=0x7, paramB=0x3a00 tile_entity_list_end -Room_Caves_FairyFountainBoomerang:: @ 080F91E4 - .4byte Entities_Caves_FairyFountainBoomerang_0 +Room_Caves_NorthHyruleFieldFairyFountain:: @ 080F91E4 + .4byte Entities_Caves_NorthHyruleFieldFairyFountain_0 .4byte 0x00000000 - .4byte Enemies_Caves_FairyFountainBoomerang - .4byte TileEntities_Caves_FairyFountainBoomerang + .4byte Enemies_Caves_NorthHyruleFieldFairyFountain + .4byte TileEntities_Caves_NorthHyruleFieldFairyFountain .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_Caves_FairyFountainBoomerang - .4byte sub_StateChange_Caves_FairyFountainBoomerang + .4byte sub_unk3_Caves_NorthHyruleFieldFairyFountain + .4byte sub_StateChange_Caves_NorthHyruleFieldFairyFountain Entities_Caves_KinstoneBusinessScrub_0:: @ 080F9204 entity_list_end @@ -21811,25 +21811,25 @@ Room_TreeInteriors_HeartPiece:: @ 080FA690 .4byte sub_unk3_TreeInteriors_HeartPiece .4byte sub_StateChange_TreeInteriors_HeartPiece -Entities_TreeInteriors_StairsToBladeBrother_0:: @ 080FA6B0 +Entities_TreeInteriors_Waveblade_0:: @ 080FA6B0 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 entity_list_end -Enemies_TreeInteriors_StairsToBladeBrother:: @ 080FA6D0 +Enemies_TreeInteriors_Waveblade:: @ 080FA6D0 entity_list_end -TileEntities_TreeInteriors_StairsToBladeBrother:: @ 080FA6E0 +TileEntities_TreeInteriors_Waveblade:: @ 080FA6E0 tile_entity_list_end -Room_TreeInteriors_StairsToBladeBrother:: @ 080FA6E8 - .4byte Entities_TreeInteriors_StairsToBladeBrother_0 +Room_TreeInteriors_Waveblade:: @ 080FA6E8 + .4byte Entities_TreeInteriors_Waveblade_0 .4byte 0x00000000 - .4byte Enemies_TreeInteriors_StairsToBladeBrother - .4byte TileEntities_TreeInteriors_StairsToBladeBrother + .4byte Enemies_TreeInteriors_Waveblade + .4byte TileEntities_TreeInteriors_Waveblade .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_TreeInteriors_StairsToBladeBrother - .4byte sub_StateChange_TreeInteriors_StairsToBladeBrother + .4byte sub_unk3_TreeInteriors_Waveblade + .4byte sub_StateChange_TreeInteriors_Waveblade Entities_TreeInteriors_14_0:: @ 080FA708 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 @@ -21931,66 +21931,66 @@ Room_TreeInteriors_BoomerangSoutheast:: @ 080FA8A0 .4byte sub_unk3_TreeInteriors_BoomerangSoutheast .4byte sub_StateChange_TreeInteriors_BoomerangSoutheast -Entities_TreeInteriors_HeartPieceSouthwestField_0:: @ 080FA8C0 +Entities_TreeInteriors_WesternWoodsHeartPiece_0:: @ 080FA8C0 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 object_raw subtype=0x0, x=0x78, y=0x44, collision=1, paramA=0x63, paramB=0x400, paramC=0x980000 entity_list_end -Enemies_TreeInteriors_HeartPieceSouthwestField:: @ 080FA8F0 +Enemies_TreeInteriors_WesternWoodsHeartPiece:: @ 080FA8F0 entity_list_end -TileEntities_TreeInteriors_HeartPieceSouthwestField:: @ 080FA900 +TileEntities_TreeInteriors_WesternWoodsHeartPiece:: @ 080FA900 tile_entity_list_end -Room_TreeInteriors_HeartPieceSouthwestField:: @ 080FA908 - .4byte Entities_TreeInteriors_HeartPieceSouthwestField_0 +Room_TreeInteriors_WesternWoodsHeartPiece:: @ 080FA908 + .4byte Entities_TreeInteriors_WesternWoodsHeartPiece_0 .4byte 0x00000000 - .4byte Enemies_TreeInteriors_HeartPieceSouthwestField - .4byte TileEntities_TreeInteriors_HeartPieceSouthwestField + .4byte Enemies_TreeInteriors_WesternWoodsHeartPiece + .4byte TileEntities_TreeInteriors_WesternWoodsHeartPiece .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_TreeInteriors_HeartPieceSouthwestField - .4byte sub_StateChange_TreeInteriors_HeartPieceSouthwestField + .4byte sub_unk3_TreeInteriors_WesternWoodsHeartPiece + .4byte sub_StateChange_TreeInteriors_WesternWoodsHeartPiece -Entities_TreeInteriors_StairsToFairyFountain_0:: @ 080FA928 +Entities_TreeInteriors_NorthHyruleFieldFairyFountain_0:: @ 080FA928 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 entity_list_end -Enemies_TreeInteriors_StairsToFairyFountain:: @ 080FA948 +Enemies_TreeInteriors_NorthHyruleFieldFairyFountain:: @ 080FA948 entity_list_end -TileEntities_TreeInteriors_StairsToFairyFountain:: @ 080FA958 +TileEntities_TreeInteriors_NorthHyruleFieldFairyFountain:: @ 080FA958 tile_entity_list_end -Room_TreeInteriors_StairsToFairyFountain:: @ 080FA960 - .4byte Entities_TreeInteriors_StairsToFairyFountain_0 +Room_TreeInteriors_NorthHyruleFieldFairyFountain:: @ 080FA960 + .4byte Entities_TreeInteriors_NorthHyruleFieldFairyFountain_0 .4byte 0x00000000 - .4byte Enemies_TreeInteriors_StairsToFairyFountain - .4byte TileEntities_TreeInteriors_StairsToFairyFountain + .4byte Enemies_TreeInteriors_NorthHyruleFieldFairyFountain + .4byte TileEntities_TreeInteriors_NorthHyruleFieldFairyFountain .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_TreeInteriors_StairsToFairyFountain - .4byte sub_StateChange_TreeInteriors_StairsToFairyFountain + .4byte sub_unk3_TreeInteriors_NorthHyruleFieldFairyFountain + .4byte sub_StateChange_TreeInteriors_NorthHyruleFieldFairyFountain -Entities_TreeInteriors_StairsToWalletFairy_0:: @ 080FA980 +Entities_TreeInteriors_MinishWoodsGreatFairy_0:: @ 080FA980 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 entity_list_end -Enemies_TreeInteriors_StairsToWalletFairy:: @ 080FA9A0 +Enemies_TreeInteriors_MinishWoodsGreatFairy:: @ 080FA9A0 entity_list_end -TileEntities_TreeInteriors_StairsToWalletFairy:: @ 080FA9B0 +TileEntities_TreeInteriors_MinishWoodsGreatFairy:: @ 080FA9B0 tile_entity_list_end -Room_TreeInteriors_StairsToWalletFairy:: @ 080FA9B8 - .4byte Entities_TreeInteriors_StairsToWalletFairy_0 +Room_TreeInteriors_MinishWoodsGreatFairy:: @ 080FA9B8 + .4byte Entities_TreeInteriors_MinishWoodsGreatFairy_0 .4byte 0x00000000 - .4byte Enemies_TreeInteriors_StairsToWalletFairy - .4byte TileEntities_TreeInteriors_StairsToWalletFairy + .4byte Enemies_TreeInteriors_MinishWoodsGreatFairy + .4byte TileEntities_TreeInteriors_MinishWoodsGreatFairy .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_TreeInteriors_StairsToWalletFairy - .4byte sub_StateChange_TreeInteriors_StairsToWalletFairy + .4byte sub_unk3_TreeInteriors_MinishWoodsGreatFairy + .4byte sub_StateChange_TreeInteriors_MinishWoodsGreatFairy Entities_TreeInteriors_1C_0:: @ 080FA9D8 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 @@ -22020,28 +22020,28 @@ Room_TreeInteriors_1C:: @ 080FAA70 .4byte sub_unk3_TreeInteriors_1C .4byte sub_StateChange_TreeInteriors_1C -Entities_TreeInteriors_StairsToBusinessScrub_0:: @ 080FAA90 +Entities_TreeInteriors_MinishWoodsBusinessScrub_0:: @ 080FAA90 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 entity_list_end -Entities_TreeInteriors_StairsToBusinessScrub_1:: @ 080FAAB0 +Entities_TreeInteriors_MinishWoodsBusinessScrub_1:: @ 080FAAB0 entity_list_end -Enemies_TreeInteriors_StairsToBusinessScrub:: @ 080FAAC0 +Enemies_TreeInteriors_MinishWoodsBusinessScrub:: @ 080FAAC0 entity_list_end -TileEntities_TreeInteriors_StairsToBusinessScrub:: @ 080FAAD0 +TileEntities_TreeInteriors_MinishWoodsBusinessScrub:: @ 080FAAD0 tile_entity_list_end -Room_TreeInteriors_StairsToBusinessScrub:: @ 080FAAD8 - .4byte Entities_TreeInteriors_StairsToBusinessScrub_0 - .4byte Entities_TreeInteriors_StairsToBusinessScrub_1 - .4byte Enemies_TreeInteriors_StairsToBusinessScrub - .4byte TileEntities_TreeInteriors_StairsToBusinessScrub +Room_TreeInteriors_MinishWoodsBusinessScrub:: @ 080FAAD8 + .4byte Entities_TreeInteriors_MinishWoodsBusinessScrub_0 + .4byte Entities_TreeInteriors_MinishWoodsBusinessScrub_1 + .4byte Enemies_TreeInteriors_MinishWoodsBusinessScrub + .4byte TileEntities_TreeInteriors_MinishWoodsBusinessScrub .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_TreeInteriors_StairsToBusinessScrub - .4byte sub_StateChange_TreeInteriors_StairsToBusinessScrub + .4byte sub_unk3_TreeInteriors_MinishWoodsBusinessScrub + .4byte sub_StateChange_TreeInteriors_MinishWoodsBusinessScrub Entities_TreeInteriors_1E_0:: @ 080FAAF8 object_raw subtype=0x4c, x=0x8c, y=0x28, collision=1, paramA=0x2 @@ -22072,26 +22072,26 @@ Room_TreeInteriors_1E:: @ 080FABA0 .4byte sub_unk3_TreeInteriors_1E .4byte sub_StateChange_TreeInteriors_1E -Entities_TreeInteriors_1F_0:: @ 080FABC0 +Entities_TreeInteriors_UnusedHeartContainer_0:: @ 080FABC0 object_raw subtype=0x4f, x=0x78, y=0x98, paramA=0x6, paramB=0x2 object_raw subtype=0x0, x=0x78, y=0x48, collision=1, paramA=0x62, paramB=0x400, paramC=0x990000 entity_list_end -Enemies_TreeInteriors_1F:: @ 080FABF0 +Enemies_TreeInteriors_UnusedHeartContainer:: @ 080FABF0 entity_list_end -TileEntities_TreeInteriors_1F:: @ 080FAC00 +TileEntities_TreeInteriors_UnusedHeartContainer:: @ 080FAC00 tile_entity_list_end -Room_TreeInteriors_1F:: @ 080FAC08 - .4byte Entities_TreeInteriors_1F_0 +Room_TreeInteriors_UnusedHeartContainer:: @ 080FAC08 + .4byte Entities_TreeInteriors_UnusedHeartContainer_0 .4byte 0x00000000 - .4byte Enemies_TreeInteriors_1F - .4byte TileEntities_TreeInteriors_1F + .4byte Enemies_TreeInteriors_UnusedHeartContainer + .4byte TileEntities_TreeInteriors_UnusedHeartContainer .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_TreeInteriors_1F - .4byte sub_StateChange_TreeInteriors_1F + .4byte sub_unk3_TreeInteriors_UnusedHeartContainer + .4byte sub_StateChange_TreeInteriors_UnusedHeartContainer Entities_MtCrenel_MountainTop_0:: @ 080FAC28 .ifdef EU_JP @@ -22846,31 +22846,31 @@ Room_CrenelCaves_MushroomKeese:: @ 080FC12C .4byte sub_unk3_CrenelCaves_MushroomKeese .4byte sub_StateChange_CrenelCaves_MushroomKeese -Entities_CrenelCaves_LadderToGreenWater_0:: @ 080FC14C +Entities_CrenelCaves_LadderToSpringWater_0:: @ 080FC14C entity_list_end -Entities_CrenelCaves_LadderToGreenWater_1:: @ 080FC15C +Entities_CrenelCaves_LadderToSpringWater_1:: @ 080FC15C object_raw subtype=0x41, x=0x78, y=0x18 entity_list_end -Enemies_CrenelCaves_LadderToGreenWater:: @ 080FC17C +Enemies_CrenelCaves_LadderToSpringWater:: @ 080FC17C enemy_raw subtype=0x1, x=0x88, y=0x58, paramA=0x1 enemy_raw subtype=0x1, x=0x68, y=0x48, paramA=0x1 enemy_raw subtype=0x1, x=0x98, y=0x48, paramA=0x1 entity_list_end -TileEntities_CrenelCaves_LadderToGreenWater:: @ 080FC1BC +TileEntities_CrenelCaves_LadderToSpringWater:: @ 080FC1BC tile_entity_list_end -Room_CrenelCaves_LadderToGreenWater:: @ 080FC1C4 - .4byte Entities_CrenelCaves_LadderToGreenWater_0 - .4byte Entities_CrenelCaves_LadderToGreenWater_1 - .4byte Enemies_CrenelCaves_LadderToGreenWater - .4byte TileEntities_CrenelCaves_LadderToGreenWater +Room_CrenelCaves_LadderToSpringWater:: @ 080FC1C4 + .4byte Entities_CrenelCaves_LadderToSpringWater_0 + .4byte Entities_CrenelCaves_LadderToSpringWater_1 + .4byte Enemies_CrenelCaves_LadderToSpringWater + .4byte TileEntities_CrenelCaves_LadderToSpringWater .4byte 0x00000000 .4byte 0x00000000 - .4byte sub_unk3_CrenelCaves_LadderToGreenWater - .4byte sub_StateChange_CrenelCaves_LadderToGreenWater + .4byte sub_unk3_CrenelCaves_LadderToSpringWater + .4byte sub_StateChange_CrenelCaves_LadderToSpringWater Entities_CrenelCaves_BombBusinessScrub_0:: @ 080FC1E4 entity_list_end diff --git a/data/map/map_data.s b/data/map/map_data.s index e3be838e..17c06332 100644 --- a/data/map/map_data.s +++ b/data/map/map_data.s @@ -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" diff --git a/data/map/map_headers.s b/data/map/map_headers.s index 3b277548..7501d324 100755 --- a/data/map/map_headers.s +++ b/data/map/map_headers.s @@ -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 diff --git a/data/map/metatile_headers.s b/data/map/metatile_headers.s index 7414c84a..5923411f 100755 --- a/data/map/metatile_headers.s +++ b/data/map/metatile_headers.s @@ -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 diff --git a/data/map/tileset_headers.s b/data/map/tileset_headers.s index f9e71a33..279e7dcc 100755 --- a/data/map/tileset_headers.s +++ b/data/map/tileset_headers.s @@ -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 diff --git a/include/roomid.h b/include/roomid.h index b6ac8c84..ec354973 100644 --- a/include/roomid.h +++ b/include/roomid.h @@ -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 diff --git a/src/data/transitions.c b/src/data/transitions.c index ba9ffae1..d85f87d9 100644 --- a/src/data/transitions.c +++ b/src/data/transitions.c @@ -2,12 +2,10 @@ #include "area.h" #include "roomid.h" -// this terminates a list of Transitions -#define TransitionListEnd \ - { WARP_TYPE_END_OF_LIST, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +// clang-format off -// some dev made a mistake and put above Terminator at the end of some lists of pointers -#define TransitionListEndBUG (void*)0x0000ffff, NULL, NULL, NULL, NULL +// this terminates a list of Transitions +#define TransitionListEnd { WARP_TYPE_END_OF_LIST, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } const Transition gExitList_NoExitList[] = { TransitionListEnd }; const Transition* const gExitLists_NoExit[] = { @@ -28,16 +26,16 @@ const Transition* const gExitLists_NoExit[] = { const Transition gExitList_MinishWoods_Main[] = { { WARP_TYPE_1, 0x00, 0x0138, 0x0318, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, - ROOM_MINISH_HOUSE_INTERIORS_26, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x01c8, 0x0258, 0x00a8, 0x00d8, 0x00, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x01, 0x00, + ROOM_MINISH_HOUSE_INTERIORS_MINISH_WOODS_BOMB, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0x00, 0x01c8, 0x0258, 0x00a8, 0x00d8, 0x00, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x03a8, 0x0010, 0x0078, 0x0088, 0x02, AREA_BEANSTALKS, ROOM_BEANSTALKS_EASTERN_HILLS, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0210, 0x01c8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1d, 0x01, 0x00, + { WARP_TYPE_1, 0x00, 0x0210, 0x01c8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0070, 0x0048, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1b, 0x01, 0x00, + { WARP_TYPE_1, 0x00, 0x0070, 0x0048, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02c0, 0x0048, 0x0078, 0x0088, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_0, 0x01, 0x00, + { WARP_TYPE_1, 0x00, 0x02c0, 0x0048, 0x0078, 0x0088, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WITCH_HUT, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x03b8, 0x0038, 0x0078, 0x0108, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_MINISH_WOODS_NORTH_1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, @@ -62,16 +60,16 @@ const Transition* const gExitLists_MinishWoods[] = { }; const Transition gExitList_LakeHylia_Main[] = { - { WARP_TYPE_1, 0, 0x02a0, 0x0378, 0x0078, 0x00a0, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_5, 0x01, + { WARP_TYPE_1, 0, 0x02a0, 0x0378, 0x0078, 0x00a0, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x0120, 0x0038, 0x0078, 0x0078, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_14, 0x01, + { WARP_TYPE_1, 0, 0x0120, 0x0038, 0x0078, 0x0078, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_STOCKWELL_LAKE_HOUSE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x0100, 0x02b8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_13, 0x01, 0x00, + { WARP_TYPE_1, 0, 0x0100, 0x02b8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WAVEBLADE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x00c8, 0x0198, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_27, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x01e8, 0x01a8, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_23, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0, 0x00c8, 0x0198, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_LAKE_HYLIA_OCARINA, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0, 0x01e8, 0x01a8, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_LIBRARI, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0, 0x02b8, 0x0058, 0x0188, 0x01a8, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_LAKE_HYLIA_NORTH, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0, 0x0148, 0x0374, 0x0248, 0x01a8, 0x00, AREA_LAKE_WOODS_CAVE, ROOM_LAKE_WOODS_CAVE_MAIN, 0x01, 0x00, @@ -96,17 +94,17 @@ const Transition* const gExitLists_LakeHylia[] = { }; const Transition gExitList_CastorWilds_Main[] = { - { WARP_TYPE_1, 0, 0x0248, 0x0032, 0x0038, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_1, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x0248, 0x0032, 0x0038, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_NORTH, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x0288, 0x0032, 0x0128, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_1, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x0288, 0x0032, 0x0128, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_NORTH, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x01a8, 0x01a2, 0x0088, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_3, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x01a8, 0x01a2, 0x0088, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_DARKNUT, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x02d8, 0x0382, 0x0078, 0x0098, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_0, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x02d8, 0x0382, 0x0078, 0x0098, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_SOUTH, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x03c8, 0x0038, 0x0078, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_4, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x03c8, 0x0038, 0x0078, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_HEART_PIECE, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x0038, 0x02d4, 0x0078, 0x0088, 0x00, AREA_DOJOS, ROOM_DOJOS_4, 1, 0, 0, 0, 0, 0, 0 }, + { WARP_TYPE_1, 0, 0x0038, 0x02d4, 0x0078, 0x0088, 0x00, AREA_DOJOS, ROOM_DOJOS_SWIFTBLADE_I, 1, 0, 0, 0, 0, 0, 0 }, { WARP_TYPE_1, 0, 0x03b8, 0x02f8, 0x0078, 0x01f8, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_SOUTHEAST_WATER_1, 1, 0, 0, 0, 0, 0, 0 }, { WARP_TYPE_0, 0, 0x0000, 0x0000, 0x0008, 0x0fff, 0x08, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_NORTH, 1, @@ -120,7 +118,7 @@ const Transition* const gExitLists_CastorWilds[] = { const Transition gExitList_Ruins_Entrance[] = { { WARP_TYPE_0, 0, 0x00, 0x00, 0x0fff, 0x3b8, 0x01, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0xc8, 0x38, 0x0078, 0x078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_2, 1, 0, 0, 0, 0, 0, 0 }, + { WARP_TYPE_1, 0, 0xc8, 0x38, 0x0078, 0x078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_WIND_RUINS, 1, 0, 0, 0, 0, 0, 0 }, TransitionListEnd, }; const Transition gExitList_Ruins_Beanstalk[] = { @@ -131,7 +129,7 @@ const Transition gExitList_Ruins_LadderToTektites[] = { TransitionListEnd, }; const Transition gExitList_Ruins_FortressEntrance[] = { - { WARP_TYPE_0, 0, 0, 0, 0x1d8, 0xb0, 3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 1, 0, 0, 0, 0, + { WARP_TYPE_0, 0, 0, 0, 0x1d8, 0xb0, 3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 1, 0, 0, 0, 0, 0, 0 }, TransitionListEnd, }; @@ -145,65 +143,65 @@ const Transition* const gExitLists_Ruins[] = { }; const Transition gExitList_HyruleTown_0[] = { - { WARP_TYPE_1, 0x00, 0x02c8, 0x0138, 0x0068, 0x0098, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_0, 0x01, + { WARP_TYPE_1, 0x00, 0x02c8, 0x0138, 0x0068, 0x0098, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_MAYOR, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0308, 0x0120, 0x00e8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0308, 0x0120, 0x00e8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_MAYOR, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0048, 0x00a8, 0x0078, 0x0090, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0048, 0x00a8, 0x0078, 0x0090, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_POST_OFFICE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0138, 0x0048, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x01, + { WARP_TYPE_1, 0x00, 0x0138, 0x0048, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0168, 0x00a8, 0x00e8, 0x00d8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_3, 0x01, + { WARP_TYPE_1, 0x00, 0x0168, 0x00a8, 0x00e8, 0x00d8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_1F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0388, 0x0258, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x01, + { WARP_TYPE_1, 0x00, 0x0388, 0x0258, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0368, 0x01b8, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_8, 0x01, + { WARP_TYPE_1, 0x00, 0x0368, 0x01b8, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x03a8, 0x0218, 0x0048, 0x01a8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_9, 0x01, + { WARP_TYPE_1, 0x00, 0x03a8, 0x0218, 0x0048, 0x01a8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02c8, 0x0098, 0x0078, 0x00c8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_b, 0x01, + { WARP_TYPE_1, 0x00, 0x02c8, 0x0098, 0x0078, 0x00c8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0328, 0x0068, 0x00d8, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_c, 0x01, + { WARP_TYPE_1, 0x00, 0x0328, 0x0068, 0x00d8, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_SCHOOL_EAST, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0258, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0258, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0198, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0198, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CAFE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0178, 0x0210, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_2, 0x01, + { WARP_TYPE_1, 0x00, 0x0178, 0x0210, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0278, 0x01f0, 0x0028, 0x0090, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_3, 0x01, + { WARP_TYPE_1, 0x00, 0x0278, 0x01f0, 0x0028, 0x0090, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BAKERY, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0178, 0x0250, 0x00c8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_4, 0x01, + { WARP_TYPE_1, 0x00, 0x0178, 0x0250, 0x00c8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_SIMON, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0178, 0x0290, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_5, 0x01, + { WARP_TYPE_1, 0x00, 0x0178, 0x0290, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0138, 0x0290, 0x0028, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_5, 0x01, + { WARP_TYPE_1, 0x00, 0x0138, 0x0290, 0x0028, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0298, 0x0258, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_6, 0x01, + { WARP_TYPE_1, 0x00, 0x0298, 0x0258, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0090, 0x02c8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0090, 0x02c8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_CARPENTER, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0098, 0x0168, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0098, 0x0168, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_STRANGER, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0038, 0x0248, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_4, 0x01, + { WARP_TYPE_1, 0x00, 0x0038, 0x0248, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DR_LEFT, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02e8, 0x02f0, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_6, 0x01, + { WARP_TYPE_1, 0x00, 0x02e8, 0x02f0, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_ROMIO, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0348, 0x02f8, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_7, 0x01, + { WARP_TYPE_1, 0x00, 0x0348, 0x02f8, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_JULIETTA, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x03b8, 0x0358, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_c, 0x01, + { WARP_TYPE_1, 0x00, 0x03b8, 0x0358, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_CUCCO, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0138, 0x0388, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0138, 0x0388, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_SWIFTBLADE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x0038, 0x01a8, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, - ROOM_MINISH_HOUSE_INTERIORS_25, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0050, 0x0378, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_10, 0x01, 0x00, + ROOM_MINISH_HOUSE_INTERIORS_HYRULE_TOWN, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0x00, 0x0050, 0x0378, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x00f0, 0x0188, 0x0078, 0x0078, 0x02, AREA_CAVES, ROOM_CAVES_b, 0x01, 0x00, 0x00, 0x00, 0x00, + { WARP_TYPE_1, 0x00, 0x00f0, 0x0188, 0x0078, 0x0078, 0x02, AREA_CAVES, ROOM_CAVES_HYRULE_TOWN_WATERFALL, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0040, 0x01b8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0040, 0x01b8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_WEST_ORACLE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02b8, 0x0360, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_9, 0x01, + { WARP_TYPE_1, 0x00, 0x02b8, 0x0360, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_EAST_ORACLE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x0338, 0x0134, 0x0288, 0x0118, 0x00, AREA_HYRULE_TOWN_UNDERGROUND, ROOM_HYRULE_TOWN_UNDERGROUND_0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, @@ -227,18 +225,18 @@ const Transition gExitList_HyruleTown_1[] = { TransitionListEnd, }; const Transition* const gExitLists_FestivalTown[] = { - [ROOM_FESTIVAL_TOWN_0] = gExitList_HyruleTown_1, + [ROOM_FESTIVAL_TOWN_MAIN] = gExitList_HyruleTown_1, }; const Transition gExitList_MtCrenel_MountainTop[] = { - { WARP_TYPE_1, 0x0, 0x328, 0x34, 0x1a8, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x328, 0x34, 0x1a8, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_WALL_CLIMB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MtCrenel_WallClimb[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x58, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_e, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x58, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HERMIT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x148, 0x1e8, 0x78, 0xf8, 0x0, AREA_GREAT_FAIRIES, ROOM_GREAT_FAIRIES_CRENEL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -247,51 +245,51 @@ const Transition gExitList_MtCrenel_WallClimb[] = { TransitionListEnd, }; const Transition gExitList_MtCrenel_CaveOfFlamesEntrance[] = { - { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x208, 0x18, 0x298, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x208, 0x18, 0x298, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0xb8, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0xb8, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_PILLAR_CAVE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x48, 0x1c8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_2, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x48, 0x1c8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BRIDGE_SWITCH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x188, 0xf8, 0xb8, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_3, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x188, 0xf8, 0xb8, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_EXIT_TO_MINES, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x208, 0x148, 0x78, 0xf0, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_10, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x208, 0x148, 0x78, 0xf0, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_TO_GRAYBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1e8, 0x1d8, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_4, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1e8, 0x1d8, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_GRIP_RING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x68, 0x72, 0x88, 0xa8, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_3, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x72, 0x88, 0xa8, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MtCrenel_GustJarShortcut[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x48, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_5, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x48, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2f8, 0x28, 0x38, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_6, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2f8, 0x28, 0x38, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x348, 0x58, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_7, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x348, 0x58, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x108, 0x78, 0x118, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_8, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x108, 0x78, 0x118, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_WATER_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MtCrenel_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x298, 0x28, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_9, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x298, 0x28, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_RUPEE_FAIRY_FOUINTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x198, 0xd8, 0x1f8, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_a, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x198, 0xd8, 0x1f8, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x138, 0x138, 0xb8, 0x138, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_b, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x138, 0x138, 0xb8, 0x138, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_MUSHROOM_KEESE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2d8, 0x188, 0x78, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2d8, 0x188, 0x78, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x198, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_d, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x198, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BOMB_BUSINESS_SCRUB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3b8, 0x168, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_f, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x3b8, 0x168, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HINT_SCRUB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x1c8, 0x18, 0x98, 0x1a8, 0x0, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_BEAN_PESTO, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2d8, 0x154, 0x78, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2d8, 0x154, 0x78, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x8, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, @@ -306,53 +304,53 @@ const Transition* const gExitLists_MtCrenel[] = { }; const Transition gExitList_HyruleField_WesternWoodSouth[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_20, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xb8, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_SouthHyruleField[] = { - { WARP_TYPE_1, 0x0, 0x290, 0x188, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_10, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x290, 0x188, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3a0, 0x228, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_12, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x3a0, 0x228, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_SOUTH_HYRULE_FIELD_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0xa8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_9, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x58, 0x118, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_10, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x118, 0xa8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_SOUTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x58, 0x118, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_SOUTH_HYRULE_FIELD_RUPEE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x178, 0xd8, 0x78, 0xb8, 0x0, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_OUTSIDE_LINKS_HOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x48, 0x1c8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_21, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x48, 0x1c8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x3b8, 0x3, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_EasternHillsSouth[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_24, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_EXIT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0x3c8, 0x8, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_EasternHillsCenter[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x98, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_13, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xa8, 0x98, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_HILLS_KEESE_CHEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_EasternHillsNorth[] = { - { WARP_TYPE_1, 0x0, 0x40, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_4, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x40, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_FARM_HOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0xc, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_LonLonRanch[] = { - { WARP_TYPE_1, 0x0, 0x158, 0x278, 0x68, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_2, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x158, 0x278, 0x68, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x188, 0x278, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_3, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x188, 0x278, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_EAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xe8, 0x1b4, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1f8, 0x208, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_f, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0x354, 0x78, 0x78, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xe8, 0x1b4, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_LON_LON_RANCH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1f8, 0x208, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_LON_LON_RANCH_WALLET, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0x354, 0x78, 0x78, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_STAIRS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x154, 0x38, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xb8, 0x154, 0x38, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_LON_LON_RANCH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x3e8, 0x1, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1c8, 0x3e8, 0x2, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, @@ -366,21 +364,21 @@ const Transition gExitList_HyruleField_LonLonRanch[] = { const Transition gExitList_HyruleField_NorthHyruleField[] = { { WARP_TYPE_1, 0x0, 0x1f8, 0x38, 0x1f8, 0x208, 0x3, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1b0, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_15, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1b0, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x240, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_16, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x240, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1b0, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_17, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1b0, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x240, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_18, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x240, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2f0, 0x138, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1a, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2f0, 0x138, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1f8, 0x154, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x138, 0x108, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x138, 0x1e8, 0x78, 0xc8, 0x0, AREA_CAVES, ROOM_CAVES_15, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xf4, 0x38, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0xf4, 0x118, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1f8, 0x154, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x108, 0x138, 0x108, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x138, 0x1e8, 0x78, 0xc8, 0x0, AREA_CAVES, ROOM_CAVES_HEART_PIECE_HALLWAY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0xf4, 0x38, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x118, 0xf4, 0x118, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x208, 0x3, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x18, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, @@ -392,15 +390,15 @@ const Transition gExitList_HyruleField_NorthHyruleField[] = { TransitionListEnd, }; const Transition gExitList_HyruleField_TrilbyHighlands[] = { - { WARP_TYPE_1, 0x0, 0x40, 0x388, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_11, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x40, 0x388, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_PERCYS_TREEHOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0x222, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_7, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x2a8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_11, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x198, 0x2b2, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_8, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0x94, 0x88, 0x68, 0x0, AREA_DIG_CAVES, ROOM_DIG_CAVES_3, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0 }, - { WARP_TYPE_1, 0x0, 0x98, 0x284, 0x38, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_e, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x284, 0x128, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_e, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0x222, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_KEESE_CHEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x38, 0x2a8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_RUPEE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x198, 0x2b2, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0x94, 0x88, 0x68, 0x0, AREA_DIG_CAVES, ROOM_DIG_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x98, 0x284, 0x38, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x118, 0x284, 0x128, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x3e8, 0x1, AREA_ROYAL_VALLEY, ROOM_ROYAL_VALLEY_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xf0, 0x8, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, @@ -410,14 +408,14 @@ const Transition gExitList_HyruleField_TrilbyHighlands[] = { TransitionListEnd, }; const Transition gExitList_HyruleField_WesternWoodsNorth[] = { - { WARP_TYPE_1, 0x0, 0xa0, 0x1e8, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_19, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa0, 0x1e8, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WESTERN_WOODS_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3e8, 0xfff, 0x40, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_WesternWoodsCenter[] = { - { WARP_TYPE_1, 0x0, 0x90, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_8, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x90, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_PERCY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -438,27 +436,27 @@ const Transition* const gExitLists_HyruleField[] = { const Transition gExitList_CastleGarden_Main[] = { { WARP_TYPE_1, 0x0, 0x1f8, 0x28, 0xd8, 0x208, 0x2, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_EAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_1, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x68, 0x74, 0x68, 0x1a8, 0x0, AREA_HYRULE_CASTLE_CELLAR, ROOM_HYRULE_CASTLE_CELLAR_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_a, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_TO_GRIMBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x48, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gUnk_08134FBC[] = { - { WARP_TYPE_1, 0x0, 0x1f8, 0x28, 0x198, 0x1f0, 0x2, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_0, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x1f8, 0x28, 0x198, 0x1f0, 0x2, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_EAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_1, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x68, 0x74, 0x68, 0x1a8, 0x0, AREA_HYRULE_CASTLE_CELLAR, ROOM_HYRULE_CASTLE_CELLAR_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_a, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_TO_GRIMBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x48, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -473,7 +471,7 @@ const Transition* const gExitLists_CastleGarden[] = { }; const Transition gExitList_CloudTops_House[] = { - { WARP_TYPE_1, 0x0, 0x1e8, 0x158, 0x78, 0x138, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1e8, 0x158, 0x78, 0x138, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -482,9 +480,9 @@ const Transition* const gExitLists_CloudTops[] = { }; const Transition gExitList_RoyalValley_Main[] = { - { WARP_TYPE_1, 0x0, 0xf0, 0x28, 0x88, 0x78, 0x2, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_8, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xf0, 0x28, 0x88, 0x78, 0x2, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1a0, 0x198, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_12, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1a0, 0x198, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DAMPE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x198, 0x2a8, 0x78, 0xf8, 0x0, AREA_GREAT_FAIRIES, ROOM_GREAT_FAIRIES_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -525,23 +523,23 @@ const Transition* const gExitLists_RoyalValley[] = { }; const Transition gExitList_VeilFalls_Main[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x22, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_0, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x22, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x158, 0x22, 0x118, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x158, 0x22, 0x118, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x42, 0xb8, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x42, 0xb8, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x1e2, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_3, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x1e2, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xd8, 0x1c2, 0x98, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_4, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xd8, 0x1c2, 0x98, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_EXIT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xd8, 0x142, 0x98, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xd8, 0x142, 0x98, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0xc2, 0xb8, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_8, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0xc2, 0xb8, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_9, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xc8, 0x74, 0x38, 0x108, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xc8, 0x74, 0x38, 0x108, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x10, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_LON_LON_RANCH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -658,26 +656,26 @@ const Transition* const gExitLists_HyruleDigCaves[] = { }; const Transition gExitList_MinishVillage_Main[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x88, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x70, 0x68, 0x50, 0x1, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_1, 0x1, - 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x258, 0x58, 0xe8, 0xb8, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_2, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x228, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_3, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x168, 0x1d8, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_4, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1a8, 0x208, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_5, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1e8, 0x2d8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_7, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x48, 0x248, 0x78, 0xc8, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_8, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x378, 0x288, 0x78, 0x140, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_9, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x368, 0x234, 0x58, 0x100, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_9, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x88, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_GENTARI_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x38, 0x70, 0x68, 0x50, 0x1, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_GENTARI_EXIT, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x258, 0x58, 0xe8, 0xb8, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_FESTARI, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x128, 0x228, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_RED, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x168, 0x1d8, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_GREEN, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1a8, 0x208, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_BLUE, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1e8, 0x2d8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_SHOE_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x48, 0x248, 0x78, 0xc8, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_POT_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x378, 0x288, 0x78, 0x140, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x368, 0x234, 0x58, 0x100, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x18, 0x30, AREA_MINISH_PATHS, ROOM_MINISH_PATHS_MINISH_VILLAGE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1c8, 0x338, 0x1, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, @@ -687,8 +685,8 @@ const Transition gExitList_MinishVillage_Main[] = { TransitionListEnd, }; const Transition gExitList_MinishVillage_SideHouse[] = { - { WARP_TYPE_1, 0x0, 0x138, 0x68, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_6, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x138, 0x68, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_SIDE_AREA, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_MinishVillage[] = { @@ -703,12 +701,12 @@ const Transition gExitList_MelarisMine_Main[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x70, 0x12c, 0xbc, 0x138, 0x0, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x1, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_10, 0x1, - 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x228, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_11, 0x1, - 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x280, 0x11c, 0x24, 0x56, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_12, 0x1, - 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xa8, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHWEST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x228, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHEAST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x280, 0x11c, 0x24, 0x56, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_EAST, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_MelarisMine[] = { @@ -742,7 +740,7 @@ const Transition gExitList_MinishPaths_LonLonRanch[] = { const Transition gExitList_MinishPaths_MayorsCabin[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2a8, 0x31a, 0x3, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x48, 0x30, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_5, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x48, 0x30, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -788,14 +786,14 @@ const Transition* const gExitLists_CrenelMinishPaths[] = { const Transition gExitList_DigCaves1_TrilbyHighlands[] = { { WARP_TYPE_1, 0x0, 0x88, 0x44, 0x88, 0x78, 0x0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1a8, 0x78, 0xb8, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_12, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1a8, 0x78, 0xb8, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_MITTS_FAIRY_FOUNTAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DigCaves1[] = { - [ROOM_DIG_CAVES_0] = gExitList_NoExitList, + [ROOM_DIG_CAVES_EASTERN_HILLS] = gExitList_NoExitList, [ROOM_DIG_CAVES_1] = gExitList_NoExitList, [ROOM_DIG_CAVES_2] = gExitList_NoExitList, - [ROOM_DIG_CAVES_3] = gExitList_DigCaves1_TrilbyHighlands, + [ROOM_DIG_CAVES_TRILBY_HIGHLANDS] = gExitList_DigCaves1_TrilbyHighlands, }; const Transition gExitList_MinishHouseInteriors_GentariMain[] = { @@ -882,7 +880,7 @@ const Transition gExitList_MinishHouseInteriors_HyruleFieldSouthwest[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_MinishHouseInteriors_HyruleFieldOutsideLinksHouse[] = { +const Transition gExitList_MinishHouseInteriors_SouthHyruleField[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x48, 0x1d4, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -918,25 +916,25 @@ const Transition gExitList_MinishHouseInteriors_LakeHyliaOcarina[] = { TransitionListEnd, }; const Transition* const gExitLists_MinishHouseInteriors[] = { - [ROOM_MINISH_HOUSE_INTERIORS_0] = gExitList_MinishHouseInteriors_GentariMain, - [ROOM_MINISH_HOUSE_INTERIORS_1] = gExitList_MinishHouseInteriors_GentariExit, - [ROOM_MINISH_HOUSE_INTERIORS_2] = gExitList_MinishHouseInteriors_Festari, - [ROOM_MINISH_HOUSE_INTERIORS_3] = gExitList_MinishHouseInteriors_Red, - [ROOM_MINISH_HOUSE_INTERIORS_4] = gExitList_MinishHouseInteriors_Green, - [ROOM_MINISH_HOUSE_INTERIORS_5] = gExitList_MinishHouseInteriors_Blue, - [ROOM_MINISH_HOUSE_INTERIORS_6] = gExitList_MinishHouseInteriors_SideArea, - [ROOM_MINISH_HOUSE_INTERIORS_7] = gExitList_MinishHouseInteriors_ShoeMinish, - [ROOM_MINISH_HOUSE_INTERIORS_8] = gExitList_MinishHouseInteriors_PotMinish, - [ROOM_MINISH_HOUSE_INTERIORS_9] = gExitList_MinishHouseInteriors_BarrelMinish, - [ROOM_MINISH_HOUSE_INTERIORS_a] = gExitList_MinishHouseInteriors_NULL1, - [ROOM_MINISH_HOUSE_INTERIORS_b] = gExitList_MinishHouseInteriors_NULL2, + [ROOM_MINISH_HOUSE_INTERIORS_GENTARI_MAIN] = gExitList_MinishHouseInteriors_GentariMain, + [ROOM_MINISH_HOUSE_INTERIORS_GENTARI_EXIT] = gExitList_MinishHouseInteriors_GentariExit, + [ROOM_MINISH_HOUSE_INTERIORS_FESTARI] = gExitList_MinishHouseInteriors_Festari, + [ROOM_MINISH_HOUSE_INTERIORS_RED] = gExitList_MinishHouseInteriors_Red, + [ROOM_MINISH_HOUSE_INTERIORS_GREEN] = gExitList_MinishHouseInteriors_Green, + [ROOM_MINISH_HOUSE_INTERIORS_BLUE] = gExitList_MinishHouseInteriors_Blue, + [ROOM_MINISH_HOUSE_INTERIORS_SIDE_AREA] = gExitList_MinishHouseInteriors_SideArea, + [ROOM_MINISH_HOUSE_INTERIORS_SHOE_MINISH] = gExitList_MinishHouseInteriors_ShoeMinish, + [ROOM_MINISH_HOUSE_INTERIORS_POT_MINISH] = gExitList_MinishHouseInteriors_PotMinish, + [ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH] = gExitList_MinishHouseInteriors_BarrelMinish, + [ROOM_MINISH_HOUSE_INTERIORS_NULL1] = gExitList_MinishHouseInteriors_NULL1, + [ROOM_MINISH_HOUSE_INTERIORS_NULL2] = gExitList_MinishHouseInteriors_NULL2, [ROOM_MINISH_HOUSE_INTERIORS_c] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_d] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_e] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_f] = gExitList_NoExitList, - [ROOM_MINISH_HOUSE_INTERIORS_10] = gExitList_MinishHouseInteriors_MelariMinesSouthwest, - [ROOM_MINISH_HOUSE_INTERIORS_11] = gExitList_MinishHouseInteriors_MelariMinesSoutheast, - [ROOM_MINISH_HOUSE_INTERIORS_12] = gExitList_MinishHouseInteriors_MelariMinesEast, + [ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHWEST] = gExitList_MinishHouseInteriors_MelariMinesSouthwest, + [ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHEAST] = gExitList_MinishHouseInteriors_MelariMinesSoutheast, + [ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_EAST] = gExitList_MinishHouseInteriors_MelariMinesEast, [ROOM_MINISH_HOUSE_INTERIORS_13] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_14] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_15] = gExitList_NoExitList, @@ -950,85 +948,85 @@ const Transition* const gExitLists_MinishHouseInteriors[] = { [ROOM_MINISH_HOUSE_INTERIORS_1d] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_1e] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_1f] = gExitList_NoExitList, - [ROOM_MINISH_HOUSE_INTERIORS_20] = gExitList_MinishHouseInteriors_HyruleFieldSouthwest, - [ROOM_MINISH_HOUSE_INTERIORS_21] = gExitList_MinishHouseInteriors_HyruleFieldOutsideLinksHouse, - [ROOM_MINISH_HOUSE_INTERIORS_22] = gExitList_MinishHouseInteriors_NextToKnuckle, - [ROOM_MINISH_HOUSE_INTERIORS_23] = gExitList_MinishHouseInteriors_Librari, - [ROOM_MINISH_HOUSE_INTERIORS_24] = gExitList_MinishHouseInteriors_HyruleFieldExit, - [ROOM_MINISH_HOUSE_INTERIORS_25] = gExitList_MinishHouseInteriors_HyruleTown, - [ROOM_MINISH_HOUSE_INTERIORS_26] = gExitList_MinishHouseInteriors_MinishWoodsBomb, - [ROOM_MINISH_HOUSE_INTERIORS_27] = gExitList_MinishHouseInteriors_LakeHyliaOcarina, + [ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_SOUTHWEST] = gExitList_MinishHouseInteriors_HyruleFieldSouthwest, + [ROOM_MINISH_HOUSE_INTERIORS_SOUTH_HYRULE_FIELD] = gExitList_MinishHouseInteriors_SouthHyruleField, + [ROOM_MINISH_HOUSE_INTERIORS_NEXT_TO_KNUCKLE] = gExitList_MinishHouseInteriors_NextToKnuckle, + [ROOM_MINISH_HOUSE_INTERIORS_LIBRARI] = gExitList_MinishHouseInteriors_Librari, + [ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_EXIT] = gExitList_MinishHouseInteriors_HyruleFieldExit, + [ROOM_MINISH_HOUSE_INTERIORS_HYRULE_TOWN] = gExitList_MinishHouseInteriors_HyruleTown, + [ROOM_MINISH_HOUSE_INTERIORS_MINISH_WOODS_BOMB] = gExitList_MinishHouseInteriors_MinishWoodsBomb, + [ROOM_MINISH_HOUSE_INTERIORS_LAKE_HYLIA_OCARINA] = gExitList_MinishHouseInteriors_LakeHyliaOcarina, }; const Transition gExitList_OuterFortressOfWinds_EntranceHall[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_23, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WIZZROBE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_20, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_21, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_22, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x288, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_24, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0x28, 0x30, AREA_RUINS, ROOM_RUINS_FORTRESS_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_2F[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_17, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_STALFOS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x92, 0x88, 0x170, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_19, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0x92, 0x88, 0x170, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAIN_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0x92, 0x88, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1d, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x288, 0x92, 0x88, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x28, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1b, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x28, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BOSS_KEY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0xd8, 0x128, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x128, 0xd8, 0x128, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0xd8, 0x1d8, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x1d8, 0xd8, 0x1d8, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0xd8, 0x288, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x288, 0xd8, 0x288, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0xd8, 0x338, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x338, 0xd8, 0x338, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_3F[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x22, 0x78, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_3, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x22, 0x78, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x198, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_4, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x198, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2e8, 0x22, 0x198, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2e8, 0x22, 0x198, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x1f8, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x1f8, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x84, 0x1d8, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x1d8, 0x84, 0x1d8, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0x84, 0x288, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x288, 0x84, 0x288, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x84, 0x338, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x338, 0x84, 0x338, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x84, 0x128, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x128, 0x84, 0x128, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_MoleMitts[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_18, 0x2, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_SmallKey[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1a, 0x2, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MINISH_HOLE, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_OuterFortressOfWinds[] = { - [ROOM_OUTER_FORTRESS_OF_WINDS_0] = gExitList_OuterFortressOfWinds_EntranceHall, - [ROOM_OUTER_FORTRESS_OF_WINDS_1] = gExitList_OuterFortressOfWinds_2F, - [ROOM_OUTER_FORTRESS_OF_WINDS_2] = gExitList_OuterFortressOfWinds_3F, - [ROOM_OUTER_FORTRESS_OF_WINDS_3] = gExitList_OuterFortressOfWinds_MoleMitts, - [ROOM_OUTER_FORTRESS_OF_WINDS_4] = gExitList_OuterFortressOfWinds_SmallKey, + [ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL] = gExitList_OuterFortressOfWinds_EntranceHall, + [ROOM_OUTER_FORTRESS_OF_WINDS_2F] = gExitList_OuterFortressOfWinds_2F, + [ROOM_OUTER_FORTRESS_OF_WINDS_3F] = gExitList_OuterFortressOfWinds_3F, + [ROOM_OUTER_FORTRESS_OF_WINDS_MOLE_MITTS] = gExitList_OuterFortressOfWinds_MoleMitts, + [ROOM_OUTER_FORTRESS_OF_WINDS_SMALL_KEY] = gExitList_OuterFortressOfWinds_SmallKey, }; const Transition gExitList_HyliaDigCaves_North[] = { @@ -1123,7 +1121,7 @@ const Transition gExitList_HouseInteriors2_Cucco[] = { TransitionListEnd, }; const Transition gExitList_HouseInteriors2_LinksHouseEntrance[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_15, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_BEDROOM, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x290, 0x19c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -1137,39 +1135,39 @@ const Transition gExitList_HouseInteriors2_Dampe[] = { const Transition gExitList_HouseInteriors2_NULL2[] = { TransitionListEnd, }; -const Transition gExitList_HouseInteriors2_Stockwell[] = { +const Transition gExitList_HouseInteriors2_StockwellLakeHouse[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x120, 0x4c, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors2_LinksHouseBedroom[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_10, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors2[] = { - [ROOM_HOUSE_INTERIORS_2_0] = gExitList_HouseInteriors2_Stranger, - [ROOM_HOUSE_INTERIORS_2_1] = gExitList_HouseInteriors2_WestOracle, + [ROOM_HOUSE_INTERIORS_2_STRANGER] = gExitList_HouseInteriors2_Stranger, + [ROOM_HOUSE_INTERIORS_2_WEST_ORACLE] = gExitList_HouseInteriors2_WestOracle, [ROOM_HOUSE_INTERIORS_2_2] = gExitList_HouseInteriors2_2, [ROOM_HOUSE_INTERIORS_2_3] = gExitList_HouseInteriors2_3, - [ROOM_HOUSE_INTERIORS_2_4] = gExitList_HouseInteriors2_DrLeft, + [ROOM_HOUSE_INTERIORS_2_DR_LEFT] = gExitList_HouseInteriors2_DrLeft, [ROOM_HOUSE_INTERIORS_2_5] = gExitList_HouseInteriors2_NULL1, - [ROOM_HOUSE_INTERIORS_2_6] = gExitList_HouseInteriors2_Romio, - [ROOM_HOUSE_INTERIORS_2_7] = gExitList_HouseInteriors2_Julietta, - [ROOM_HOUSE_INTERIORS_2_8] = gExitList_HouseInteriors2_Percy, - [ROOM_HOUSE_INTERIORS_2_9] = gExitList_HouseInteriors2_EastOracle, + [ROOM_HOUSE_INTERIORS_2_ROMIO] = gExitList_HouseInteriors2_Romio, + [ROOM_HOUSE_INTERIORS_2_JULIETTA] = gExitList_HouseInteriors2_Julietta, + [ROOM_HOUSE_INTERIORS_2_PERCY] = gExitList_HouseInteriors2_Percy, + [ROOM_HOUSE_INTERIORS_2_EAST_ORACLE] = gExitList_HouseInteriors2_EastOracle, [ROOM_HOUSE_INTERIORS_2_a] = gExitList_HouseInteriors2_A, [ROOM_HOUSE_INTERIORS_2_b] = gExitList_HouseInteriors2_B, - [ROOM_HOUSE_INTERIORS_2_c] = gExitList_HouseInteriors2_Cucco, + [ROOM_HOUSE_INTERIORS_2_CUCCO] = gExitList_HouseInteriors2_Cucco, [ROOM_HOUSE_INTERIORS_2_d] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_e] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_f] = gExitList_NoExitList, - [ROOM_HOUSE_INTERIORS_2_10] = gExitList_HouseInteriors2_LinksHouseEntrance, - [ROOM_HOUSE_INTERIORS_2_11] = gExitList_NoExitList, - [ROOM_HOUSE_INTERIORS_2_12] = gExitList_HouseInteriors2_Dampe, + [ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE] = gExitList_HouseInteriors2_LinksHouseEntrance, + [ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_SMITH] = gExitList_NoExitList, + [ROOM_HOUSE_INTERIORS_2_DAMPE] = gExitList_HouseInteriors2_Dampe, [ROOM_HOUSE_INTERIORS_2_13] = gExitList_HouseInteriors2_NULL2, - [ROOM_HOUSE_INTERIORS_2_14] = gExitList_HouseInteriors2_Stockwell, - [ROOM_HOUSE_INTERIORS_2_15] = gExitList_HouseInteriors2_LinksHouseBedroom, + [ROOM_HOUSE_INTERIORS_2_STOCKWELL_LAKE_HOUSE] = gExitList_HouseInteriors2_StockwellLakeHouse, + [ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_BEDROOM] = gExitList_HouseInteriors2_LinksHouseBedroom, [ROOM_HOUSE_INTERIORS_2_16] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_17] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_18] = gExitList_NoExitList, @@ -1223,18 +1221,18 @@ const Transition gExitList_HouseInteriors4_FarmHouse[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_HouseInteriors4_Mayor[] = { +const Transition gExitList_HouseInteriors4_MayorLakeCabin[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2a0, 0x38c, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors4[] = { - [ROOM_HOUSE_INTERIORS_4_0] = gExitList_HouseInteriors4_Carpenter, - [ROOM_HOUSE_INTERIORS_4_1] = gExitList_HouseInteriors4_Swiftblade, - [ROOM_HOUSE_INTERIORS_4_2] = gExitList_HouseInteriors4_RanchHouseWest, - [ROOM_HOUSE_INTERIORS_4_3] = gExitList_HouseInteriors4_RanchHouseEast, - [ROOM_HOUSE_INTERIORS_4_4] = gExitList_HouseInteriors4_FarmHouse, - [ROOM_HOUSE_INTERIORS_4_5] = gExitList_HouseInteriors4_Mayor, + [ROOM_HOUSE_INTERIORS_4_CARPENTER] = gExitList_HouseInteriors4_Carpenter, + [ROOM_HOUSE_INTERIORS_4_SWIFTBLADE] = gExitList_HouseInteriors4_Swiftblade, + [ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_WEST] = gExitList_HouseInteriors4_RanchHouseWest, + [ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_EAST] = gExitList_HouseInteriors4_RanchHouseEast, + [ROOM_HOUSE_INTERIORS_4_FARM_HOUSE] = gExitList_HouseInteriors4_FarmHouse, + [ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN] = gExitList_HouseInteriors4_MayorLakeCabin, [ROOM_HOUSE_INTERIORS_4_6] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_4_7] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_4_8] = gExitList_NoExitList, @@ -1253,7 +1251,7 @@ const Transition gExitList_GreatFairies_Graveyard[] = { TransitionListEnd, }; const Transition gExitList_GreatFairies_MinishWoods[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1b, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1304,30 +1302,30 @@ const Transition gExitList_HouseInteriors3_FigurineHouse[] = { const Transition gExitList_HouseInteriors3_BorlovEntrance[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x298, 0x26c, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x78, 0x3, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_8, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x78, 0x3, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors3_Carlov[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x60, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_10, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x60, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors3_Borlov[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x68, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_6, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x68, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors3[] = { - [ROOM_HOUSE_INTERIORS_3_0] = gExitList_HouseInteriors3_StockwellShop, - [ROOM_HOUSE_INTERIORS_3_1] = gExitList_HouseInteriors3_Cafe, - [ROOM_HOUSE_INTERIORS_3_2] = gExitList_HouseInteriors3_RemShoeShop, - [ROOM_HOUSE_INTERIORS_3_3] = gExitList_HouseInteriors3_Bakery, - [ROOM_HOUSE_INTERIORS_3_4] = gExitList_HouseInteriors3_Simon, - [ROOM_HOUSE_INTERIORS_3_5] = gExitList_HouseInteriors3_FigurineHouse, - [ROOM_HOUSE_INTERIORS_3_6] = gExitList_HouseInteriors3_BorlovEntrance, - [ROOM_HOUSE_INTERIORS_3_7] = gExitList_HouseInteriors3_Carlov, - [ROOM_HOUSE_INTERIORS_3_8] = gExitList_HouseInteriors3_Borlov, + [ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP] = gExitList_HouseInteriors3_StockwellShop, + [ROOM_HOUSE_INTERIORS_3_CAFE] = gExitList_HouseInteriors3_Cafe, + [ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP] = gExitList_HouseInteriors3_RemShoeShop, + [ROOM_HOUSE_INTERIORS_3_BAKERY] = gExitList_HouseInteriors3_Bakery, + [ROOM_HOUSE_INTERIORS_3_SIMON] = gExitList_HouseInteriors3_Simon, + [ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE] = gExitList_HouseInteriors3_FigurineHouse, + [ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE] = gExitList_HouseInteriors3_BorlovEntrance, + [ROOM_HOUSE_INTERIORS_3_CARLOV] = gExitList_HouseInteriors3_Carlov, + [ROOM_HOUSE_INTERIORS_3_BORLOV] = gExitList_HouseInteriors3_Borlov, [ROOM_HOUSE_INTERIORS_3_9] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_3_a] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_3_b] = gExitList_NoExitList, @@ -1352,42 +1350,42 @@ const Transition gExitList_HouseInteriors1_PostOffice[] = { const Transition gExitList_HouseInteriors1_Library2F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x138, 0x58, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x68, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_3, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x68, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_Library1F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x168, 0xb8, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x78, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x78, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_Inn1F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x388, 0x268, 0x10, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x98, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_5, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x98, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_6, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xf8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xf8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x38, 0xb8, 0x168, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_9, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x38, 0xb8, 0x168, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_InnWestRoom[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_InnMiddleRoom[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_InnEastRoom[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1399,7 +1397,7 @@ const Transition gExitList_HouseInteriors1_InnWest2F[] = { const Transition gExitList_HouseInteriors1_InnEast2F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3a8, 0x230, 0x10, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x178, 0x118, 0x48, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xb8, 0x178, 0x118, 0x48, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1416,19 +1414,19 @@ const Transition gExitList_HouseInteriors1_SchoolEast[] = { TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors1[] = { - [ROOM_HOUSE_INTERIORS_1_0] = gExitList_HouseInteriors1_Mayor, - [ROOM_HOUSE_INTERIORS_1_1] = gExitList_HouseInteriors1_PostOffice, - [ROOM_HOUSE_INTERIORS_1_2] = gExitList_HouseInteriors1_Library2F, - [ROOM_HOUSE_INTERIORS_1_3] = gExitList_HouseInteriors1_Library1F, - [ROOM_HOUSE_INTERIORS_1_4] = gExitList_HouseInteriors1_Inn1F, - [ROOM_HOUSE_INTERIORS_1_5] = gExitList_HouseInteriors1_InnWestRoom, - [ROOM_HOUSE_INTERIORS_1_6] = gExitList_HouseInteriors1_InnMiddleRoom, - [ROOM_HOUSE_INTERIORS_1_7] = gExitList_HouseInteriors1_InnEastRoom, - [ROOM_HOUSE_INTERIORS_1_8] = gExitList_HouseInteriors1_InnWest2F, - [ROOM_HOUSE_INTERIORS_1_9] = gExitList_HouseInteriors1_InnEast2F, - [ROOM_HOUSE_INTERIORS_1_a] = gExitList_NoExitList, - [ROOM_HOUSE_INTERIORS_1_b] = gExitList_HouseInteriors1_SchoolWest, - [ROOM_HOUSE_INTERIORS_1_c] = gExitList_HouseInteriors1_SchoolEast, + [ROOM_HOUSE_INTERIORS_1_MAYOR] = gExitList_HouseInteriors1_Mayor, + [ROOM_HOUSE_INTERIORS_1_POST_OFFICE] = gExitList_HouseInteriors1_PostOffice, + [ROOM_HOUSE_INTERIORS_1_LIBRARY_2F] = gExitList_HouseInteriors1_Library2F, + [ROOM_HOUSE_INTERIORS_1_LIBRARY_1F] = gExitList_HouseInteriors1_Library1F, + [ROOM_HOUSE_INTERIORS_1_INN_1F] = gExitList_HouseInteriors1_Inn1F, + [ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM] = gExitList_HouseInteriors1_InnWestRoom, + [ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM] = gExitList_HouseInteriors1_InnMiddleRoom, + [ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM] = gExitList_HouseInteriors1_InnEastRoom, + [ROOM_HOUSE_INTERIORS_1_INN_WEST_2F] = gExitList_HouseInteriors1_InnWest2F, + [ROOM_HOUSE_INTERIORS_1_INN_EAST_2F] = gExitList_HouseInteriors1_InnEast2F, + [ROOM_HOUSE_INTERIORS_1_INN_MINISH_HEART_PIECE] = gExitList_NoExitList, + [ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST] = gExitList_HouseInteriors1_SchoolWest, + [ROOM_HOUSE_INTERIORS_1_SCHOOL_EAST] = gExitList_HouseInteriors1_SchoolEast, [ROOM_HOUSE_INTERIORS_1_d] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_1_e] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_1_f] = gExitList_NoExitList, @@ -1456,7 +1454,7 @@ const Transition gExitList_TreeInteriors_WitchHut[] = { TransitionListEnd, }; const Transition gExitList_TreeInteriors_StairsToCarlov[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CARLOV, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x50, 0x388, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -1472,8 +1470,8 @@ const Transition gExitList_TreeInteriors_HeartPiece[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToBladeBrother[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x98, 0x0, AREA_DOJOS, ROOM_DOJOS_6, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, +const Transition gExitList_TreeInteriors_Waveblade[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x98, 0x0, AREA_DOJOS, ROOM_DOJOS_WAVEBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x100, 0x2c8, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -1484,41 +1482,41 @@ const Transition gExitList_TreeInteriors_14[] = { TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangNorthwest[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b0, 0x138, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangNortheast[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x240, 0x138, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangSouthwest[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b0, 0x198, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangSoutheast[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x240, 0x198, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_HeartPieceSouthwestField[] = { +const Transition gExitList_TreeInteriors_WesternWoodsHeartPiece[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa0, 0x1f8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_NORTH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToFairyFountain[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_16, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, +const Transition gExitList_TreeInteriors_NorthHyruleFieldFairyFountain[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2f0, 0x148, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToWalletFairy[] = { +const Transition gExitList_TreeInteriors_MinishWoodsGreatFairy[] = { { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0xf8, 0x0, AREA_GREAT_FAIRIES, ROOM_GREAT_FAIRIES_MINISH_WOODS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x70, 0x58, 0x30, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, @@ -1530,8 +1528,8 @@ const Transition gExitList_TreeInteriors_1C[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToBusinessScrub[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_17, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, +const Transition gExitList_TreeInteriors_MinishWoodsBusinessScrub[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_KINSTONE_BUSINESS_SCRUB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x210, 0x1d8, 0x30, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -1539,13 +1537,13 @@ const Transition gExitList_TreeInteriors_StairsToBusinessScrub[] = { const Transition gExitList_TreeInteriors_1E[] = { TransitionListEnd, }; -const Transition gExitList_TreeInteriors_1F[] = { +const Transition gExitList_TreeInteriors_UnusedHeartContainer[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1e0, 0x1b8, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_TreeInteriors[] = { - [ROOM_TREE_INTERIORS_0] = gExitList_TreeInteriors_WitchHut, + [ROOM_TREE_INTERIORS_WITCH_HUT] = gExitList_TreeInteriors_WitchHut, [ROOM_TREE_INTERIORS_1] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_2] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_3] = gExitList_NoExitList, @@ -1561,26 +1559,26 @@ const Transition* const gExitLists_TreeInteriors[] = { [ROOM_TREE_INTERIORS_d] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_e] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_f] = gExitList_NoExitList, - [ROOM_TREE_INTERIORS_10] = gExitList_TreeInteriors_StairsToCarlov, - [ROOM_TREE_INTERIORS_11] = gExitList_TreeInteriors_PercysTreehouse, - [ROOM_TREE_INTERIORS_12] = gExitList_TreeInteriors_HeartPiece, - [ROOM_TREE_INTERIORS_13] = gExitList_TreeInteriors_StairsToBladeBrother, + [ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV] = gExitList_TreeInteriors_StairsToCarlov, + [ROOM_TREE_INTERIORS_PERCYS_TREEHOUSE] = gExitList_TreeInteriors_PercysTreehouse, + [ROOM_TREE_INTERIORS_SOUTH_HYRULE_FIELD_HEART_PIECE] = gExitList_TreeInteriors_HeartPiece, + [ROOM_TREE_INTERIORS_WAVEBLADE] = gExitList_TreeInteriors_Waveblade, [ROOM_TREE_INTERIORS_14] = gExitList_TreeInteriors_14, - [ROOM_TREE_INTERIORS_15] = gExitList_TreeInteriors_BoomerangNorthwest, - [ROOM_TREE_INTERIORS_16] = gExitList_TreeInteriors_BoomerangNortheast, - [ROOM_TREE_INTERIORS_17] = gExitList_TreeInteriors_BoomerangSouthwest, - [ROOM_TREE_INTERIORS_18] = gExitList_TreeInteriors_BoomerangSoutheast, - [ROOM_TREE_INTERIORS_19] = gExitList_TreeInteriors_HeartPieceSouthwestField, - [ROOM_TREE_INTERIORS_1a] = gExitList_TreeInteriors_StairsToFairyFountain, - [ROOM_TREE_INTERIORS_1b] = gExitList_TreeInteriors_StairsToWalletFairy, + [ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST] = gExitList_TreeInteriors_BoomerangNorthwest, + [ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST] = gExitList_TreeInteriors_BoomerangNortheast, + [ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST] = gExitList_TreeInteriors_BoomerangSouthwest, + [ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST] = gExitList_TreeInteriors_BoomerangSoutheast, + [ROOM_TREE_INTERIORS_WESTERN_WOODS_HEART_PIECE] = gExitList_TreeInteriors_WesternWoodsHeartPiece, + [ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN] = gExitList_TreeInteriors_NorthHyruleFieldFairyFountain, + [ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY] = gExitList_TreeInteriors_MinishWoodsGreatFairy, [ROOM_TREE_INTERIORS_1c] = gExitList_TreeInteriors_1C, - [ROOM_TREE_INTERIORS_1d] = gExitList_TreeInteriors_StairsToBusinessScrub, + [ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB] = gExitList_TreeInteriors_MinishWoodsBusinessScrub, [ROOM_TREE_INTERIORS_1e] = gExitList_TreeInteriors_1E, - [ROOM_TREE_INTERIORS_1f] = gExitList_TreeInteriors_1F, + [ROOM_TREE_INTERIORS_UNUSED_HEART_CONTAINER] = gExitList_TreeInteriors_UnusedHeartContainer, }; const Transition gExitList_Dojos_Grayblade[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x20, 0x30, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_10, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x20, 0x30, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_TO_GRAYBLADE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1590,7 +1588,7 @@ const Transition gExitList_Dojos_Swiftblade[] = { TransitionListEnd, }; const Transition gExitList_Dojos_Waveblade[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_13, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WAVEBLADE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1615,14 +1613,22 @@ const Transition gExitList_Dojos_ToScarblade[] = { TransitionListEnd, }; const Transition* const gExitLists_Dojos[] = { - [ROOM_DOJOS_0] = gExitList_Dojos_Grayblade, [ROOM_DOJOS_1] = gExitList_NoExitList, - [ROOM_DOJOS_2] = gExitList_NoExitList, [ROOM_DOJOS_3] = gExitList_NoExitList, - [ROOM_DOJOS_4] = gExitList_Dojos_Swiftblade, [ROOM_DOJOS_5] = gExitList_NoExitList, - [ROOM_DOJOS_6] = gExitList_Dojos_Waveblade, [ROOM_DOJOS_7] = gExitList_NoExitList, - [ROOM_DOJOS_8] = gExitList_NoExitList, [ROOM_DOJOS_9] = gExitList_NoExitList, - [ROOM_DOJOS_a] = gExitList_Dojos_ToGrimblade, [ROOM_DOJOS_b] = gExitList_Dojos_ToSplitblade, - [ROOM_DOJOS_c] = gExitList_Dojos_ToGreatblade, [ROOM_DOJOS_d] = gExitList_Dojos_ToScarblade, - [ROOM_DOJOS_e] = gExitList_NoExitList, [ROOM_DOJOS_f] = gExitList_NoExitList, + [ROOM_DOJOS_GRAYBLADE] = gExitList_Dojos_Grayblade, + [ROOM_DOJOS_SPLITBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_GREATBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_SCARBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_SWIFTBLADE_I] = gExitList_Dojos_Swiftblade, + [ROOM_DOJOS_GRIMBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_WAVEBLADE] = gExitList_Dojos_Waveblade, + [ROOM_DOJOS_7] = gExitList_NoExitList, + [ROOM_DOJOS_8] = gExitList_NoExitList, + [ROOM_DOJOS_9] = gExitList_NoExitList, + [ROOM_DOJOS_TO_GRIMBLADE] = gExitList_Dojos_ToGrimblade, + [ROOM_DOJOS_TO_SPLITBLADE] = gExitList_Dojos_ToSplitblade, + [ROOM_DOJOS_TO_GREATBLADE] = gExitList_Dojos_ToGreatblade, + [ROOM_DOJOS_TO_SCARBLADE] = gExitList_Dojos_ToScarblade, + [ROOM_DOJOS_e] = gExitList_NoExitList, + [ROOM_DOJOS_f] = gExitList_NoExitList, }; const Transition gExitList_MinishCracks_LonLonRanchNorth[] = { @@ -1653,7 +1659,7 @@ const Transition gExitList_MinishCracks_EastHyruleCastle[] = { const Transition gExitList_MinishCracks_5[] = { TransitionListEnd, }; -const Transition gExitList_MinishCracks_CastleWildsBowHole[] = { +const Transition gExitList_MinishCracks_CastorWildsBow[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x28, 0x54, 0x3, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -1696,20 +1702,20 @@ const Transition gExitList_MinishCracks_11[] = { TransitionListEnd, }; const Transition* const gExitLists_MinishCracks[] = { - [ROOM_MINISH_CRACKS_0] = gExitList_MinishCracks_LonLonRanchNorth, - [ROOM_MINISH_CRACKS_1] = gExitList_MinishCracks_LakeHyliaEast, - [ROOM_MINISH_CRACKS_2] = gExitList_MinishCracks_HyruleCastleGarden, - [ROOM_MINISH_CRACKS_3] = gExitList_MinishCracks_MtCrenel, - [ROOM_MINISH_CRACKS_4] = gExitList_MinishCracks_EastHyruleCastle, + [ROOM_MINISH_CRACKS_LON_LON_RANCH_NORTH] = gExitList_MinishCracks_LonLonRanchNorth, + [ROOM_MINISH_CRACKS_LAKE_HYLIA_EAST] = gExitList_MinishCracks_LakeHyliaEast, + [ROOM_MINISH_CRACKS_HYRULE_CASTLE_GARDEN] = gExitList_MinishCracks_HyruleCastleGarden, + [ROOM_MINISH_CRACKS_MT_CRENEL] = gExitList_MinishCracks_MtCrenel, + [ROOM_MINISH_CRACKS_EAST_HYRULE_CASTLE] = gExitList_MinishCracks_EastHyruleCastle, [ROOM_MINISH_CRACKS_5] = gExitList_MinishCracks_5, - [ROOM_MINISH_CRACKS_6] = gExitList_MinishCracks_CastleWildsBowHole, - [ROOM_MINISH_CRACKS_7] = gExitList_MinishCracks_RuinsEntrance, - [ROOM_MINISH_CRACKS_8] = gExitList_MinishCracks_MinishWoodsSouth, - [ROOM_MINISH_CRACKS_9] = gExitList_MinishCracks_CastorWildsNorth, - [ROOM_MINISH_CRACKS_a] = gExitList_MinishCracks_CastorWildsWest, - [ROOM_MINISH_CRACKS_b] = gExitList_MinishCracks_CastorWildsMiddle, - [ROOM_MINISH_CRACKS_c] = gExitList_MinishCracks_RuinsTektite, - [ROOM_MINISH_CRACKS_d] = gExitList_MinishCracks_CastorWildsNextToBow, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_BOW] = gExitList_MinishCracks_CastorWildsBow, + [ROOM_MINISH_CRACKS_RUINS_ENTRANCE] = gExitList_MinishCracks_RuinsEntrance, + [ROOM_MINISH_CRACKS_MINISH_WOODS_SOUTH] = gExitList_MinishCracks_MinishWoodsSouth, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_NORTH] = gExitList_MinishCracks_CastorWildsNorth, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_WEST] = gExitList_MinishCracks_CastorWildsWest, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_MIDDLE] = gExitList_MinishCracks_CastorWildsMiddle, + [ROOM_MINISH_CRACKS_RUINS_TEKTITE] = gExitList_MinishCracks_RuinsTektite, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_NEXT_TO_BOW] = gExitList_MinishCracks_CastorWildsNextToBow, [ROOM_MINISH_CRACKS_e] = gExitList_NoExitList, [ROOM_MINISH_CRACKS_f] = gExitList_NoExitList, [ROOM_MINISH_CRACKS_10] = gExitList_NoExitList, @@ -1729,28 +1735,28 @@ const Transition gExitList_CrenelCaves_BlockPushing[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0x28, 0x20, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_2, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BRIDGE_SWITCH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_PillarCave[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0xc8, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_3, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_EXIT_TO_MINES, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_BridgeSwitch[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x238, 0xc8, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x238, 0xc8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x238, 0xc8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_ExitToMines[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x188, 0x108, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_1, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_PILLAR_CAVE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1767,14 +1773,14 @@ const Transition gExitList_CrenelCaves_FairyFountain[] = { const Transition gExitList_CrenelCaves_SpinyChuPuzzle[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2f8, 0x38, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CENTER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_7, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_ChuchuPotChest[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x348, 0x68, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CENTER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_6, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1791,18 +1797,18 @@ const Transition gExitList_CrenelCaves_RupeeFairyFountain[] = { const Transition gExitList_CrenelCaves_HelmasaurHallway[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0xe8, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x68, 0x18, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_b, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x18, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_MUSHROOM_KEESE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_MushroomKeese[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x138, 0x148, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x68, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_a, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x68, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_CrenelCaves_LadderToGreenWater[] = { +const Transition gExitList_CrenelCaves_LadderToSpringWater[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2d8, 0x198, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2d8, 0x138, 0x3, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, @@ -1825,29 +1831,29 @@ const Transition gExitList_CrenelCaves_HintScrub[] = { TransitionListEnd, }; const Transition gExitList_CrenelCaves_ToGrayblade[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0xa0, 0x3, AREA_DOJOS, ROOM_DOJOS_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0xa0, 0x3, AREA_DOJOS, ROOM_DOJOS_GRAYBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0x158, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_CrenelCaves[] = { - [ROOM_CRENEL_CAVES_0] = gExitList_CrenelCaves_BlockPushing, - [ROOM_CRENEL_CAVES_1] = gExitList_CrenelCaves_PillarCave, - [ROOM_CRENEL_CAVES_2] = gExitList_CrenelCaves_BridgeSwitch, - [ROOM_CRENEL_CAVES_3] = gExitList_CrenelCaves_ExitToMines, - [ROOM_CRENEL_CAVES_4] = gExitList_CrenelCaves_GripRing, - [ROOM_CRENEL_CAVES_5] = gExitList_CrenelCaves_FairyFountain, - [ROOM_CRENEL_CAVES_6] = gExitList_CrenelCaves_SpinyChuPuzzle, - [ROOM_CRENEL_CAVES_7] = gExitList_CrenelCaves_ChuchuPotChest, - [ROOM_CRENEL_CAVES_8] = gExitList_CrenelCaves_WaterHeartPiece, - [ROOM_CRENEL_CAVES_9] = gExitList_CrenelCaves_RupeeFairyFountain, - [ROOM_CRENEL_CAVES_a] = gExitList_CrenelCaves_HelmasaurHallway, - [ROOM_CRENEL_CAVES_b] = gExitList_CrenelCaves_MushroomKeese, - [ROOM_CRENEL_CAVES_c] = gExitList_CrenelCaves_LadderToGreenWater, - [ROOM_CRENEL_CAVES_d] = gExitList_CrenelCaves_BombBusinessScrub, - [ROOM_CRENEL_CAVES_e] = gExitList_CrenelCaves_Hermit, - [ROOM_CRENEL_CAVES_f] = gExitList_CrenelCaves_HintScrub, - [ROOM_CRENEL_CAVES_10] = gExitList_CrenelCaves_ToGrayblade, + [ROOM_CRENEL_CAVES_BLOCK_PUSHING] = gExitList_CrenelCaves_BlockPushing, + [ROOM_CRENEL_CAVES_PILLAR_CAVE] = gExitList_CrenelCaves_PillarCave, + [ROOM_CRENEL_CAVES_BRIDGE_SWITCH] = gExitList_CrenelCaves_BridgeSwitch, + [ROOM_CRENEL_CAVES_EXIT_TO_MINES] = gExitList_CrenelCaves_ExitToMines, + [ROOM_CRENEL_CAVES_GRIP_RING] = gExitList_CrenelCaves_GripRing, + [ROOM_CRENEL_CAVES_FAIRY_FOUNTAIN] = gExitList_CrenelCaves_FairyFountain, + [ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE] = gExitList_CrenelCaves_SpinyChuPuzzle, + [ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST] = gExitList_CrenelCaves_ChuchuPotChest, + [ROOM_CRENEL_CAVES_WATER_HEART_PIECE] = gExitList_CrenelCaves_WaterHeartPiece, + [ROOM_CRENEL_CAVES_RUPEE_FAIRY_FOUINTAIN] = gExitList_CrenelCaves_RupeeFairyFountain, + [ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY] = gExitList_CrenelCaves_HelmasaurHallway, + [ROOM_CRENEL_CAVES_MUSHROOM_KEESE] = gExitList_CrenelCaves_MushroomKeese, + [ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER] = gExitList_CrenelCaves_LadderToSpringWater, + [ROOM_CRENEL_CAVES_BOMB_BUSINESS_SCRUB] = gExitList_CrenelCaves_BombBusinessScrub, + [ROOM_CRENEL_CAVES_HERMIT] = gExitList_CrenelCaves_Hermit, + [ROOM_CRENEL_CAVES_HINT_SCRUB] = gExitList_CrenelCaves_HintScrub, + [ROOM_CRENEL_CAVES_TO_GRAYBLADE] = gExitList_CrenelCaves_ToGrayblade, }; const Transition gExitList_CastorCaves_South[] = { @@ -1868,7 +1874,7 @@ const Transition gExitList_CastorCaves_WindRuins[] = { TransitionListEnd, }; const Transition gExitList_CastorCaves_Darknut[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x188, 0x28, 0x0, AREA_CASTOR_DARKNUT, ROOM_CASTOR_DARKNUT_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x188, 0x28, 0x0, AREA_CASTOR_DARKNUT, ROOM_CASTOR_DARKNUT_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1a8, 0x1b8, 0x30, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -1880,11 +1886,11 @@ const Transition gExitList_CastorCaves_HeartPiece[] = { TransitionListEnd, }; const Transition* const gExitLists_CastorCaves[] = { - [ROOM_CASTOR_CAVES_0] = gExitList_CastorCaves_South, - [ROOM_CASTOR_CAVES_1] = gExitList_CastorCaves_North, - [ROOM_CASTOR_CAVES_2] = gExitList_CastorCaves_WindRuins, - [ROOM_CASTOR_CAVES_3] = gExitList_CastorCaves_Darknut, - [ROOM_CASTOR_CAVES_4] = gExitList_CastorCaves_HeartPiece, + [ROOM_CASTOR_CAVES_SOUTH] = gExitList_CastorCaves_South, + [ROOM_CASTOR_CAVES_NORTH] = gExitList_CastorCaves_North, + [ROOM_CASTOR_CAVES_WIND_RUINS] = gExitList_CastorCaves_WindRuins, + [ROOM_CASTOR_CAVES_DARKNUT] = gExitList_CastorCaves_Darknut, + [ROOM_CASTOR_CAVES_HEART_PIECE] = gExitList_CastorCaves_HeartPiece, [ROOM_CASTOR_CAVES_5] = gExitList_NoExitList, [ROOM_CASTOR_CAVES_6] = gExitList_NoExitList, [ROOM_CASTOR_CAVES_7] = gExitList_NoExitList, @@ -1894,13 +1900,13 @@ const Transition gExitList_CastorDarknut_Main[] = { TransitionListEnd, }; const Transition gExitList_CastorDarknut_Hall[] = { - { WARP_TYPE_1, 0x0, 0x188, 0x18, 0x68, 0x28, 0x0, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_3, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x188, 0x18, 0x68, 0x28, 0x0, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_DARKNUT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_CastorDarknut[] = { - [ROOM_CASTOR_DARKNUT_0] = gExitList_CastorDarknut_Main, - [ROOM_CASTOR_DARKNUT_1] = gExitList_CastorDarknut_Hall, + [ROOM_CASTOR_DARKNUT_MAIN] = gExitList_CastorDarknut_Main, + [ROOM_CASTOR_DARKNUT_HALL] = gExitList_CastorDarknut_Hall, NULL, NULL, }; @@ -1951,79 +1957,79 @@ const Transition gExitList_ArmosInteriors_8[] = { TransitionListEnd, }; const Transition gExitList_ArmosInteriors_FortressOfWindsLeft[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_ArmosInteriors_FortressOfWindsRight[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_ArmosInteriors[] = { - [ROOM_ARMOS_INTERIORS_0] = gExitList_ArmosInteriors_RuinsEntranceNorth, - [ROOM_ARMOS_INTERIORS_1] = gExitList_ArmosInteriors_RuinsEntranceSouth, - [ROOM_ARMOS_INTERIORS_2] = gExitList_ArmosInteriors_RuinsLeft, - [ROOM_ARMOS_INTERIORS_3] = gExitList_ArmosInteriors_RuinsMiddleLeft, - [ROOM_ARMOS_INTERIORS_4] = gExitList_ArmosInteriors_RuinsMiddleRight, - [ROOM_ARMOS_INTERIORS_5] = gExitList_ArmosInteriors_RuinsRight, + [ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_NORTH] = gExitList_ArmosInteriors_RuinsEntranceNorth, + [ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_SOUTH] = gExitList_ArmosInteriors_RuinsEntranceSouth, + [ROOM_ARMOS_INTERIORS_RUINS_LEFT] = gExitList_ArmosInteriors_RuinsLeft, + [ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_LEFT] = gExitList_ArmosInteriors_RuinsMiddleLeft, + [ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_RIGHT] = gExitList_ArmosInteriors_RuinsMiddleRight, + [ROOM_ARMOS_INTERIORS_RUINS_RIGHT] = gExitList_ArmosInteriors_RuinsRight, [ROOM_ARMOS_INTERIORS_6] = gExitList_ArmosInteriors_6, - [ROOM_ARMOS_INTERIORS_7] = gExitList_ArmosInteriors_RuinsGrassPath, + [ROOM_ARMOS_INTERIORS_RUINS_GRASS_PATH] = gExitList_ArmosInteriors_RuinsGrassPath, [ROOM_ARMOS_INTERIORS_8] = gExitList_ArmosInteriors_8, - [ROOM_ARMOS_INTERIORS_9] = gExitList_ArmosInteriors_FortressOfWindsLeft, - [ROOM_ARMOS_INTERIORS_a] = gExitList_ArmosInteriors_FortressOfWindsRight, + [ROOM_ARMOS_INTERIORS_FORTRESS_LEFT] = gExitList_ArmosInteriors_FortressOfWindsLeft, + [ROOM_ARMOS_INTERIORS_FORTRESS_RIGHT] = gExitList_ArmosInteriors_FortressOfWindsRight, }; const Transition gExitList_TownMinishHoles_MayorsHouse[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x2c, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_0, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x2c, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_MAYOR, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_WestOracle[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x38, 0xc, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_1, 0x1, 0x1, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x38, 0xc, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_WEST_ORACLE, 0x1, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_DrLeft[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x44, 0x30, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_4, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x44, 0x30, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DR_LEFT, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_Carpenter[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x68, 0xc, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_0, 0x1, 0x1, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x68, 0xc, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_CARPENTER, 0x1, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_Cafe[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xcc, 0x48, 0xc0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_1, 0x1, 0x1, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xcc, 0x48, 0xc0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CAFE, 0x1, 0x1, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_LibraryBookshelf[] = { - { WARP_TYPE_1, 0x0, 0x100, 0xc8, 0x78, 0xc0, 0x0, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_11, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x100, 0xc8, 0x78, 0xc0, 0x0, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKS_HOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3e, 0x3c, 0x10, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3e, 0x3c, 0x10, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x54, 0x3c, 0x20, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x54, 0x3c, 0x20, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_LibrariBookHouse[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xd8, 0x30, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_10, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xd8, 0x30, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKSHELF, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_RemShoeShop[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x74, 0x64, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x74, 0x64, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_TownMinishHoles[] = { - [ROOM_TOWN_MINISH_HOLES_0] = gExitList_TownMinishHoles_MayorsHouse, - [ROOM_TOWN_MINISH_HOLES_1] = gExitList_TownMinishHoles_WestOracle, - [ROOM_TOWN_MINISH_HOLES_2] = gExitList_TownMinishHoles_DrLeft, - [ROOM_TOWN_MINISH_HOLES_3] = gExitList_TownMinishHoles_Carpenter, - [ROOM_TOWN_MINISH_HOLES_4] = gExitList_TownMinishHoles_Cafe, + [ROOM_TOWN_MINISH_HOLES_MAYORS_HOUSE] = gExitList_TownMinishHoles_MayorsHouse, + [ROOM_TOWN_MINISH_HOLES_WEST_ORACLE] = gExitList_TownMinishHoles_WestOracle, + [ROOM_TOWN_MINISH_HOLES_DR_LEFT] = gExitList_TownMinishHoles_DrLeft, + [ROOM_TOWN_MINISH_HOLES_CARPENTER] = gExitList_TownMinishHoles_Carpenter, + [ROOM_TOWN_MINISH_HOLES_CAFE] = gExitList_TownMinishHoles_Cafe, [ROOM_TOWN_MINISH_HOLES_5] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_6] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_7] = gExitList_NoExitList, @@ -2035,99 +2041,99 @@ const Transition* const gExitLists_TownMinishHoles[] = { [ROOM_TOWN_MINISH_HOLES_d] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_e] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_f] = gExitList_NoExitList, - [ROOM_TOWN_MINISH_HOLES_10] = gExitList_TownMinishHoles_LibraryBookshelf, - [ROOM_TOWN_MINISH_HOLES_11] = gExitList_TownMinishHoles_LibrariBookHouse, - [ROOM_TOWN_MINISH_HOLES_12] = gExitList_TownMinishHoles_RemShoeShop, + [ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKSHELF] = gExitList_TownMinishHoles_LibraryBookshelf, + [ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKS_HOUSE] = gExitList_TownMinishHoles_LibrariBookHouse, + [ROOM_TOWN_MINISH_HOLES_REM_SHOE_SHOP] = gExitList_TownMinishHoles_RemShoeShop, [ROOM_TOWN_MINISH_HOLES_13] = gExitList_NoExitList, }; const Transition gExitList_MinishRafters_Cafe[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_1, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CAFE, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1bc, 0x2b4, 0xc, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MinishRafters_Stockwell[] = { - { WARP_TYPE_1, 0x0, 0x198, 0x18, 0xac, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_0, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x198, 0x18, 0xac, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x238, 0x2b4, 0xc0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x1, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MinishRafters_DrLeft[] = { - { WARP_TYPE_1, 0x0, 0xe8, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_4, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0xe8, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DR_LEFT, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MinishRafters_Bakery[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_3, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x48, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BAKERY, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x148, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_3, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x148, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BAKERY, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_MinishRafters[] = { - [ROOM_MINISH_RAFTERS_0] = gExitList_MinishRafters_Cafe, - [ROOM_MINISH_RAFTERS_1] = gExitList_MinishRafters_Stockwell, - [ROOM_MINISH_RAFTERS_2] = gExitList_MinishRafters_DrLeft, - [ROOM_MINISH_RAFTERS_3] = gExitList_MinishRafters_Bakery, + [ROOM_MINISH_RAFTERS_CAFE] = gExitList_MinishRafters_Cafe, + [ROOM_MINISH_RAFTERS_STOCKWELL] = gExitList_MinishRafters_Stockwell, + [ROOM_MINISH_RAFTERS_DR_LEFT] = gExitList_MinishRafters_DrLeft, + [ROOM_MINISH_RAFTERS_BAKERY] = gExitList_MinishRafters_Bakery, }; -const Transition gExitList_GoronCave_StairsToCave[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x78, 0x278, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, +const Transition gExitList_GoronCave_Stairs[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x78, 0x278, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x368, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_LON_LON_RANCH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_GoronCave_Main[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x288, 0x78, 0x48, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x288, 0x78, 0x48, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_STAIRS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_GoronCave[] = { - [ROOM_GORON_CAVE_0] = gExitList_GoronCave_StairsToCave, - [ROOM_GORON_CAVE_1] = gExitList_GoronCave_Main, + [ROOM_GORON_CAVE_STAIRS] = gExitList_GoronCave_Stairs, + [ROOM_GORON_CAVE_MAIN] = gExitList_GoronCave_Main, }; const Transition gExitList_WindTribeTower_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1e8, 0x168, 0x30, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_WindTribeTower_Floor2[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_0, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_2, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_2, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_WindTribeTower_Floor3[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_3, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_3, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_WindTribeTower_Floor4[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_2, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_2, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0x148, 0x0, AREA_WIND_TRIBE_TOWER_ROOF, ROOM_WIND_TRIBE_TOWER_ROOF_0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_WindTribeTower[] = { - [ROOM_WIND_TRIBE_TOWER_0] = gExitList_WindTribeTower_Entrance, - [ROOM_WIND_TRIBE_TOWER_1] = gExitList_WindTribeTower_Floor2, - [ROOM_WIND_TRIBE_TOWER_2] = gExitList_WindTribeTower_Floor3, - [ROOM_WIND_TRIBE_TOWER_3] = gExitList_WindTribeTower_Floor4, + [ROOM_WIND_TRIBE_TOWER_ENTRANCE] = gExitList_WindTribeTower_Entrance, + [ROOM_WIND_TRIBE_TOWER_FLOOR_1] = gExitList_WindTribeTower_Floor2, + [ROOM_WIND_TRIBE_TOWER_FLOOR_2] = gExitList_WindTribeTower_Floor3, + [ROOM_WIND_TRIBE_TOWER_FLOOR_3] = gExitList_WindTribeTower_Floor4, }; const Transition gExitList_WindTribeTowerRoof_Main[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x138, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_3, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xb8, 0x138, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_3, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -2136,13 +2142,13 @@ const Transition* const gExitLists_WindTribeTowerRoof[] = { }; const Transition gExitList_Caves_Boomerang[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_15, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_16, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x48, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_17, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_18, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0xa8, 0xb8, 0x1f8, 0x138, 0x0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -2153,7 +2159,7 @@ const Transition gExitList_Caves_ToGraveyard[] = { 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x118, 0x38, 0x118, 0xd8, 0x0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x138, 0x98, 0x78, 0x48, 0x0, AREA_CAVES, ROOM_CAVES_15, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x138, 0x98, 0x78, 0x48, 0x0, AREA_CAVES, ROOM_CAVES_HEART_PIECE_HALLWAY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x108, 0x148, 0x20, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -2172,17 +2178,17 @@ const Transition gExitList_Caves_4[] = { const Transition gExitList_Caves_5[] = { TransitionListEnd, }; -const Transition gExitList_Caves_KeeseChest[] = { +const Transition gExitList_Caves_TrilbyKeeseChest[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x238, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainTrilbyHighlands[] = { +const Transition gExitList_Caves_TrilbyFairyFountain[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0x2c8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainLinksHouse[] = { +const Transition gExitList_Caves_SouthHyruleFieldFairyFountain[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x118, 0xb8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -2214,22 +2220,22 @@ const Transition gExitList_Caves_LonLonRanchWallet[] = { 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_RupeeLinksHouse[] = { +const Transition gExitList_Caves_SouthHyruleFieldRupee[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x58, 0x128, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_RupeeTrilbyHighlands[] = { +const Transition gExitList_Caves_TrilbyRupee[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x2b8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainMoleMitts[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1a8, 0x68, 0x3, AREA_DIG_CAVES, ROOM_DIG_CAVES_3, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0 }, +const Transition gExitList_Caves_TrilbyMittsFairyFountain[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1a8, 0x68, 0x3, AREA_DIG_CAVES, ROOM_DIG_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_KeeseChestSoutheastHyrule[] = { +const Transition gExitList_Caves_HillsKeeseChest[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xa8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -2238,50 +2244,50 @@ const Transition gExitList_Caves_BottleBusinessScrub[] = { TransitionListEnd, }; const Transition gExitList_Caves_HeartPieceHallway[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x138, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x138, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x138, 0x1f8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainBoomerang[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1a, 0x1, 0x0, 0x4, 0x0, +const Transition gExitList_Caves_NorthHyruleFieldFairyFountain[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_Caves_KinstoneBusinessScrub[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1d, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_Caves[] = { - [ROOM_CAVES_0] = gExitList_Caves_Boomerang, - [ROOM_CAVES_1] = gExitList_Caves_ToGraveyard, + [ROOM_CAVES_BOOMERANG] = gExitList_Caves_Boomerang, + [ROOM_CAVES_TO_GRAVEYARD] = gExitList_Caves_ToGraveyard, [ROOM_CAVES_2] = gExitList_Caves_2, [ROOM_CAVES_3] = gExitList_Caves_3, [ROOM_CAVES_4] = gExitList_Caves_4, [ROOM_CAVES_5] = gExitList_Caves_5, [ROOM_CAVES_6] = gExitList_NoExitList, - [ROOM_CAVES_7] = gExitList_Caves_KeeseChest, - [ROOM_CAVES_8] = gExitList_Caves_FairyFountainTrilbyHighlands, - [ROOM_CAVES_9] = gExitList_Caves_FairyFountainLinksHouse, + [ROOM_CAVES_TRILBY_KEESE_CHEST] = gExitList_Caves_TrilbyKeeseChest, + [ROOM_CAVES_TRILBY_FAIRY_FOUNTAIN] = gExitList_Caves_TrilbyFairyFountain, + [ROOM_CAVES_SOUTH_HYRULE_FIELD_FAIRY_FOUNTAIN] = gExitList_Caves_SouthHyruleFieldFairyFountain, [ROOM_CAVES_a] = gExitList_Caves_A, - [ROOM_CAVES_b] = gExitList_Caves_HyruleTownWaterfall, - [ROOM_CAVES_c] = gExitList_Caves_LonLonRanch, - [ROOM_CAVES_d] = gExitList_NoExitList, - [ROOM_CAVES_e] = gExitList_Caves_TrilbyHighlands, - [ROOM_CAVES_f] = gExitList_Caves_LonLonRanchWallet, - [ROOM_CAVES_10] = gExitList_Caves_RupeeLinksHouse, - [ROOM_CAVES_11] = gExitList_Caves_RupeeTrilbyHighlands, - [ROOM_CAVES_12] = gExitList_Caves_FairyFountainMoleMitts, - [ROOM_CAVES_13] = gExitList_Caves_KeeseChestSoutheastHyrule, - [ROOM_CAVES_14] = gExitList_Caves_BottleBusinessScrub, - [ROOM_CAVES_15] = gExitList_Caves_HeartPieceHallway, - [ROOM_CAVES_16] = gExitList_Caves_FairyFountainBoomerang, - [ROOM_CAVES_17] = gExitList_Caves_KinstoneBusinessScrub, + [ROOM_CAVES_HYRULE_TOWN_WATERFALL] = gExitList_Caves_HyruleTownWaterfall, + [ROOM_CAVES_LON_LON_RANCH] = gExitList_Caves_LonLonRanch, + [ROOM_CAVES_LON_LON_RANCH_SECRET] = gExitList_NoExitList, + [ROOM_CAVES_TRILBY_HIGHLANDS] = gExitList_Caves_TrilbyHighlands, + [ROOM_CAVES_LON_LON_RANCH_WALLET] = gExitList_Caves_LonLonRanchWallet, + [ROOM_CAVES_SOUTH_HYRULE_FIELD_RUPEE] = gExitList_Caves_SouthHyruleFieldRupee, + [ROOM_CAVES_TRILBY_RUPEE] = gExitList_Caves_TrilbyRupee, + [ROOM_CAVES_TRILBY_MITTS_FAIRY_FOUNTAIN] = gExitList_Caves_TrilbyMittsFairyFountain, + [ROOM_CAVES_HILLS_KEESE_CHEST] = gExitList_Caves_HillsKeeseChest, + [ROOM_CAVES_BOTTLE_BUSINESS_SCRUB] = gExitList_Caves_BottleBusinessScrub, + [ROOM_CAVES_HEART_PIECE_HALLWAY] = gExitList_Caves_HeartPieceHallway, + [ROOM_CAVES_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN] = gExitList_Caves_NorthHyruleFieldFairyFountain, + [ROOM_CAVES_KINSTONE_BUSINESS_SCRUB] = gExitList_Caves_KinstoneBusinessScrub, }; const Transition gExitList_VeilFallsCaves_Hallway2F[] = { - { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0x78, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0x78, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x38, 0x10, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2290,9 +2296,9 @@ const Transition gExitList_VeilFallsCaves_Hallway2F[] = { TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_Hallway1F[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x98, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_8, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x98, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x78, 0x18, 0xd8, 0x38, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_0, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x18, 0xd8, 0x38, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0xb8, 0x8c, 0x118, 0x58, 0x0, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2301,40 +2307,40 @@ const Transition gExitList_VeilFallsCaves_Hallway1F[] = { TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_4, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_EXIT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x1f8, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_Exit[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x128, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_3, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x128, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xd8, 0x1d8, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_SecretChest[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_6, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_SecretStaircases[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_7, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_5, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_SECRET_CHEST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_BlockPuzzle[] = { - { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_6, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xd8, 0x158, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_RupeePath[] = { - { WARP_TYPE_1, 0x0, 0x98, 0x18, 0x38, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x98, 0x18, 0x38, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xd8, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2346,16 +2352,16 @@ const Transition gExitList_VeilFallsCaves_HeartPiece[] = { TransitionListEnd, }; const Transition* const gExitLists_VeilFallsCaves[] = { - [ROOM_VEIL_FALLS_CAVES_0] = gExitList_VeilFallsCaves_Hallway2F, - [ROOM_VEIL_FALLS_CAVES_1] = gExitList_VeilFallsCaves_Hallway1F, - [ROOM_VEIL_FALLS_CAVES_2] = gExitList_NoExitList, - [ROOM_VEIL_FALLS_CAVES_3] = gExitList_VeilFallsCaves_Entrance, - [ROOM_VEIL_FALLS_CAVES_4] = gExitList_VeilFallsCaves_Exit, - [ROOM_VEIL_FALLS_CAVES_5] = gExitList_VeilFallsCaves_SecretChest, - [ROOM_VEIL_FALLS_CAVES_6] = gExitList_VeilFallsCaves_SecretStaircases, - [ROOM_VEIL_FALLS_CAVES_7] = gExitList_VeilFallsCaves_BlockPuzzle, - [ROOM_VEIL_FALLS_CAVES_8] = gExitList_VeilFallsCaves_RupeePath, - [ROOM_VEIL_FALLS_CAVES_9] = gExitList_VeilFallsCaves_HeartPiece, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_2F] = gExitList_VeilFallsCaves_Hallway2F, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_1F] = gExitList_VeilFallsCaves_Hallway1F, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_ROOM] = gExitList_NoExitList, + [ROOM_VEIL_FALLS_CAVES_ENTRANCE] = gExitList_VeilFallsCaves_Entrance, + [ROOM_VEIL_FALLS_CAVES_EXIT] = gExitList_VeilFallsCaves_Exit, + [ROOM_VEIL_FALLS_CAVES_SECRET_CHEST] = gExitList_VeilFallsCaves_SecretChest, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE] = gExitList_VeilFallsCaves_SecretStaircases, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE] = gExitList_VeilFallsCaves_BlockPuzzle, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH] = gExitList_VeilFallsCaves_RupeePath, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_HEART_PIECE] = gExitList_VeilFallsCaves_HeartPiece, [ROOM_VEIL_FALLS_CAVES_a] = gExitList_NoExitList, [ROOM_VEIL_FALLS_CAVES_b] = gExitList_NoExitList, [ROOM_VEIL_FALLS_CAVES_c] = gExitList_NoExitList, @@ -2471,7 +2477,7 @@ const Transition* const gExitLists_37[] = { const Transition gExitList_HyruleTownUnderground_Main[] = { { WARP_TYPE_1, 0x0, 0x288, 0xf8, 0x338, 0x118, 0x0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x168, 0x18, 0x78, 0x38, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_b, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x168, 0x18, 0x78, 0x38, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x48, 0xf8, 0x188, 0x208, 0x0, AREA_HYRULE_DIG_CAVES, ROOM_HYRULE_DIG_CAVES_TOWN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -2539,8 +2545,8 @@ const Transition gExitList_GardenFountains_West[] = { TransitionListEnd, }; const Transition* const gExitLists_GardenFountains[] = { - [ROOM_GARDEN_FOUNTAINS_0] = gExitList_GardenFountains_East, - [ROOM_GARDEN_FOUNTAINS_1] = gExitList_GardenFountains_West, + [ROOM_GARDEN_FOUNTAINS_EAST] = gExitList_GardenFountains_East, + [ROOM_GARDEN_FOUNTAINS_WEST] = gExitList_GardenFountains_West, }; const Transition gExitList_GreatFairies_Entrance[] = { @@ -2564,112 +2570,112 @@ const Transition* const gExitLists_40[] = { }; const Transition gExitList_DeepwoodShrine_StairsToB1[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_12, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_BluePortal[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Map[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Button[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x6, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Lever[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x168, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x168, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Barrel[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x88, 0x50, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x88, 0x50, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x88, 0xa0, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x88, 0xa0, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x108, 0x50, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x108, 0x50, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x108, 0xa0, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x108, 0xa0, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_1, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x28, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_7, 0x1, 0x0, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x28, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BUTTON, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_a, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LEVER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xe8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_5, 0x1, 0x0, 0x6, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xe8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MAP, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_17, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_17, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x64, 0x30, AREA_DEEPWOOD_SHRINE_ENTRY, ROOM_DEEPWOOD_SHRINE_ENTRY_0, 0x1, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x64, 0x30, AREA_DEEPWOOD_SHRINE_ENTRY, ROOM_DEEPWOOD_SHRINE_ENTRY_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Compass[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_2, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrineBoss_Main[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x8, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_17, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x8, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_PreBoss[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x3, AREA_DEEPWOOD_SHRINE_BOSS, ROOM_DEEPWOOD_SHRINE_BOSS_0, 0x1, 0x3, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x3, AREA_DEEPWOOD_SHRINE_BOSS, ROOM_DEEPWOOD_SHRINE_BOSS_MAIN, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DeepwoodShrine[] = { - [ROOM_DEEPWOOD_SHRINE_0] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_1] = gExitList_DeepwoodShrine_BluePortal, - [ROOM_DEEPWOOD_SHRINE_2] = gExitList_DeepwoodShrine_StairsToB1, - [ROOM_DEEPWOOD_SHRINE_3] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_4] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_5] = gExitList_DeepwoodShrine_Map, - [ROOM_DEEPWOOD_SHRINE_6] = gExitList_DeepwoodShrine_Barrel, - [ROOM_DEEPWOOD_SHRINE_7] = gExitList_DeepwoodShrine_Button, - [ROOM_DEEPWOOD_SHRINE_8] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_9] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_a] = gExitList_DeepwoodShrine_Lever, - [ROOM_DEEPWOOD_SHRINE_b] = gExitList_DeepwoodShrine_Entrance, + [ROOM_DEEPWOOD_SHRINE_MADDERPILLAR] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL] = gExitList_DeepwoodShrine_BluePortal, + [ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1] = gExitList_DeepwoodShrine_StairsToB1, + [ROOM_DEEPWOOD_SHRINE_POT_BRIDGE] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_DOUBLE_STATUE] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_MAP] = gExitList_DeepwoodShrine_Map, + [ROOM_DEEPWOOD_SHRINE_BARREL] = gExitList_DeepwoodShrine_Barrel, + [ROOM_DEEPWOOD_SHRINE_BUTTON] = gExitList_DeepwoodShrine_Button, + [ROOM_DEEPWOOD_SHRINE_MULLDOZER] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_PILLARS] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_LEVER] = gExitList_DeepwoodShrine_Lever, + [ROOM_DEEPWOOD_SHRINE_ENTRANCE] = gExitList_DeepwoodShrine_Entrance, [ROOM_DEEPWOOD_SHRINE_c] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_d] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_e] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_f] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_10] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_11] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_12] = gExitList_DeepwoodShrine_Compass, + [ROOM_DEEPWOOD_SHRINE_TORCHES] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_BOSS_KEY] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_COMPASS] = gExitList_DeepwoodShrine_Compass, [ROOM_DEEPWOOD_SHRINE_13] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_14] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_15] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_LILY_PAD_WEST] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_LILY_PAD_EAST] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_16] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_17] = gExitList_DeepwoodShrine_PreBoss, + [ROOM_DEEPWOOD_SHRINE_BOSS_DOOR] = gExitList_DeepwoodShrine_PreBoss, [ROOM_DEEPWOOD_SHRINE_18] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_19] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_1a] = gExitList_NoExitList, @@ -2678,15 +2684,15 @@ const Transition* const gExitLists_DeepwoodShrine[] = { [ROOM_DEEPWOOD_SHRINE_1d] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_1e] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_1f] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_20] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL] = gExitList_NoExitList, }; const Transition* const gExitLists_DeepwoodShrineBoss[] = { - [ROOM_DEEPWOOD_SHRINE_BOSS_0] = gExitList_DeepwoodShrineBoss_Main, + [ROOM_DEEPWOOD_SHRINE_BOSS_MAIN] = gExitList_DeepwoodShrineBoss_Main, }; const Transition gExitList_DeepwoodShrineEntry_Main[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x0, 0x88, + { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x0, 0x88, 0x1, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1c8, 0x272, 0x30, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2697,11 +2703,11 @@ const Transition gExitList_DeepwoodShrineEntry_Main[] = { TransitionListEnd, }; const Transition* const gExitLists_DeepwoodShrineEntry[] = { - [ROOM_DEEPWOOD_SHRINE_ENTRY_0] = gExitList_DeepwoodShrineEntry_Main, + [ROOM_DEEPWOOD_SHRINE_ENTRY_MAIN] = gExitList_DeepwoodShrineEntry_Main, }; const Transition gExitList_CaveOfFlames_AfterCane[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x1a8, 0x38, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_10, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x1a8, 0x38, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MINISH_SPIKES, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -2711,55 +2717,55 @@ const Transition gExitList_CaveOfFlames_Entrance[] = { TransitionListEnd, }; const Transition gExitList_CaveOfFlames_MainCart[] = { - { WARP_TYPE_1, 0x0, 0x1f8, 0x38, 0x88, 0x28, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_5, 0x2, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x1f8, 0x38, 0x88, 0x28, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_NorthEntrance[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x1f8, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_4, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x1f8, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_MinishSpikes[] = { - { WARP_TYPE_1, 0x0, 0x1a8, 0x28, 0x88, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_0, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x1a8, 0x28, 0x88, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_AFTER_CANE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_BeforeGleerok[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_17, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_BossDoor[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc0, 0x1, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_12, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc0, 0x1, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_CaveOfFlames[] = { - [ROOM_CAVE_OF_FLAMES_0] = gExitList_CaveOfFlames_AfterCane, - [ROOM_CAVE_OF_FLAMES_1] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_2] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_3] = gExitList_CaveOfFlames_Entrance, - [ROOM_CAVE_OF_FLAMES_4] = gExitList_CaveOfFlames_MainCart, - [ROOM_CAVE_OF_FLAMES_5] = gExitList_CaveOfFlames_NorthEntrance, - [ROOM_CAVE_OF_FLAMES_6] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_7] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_8] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_9] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_AFTER_CANE] = gExitList_CaveOfFlames_AfterCane, + [ROOM_CAVE_OF_FLAMES_SPINY_CHU] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_CART_TO_SPINY_CHU] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_ENTRANCE] = gExitList_CaveOfFlames_Entrance, + [ROOM_CAVE_OF_FLAMES_MAIN_CART] = gExitList_CaveOfFlames_MainCart, + [ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE] = gExitList_CaveOfFlames_NorthEntrance, + [ROOM_CAVE_OF_FLAMES_CART_WEST] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_HELMASAUR_FIGHT] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_ROLLOBITE_LAVA_ROOM] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_MINISH_LAVA_ROOM] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_a] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_b] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_c] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_d] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_e] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_f] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_10] = gExitList_CaveOfFlames_MinishSpikes, - [ROOM_CAVE_OF_FLAMES_11] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_12] = gExitList_CaveOfFlames_BeforeGleerok, - [ROOM_CAVE_OF_FLAMES_13] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_14] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_15] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_16] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_17] = gExitList_CaveOfFlames_BossDoor, + [ROOM_CAVE_OF_FLAMES_MINISH_SPIKES] = gExitList_CaveOfFlames_MinishSpikes, + [ROOM_CAVE_OF_FLAMES_TOMPAS_DOOM] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK] = gExitList_CaveOfFlames_BeforeGleerok, + [ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH1] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH2] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_COMPASS] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BOB_OMB_WALL] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BOSS_DOOR] = gExitList_CaveOfFlames_BossDoor, [ROOM_CAVE_OF_FLAMES_18] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_19] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_1a] = gExitList_NoExitList, @@ -2772,110 +2778,110 @@ const Transition* const gExitLists_CaveOfFlames[] = { }; const Transition gExitList_FortressOfWinds_BeforeMazaal[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_4, 0x1, 0x3, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER, 0x1, 0x3, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EastKeyLever[] = { - { WARP_TYPE_1, 0x0, 0x198, 0x198, 0x2e8, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x198, 0x198, 0x2e8, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1f8, 0x198, 0x338, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x1f8, 0x198, 0x338, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_PitPlatforms[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_WestKeyLever[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1, 0x1, 0x3, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Mazaal[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0xa0, 0x18c, 0x0, AREA_FORTRESS_OF_WINDS_TOP, ROOM_FORTRESS_OF_WINDS_TOP_0, 0x1, + { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0xa0, 0x18c, 0x0, AREA_FORTRESS_OF_WINDS_TOP, ROOM_FORTRESS_OF_WINDS_TOP_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Stalfos[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EntranceMoleMitts[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_MOLE_MITTS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Main2F[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xf8, 0x78, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_21, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0xf8, 0x78, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_MinishHole[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_4, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_SMALL_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_BossKey[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_WestStairs2F[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_20, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EastStairs2F[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_22, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_WestStairs1F[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1c, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x128, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x128, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_CenterStairs1F[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x28, 0x88, 0x108, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_19, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x78, 0x28, 0x88, 0x108, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAIN_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EastStairs1F[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1d, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Wizzrobe[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_HeartPiece[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_FortressOfWinds[] = { - [ROOM_FORTRESS_OF_WINDS_0] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_1] = gExitList_FortressOfWinds_BeforeMazaal, - [ROOM_FORTRESS_OF_WINDS_2] = gExitList_FortressOfWinds_EastKeyLever, - [ROOM_FORTRESS_OF_WINDS_3] = gExitList_FortressOfWinds_PitPlatforms, - [ROOM_FORTRESS_OF_WINDS_4] = gExitList_FortressOfWinds_WestKeyLever, + [ROOM_FORTRESS_OF_WINDS_DOUBLE_EYEGORE] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL] = gExitList_FortressOfWinds_BeforeMazaal, + [ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER] = gExitList_FortressOfWinds_EastKeyLever, + [ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS] = gExitList_FortressOfWinds_PitPlatforms, + [ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER] = gExitList_FortressOfWinds_WestKeyLever, [ROOM_FORTRESS_OF_WINDS_5] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_6] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_7] = gExitList_NoExitList, @@ -2887,189 +2893,189 @@ const Transition* const gExitLists_FortressOfWinds[] = { [ROOM_FORTRESS_OF_WINDS_d] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_e] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_f] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_10] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_11] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_12] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_13] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_14] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_15] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_16] = gExitList_FortressOfWinds_Mazaal, - [ROOM_FORTRESS_OF_WINDS_17] = gExitList_FortressOfWinds_Stalfos, - [ROOM_FORTRESS_OF_WINDS_18] = gExitList_FortressOfWinds_EntranceMoleMitts, - [ROOM_FORTRESS_OF_WINDS_19] = gExitList_FortressOfWinds_Main2F, - [ROOM_FORTRESS_OF_WINDS_1a] = gExitList_FortressOfWinds_MinishHole, - [ROOM_FORTRESS_OF_WINDS_1b] = gExitList_FortressOfWinds_BossKey, - [ROOM_FORTRESS_OF_WINDS_1c] = gExitList_FortressOfWinds_WestStairs2F, - [ROOM_FORTRESS_OF_WINDS_1d] = gExitList_FortressOfWinds_EastStairs2F, + [ROOM_FORTRESS_OF_WINDS_DARKNUT_ROOM] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_ARROW_EYE_BRIDGE] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_NORTH_SPLIT_PATH_PIT] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_WALLMASTER_MINISH_PORTAL] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_PILLAR_CLONE_BUTTONS] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_ROTATING_SPIKE_TRAPS] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_MAZAAL] = gExitList_FortressOfWinds_Mazaal, + [ROOM_FORTRESS_OF_WINDS_STALFOS] = gExitList_FortressOfWinds_Stalfos, + [ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS] = gExitList_FortressOfWinds_EntranceMoleMitts, + [ROOM_FORTRESS_OF_WINDS_MAIN_2F] = gExitList_FortressOfWinds_Main2F, + [ROOM_FORTRESS_OF_WINDS_MINISH_HOLE] = gExitList_FortressOfWinds_MinishHole, + [ROOM_FORTRESS_OF_WINDS_BOSS_KEY] = gExitList_FortressOfWinds_BossKey, + [ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F] = gExitList_FortressOfWinds_WestStairs2F, + [ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F] = gExitList_FortressOfWinds_EastStairs2F, [ROOM_FORTRESS_OF_WINDS_1e] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_1f] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_20] = gExitList_FortressOfWinds_WestStairs1F, - [ROOM_FORTRESS_OF_WINDS_21] = gExitList_FortressOfWinds_CenterStairs1F, - [ROOM_FORTRESS_OF_WINDS_22] = gExitList_FortressOfWinds_EastStairs1F, - [ROOM_FORTRESS_OF_WINDS_23] = gExitList_FortressOfWinds_Wizzrobe, - [ROOM_FORTRESS_OF_WINDS_24] = gExitList_FortressOfWinds_HeartPiece, + [ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F] = gExitList_FortressOfWinds_WestStairs1F, + [ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F] = gExitList_FortressOfWinds_CenterStairs1F, + [ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F] = gExitList_FortressOfWinds_EastStairs1F, + [ROOM_FORTRESS_OF_WINDS_WIZZROBE] = gExitList_FortressOfWinds_Wizzrobe, + [ROOM_FORTRESS_OF_WINDS_HEART_PIECE] = gExitList_FortressOfWinds_HeartPiece, [ROOM_FORTRESS_OF_WINDS_25] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_26] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_27] = gExitList_NoExitList, }; const Transition gExitList_FortressOfWindsTop_Main[] = { - { WARP_TYPE_1, 0x0, 0xa0, 0x1a0, 0xb8, 0x28, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_16, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa0, 0x1a0, 0xb8, 0x28, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_FortressOfWindsTop[] = { - [ROOM_FORTRESS_OF_WINDS_TOP_0] = gExitList_FortressOfWindsTop_Main, + [ROOM_FORTRESS_OF_WINDS_TOP_MAIN] = gExitList_FortressOfWindsTop_Main, }; const Transition gExitList_InnerMazaal_Main[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x11c, 0xb8, 0x5c, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_16, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x11c, 0xb8, 0x5c, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_InnerMazaal[] = { - [ROOM_INNER_MAZAAL_0] = gExitList_InnerMazaal_Main, - [ROOM_INNER_MAZAAL_1] = gExitList_InnerMazaal_Main, + [ROOM_INNER_MAZAAL_MAIN] = gExitList_InnerMazaal_Main, + [ROOM_INNER_MAZAAL_PHASE_1] = gExitList_InnerMazaal_Main, }; const Transition gExitList_TempleOfDroplets_WestHole[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_20, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_EastHole[] = { - { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_21, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_HoleToBlueChuchu[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_2e, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BigBlueChuchu[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xb8, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_f, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xb8, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BigBlueChuchuKey[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_2e, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BossKey[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_0, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_NorthSmallKey[] = { - { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_2, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BlueChuchuKeyLever[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xc8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_b, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xc8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_11, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_Entrance[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_WaterfallNortheast[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x2, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_Element[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_7, 0x1, 0x0, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x4, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_9, 0x1, 0x0, 0x2, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x4, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x8, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_b, 0x1, 0x0, 0x2, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x8, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_3, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_e, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_IceCorner[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BigOcto[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_NorthwestStairs[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_24, 0x2, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_ScissorsMiniboss[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_25, 0x2, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_WaterfallSouthwest[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x170, 0x38, 0x18, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_31, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x170, 0x38, 0x18, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_ToBigBlueChuchu[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_32, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x8, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_10, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x8, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BlockCloneIceBridge[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_4, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_StairsToScissorsMiniboss[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_5, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_LilypadWestB2[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x168, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_d, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x168, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_CompassRoom[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_f, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_TempleOfDroplets[] = { - [ROOM_TEMPLE_OF_DROPLETS_0] = gExitList_TempleOfDroplets_WestHole, - [ROOM_TEMPLE_OF_DROPLETS_1] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2] = gExitList_TempleOfDroplets_EastHole, - [ROOM_TEMPLE_OF_DROPLETS_3] = gExitList_TempleOfDroplets_Entrance, - [ROOM_TEMPLE_OF_DROPLETS_4] = gExitList_TempleOfDroplets_NorthwestStairs, - [ROOM_TEMPLE_OF_DROPLETS_5] = gExitList_TempleOfDroplets_ScissorsMiniboss, - [ROOM_TEMPLE_OF_DROPLETS_6] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_7] = gExitList_TempleOfDroplets_WaterfallNortheast, - [ROOM_TEMPLE_OF_DROPLETS_8] = gExitList_TempleOfDroplets_Element, - [ROOM_TEMPLE_OF_DROPLETS_9] = gExitList_TempleOfDroplets_IceCorner, - [ROOM_TEMPLE_OF_DROPLETS_a] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_b] = gExitList_TempleOfDroplets_HoleToBlueChuchu, - [ROOM_TEMPLE_OF_DROPLETS_c] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_d] = gExitList_TempleOfDroplets_WaterfallSouthwest, - [ROOM_TEMPLE_OF_DROPLETS_e] = gExitList_TempleOfDroplets_BigOcto, - [ROOM_TEMPLE_OF_DROPLETS_f] = gExitList_TempleOfDroplets_ToBigBlueChuchu, - [ROOM_TEMPLE_OF_DROPLETS_10] = gExitList_TempleOfDroplets_BigBlueChuchu, - [ROOM_TEMPLE_OF_DROPLETS_11] = gExitList_TempleOfDroplets_BigBlueChuchuKey, + [ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE] = gExitList_TempleOfDroplets_WestHole, + [ROOM_TEMPLE_OF_DROPLETS_NORTH_SPLIT_ROOM] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE] = gExitList_TempleOfDroplets_EastHole, + [ROOM_TEMPLE_OF_DROPLETS_ENTRANCE] = gExitList_TempleOfDroplets_Entrance, + [ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS] = gExitList_TempleOfDroplets_NorthwestStairs, + [ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS] = gExitList_TempleOfDroplets_ScissorsMiniboss, + [ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHWEST] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST] = gExitList_TempleOfDroplets_WaterfallNortheast, + [ROOM_TEMPLE_OF_DROPLETS_ELEMENT] = gExitList_TempleOfDroplets_Element, + [ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER] = gExitList_TempleOfDroplets_IceCorner, + [ROOM_TEMPLE_OF_DROPLETS_ICE_PIT_MAZE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY] = gExitList_TempleOfDroplets_HoleToBlueChuchu, + [ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHEAST] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST] = gExitList_TempleOfDroplets_WaterfallSouthwest, + [ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO] = gExitList_TempleOfDroplets_BigOcto, + [ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU] = gExitList_TempleOfDroplets_ToBigBlueChuchu, + [ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU] = gExitList_TempleOfDroplets_BigBlueChuchu, + [ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY] = gExitList_TempleOfDroplets_BigBlueChuchuKey, [ROOM_TEMPLE_OF_DROPLETS_12] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_13] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_14] = gExitList_NoExitList, @@ -3084,29 +3090,29 @@ const Transition* const gExitLists_TempleOfDroplets[] = { [ROOM_TEMPLE_OF_DROPLETS_1d] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_1e] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_1f] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_20] = gExitList_TempleOfDroplets_BossKey, - [ROOM_TEMPLE_OF_DROPLETS_21] = gExitList_TempleOfDroplets_NorthSmallKey, - [ROOM_TEMPLE_OF_DROPLETS_22] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_23] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_24] = gExitList_TempleOfDroplets_BlockCloneIceBridge, - [ROOM_TEMPLE_OF_DROPLETS_25] = gExitList_TempleOfDroplets_StairsToScissorsMiniboss, - [ROOM_TEMPLE_OF_DROPLETS_26] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_27] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_28] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY] = gExitList_TempleOfDroplets_BossKey, + [ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY] = gExitList_TempleOfDroplets_NorthSmallKey, + [ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_BUTTON_PUZZLE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_PUZZLE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE] = gExitList_TempleOfDroplets_BlockCloneIceBridge, + [ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS] = gExitList_TempleOfDroplets_StairsToScissorsMiniboss, + [ROOM_TEMPLE_OF_DROPLETS_SPIKE_BAR_FLIPPER_ROOM] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_9_LANTERNS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_LILYPAD_ICE_BLOCKS] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_29] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2a] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2b] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2c] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2d] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2e] = gExitList_TempleOfDroplets_BlueChuchuKeyLever, - [ROOM_TEMPLE_OF_DROPLETS_2f] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_30] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_31] = gExitList_TempleOfDroplets_LilypadWestB2, - [ROOM_TEMPLE_OF_DROPLETS_32] = gExitList_TempleOfDroplets_CompassRoom, - [ROOM_TEMPLE_OF_DROPLETS_33] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_34] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_35] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_36] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_MULLDOZERS_FIRE_BARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_DARK_MAZE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_TWIN_MADDERPILLARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_AFTER_TWIN_MADDERPILLARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER] = gExitList_TempleOfDroplets_BlueChuchuKeyLever, + [ROOM_TEMPLE_OF_DROPLETS_MULLDOZER_KEY] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BEFORE_TWIN_MADDERPILLARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST] = gExitList_TempleOfDroplets_LilypadWestB2, + [ROOM_TEMPLE_OF_DROPLETS_COMPASS] = gExitList_TempleOfDroplets_CompassRoom, + [ROOM_TEMPLE_OF_DROPLETS_DARK_SCISSOR_BEETLES] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_MIDDLE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_ICE_MADDERPILLAR] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_FLAMEBAR_BLOCK_PUZZLE] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_37] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_38] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_39] = gExitList_NoExitList, @@ -3119,7 +3125,7 @@ const Transition* const gExitLists_TempleOfDroplets[] = { }; const Transition gExitList_61_0[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x118, 0x174, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -3133,19 +3139,19 @@ const Transition gExitList_RoyalCrypt_WaterRope[] = { TransitionListEnd, }; const Transition gExitList_RoyalCrypt_Gibdo[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x12e, 0x128, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_4, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x12e, 0x128, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_KEY_BLOCK, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_RoyalCrypt_KeyBlock[] = { - { WARP_TYPE_1, 0x0, 0x128, 0x38, 0xa8, 0x118, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_2, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x38, 0xa8, 0x118, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_GIBDO, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x16e, 0x88, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_7, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x16e, 0x88, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_MUSHROOM_PIT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_RoyalCrypt_MushroomPit[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x128, 0x158, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_4, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x128, 0x158, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_KEY_BLOCK, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -3155,11 +3161,15 @@ const Transition gExitList_RoyalCrypt_Entrance[] = { TransitionListEnd, }; const Transition* const gExitLists_RoyalCrypt[] = { - [ROOM_ROYAL_CRYPT_0] = gExitList_NoExitList, [ROOM_ROYAL_CRYPT_1] = gExitList_RoyalCrypt_WaterRope, - [ROOM_ROYAL_CRYPT_2] = gExitList_RoyalCrypt_Gibdo, [ROOM_ROYAL_CRYPT_3] = gExitList_NoExitList, - [ROOM_ROYAL_CRYPT_4] = gExitList_RoyalCrypt_KeyBlock, [ROOM_ROYAL_CRYPT_5] = gExitList_NoExitList, - [ROOM_ROYAL_CRYPT_6] = gExitList_NoExitList, [ROOM_ROYAL_CRYPT_7] = gExitList_RoyalCrypt_MushroomPit, - [ROOM_ROYAL_CRYPT_8] = gExitList_RoyalCrypt_Entrance, + [ROOM_ROYAL_CRYPT_0] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_WATER_ROPE] = gExitList_RoyalCrypt_WaterRope, + [ROOM_ROYAL_CRYPT_GIBDO] = gExitList_RoyalCrypt_Gibdo, + [ROOM_ROYAL_CRYPT_3] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_KEY_BLOCK] = gExitList_RoyalCrypt_KeyBlock, + [ROOM_ROYAL_CRYPT_5] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_6] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_MUSHROOM_PIT] = gExitList_RoyalCrypt_MushroomPit, + [ROOM_ROYAL_CRYPT_ENTRANCE] = gExitList_RoyalCrypt_Entrance, }; const Transition gExitList_PalaceOfWinds_0[] = { @@ -3342,305 +3352,311 @@ const Transition* const gExitLists_PalaceOfWinds[] = { [ROOM_PALACE_OF_WINDS_31] = gExitList_NoExitList, [ROOM_PALACE_OF_WINDS_32] = gExitList_PalaceOfWinds_50, [ROOM_PALACE_OF_WINDS_33] = gExitList_NoExitList, - TransitionListEndBUG, }; -const Transition gExitList_DarkHyruleCastle_0[] = { - { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_37, 0x2, 0x0, +const Transition gExitList_Unused1[] = { + TransitionListEnd, +}; + +const Transition gExitList_DarkHyruleCastle_1FEntrance[] = { + { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_MAP, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_37, 0x2, 0x0, + { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_MAP, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x198, 0x220, 0x1f8, 0x38, 0x2, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_1[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_7, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_3FTopLeftTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_2[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_d, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_3FTopRightTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_3[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_19, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_3FBottomLeftTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_4[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1d, 0x1, 0x0, +const Transition gExitList_DarkHyruleCastle_3FBottomRightTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_5[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xe8, 0x3, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_6, 0x1, 0x0, 0x0, +const Transition gExitList_DarkHyruleCastle_3FKeatonHallToVaati[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xe8, 0x3, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x190, 0x88, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_0, + { WARP_TYPE_1, 0x0, 0xa8, 0x190, 0x88, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_6[] = { +const Transition gExitList_DarkHyruleCastle_3FTripleDarknut[] = { { WARP_TYPE_1, 0x0, 0xa8, 0x28, 0x78, 0x168, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, - ROOM_DARK_HYRULE_CASTLE_OUTSIDE_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_5, 0x1, 0x0, 0x4, + ROOM_DARK_HYRULE_CASTLE_OUTSIDE_ZELDA_STATUE_PLATFORM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_7[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FTopLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1e, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_2, + { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHWEST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_13[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FTopRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_21, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_3, + { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHEAST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_18[] = { - { WARP_TYPE_1, 0x0, 0xf0, 0x5c, 0x44, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4, +const Transition gExitList_DarkHyruleCastle_2FRight[] = { + { WARP_TYPE_1, 0x0, 0xf0, 0x5c, 0x44, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST, 0x2, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xf0, 0xec, 0x44, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4, + { WARP_TYPE_1, 0x0, 0xf0, 0xec, 0x44, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST, 0x2, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_20[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x118, 0x3, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_0, +const Transition gExitList_DarkHyruleCastle_2FBossDoor[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x118, 0x3, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_23[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6, +const Transition gExitList_DarkHyruleCastle_2FEntrance[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_25[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FBottomLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2b, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x78, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_5, + { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x78, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHWEST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_26[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6, +const Transition gExitList_DarkHyruleCastle_2FBottomLeftGhini[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_28[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x188, 0x3, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1, +const Transition gExitList_DarkHyruleCastle_B1Entrance[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x188, 0x3, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_29[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x108, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_4, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FBottomRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x108, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x108, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2c, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x108, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x88, 0x190, 0x88, 0x288, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, - ROOM_DARK_HYRULE_CASTLE_OUTSIDE_7, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHEAST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_30[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_7, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FTopLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_31[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2d, 0x1, 0x0, 0x0, +const Transition gExitList_DarkHyruleCastle_1FThroneRoom[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_32[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2e, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FCompass[] = { + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_33[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_d, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FTopRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_34[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x78, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2f, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FBeforeThrone[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x78, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_43[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_19, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FBottomLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_44[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1d, 0x1, 0x0, +const Transition gExitList_DarkHyruleCastle_1FBottomRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_45[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1f, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B1BelowThrone[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_46[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_20, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B1BelowCompass[] = { + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_47[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_22, 0x1, 0x0, 0x0, +const Transition gExitList_DarkHyruleCastle_B1BeforeThrone[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_48[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_38, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B1ToPrison[] = { + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_55[] = { - { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_0, 0x1, 0x0, +const Transition gExitList_DarkHyruleCastle_B1Map[] = { + { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_0, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_56[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_30, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B2ToPrison[] = { + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DarkHyruleCastle[] = { - [ROOM_DARK_HYRULE_CASTLE_0] = gExitList_DarkHyruleCastle_0, - [ROOM_DARK_HYRULE_CASTLE_1] = gExitList_DarkHyruleCastle_1, - [ROOM_DARK_HYRULE_CASTLE_2] = gExitList_DarkHyruleCastle_2, - [ROOM_DARK_HYRULE_CASTLE_3] = gExitList_DarkHyruleCastle_3, - [ROOM_DARK_HYRULE_CASTLE_4] = gExitList_DarkHyruleCastle_4, - [ROOM_DARK_HYRULE_CASTLE_5] = gExitList_DarkHyruleCastle_5, - [ROOM_DARK_HYRULE_CASTLE_6] = gExitList_DarkHyruleCastle_6, - [ROOM_DARK_HYRULE_CASTLE_7] = gExitList_DarkHyruleCastle_7, - [ROOM_DARK_HYRULE_CASTLE_8] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_9] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_a] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_b] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_c] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_d] = gExitList_DarkHyruleCastle_13, - [ROOM_DARK_HYRULE_CASTLE_e] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_f] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_10] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_11] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_12] = gExitList_DarkHyruleCastle_18, - [ROOM_DARK_HYRULE_CASTLE_13] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_14] = gExitList_DarkHyruleCastle_20, - [ROOM_DARK_HYRULE_CASTLE_15] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_16] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_17] = gExitList_DarkHyruleCastle_23, - [ROOM_DARK_HYRULE_CASTLE_18] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_19] = gExitList_DarkHyruleCastle_25, - [ROOM_DARK_HYRULE_CASTLE_1a] = gExitList_DarkHyruleCastle_26, + [ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE] = gExitList_DarkHyruleCastle_1FEntrance, + [ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER] = gExitList_DarkHyruleCastle_3FTopLeftTower, + [ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER] = gExitList_DarkHyruleCastle_3FTopRightTower, + [ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER] = gExitList_DarkHyruleCastle_3FBottomLeftTower, + [ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER] = gExitList_DarkHyruleCastle_3FBottomRightTower, + [ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI] = gExitList_DarkHyruleCastle_3FKeatonHallToVaati, + [ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT] = gExitList_DarkHyruleCastle_3FTripleDarknut, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER] = gExitList_DarkHyruleCastle_2FTopLeftTower, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_CORNER] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOSS_KEY] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BLUE_WARP] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_GHINI] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_TORCHES] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER] = gExitList_DarkHyruleCastle_2FTopRightTower, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_SPARKS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_RIGHT] = gExitList_DarkHyruleCastle_2FRight, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR] = gExitList_DarkHyruleCastle_2FBossDoor, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_CORNER_PUZZLE] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE] = gExitList_DarkHyruleCastle_2FEntrance, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_CORNER] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER] = gExitList_DarkHyruleCastle_2FBottomLeftTower, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI] = gExitList_DarkHyruleCastle_2FBottomLeftGhini, [ROOM_DARK_HYRULE_CASTLE_1b] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_1c] = gExitList_DarkHyruleCastle_28, - [ROOM_DARK_HYRULE_CASTLE_1d] = gExitList_DarkHyruleCastle_29, - [ROOM_DARK_HYRULE_CASTLE_1e] = gExitList_DarkHyruleCastle_30, - [ROOM_DARK_HYRULE_CASTLE_1f] = gExitList_DarkHyruleCastle_31, - [ROOM_DARK_HYRULE_CASTLE_20] = gExitList_DarkHyruleCastle_32, - [ROOM_DARK_HYRULE_CASTLE_21] = gExitList_DarkHyruleCastle_33, - [ROOM_DARK_HYRULE_CASTLE_22] = gExitList_DarkHyruleCastle_34, - [ROOM_DARK_HYRULE_CASTLE_23] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_24] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_25] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_26] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_27] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_28] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_29] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_2a] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_2b] = gExitList_DarkHyruleCastle_43, - [ROOM_DARK_HYRULE_CASTLE_2c] = gExitList_DarkHyruleCastle_44, - [ROOM_DARK_HYRULE_CASTLE_2d] = gExitList_DarkHyruleCastle_45, - [ROOM_DARK_HYRULE_CASTLE_2e] = gExitList_DarkHyruleCastle_46, - [ROOM_DARK_HYRULE_CASTLE_2f] = gExitList_DarkHyruleCastle_47, - [ROOM_DARK_HYRULE_CASTLE_30] = gExitList_DarkHyruleCastle_48, - [ROOM_DARK_HYRULE_CASTLE_31] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_32] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_33] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_34] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_35] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_36] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_37] = gExitList_DarkHyruleCastle_55, - [ROOM_DARK_HYRULE_CASTLE_38] = gExitList_DarkHyruleCastle_56, - [ROOM_DARK_HYRULE_CASTLE_39] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_3a] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE] = gExitList_DarkHyruleCastle_B1Entrance, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER] = gExitList_DarkHyruleCastle_2FBottomRightTower, + [ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER] = gExitList_DarkHyruleCastle_1FTopLeftTower, + [ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM] = gExitList_DarkHyruleCastle_1FThroneRoom, + [ROOM_DARK_HYRULE_CASTLE_1F_COMPASS] = gExitList_DarkHyruleCastle_1FCompass, + [ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER] = gExitList_DarkHyruleCastle_1FTopRightTower, + [ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE] = gExitList_DarkHyruleCastle_1FBeforeThrone, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER] = gExitList_DarkHyruleCastle_1FBottomLeftTower, + [ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER] = gExitList_DarkHyruleCastle_1FBottomRightTower, + [ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE] = gExitList_DarkHyruleCastle_B1BelowThrone, + [ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS] = gExitList_DarkHyruleCastle_B1BelowCompass, + [ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE] = gExitList_DarkHyruleCastle_B1BeforeThrone, + [ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON] = gExitList_DarkHyruleCastle_B1ToPrison, + [ROOM_DARK_HYRULE_CASTLE_B1_BOMB_WALL] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_KEATONS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON_FIREBAR] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_CANNONS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_MAP] = gExitList_DarkHyruleCastle_B1Map, + [ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON] = gExitList_DarkHyruleCastle_B2ToPrison, + [ROOM_DARK_HYRULE_CASTLE_B2_PRISON] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B2_DROPDOWN] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3b] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3c] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3d] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3e] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3f] = gExitList_NoExitList, - TransitionListEndBUG, +}; + +const Transition gExitList_Unused2[] = { + TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_ZeldaStatuePlatform[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x178, 0xa8, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_6, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x78, 0x178, 0xa8, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_Garden[] = { { WARP_TYPE_1, 0x0, 0x88, 0x38, 0xc8, 0x1e8, 0x0, AREA_SANCTUARY, ROOM_SANCTUARY_HALL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1c, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideNorthwest[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideNortheast[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_d, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideEast[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x5c, 0xde, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_12, 0x1, 0x0, 0x6, + { WARP_TYPE_1, 0x0, 0x38, 0x5c, 0xde, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_RIGHT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0xec, 0xde, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_12, 0x1, 0x0, 0x6, + { WARP_TYPE_1, 0x0, 0x38, 0xec, 0xde, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_RIGHT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideSouthwest[] = { - { WARP_TYPE_1, 0x0, 0x78, 0xd8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_19, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0xd8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideSouth[] = { - { WARP_TYPE_1, 0x0, 0x198, 0xc8, 0x88, 0x170, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_17, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x198, 0xc8, 0x88, 0x170, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1a, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideSoutheast[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x278, 0x88, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1d, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x278, 0x88, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DarkHyruleCastleOutside[] = { - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_0] = gExitList_DarkHyruleCastleOutside_ZeldaStatuePlatform, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1] = gExitList_DarkHyruleCastleOutside_Garden, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_2] = gExitList_DarkHyruleCastleOutside_OutsideNorthwest, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_3] = gExitList_DarkHyruleCastleOutside_OutsideNortheast, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4] = gExitList_DarkHyruleCastleOutside_OutsideEast, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_5] = gExitList_DarkHyruleCastleOutside_OutsideSouthwest, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6] = gExitList_DarkHyruleCastleOutside_OutsideSouth, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_7] = gExitList_DarkHyruleCastleOutside_OutsideSoutheast, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_ZELDA_STATUE_PLATFORM] = gExitList_DarkHyruleCastleOutside_ZeldaStatuePlatform, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN] = gExitList_DarkHyruleCastleOutside_Garden, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHWEST] = gExitList_DarkHyruleCastleOutside_OutsideNorthwest, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHEAST] = gExitList_DarkHyruleCastleOutside_OutsideNortheast, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST] = gExitList_DarkHyruleCastleOutside_OutsideEast, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHWEST] = gExitList_DarkHyruleCastleOutside_OutsideSouthwest, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH] = gExitList_DarkHyruleCastleOutside_OutsideSouth, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHEAST] = gExitList_DarkHyruleCastleOutside_OutsideSoutheast, }; const Transition gExitList_VaatisArms_First[] = { @@ -3657,14 +3673,14 @@ const Transition* const gExitLists_VaatisArms[] = { }; const Transition gExitList_DarkHyruleCastleBridge_Main[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xa8, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_5, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xa8, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x28, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_14, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x28, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DarkHyruleCastleBridge[] = { - [ROOM_DARK_HYRULE_CASTLE_BRIDGE_0] = gExitList_DarkHyruleCastleBridge_Main, + [ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN] = gExitList_DarkHyruleCastleBridge_Main, }; const Transition gExitList_HyruleCastle_0[] = { @@ -3695,10 +3711,14 @@ const Transition gExitList_HyruleCastle_3[] = { TransitionListEnd, }; const Transition* const gExitLists_HyruleCastle[] = { - [ROOM_HYRULE_CASTLE_0] = gExitList_HyruleCastle_0, [ROOM_HYRULE_CASTLE_1] = gExitList_HyruleCastle_1, - [ROOM_HYRULE_CASTLE_2] = gExitList_NoExitList, [ROOM_HYRULE_CASTLE_3] = gExitList_HyruleCastle_3, - [ROOM_HYRULE_CASTLE_4] = gExitList_NoExitList, [ROOM_HYRULE_CASTLE_5] = gExitList_NoExitList, - [ROOM_HYRULE_CASTLE_6] = gExitList_NoExitList, [ROOM_HYRULE_CASTLE_7] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_0] = gExitList_HyruleCastle_0, + [ROOM_HYRULE_CASTLE_1] = gExitList_HyruleCastle_1, + [ROOM_HYRULE_CASTLE_2] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_3] = gExitList_HyruleCastle_3, + [ROOM_HYRULE_CASTLE_4] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_5] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_6] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_7] = gExitList_NoExitList, }; const Transition gExitList_SanctuaryEntrance_Main[] = { @@ -3719,7 +3739,7 @@ const Transition gExitList_Sanctuary_Hall[] = { }; const Transition gUnk_0813A76C[] = { { WARP_TYPE_1, 0x0, 0xc8, 0x1fc, 0x88, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, - ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_Sanctuary_Main[] = { @@ -3895,3 +3915,4 @@ const Transition* const* const gExitLists[] = { /*AREA_97*/ gExitLists_NoExit, /*AREA_98*/ gExitLists_NoExit, }; +// clang-format on diff --git a/src/roomInit.c b/src/roomInit.c index b607424e..5437ce6f 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -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) { diff --git a/src/title.c b/src/title.c index 0a86638e..3329f80e 100644 --- a/src/title.c +++ b/src/title.c @@ -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,