diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-12-11 12:07:48 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-12-11 12:07:48 +0100 |
| commit | 1d741c182dec03c6c7a6ea337f351eedf7d6eb65 (patch) | |
| tree | 7a1fc484cc98a123a562ed5bb2e03e85b6f28e95 | |
| parent | 017eb5a65efe06ab338f7d6a3bdd1188fcca6c3e (diff) | |
Extract dungeon maps
42 files changed, 2536 insertions, 1472 deletions
diff --git a/asm/non_matching/common/DrawDungeonMap.inc b/asm/non_matching/common/DrawDungeonMap.inc index d71568a1..dd865a00 100644 --- a/asm/non_matching/common/DrawDungeonMap.inc +++ b/asm/non_matching/common/DrawDungeonMap.inc @@ -22,7 +22,7 @@ ands r0, r1 strb r0, [r5, #2] adds r5, #3 - ldr r1, _0801DBE8 @ =gUnk_080C9C50 + ldr r1, _0801DBE8 @ =gDungeonLayouts ldr r0, _0801DBEC @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 @@ -34,7 +34,7 @@ b _0801DD3A .align 2, 0 _0801DBE4: .4byte gRoomTransition -_0801DBE8: .4byte gUnk_080C9C50 +_0801DBE8: .4byte gDungeonLayouts _0801DBEC: .4byte gArea _0801DBF0: ldrb r0, [r6] diff --git a/asm/non_matching/playerUtils/sub_0807BFD0.inc b/asm/non_matching/playerUtils/sub_0807BFD0.inc index f53eb74d..055bcd55 100644 --- a/asm/non_matching/playerUtils/sub_0807BFD0.inc +++ b/asm/non_matching/playerUtils/sub_0807BFD0.inc @@ -31,11 +31,11 @@ cmp r1, r0 beq _0807C01C str r0, [r2, #0x34] - bl sub_080197D4 + bl LoadMapData _0807C01C: ldr r0, [r4] ldr r0, [r0, #0x10] - bl sub_080197D4 + bl LoadMapData ldr r1, _0807C0D0 @ =gPaletteBuffer adds r0, r1, #0 adds r0, #0x60 diff --git a/asm/src/veneer.s b/asm/src/veneer.s index 42a0af6b..ab8e1336 100644 --- a/asm/src/veneer.s +++ b/asm/src/veneer.s @@ -161,7 +161,7 @@ gUnk_08000258:: .4byte gMapTop+0x5004 .4byte gMapBottom+0x3004 .4byte gMapBottom+0x5004 -gUnk_08000278:: +gUnk_08000278:: @ unkData3 for layers .4byte gMapBottom+0xb004 .4byte gMapBottom+0xb004 .4byte gMapTop+0xb004 diff --git a/assets/map.json b/assets/map.json index 108a75d6..c1796676 100644 --- a/assets/map.json +++ b/assets/map.json @@ -18,19 +18,19 @@ "type": "map_layer2" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_0.4bpp.lz", + "path": "tilesets/gAreaTileset_MinishWoods_0_0.4bpp.lz", "start": 3296948, "size": 11346, "type": "tileset" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_1.4bpp.lz", + "path": "tilesets/gAreaTileset_MinishWoods_0_1.4bpp.lz", "start": 3308296, "size": 9712, "type": "tileset" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_2.4bpp.lz", + "path": "tilesets/gAreaTileset_MinishWoods_0_2.4bpp.lz", "start": 3318008, "size": 8429, "type": "tileset" @@ -5462,10 +5462,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_29.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/dungeon_map.bin", "start": 5127436, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_Madderpillar" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_1_0.bin.lz", @@ -5480,10 +5485,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_30.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/dungeon_map.bin", "start": 5128228, "size": 108, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 7, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_BluePortal" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_2_0.bin.lz", @@ -5498,10 +5508,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_31.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/dungeon_map.bin", "start": 5128996, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_StairsToB1" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_3_0.bin.lz", @@ -5516,10 +5531,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_32.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/dungeon_map.bin", "start": 5129676, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_PotBridge" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_4_0.bin.lz", @@ -5534,10 +5554,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_33.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/dungeon_map.bin", "start": 5130208, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 10 + }, + "name": "gDungeonMaps_DeepwoodShrine_DoubleStatue" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_5_0.bin.lz", @@ -5552,10 +5577,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_34.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/05_Map/dungeon_map.bin", "start": 5131100, "size": 128, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_Map" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_6_0.bin.lz", @@ -5570,10 +5600,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_35.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/dungeon_map.bin", "start": 5132376, "size": 200, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_Barrel" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_7_0.bin.lz", @@ -5588,10 +5623,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_36.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/07_Button/dungeon_map.bin", "start": 5133348, "size": 128, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_Button" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_8_0.bin.lz", @@ -5606,10 +5646,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_37.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/dungeon_map.bin", "start": 5133972, "size": 60, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 12 + }, + "name": "gDungeonMaps_DeepwoodShrine_Mulldozer" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_9_0.bin.lz", @@ -5624,10 +5669,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_38.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/dungeon_map.bin", "start": 5134544, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DeepwoodShrine_Pillars" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_10_0.bin.lz", @@ -5642,10 +5692,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_39.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/10_Lever/dungeon_map.bin", "start": 5135312, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_Lever" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_11_0.bin.lz", @@ -5660,10 +5715,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_40.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/dungeon_map.bin", "start": 5136224, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_Entrance" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_12_0.bin.lz", @@ -5678,10 +5738,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_41.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/16_Torches/dungeon_map.bin", "start": 5137020, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_Torches" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_13_0.bin.lz", @@ -5696,10 +5761,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_42.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/dungeon_map.bin", "start": 5137800, "size": 108, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 7, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_BossKey" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_14_0.bin.lz", @@ -5714,10 +5784,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_43.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/18_Compass/dungeon_map.bin", "start": 5138532, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_Compass" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_15_0.bin.lz", @@ -5735,7 +5810,12 @@ "path": "assets/unknown_44.bin", "start": 5139036, "size": 60, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 12 + }, + "name": "gDungeonMaps_unknown_44" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_16_0.bin.lz", @@ -5750,10 +5830,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_45.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/dungeon_map.bin", "start": 5140140, "size": 200, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_LilyPadWest" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_17_0.bin.lz", @@ -5768,10 +5853,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_46.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/dungeon_map.bin", "start": 5140852, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 18 + }, + "name": "gDungeonMaps_DeepwoodShrine_LilyPadEast" }, { "path": "assets/gAreaRoomMap_DeepwoodShrineBoss_0_0.bin.lz", @@ -5786,10 +5876,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_47.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/dungeon_map.bin", "start": 5141508, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrineBoss_Main" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_18_0.bin.lz", @@ -5804,10 +5899,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_48.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/dungeon_map.bin", "start": 5142384, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_BossDoor" }, { "path": "assets/gAreaRoomMap_DeepwoodShrine_19_0.bin.lz", @@ -5825,7 +5925,12 @@ "path": "assets/unknown_49.bin", "start": 5142588, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_unknown_49" }, { "path": "assets/gAreaRoomMap_DeepwoodShrineEntry_0_0.bin", @@ -5942,10 +6047,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_50.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/dungeon_map.bin", "start": 5222948, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_AfterCane" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_1_0.bin.lz", @@ -5960,10 +6070,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_51.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/dungeon_map.bin", "start": 5223772, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_SpinyChu" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_2_0.bin.lz", @@ -5978,10 +6093,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_52.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/dungeon_map.bin", "start": 5224792, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_CartToSpinyChu" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_3_0.bin.lz", @@ -5996,10 +6116,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_53.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/03_Entrance/dungeon_map.bin", "start": 5225332, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_Entrance" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_4_0.bin.lz", @@ -6014,10 +6139,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_54.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/04_MainCart/dungeon_map.bin", "start": 5226716, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 14, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_MainCart" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_5_0.bin.lz", @@ -6032,10 +6162,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_55.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/dungeon_map.bin", "start": 5227372, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_NorthEntrance" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_6_0.bin.lz", @@ -6050,10 +6185,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_56.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/06_CartWest/dungeon_map.bin", "start": 5228320, "size": 188, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_CartWest" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_7_0.bin.lz", @@ -6068,10 +6208,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_57.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/dungeon_map.bin", "start": 5228960, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_HelmasaurFight" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_8_0.bin.lz", @@ -6086,10 +6231,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_58.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/dungeon_map.bin", "start": 5230172, "size": 168, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 28 + }, + "name": "gDungeonMaps_CaveOfFlames_RollobiteLavaRoom" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_9_0.bin.lz", @@ -6104,10 +6254,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_59.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/dungeon_map.bin", "start": 5231484, "size": 168, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 28 + }, + "name": "gDungeonMaps_CaveOfFlames_MinishLavaRoom" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_10_0.bin.lz", @@ -6122,10 +6277,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_60.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/dungeon_map.bin", "start": 5233196, "size": 332, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 30 + }, + "name": "gDungeonMaps_CaveOfFlames_MinishSpikes" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_11_0.bin.lz", @@ -6140,10 +6300,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_61.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/dungeon_map.bin", "start": 5234248, "size": 168, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_TompasDoom" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_12_0.bin.lz", @@ -6158,10 +6323,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_62.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/dungeon_map.bin", "start": 5234960, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_BeforeGleerok" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_13_0.bin.lz", @@ -6176,10 +6346,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_63.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/dungeon_map.bin", "start": 5235636, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_BosskeyPath1" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_14_0.bin.lz", @@ -6194,10 +6369,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_64.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/dungeon_map.bin", "start": 5236272, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_BosskeyPath2" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_15_0.bin.lz", @@ -6212,10 +6392,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_65.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/21_Compass/dungeon_map.bin", "start": 5236728, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_Compass" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_16_0.bin.lz", @@ -6230,10 +6415,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_66.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/dungeon_map.bin", "start": 5237112, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_BobOmbWall" }, { "path": "assets/gAreaRoomMap_CaveOfFlames_17_0.bin.lz", @@ -6248,10 +6438,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_67.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/dungeon_map.bin", "start": 5238912, "size": 332, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 30 + }, + "name": "gDungeonMaps_CaveOfFlames_BossDoor" }, { "path": "assets/gAreaRoomMap_CaveOfFlamesBoss_0_0.bin.lz", @@ -6266,10 +6461,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_68.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/dungeon_map.bin", "start": 5240604, "size": 108, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 18 + }, + "name": "gDungeonMaps_CaveOfFlamesBoss_0" }, { "path": "tilesets/gAreaTileset_CastorDarknut_0_0.4bpp.lz", @@ -6410,10 +6610,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_69.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/dungeon_map.bin", "start": 5334636, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_DoubleEyegore" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_1_0.bin.lz", @@ -6428,10 +6633,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_70.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/dungeon_map.bin", "start": 5335148, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_BeforeMazaal" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_2_0.bin.lz", @@ -6446,10 +6656,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_71.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/dungeon_map.bin", "start": 5336500, "size": 272, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 10, + "height": 27 + }, + "name": "gDungeonMaps_FortressOfWinds_EastKeyLever" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_3_0.bin.lz", @@ -6464,10 +6679,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_72.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/dungeon_map.bin", "start": 5337244, "size": 72, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 14 + }, + "name": "gDungeonMaps_FortressOfWinds_PitPlatforms" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_4_0.bin.lz", @@ -6482,10 +6702,37 @@ "type": "map_layer1" }, { - "path": "assets/unknown_73.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/dungeon_map.bin", "start": 5338112, - "size": 248, - "type": "unknown" + "size": 112, + "type": "dungeon_map", + "options": { + "width": 8, + "height": 14 + }, + "name": "gDungeonMaps_FortressOfWinds_WestKeyLever" + }, + { + "path": "maps/areas/088_FortressOfWinds/rooms/05_5/dungeon_map.bin", + "start": 5338224, + "size": 68, + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_5" + }, + { + "path": "maps/areas/088_FortressOfWinds/rooms/06_6/dungeon_map.bin", + "start": 5338292, + "size": 68, + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_6" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_5_0.bin.lz", @@ -6500,10 +6747,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_74.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/dungeon_map.bin", "start": 5338804, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_DarknutRoom" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_6_0.bin.lz", @@ -6518,10 +6770,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_75.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/dungeon_map.bin", "start": 5339308, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_ArrowEyeBridge" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_7_0.bin.lz", @@ -6536,10 +6793,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_76.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/dungeon_map.bin", "start": 5340116, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_FortressOfWinds_NorthSplitPathPit" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_8_0.bin.lz", @@ -6554,10 +6816,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_77.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/dungeon_map.bin", "start": 5340608, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_WallmasterMinishPortal" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_9_0.bin.lz", @@ -6572,10 +6839,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_78.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/dungeon_map.bin", "start": 5341344, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_FortressOfWinds_PillarCloneButtons" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_10_0.bin.lz", @@ -6590,10 +6862,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_79.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/dungeon_map.bin", "start": 5341900, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_RotatingSpikeTraps" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_11_0.bin.lz", @@ -6608,10 +6885,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_80.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/dungeon_map.bin", "start": 5342420, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_Mazaal" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_12_0.bin.lz", @@ -6626,10 +6908,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_81.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/dungeon_map.bin", "start": 5342936, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_Stalfos" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_13_0.bin.lz", @@ -6644,10 +6931,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_82.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/dungeon_map.bin", "start": 5343376, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_EntranceMoleMitts" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_14_0.bin.lz", @@ -6662,10 +6954,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_83.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/dungeon_map.bin", "start": 5344292, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_FortressOfWinds_Main2f" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_15_0.bin.lz", @@ -6680,10 +6977,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_84.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/dungeon_map.bin", "start": 5344824, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_MinishHole" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_16_0.bin.lz", @@ -6698,10 +7000,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_85.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/dungeon_map.bin", "start": 5345324, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_BossKey" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_17_0.bin.lz", @@ -6716,10 +7023,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_86.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/dungeon_map.bin", "start": 5345788, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_WestStairs2f" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_18_0.bin.lz", @@ -6734,10 +7046,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_87.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/dungeon_map.bin", "start": 5346284, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_EastStairs2f" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_19_0.bin.lz", @@ -6752,10 +7069,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_88.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/dungeon_map.bin", "start": 5346708, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_WestStairs1f" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_20_0.bin.lz", @@ -6770,10 +7092,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_89.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/dungeon_map.bin", "start": 5347132, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_CenterStairs1f" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_21_0.bin.lz", @@ -6788,10 +7115,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_90.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/dungeon_map.bin", "start": 5347564, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_EastStairs1f" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_22_0.bin.lz", @@ -6806,10 +7138,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_91.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/dungeon_map.bin", "start": 5347940, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_Wizzrobe" }, { "path": "assets/gAreaRoomMap_FortressOfWinds_23_0.bin.lz", @@ -6824,10 +7161,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_92.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/dungeon_map.bin", "start": 5348348, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_HeartPiece" }, { "path": "assets/gAreaRoomMap_InnerMazaal_0_0.bin.lz", @@ -6866,19 +7208,19 @@ "type": "map_layer1" }, { - "path": "tilesets/gAreaTileset_HyruleTownMinishCaves_0_0.4bpp.lz", + "path": "tilesets/gAreaTileset_TempleOfDroplets_0_0.4bpp.lz", "start": 5350656, "size": 8744, "type": "tileset" }, { - "path": "tilesets/gAreaTileset_HyruleTownMinishCaves_0_1.4bpp.lz", + "path": "tilesets/gAreaTileset_TempleOfDroplets_0_1.4bpp.lz", "start": 5359400, "size": 9899, "type": "tileset" }, { - "path": "tilesets/gAreaTileset_HyruleTownMinishCaves_0_2.4bpp.lz", + "path": "tilesets/gAreaTileset_TempleOfDroplets_0_2.4bpp.lz", "start": 5369300, "size": 8707, "type": "tileset" @@ -6962,10 +7304,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_93.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/dungeon_map.bin", "start": 5414708, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_WestHole" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_1_0.bin.lz", @@ -6980,10 +7327,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_94.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/dungeon_map.bin", "start": 5415192, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_NorthSplitRoom" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_2_0.bin.lz", @@ -6998,10 +7350,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_95.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/dungeon_map.bin", "start": 5415672, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_EastHole" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_3_0.bin.lz", @@ -7016,10 +7373,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_96.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/dungeon_map.bin", "start": 5416856, "size": 236, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_Entrance" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_4_0.bin.lz", @@ -7034,10 +7396,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_97.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/dungeon_map.bin", "start": 5417540, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_NorthwestStairs" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_5_0.bin.lz", @@ -7052,10 +7419,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_98.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/dungeon_map.bin", "start": 5417968, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_ScissorsMiniboss" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_6_0.bin.lz", @@ -7070,10 +7442,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_99.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/dungeon_map.bin", "start": 5418732, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_WaterfallNorthwest" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_7_0.bin.lz", @@ -7088,10 +7465,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_100.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/dungeon_map.bin", "start": 5419512, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_WaterfallNortheast" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_8_0.bin.lz", @@ -7106,10 +7488,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_101.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/08_Element/dungeon_map.bin", "start": 5421188, "size": 324, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 36 + }, + "name": "gDungeonMaps_TempleOfDroplets_Element" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_9_0.bin.lz", @@ -7124,10 +7511,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_102.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/dungeon_map.bin", "start": 5421920, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_IceCorner" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_10_0.bin.lz", @@ -7142,10 +7534,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_103.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/dungeon_map.bin", "start": 5422896, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 39 + }, + "name": "gDungeonMaps_TempleOfDroplets_IcePitMaze" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_11_0.bin.lz", @@ -7160,10 +7557,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_104.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/dungeon_map.bin", "start": 5423536, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_12_0.bin.lz", @@ -7178,10 +7580,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_105.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/dungeon_map.bin", "start": 5423916, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_13_0.bin.lz", @@ -7196,10 +7603,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_106.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/dungeon_map.bin", "start": 5424700, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_14_0.bin.lz", @@ -7214,10 +7626,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_107.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/dungeon_map.bin", "start": 5425252, "size": 144, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 16 + }, + "name": "gDungeonMaps_TempleOfDroplets_BigOcto" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_15_0.bin.lz", @@ -7232,10 +7649,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_108.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/dungeon_map.bin", "start": 5425836, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_ToBlueChu" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_16_0.bin.lz", @@ -7250,10 +7672,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_109.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/dungeon_map.bin", "start": 5426220, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlueChu" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_17_0.bin.lz", @@ -7268,10 +7695,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_110.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/dungeon_map.bin", "start": 5426624, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlueChuKey" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_18_0.bin.lz", @@ -7286,10 +7718,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_111.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/dungeon_map.bin", "start": 5427240, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BossKey" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_19_0.bin.lz", @@ -7304,10 +7741,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_112.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/dungeon_map.bin", "start": 5427796, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_NorthSmallKey" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_20_0.bin.lz", @@ -7322,10 +7764,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_113.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/dungeon_map.bin", "start": 5428392, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlockCloneButtonPuzzle" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_21_0.bin.lz", @@ -7340,10 +7787,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_114.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/dungeon_map.bin", "start": 5428892, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlockClonePuzzle" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_22_0.bin.lz", @@ -7358,10 +7810,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_115.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/dungeon_map.bin", "start": 5429848, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_23_0.bin.lz", @@ -7376,10 +7833,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_116.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/dungeon_map.bin", "start": 5430460, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_24_0.bin.lz", @@ -7394,10 +7856,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_117.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/dungeon_map.bin", "start": 5431392, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 40 + }, + "name": "gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_25_0.bin.lz", @@ -7412,10 +7879,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_118.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/dungeon_map.bin", "start": 5431920, "size": 56, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 14 + }, + "name": "gDungeonMaps_TempleOfDroplets_9Lanterns" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_26_0.bin.lz", @@ -7450,10 +7922,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_119.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/dungeon_map.bin", "start": 5433552, "size": 352, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 39 + }, + "name": "gDungeonMaps_TempleOfDroplets_LilypadIceBlocks" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_27_0.bin.lz", @@ -7468,10 +7945,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_120.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/41_29/dungeon_map.bin", "start": 5434340, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_29" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_28_0.bin.lz", @@ -7486,10 +7968,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_121.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/dungeon_map.bin", "start": 5434748, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_MulldozersFireBars" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_29_0.bin.lz", @@ -7504,10 +7991,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_122.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/dungeon_map.bin", "start": 5435484, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 39 + }, + "name": "gDungeonMaps_TempleOfDroplets_DarkMaze" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_30_0.bin.lz", @@ -7522,10 +8014,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_123.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/dungeon_map.bin", "start": 5435956, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_TwinMadderpillars" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_31_0.bin.lz", @@ -7540,10 +8037,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_124.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/dungeon_map.bin", "start": 5436448, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_32_0.bin.lz", @@ -7558,10 +8060,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_125.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/dungeon_map.bin", "start": 5436916, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlueChuKeyLever" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_33_0.bin.lz", @@ -7576,10 +8083,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_126.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/dungeon_map.bin", "start": 5437284, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_MulldozerKey" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_34_0.bin.lz", @@ -7594,10 +8106,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_127.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/dungeon_map.bin", "start": 5437676, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BeforeTwinMadderpillars" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_35_0.bin.lz", @@ -7612,10 +8129,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_128.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/dungeon_map.bin", "start": 5438436, "size": 136, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 27 + }, + "name": "gDungeonMaps_TempleOfDroplets_LilypadB2West" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_36_0.bin.lz", @@ -7630,10 +8152,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_129.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/50_Compass/dungeon_map.bin", "start": 5439028, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_Compass" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_37_0.bin.lz", @@ -7648,10 +8175,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_130.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/dungeon_map.bin", "start": 5439496, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_DarkScissorBeetles" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_38_0.bin.lz", @@ -7666,10 +8198,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_131.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/dungeon_map.bin", "start": 5440144, "size": 128, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 14 + }, + "name": "gDungeonMaps_TempleOfDroplets_LilypadB2Middle" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_39_0.bin.lz", @@ -7684,10 +8221,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_132.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/dungeon_map.bin", "start": 5440680, "size": 72, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 14 + }, + "name": "gDungeonMaps_TempleOfDroplets_IceMadderpillar" }, { "path": "assets/gAreaRoomMap_TempleOfDroplets_40_0.bin.lz", @@ -7702,10 +8244,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_133.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/dungeon_map.bin", "start": 5441140, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_FlamebarBlockPuzzle" }, { "path": "assets/gAreaRoomMap_61_0_0.bin.lz", @@ -8140,10 +8687,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_135.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/dungeon_map.bin", "start": 5543568, "size": 360, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_GyorgTornado" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BossKey_0.bin.lz", @@ -8158,10 +8710,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_136.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/dungeon_map.bin", "start": 5544224, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BossKey" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0.bin.lz", @@ -8176,10 +8733,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_137.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/dungeon_map.bin", "start": 5544712, "size": 56, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 14 + }, + "name": "gDungeonMaps_PalaceOfWinds_BeforeBallAndChainSoldiers" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0.bin.lz", @@ -8194,10 +8756,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_138.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/dungeon_map.bin", "start": 5545576, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_GyorgBossDoor" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0.bin.lz", @@ -8212,10 +8779,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_139.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/dungeon_map.bin", "start": 5545952, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_EastChestFromGyorgBossDoor" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0.bin.lz", @@ -8230,10 +8802,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_140.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/dungeon_map.bin", "start": 5546684, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_MoblinAndWizzrobeFight" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0.bin.lz", @@ -8248,10 +8825,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_141.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/dungeon_map.bin", "start": 5547468, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_FourButtonStalfos" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0.bin.lz", @@ -8266,10 +8848,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_142.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/dungeon_map.bin", "start": 5548292, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_FanAndKeyToBossKey" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0.bin.lz", @@ -8284,10 +8871,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_143.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/dungeon_map.bin", "start": 5548988, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_BallAndChainSoldiers" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_0.bin.lz", @@ -8302,10 +8894,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_144.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/dungeon_map.bin", "start": 5549344, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BombarossaPath" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0.bin.lz", @@ -8320,10 +8917,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_145.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/dungeon_map.bin", "start": 5549768, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_PalaceOfWinds_HoleToDarknut" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0.bin.lz", @@ -8338,10 +8940,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_146.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/dungeon_map.bin", "start": 5550132, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_ToBombarossaPath" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0.bin.lz", @@ -8356,10 +8963,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_147.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/dungeon_map.bin", "start": 5550432, "size": 64, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 16 + }, + "name": "gDungeonMaps_PalaceOfWinds_DarknutMiniboss" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_0.bin.lz", @@ -8374,10 +8986,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_148.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/dungeon_map.bin", "start": 5550804, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BombWallInside" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_0.bin.lz", @@ -8392,10 +9009,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_149.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/dungeon_map.bin", "start": 5551240, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_BombWallOutside" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_0.bin.lz", @@ -8410,10 +9032,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_150.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/dungeon_map.bin", "start": 5552228, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_CloudJumps" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0.bin.lz", @@ -8428,10 +9055,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_151.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/dungeon_map.bin", "start": 5553624, "size": 360, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_BlockMazeToBossDoor" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0.bin.lz", @@ -8446,10 +9078,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_152.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/dungeon_map.bin", "start": 5554656, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_CrackedFloorLakitu" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0.bin.lz", @@ -8464,10 +9101,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_153.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/dungeon_map.bin", "start": 5555128, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_HeartPieceBridge" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_0.bin.lz", @@ -8482,10 +9124,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_154.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/dungeon_map.bin", "start": 5556088, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_FanBridge" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_0.bin.lz", @@ -8500,10 +9147,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_155.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/dungeon_map.bin", "start": 5556700, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_ToFanBridge" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_0.bin.lz", @@ -8518,10 +9170,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_156.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/dungeon_map.bin", "start": 5558112, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_RedWarpHall" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0.bin.lz", @@ -8536,10 +9193,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_157.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/dungeon_map.bin", "start": 5559244, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PlatformCloneRide" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0.bin.lz", @@ -8554,10 +9216,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_158.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/dungeon_map.bin", "start": 5559696, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PitCornerAfterKey" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_0.bin.lz", @@ -8572,10 +9239,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_159.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/dungeon_map.bin", "start": 5560360, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 40 + }, + "name": "gDungeonMaps_PalaceOfWinds_PlatformCrowRide" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0.bin.lz", @@ -8590,10 +9262,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_160.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/dungeon_map.bin", "start": 5561212, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_GratePlatformRide" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_PotPush_0.bin.lz", @@ -8608,10 +9285,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_161.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/dungeon_map.bin", "start": 5562296, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PotPush" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_0.bin.lz", @@ -8626,10 +9308,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_162.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/dungeon_map.bin", "start": 5562772, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_FloormasterLever" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_Map_0.bin.lz", @@ -8644,10 +9331,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_163.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/28_Map/dungeon_map.bin", "start": 5563100, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_Map" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_0.bin.lz", @@ -8662,10 +9354,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_164.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/dungeon_map.bin", "start": 5563444, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_CornerToMap" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0.bin.lz", @@ -8680,10 +9377,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_165.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/dungeon_map.bin", "start": 5563792, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_StairsAfterFloormaster" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0.bin.lz", @@ -8698,10 +9400,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_166.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/dungeon_map.bin", "start": 5564112, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_HoleToKinstoneWizzrobe" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0.bin.lz", @@ -8716,10 +9423,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_167.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/dungeon_map.bin", "start": 5564440, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_KeyArrowButton" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_0.bin.lz", @@ -8734,10 +9446,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_168.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/dungeon_map.bin", "start": 5565904, "size": 360, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_GratesTo3f" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_0.bin.lz", @@ -8752,10 +9469,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_169.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/dungeon_map.bin", "start": 5567376, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_SpinyFight" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0.bin.lz", @@ -8770,10 +9492,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_170.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/dungeon_map.bin", "start": 5568132, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PeahatSwitch" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0.bin.lz", @@ -8788,10 +9515,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_171.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/dungeon_map.bin", "start": 5568776, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_WhirlwindBombarossa" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0.bin.lz", @@ -8806,10 +9538,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_172.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/dungeon_map.bin", "start": 5569272, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_DoorToStalfosFirebar" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0.bin.lz", @@ -8824,10 +9561,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_173.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/dungeon_map.bin", "start": 5569644, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_StalfosFirebarHole" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0.bin.lz", @@ -8842,10 +9584,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_174.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/dungeon_map.bin", "start": 5570016, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_ShortcutDoorButtons" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0.bin.lz", @@ -8860,10 +9607,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_175.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/dungeon_map.bin", "start": 5570388, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_ToPeahatSwitch" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0.bin.lz", @@ -8878,10 +9630,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_176.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/dungeon_map.bin", "start": 5570728, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_KinstoneWizzrobeFight" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_0.bin.lz", @@ -8896,10 +9653,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_177.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/dungeon_map.bin", "start": 5571092, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_GibdoStairs" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0.bin.lz", @@ -8914,10 +9676,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_178.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/dungeon_map.bin", "start": 5571624, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_SpikeBarSmallKey" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_RocCape_0.bin.lz", @@ -8947,10 +9714,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_179.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/dungeon_map.bin", "start": 5572700, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_RocCape" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_0.bin.lz", @@ -8965,10 +9737,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_180.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/dungeon_map.bin", "start": 5573880, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_FireBarGrates" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0.bin.lz", @@ -8983,10 +9760,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_181.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/dungeon_map.bin", "start": 5574756, "size": 200, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 40 + }, + "name": "gDungeonMaps_PalaceOfWinds_PlatformRideBombarossas" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0.bin.lz", @@ -9001,10 +9783,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_182.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/dungeon_map.bin", "start": 5575128, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BridgeAfterDarknut" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0.bin.lz", @@ -9019,10 +9806,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_183.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/dungeon_map.bin", "start": 5576004, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_BridgeSwitchesCloneBlock" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_0.bin.lz", @@ -9037,10 +9829,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_184.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/dungeon_map.bin", "start": 5576656, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 11 + }, + "name": "gDungeonMaps_PalaceOfWinds_EntranceRoom" }, { "path": "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0.bin.lz", @@ -9055,10 +9852,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_185.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/dungeon_map.bin", "start": 5577900, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_DarkCompassHall" }, { "path": "assets/gAreaRoomMap_PalaceOfWindsBoss_0_0.bin.lz", @@ -9559,10 +10361,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_188.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/dungeon_map.bin", "start": 5808344, "size": 468, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 13, + "height": 36 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fEntrance" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0.bin.lz", @@ -9577,10 +10384,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_189.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/dungeon_map.bin", "start": 5809156, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fTopLeftTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0.bin.lz", @@ -9595,10 +10407,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_190.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/dungeon_map.bin", "start": 5809592, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fTopRightTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0.bin.lz", @@ -9613,10 +10430,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_191.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/dungeon_map.bin", "start": 5810036, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fBottomLeftTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0.bin.lz", @@ -9631,10 +10453,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_192.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/dungeon_map.bin", "start": 5810488, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fBottomRightTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0.bin.lz", @@ -9649,10 +10476,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_193.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/dungeon_map.bin", "start": 5811284, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fKeatonHallToVaati" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0.bin.lz", @@ -9667,10 +10499,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_194.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/dungeon_map.bin", "start": 5812004, "size": 96, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 16 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fTripleDarknut" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0.bin.lz", @@ -9685,10 +10522,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_195.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/dungeon_map.bin", "start": 5812624, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopLeftTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0.bin.lz", @@ -9703,10 +10545,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_196.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/dungeon_map.bin", "start": 5813412, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopLeftCorner" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_0.bin.lz", @@ -9721,10 +10568,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_197.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/dungeon_map.bin", "start": 5814032, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBossKey" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0.bin.lz", @@ -9739,10 +10591,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_198.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/dungeon_map.bin", "start": 5814544, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBlueWarp" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0.bin.lz", @@ -9757,10 +10614,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_199.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/dungeon_map.bin", "start": 5814972, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightCornerGhini" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0.bin.lz", @@ -9775,10 +10637,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_200.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/dungeon_map.bin", "start": 5815420, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightCornerTorches" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0.bin.lz", @@ -9793,10 +10660,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_201.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/dungeon_map.bin", "start": 5815892, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0.bin.lz", @@ -9811,10 +10683,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_202.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/dungeon_map.bin", "start": 5816436, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopLeftDarknut" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_0.bin.lz", @@ -9829,10 +10706,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_203.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/dungeon_map.bin", "start": 5816924, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fSparks" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0.bin.lz", @@ -9847,10 +10729,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_204.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/dungeon_map.bin", "start": 5817456, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightDarknuts" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_0.bin.lz", @@ -9865,10 +10752,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_205.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/dungeon_map.bin", "start": 5818136, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fLeft" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_0.bin.lz", @@ -9883,10 +10775,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_206.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/dungeon_map.bin", "start": 5818824, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fRight" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0.bin.lz", @@ -9901,10 +10798,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_207.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/dungeon_map.bin", "start": 5819400, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftDarknuts" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0.bin.lz", @@ -9919,10 +10821,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_208.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/dungeon_map.bin", "start": 5819972, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBossDoor" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0.bin.lz", @@ -9937,10 +10844,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_209.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/dungeon_map.bin", "start": 5820488, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomRightDarknut" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0.bin.lz", @@ -9955,10 +10867,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_210.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/dungeon_map.bin", "start": 5820940, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftCornerPuzzle" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_0.bin.lz", @@ -9973,10 +10890,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_211.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/dungeon_map.bin", "start": 5821688, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fEntrance" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0.bin.lz", @@ -9991,10 +10913,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_212.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/dungeon_map.bin", "start": 5822388, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomRightCorner" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0.bin.lz", @@ -10009,10 +10936,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_213.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/dungeon_map.bin", "start": 5822892, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0.bin.lz", @@ -10027,10 +10959,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_214.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/dungeon_map.bin", "start": 5823308, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftGhini" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0.bin.lz", @@ -10048,7 +10985,12 @@ "path": "assets/unknown_215.bin", "start": 5823496, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_unknown_215" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_0.bin.lz", @@ -10063,10 +11005,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_216.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/dungeon_map.bin", "start": 5824012, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Entrance" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0.bin.lz", @@ -10081,10 +11028,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_217.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/dungeon_map.bin", "start": 5824592, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomRightTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0.bin.lz", @@ -10099,10 +11051,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_218.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/dungeon_map.bin", "start": 5825076, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fTopLeftTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0.bin.lz", @@ -10117,10 +11074,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_219.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/dungeon_map.bin", "start": 5825628, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fThroneRoom" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_0.bin.lz", @@ -10135,10 +11097,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_220.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/dungeon_map.bin", "start": 5826168, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fCompass" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0.bin.lz", @@ -10153,10 +11120,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_221.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/dungeon_map.bin", "start": 5826644, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fTopRightTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0.bin.lz", @@ -10171,10 +11143,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_222.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/dungeon_map.bin", "start": 5827148, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fBeforeThrone" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0.bin.lz", @@ -10189,10 +11166,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_223.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/dungeon_map.bin", "start": 5827592, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTopLeft" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0.bin.lz", @@ -10207,10 +11189,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_224.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/dungeon_map.bin", "start": 5827992, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTop" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0.bin.lz", @@ -10225,10 +11212,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_225.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/dungeon_map.bin", "start": 5828416, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTopRight" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0.bin.lz", @@ -10243,10 +11235,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_226.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/dungeon_map.bin", "start": 5829004, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopLeft" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0.bin.lz", @@ -10261,10 +11258,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_227.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/dungeon_map.bin", "start": 5829568, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopRight" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0.bin.lz", @@ -10279,10 +11281,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_228.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/dungeon_map.bin", "start": 5830040, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottomLeft" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0.bin.lz", @@ -10297,10 +11304,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_229.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/dungeon_map.bin", "start": 5830424, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottom" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0.bin.lz", @@ -10315,10 +11327,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_230.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/dungeon_map.bin", "start": 5830840, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0.bin.lz", @@ -10333,10 +11350,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_231.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/dungeon_map.bin", "start": 5831260, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fBottomLeftTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0.bin.lz", @@ -10351,10 +11373,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_232.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/dungeon_map.bin", "start": 5831676, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fBottomRightTower" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0.bin.lz", @@ -10369,10 +11396,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_233.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/dungeon_map.bin", "start": 5832084, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BelowThrone" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0.bin.lz", @@ -10387,10 +11419,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_234.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/dungeon_map.bin", "start": 5832540, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BelowCompass" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0.bin.lz", @@ -10405,10 +11442,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_235.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/dungeon_map.bin", "start": 5832952, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BeforeThrone" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0.bin.lz", @@ -10423,10 +11465,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_236.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/dungeon_map.bin", "start": 5833356, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1ToPrison" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_0.bin.lz", @@ -10441,10 +11488,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_237.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/dungeon_map.bin", "start": 5833764, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BombWall" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_0.bin.lz", @@ -10459,10 +11511,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_238.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/dungeon_map.bin", "start": 5834196, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Keatons" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0.bin.lz", @@ -10477,10 +11534,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_239.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/dungeon_map.bin", "start": 5834760, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_0.bin.lz", @@ -10495,10 +11557,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_240.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/dungeon_map.bin", "start": 5835316, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Cannons" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_0.bin.lz", @@ -10513,10 +11580,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_241.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/dungeon_map.bin", "start": 5835824, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Left" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_0.bin.lz", @@ -10531,10 +11603,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_242.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/dungeon_map.bin", "start": 5836300, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Right" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_0.bin.lz", @@ -10549,10 +11626,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_243.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/dungeon_map.bin", "start": 5837996, "size": 340, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 13, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Map" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0.bin.lz", @@ -10567,10 +11649,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_244.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/dungeon_map.bin", "start": 5838764, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B2ToPrison" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_0.bin.lz", @@ -10585,10 +11672,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_245.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/dungeon_map.bin", "start": 5839404, "size": 136, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 15 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B2Prison" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0.bin.lz", @@ -10603,10 +11695,15 @@ "type": "map_layer1" }, { - "path": "assets/unknown_246.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/dungeon_map.bin", "start": 5839900, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 18 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B2Dropdown" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0.bin.lz", @@ -10624,7 +11721,12 @@ "path": "assets/unknown_247.bin", "start": 5840112, "size": 112, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 28 + }, + "name": "gDungeonMaps_unknown_247" }, { "path": "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_0.bin.lz", @@ -10642,7 +11744,12 @@ "path": "assets/unknown_248.bin", "start": 5840868, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_unknown_248" }, { "path": "assets/gAreaRoomMap_Vaati3_0_0.bin.lz", diff --git a/data/const/common.s b/data/const/common.s deleted file mode 100644 index d40d1700..00000000 --- a/data/const/common.s +++ /dev/null @@ -1,336 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -@ before: playerItemCellOverwriteSet -@ in here: ui.c, color.c, common.c -@ before on data side: sineTable.c -@ after: octorok.c - -@ code_080043E8.c -gUnk_080C93E0:: @ 080C93E0 - .incbin "data_080C93E0/gUnk_080C93E0.bin" - -@ common.c -gUnk_080C9460:: @ 080C9460 - .incbin "data_080C93E0/gUnk_080C9460.bin" - - -@ DungeonLayout - -gUnk_080C9480:: @ 080C9480 - .incbin "data_080C93E0/gUnk_080C9480.bin" - -gUnk_080C9488:: @ 080C9488 - .4byte gUnk_080C9480 - -gUnk_080C948C:: @ 080C948C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C948C_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C948C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C94A4:: @ 080C94A4 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C94A4_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C94A4_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9514:: @ 080C9514 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9514_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9514_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C953C:: @ 080C953C - .4byte gUnk_080C948C - .4byte gUnk_080C94A4 - .4byte gUnk_080C9514 - -gUnk_080C9548:: @ 080C9548 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9548_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9548_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9570:: @ 080C9570 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9570_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9570_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C95B8:: @ 080C95B8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C95B8_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C95B8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C95F0:: @ 080C95F0 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C95F0_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C95F0_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9600:: @ 080C9600 - .4byte gUnk_080C9548 - .4byte gUnk_080C9570 - .4byte gUnk_080C95B8 - .4byte gUnk_080C95F0 - -gUnk_080C9610:: @ 080C9610 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9610_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9610_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9648:: @ 080C9648 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9648_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9648_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C96C8:: @ 080C96C8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C96C8_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C96C8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C96F8:: @ 080C96F8 - .4byte gUnk_080C9610 - .4byte gUnk_080C9648 - .4byte gUnk_080C96C8 - -gUnk_080C9704:: @ 080C9704 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9704_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9704_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9794:: @ 080C9794 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9794_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9794_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9854:: @ 080C9854 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9854_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9854_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9864:: @ 080C9864 - .4byte gUnk_080C9704 - .4byte gUnk_080C9794 - .4byte gUnk_080C9854 - -gUnk_080C9870:: @ 080C9870 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9870_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9870_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9870_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9870_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C98E8:: @ 080C98E8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C98E8_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C98E8_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C98E8_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C98E8_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9928:: @ 080C9928 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9928_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9928_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9928_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9928_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9988:: @ 080C9988 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9988_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9988_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9988_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9988_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C99E8:: @ 080C99E8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C99E8_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C99E8_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C99E8_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C99E8_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9A30:: @ 080C9A30 - .4byte gUnk_080C9870 - .4byte gUnk_080C98E8 - .4byte gUnk_080C9928 - .4byte gUnk_080C9988 - .4byte gUnk_080C99E8 - -gUnk_080C9A44:: @ 080C9A44 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9A44_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9A44_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9A44_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9A44_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9A7C:: @ 080C9A7C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9A7C_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9A7C_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9A7C_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9A7C_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9B2C:: @ 080C9B2C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9B2C_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9B2C_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9B2C_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9B2C_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9BB4:: @ 080C9BB4 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9BB4_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9BB4_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9BB4_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9BB4_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9C1C:: @ 080C9C1C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9C1C_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9C1C_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9C1C_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9C1C_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9C3C:: @ 080C9C3C - .4byte gUnk_080C9A44 - .4byte gUnk_080C9A7C - .4byte gUnk_080C9B2C - .4byte gUnk_080C9BB4 - .4byte gUnk_080C9C1C - -@ common.c -gUnk_080C9C50:: @ 080C9C50 - .4byte gUnk_080C9488 - .4byte gUnk_080C953C - .4byte gUnk_080C9600 - .4byte gUnk_080C96F8 - .4byte gUnk_080C9864 - .4byte gUnk_080C9A30 - .4byte gUnk_080C9C3C diff --git a/data/map/map_data.s b/data/map/map_data.s index e11c597f..056d1c11 100644 --- a/data/map/map_data.s +++ b/data/map/map_data.s @@ -4,18 +4,19 @@ .section .rodata .align 2 + gMapData:: @ 08324AE4 @ Contains purely 0xff to indicate that no metatiles are used, but the mapping for the tiles is supplied directly. gAreaRoomMap_None:: .incbin "assets/gAreaRoomMap_None.bin.lz" .align 2 -gAreaTileset_LakeWoodsCave_0_0:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_0.4bpp.lz" +gAreaTileset_MinishWoods_0_0:: + .incbin "tilesets/gAreaTileset_MinishWoods_0_0.4bpp.lz" .align 2 -gAreaTileset_LakeWoodsCave_0_1:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_1.4bpp.lz" -gAreaTileset_LakeWoodsCave_0_2:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_2.4bpp.lz" +gAreaTileset_MinishWoods_0_1:: + .incbin "tilesets/gAreaTileset_MinishWoods_0_1.4bpp.lz" +gAreaTileset_MinishWoods_0_2:: + .incbin "tilesets/gAreaTileset_MinishWoods_0_2.4bpp.lz" .align 2 gAreaMetatiles_MinishWoods_0:: .incbin "assets/gAreaMetatiles_MinishWoods_0.bin.lz" @@ -2430,115 +2431,115 @@ gAreaRoomMap_DeepwoodShrine_0_0:: gAreaRoomMap_DeepwoodShrine_0_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_0_1.bin.lz" .align 2 -unknown_29:: - .incbin "assets/unknown_29.bin" + gDungeonMaps_DeepwoodShrine_Madderpillar:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_1_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_1_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_1_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_1_1.bin.lz" .align 2 -unknown_30:: - .incbin "assets/unknown_30.bin" + gDungeonMaps_DeepwoodShrine_BluePortal:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_2_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_2_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_2_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_2_1.bin.lz" .align 2 -unknown_31:: - .incbin "assets/unknown_31.bin" + gDungeonMaps_DeepwoodShrine_StairsToB1:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_3_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_3_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_3_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_3_1.bin.lz" .align 2 -unknown_32:: - .incbin "assets/unknown_32.bin" + gDungeonMaps_DeepwoodShrine_PotBridge:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_4_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_4_0.bin.lz" gAreaRoomMap_DeepwoodShrine_4_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_4_1.bin.lz" .align 2 -unknown_33:: - .incbin "assets/unknown_33.bin" + gDungeonMaps_DeepwoodShrine_DoubleStatue:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_5_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_5_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_5_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_5_1.bin.lz" .align 2 -unknown_34:: - .incbin "assets/unknown_34.bin" + gDungeonMaps_DeepwoodShrine_Map:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/05_Map/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_6_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_6_0.bin.lz" gAreaRoomMap_DeepwoodShrine_6_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_6_1.bin.lz" .align 2 -unknown_35:: - .incbin "assets/unknown_35.bin" + gDungeonMaps_DeepwoodShrine_Barrel:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_7_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_7_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_7_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_7_1.bin.lz" .align 2 -unknown_36:: - .incbin "assets/unknown_36.bin" + gDungeonMaps_DeepwoodShrine_Button:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/07_Button/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_8_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_8_0.bin.lz" gAreaRoomMap_DeepwoodShrine_8_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_8_1.bin.lz" .align 2 -unknown_37:: - .incbin "assets/unknown_37.bin" + gDungeonMaps_DeepwoodShrine_Mulldozer:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_9_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_9_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_9_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_9_1.bin.lz" .align 2 -unknown_38:: - .incbin "assets/unknown_38.bin" + gDungeonMaps_DeepwoodShrine_Pillars:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_10_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_10_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_10_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_10_1.bin.lz" .align 2 -unknown_39:: - .incbin "assets/unknown_39.bin" + gDungeonMaps_DeepwoodShrine_Lever:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/10_Lever/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_11_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_11_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_11_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_11_1.bin.lz" .align 2 -unknown_40:: - .incbin "assets/unknown_40.bin" + gDungeonMaps_DeepwoodShrine_Entrance:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_12_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_12_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_12_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_12_1.bin.lz" .align 2 -unknown_41:: - .incbin "assets/unknown_41.bin" + gDungeonMaps_DeepwoodShrine_Torches:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/16_Torches/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_13_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_13_0.bin.lz" gAreaRoomMap_DeepwoodShrine_13_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_13_1.bin.lz" .align 2 -unknown_42:: - .incbin "assets/unknown_42.bin" + gDungeonMaps_DeepwoodShrine_BossKey:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_14_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_14_0.bin.lz" gAreaRoomMap_DeepwoodShrine_14_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_14_1.bin.lz" .align 2 -unknown_43:: - .incbin "assets/unknown_43.bin" + gDungeonMaps_DeepwoodShrine_Compass:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_15_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_15_0.bin.lz" .align 2 @@ -2553,31 +2554,31 @@ gAreaRoomMap_DeepwoodShrine_16_0:: gAreaRoomMap_DeepwoodShrine_16_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_16_1.bin.lz" .align 2 -unknown_45:: - .incbin "assets/unknown_45.bin" + gDungeonMaps_DeepwoodShrine_LilyPadWest:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_17_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_17_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_17_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_17_1.bin.lz" .align 2 -unknown_46:: - .incbin "assets/unknown_46.bin" + gDungeonMaps_DeepwoodShrine_LilyPadEast:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/dungeon_map.bin" gAreaRoomMap_DeepwoodShrineBoss_0_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrineBoss_0_0.bin.lz" gAreaRoomMap_DeepwoodShrineBoss_0_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrineBoss_0_1.bin.lz" .align 2 -unknown_47:: - .incbin "assets/unknown_47.bin" + gDungeonMaps_DeepwoodShrineBoss_Main:: + .incbin "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_18_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_18_0.bin.lz" .align 2 gAreaRoomMap_DeepwoodShrine_18_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_18_1.bin.lz" .align 2 -unknown_48:: - .incbin "assets/unknown_48.bin" + gDungeonMaps_DeepwoodShrine_BossDoor:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_19_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_19_0.bin.lz" .align 2 @@ -2641,142 +2642,142 @@ gAreaRoomMap_CaveOfFlames_0_0:: gAreaRoomMap_CaveOfFlames_0_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_0_1.bin.lz" .align 2 -unknown_50:: - .incbin "assets/unknown_50.bin" + gDungeonMaps_CaveOfFlames_AfterCane:: + .incbin "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_1_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_1_0.bin.lz" gAreaRoomMap_CaveOfFlames_1_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_1_1.bin.lz" .align 2 -unknown_51:: - .incbin "assets/unknown_51.bin" + gDungeonMaps_CaveOfFlames_SpinyChu:: + .incbin "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_2_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_2_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_2_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_2_1.bin.lz" .align 2 -unknown_52:: - .incbin "assets/unknown_52.bin" + gDungeonMaps_CaveOfFlames_CartToSpinyChu:: + .incbin "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_3_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_3_0.bin.lz" gAreaRoomMap_CaveOfFlames_3_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_3_1.bin.lz" .align 2 -unknown_53:: - .incbin "assets/unknown_53.bin" + gDungeonMaps_CaveOfFlames_Entrance:: + .incbin "maps/areas/080_CaveOfFlames/rooms/03_Entrance/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_4_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_4_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_4_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_4_1.bin.lz" .align 2 -unknown_54:: - .incbin "assets/unknown_54.bin" + gDungeonMaps_CaveOfFlames_MainCart:: + .incbin "maps/areas/080_CaveOfFlames/rooms/04_MainCart/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_5_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_5_0.bin.lz" gAreaRoomMap_CaveOfFlames_5_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_5_1.bin.lz" .align 2 -unknown_55:: - .incbin "assets/unknown_55.bin" + gDungeonMaps_CaveOfFlames_NorthEntrance:: + .incbin "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_6_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_6_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_6_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_6_1.bin.lz" .align 2 -unknown_56:: - .incbin "assets/unknown_56.bin" + gDungeonMaps_CaveOfFlames_CartWest:: + .incbin "maps/areas/080_CaveOfFlames/rooms/06_CartWest/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_7_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_7_0.bin.lz" gAreaRoomMap_CaveOfFlames_7_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_7_1.bin.lz" .align 2 -unknown_57:: - .incbin "assets/unknown_57.bin" + gDungeonMaps_CaveOfFlames_HelmasaurFight:: + .incbin "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_8_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_8_0.bin.lz" gAreaRoomMap_CaveOfFlames_8_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_8_1.bin.lz" .align 2 -unknown_58:: - .incbin "assets/unknown_58.bin" + gDungeonMaps_CaveOfFlames_RollobiteLavaRoom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_9_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_9_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_9_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_9_1.bin.lz" .align 2 -unknown_59:: - .incbin "assets/unknown_59.bin" + gDungeonMaps_CaveOfFlames_MinishLavaRoom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_10_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_10_0.bin.lz" gAreaRoomMap_CaveOfFlames_10_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_10_1.bin.lz" .align 2 -unknown_60:: - .incbin "assets/unknown_60.bin" + gDungeonMaps_CaveOfFlames_MinishSpikes:: + .incbin "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_11_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_11_0.bin.lz" gAreaRoomMap_CaveOfFlames_11_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_11_1.bin.lz" .align 2 -unknown_61:: - .incbin "assets/unknown_61.bin" + gDungeonMaps_CaveOfFlames_TompasDoom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_12_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_12_0.bin.lz" gAreaRoomMap_CaveOfFlames_12_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_12_1.bin.lz" .align 2 -unknown_62:: - .incbin "assets/unknown_62.bin" + gDungeonMaps_CaveOfFlames_BeforeGleerok:: + .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_13_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_13_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_13_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_13_1.bin.lz" .align 2 -unknown_63:: - .incbin "assets/unknown_63.bin" + gDungeonMaps_CaveOfFlames_BosskeyPath1:: + .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_14_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_14_0.bin.lz" gAreaRoomMap_CaveOfFlames_14_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_14_1.bin.lz" .align 2 -unknown_64:: - .incbin "assets/unknown_64.bin" + gDungeonMaps_CaveOfFlames_BosskeyPath2:: + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_15_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_15_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_15_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_15_1.bin.lz" .align 2 -unknown_65:: - .incbin "assets/unknown_65.bin" + gDungeonMaps_CaveOfFlames_Compass:: + .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_16_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_16_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_16_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_16_1.bin.lz" .align 2 -unknown_66:: - .incbin "assets/unknown_66.bin" + gDungeonMaps_CaveOfFlames_BobOmbWall:: + .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_17_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_17_0.bin.lz" .align 2 gAreaRoomMap_CaveOfFlames_17_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_17_1.bin.lz" .align 2 -unknown_67:: - .incbin "assets/unknown_67.bin" + gDungeonMaps_CaveOfFlames_BossDoor:: + .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/dungeon_map.bin" gAreaRoomMap_CaveOfFlamesBoss_0_0:: .incbin "assets/gAreaRoomMap_CaveOfFlamesBoss_0_0.bin.lz" gAreaRoomMap_CaveOfFlamesBoss_0_1:: .incbin "assets/gAreaRoomMap_CaveOfFlamesBoss_0_1.bin.lz" .align 2 -unknown_68:: - .incbin "assets/unknown_68.bin" + gDungeonMaps_CaveOfFlamesBoss_0:: + .incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/dungeon_map.bin" gAreaTileset_CastorDarknut_0_0:: .incbin "tilesets/gAreaTileset_CastorDarknut_0_0.4bpp.lz" .align 2 @@ -2844,181 +2845,185 @@ gAreaRoomMap_FortressOfWinds_0_0:: gAreaRoomMap_FortressOfWinds_0_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_0_1.bin.lz" .align 2 -unknown_69:: - .incbin "assets/unknown_69.bin" + gDungeonMaps_FortressOfWinds_DoubleEyegore:: + .incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_1_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_1_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_1_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_1_1.bin.lz" .align 2 -unknown_70:: - .incbin "assets/unknown_70.bin" + gDungeonMaps_FortressOfWinds_BeforeMazaal:: + .incbin "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_2_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_2_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_2_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_2_1.bin.lz" .align 2 -unknown_71:: - .incbin "assets/unknown_71.bin" + gDungeonMaps_FortressOfWinds_EastKeyLever:: + .incbin "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_3_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_3_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_3_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_3_1.bin.lz" .align 2 -unknown_72:: - .incbin "assets/unknown_72.bin" + gDungeonMaps_FortressOfWinds_PitPlatforms:: + .incbin "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_4_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_4_0.bin.lz" gAreaRoomMap_FortressOfWinds_4_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_4_1.bin.lz" .align 2 -unknown_73:: - .incbin "assets/unknown_73.bin" + gDungeonMaps_FortressOfWinds_WestKeyLever:: + .incbin "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/dungeon_map.bin" + gDungeonMaps_FortressOfWinds_5:: + .incbin "maps/areas/088_FortressOfWinds/rooms/05_5/dungeon_map.bin" + gDungeonMaps_FortressOfWinds_6:: + .incbin "maps/areas/088_FortressOfWinds/rooms/06_6/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_5_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_5_0.bin.lz" gAreaRoomMap_FortressOfWinds_5_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_5_1.bin.lz" .align 2 -unknown_74:: - .incbin "assets/unknown_74.bin" + gDungeonMaps_FortressOfWinds_DarknutRoom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_6_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_6_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_6_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_6_1.bin.lz" .align 2 -unknown_75:: - .incbin "assets/unknown_75.bin" + gDungeonMaps_FortressOfWinds_ArrowEyeBridge:: + .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_7_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_7_0.bin.lz" gAreaRoomMap_FortressOfWinds_7_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_7_1.bin.lz" .align 2 -unknown_76:: - .incbin "assets/unknown_76.bin" + gDungeonMaps_FortressOfWinds_NorthSplitPathPit:: + .incbin "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_8_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_8_0.bin.lz" gAreaRoomMap_FortressOfWinds_8_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_8_1.bin.lz" .align 2 -unknown_77:: - .incbin "assets/unknown_77.bin" + gDungeonMaps_FortressOfWinds_WallmasterMinishPortal:: + .incbin "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_9_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_9_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_9_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_9_1.bin.lz" .align 2 -unknown_78:: - .incbin "assets/unknown_78.bin" + gDungeonMaps_FortressOfWinds_PillarCloneButtons:: + .incbin "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_10_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_10_0.bin.lz" gAreaRoomMap_FortressOfWinds_10_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_10_1.bin.lz" .align 2 -unknown_79:: - .incbin "assets/unknown_79.bin" + gDungeonMaps_FortressOfWinds_RotatingSpikeTraps:: + .incbin "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_11_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_11_0.bin.lz" gAreaRoomMap_FortressOfWinds_11_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_11_1.bin.lz" .align 2 -unknown_80:: - .incbin "assets/unknown_80.bin" + gDungeonMaps_FortressOfWinds_Mazaal:: + .incbin "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_12_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_12_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_12_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_12_1.bin.lz" .align 2 -unknown_81:: - .incbin "assets/unknown_81.bin" + gDungeonMaps_FortressOfWinds_Stalfos:: + .incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_13_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_13_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_13_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_13_1.bin.lz" .align 2 -unknown_82:: - .incbin "assets/unknown_82.bin" + gDungeonMaps_FortressOfWinds_EntranceMoleMitts:: + .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_14_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_14_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_14_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_14_1.bin.lz" .align 2 -unknown_83:: - .incbin "assets/unknown_83.bin" + gDungeonMaps_FortressOfWinds_Main2f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_15_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_15_0.bin.lz" gAreaRoomMap_FortressOfWinds_15_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_15_1.bin.lz" .align 2 -unknown_84:: - .incbin "assets/unknown_84.bin" + gDungeonMaps_FortressOfWinds_MinishHole:: + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_16_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_16_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_16_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_16_1.bin.lz" .align 2 -unknown_85:: - .incbin "assets/unknown_85.bin" + gDungeonMaps_FortressOfWinds_BossKey:: + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_17_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_17_0.bin.lz" gAreaRoomMap_FortressOfWinds_17_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_17_1.bin.lz" .align 2 -unknown_86:: - .incbin "assets/unknown_86.bin" + gDungeonMaps_FortressOfWinds_WestStairs2f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_18_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_18_0.bin.lz" gAreaRoomMap_FortressOfWinds_18_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_18_1.bin.lz" .align 2 -unknown_87:: - .incbin "assets/unknown_87.bin" + gDungeonMaps_FortressOfWinds_EastStairs2f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_19_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_19_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_19_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_19_1.bin.lz" .align 2 -unknown_88:: - .incbin "assets/unknown_88.bin" + gDungeonMaps_FortressOfWinds_WestStairs1f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_20_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_20_0.bin.lz" gAreaRoomMap_FortressOfWinds_20_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_20_1.bin.lz" .align 2 -unknown_89:: - .incbin "assets/unknown_89.bin" + gDungeonMaps_FortressOfWinds_CenterStairs1f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_21_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_21_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_21_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_21_1.bin.lz" .align 2 -unknown_90:: - .incbin "assets/unknown_90.bin" + gDungeonMaps_FortressOfWinds_EastStairs1f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_22_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_22_0.bin.lz" gAreaRoomMap_FortressOfWinds_22_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_22_1.bin.lz" .align 2 -unknown_91:: - .incbin "assets/unknown_91.bin" + gDungeonMaps_FortressOfWinds_Wizzrobe:: + .incbin "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_23_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_23_0.bin.lz" .align 2 gAreaRoomMap_FortressOfWinds_23_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_23_1.bin.lz" .align 2 -unknown_92:: - .incbin "assets/unknown_92.bin" + gDungeonMaps_FortressOfWinds_HeartPiece:: + .incbin "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/dungeon_map.bin" gAreaRoomMap_InnerMazaal_0_0:: .incbin "assets/gAreaRoomMap_InnerMazaal_0_0.bin.lz" .align 2 @@ -3035,13 +3040,13 @@ gAreaRoomMap_FortressOfWindsTop_0_0:: .incbin "assets/gAreaRoomMap_FortressOfWindsTop_0_0.bin.lz" gAreaRoomMap_FortressOfWindsTop_0_1:: .incbin "assets/gAreaRoomMap_FortressOfWindsTop_0_1.bin.lz" -gAreaTileset_HyruleTownMinishCaves_0_0:: - .incbin "tilesets/gAreaTileset_HyruleTownMinishCaves_0_0.4bpp.lz" -gAreaTileset_HyruleTownMinishCaves_0_1:: - .incbin "tilesets/gAreaTileset_HyruleTownMinishCaves_0_1.4bpp.lz" +gAreaTileset_TempleOfDroplets_0_0:: + .incbin "tilesets/gAreaTileset_TempleOfDroplets_0_0.4bpp.lz" +gAreaTileset_TempleOfDroplets_0_1:: + .incbin "tilesets/gAreaTileset_TempleOfDroplets_0_1.4bpp.lz" .align 2 -gAreaTileset_HyruleTownMinishCaves_0_2:: - .incbin "tilesets/gAreaTileset_HyruleTownMinishCaves_0_2.4bpp.lz" +gAreaTileset_TempleOfDroplets_0_2:: + .incbin "tilesets/gAreaTileset_TempleOfDroplets_0_2.4bpp.lz" .align 2 gAreaMetatiles_TempleOfDroplets_0:: .incbin "assets/gAreaMetatiles_TempleOfDroplets_0.bin.lz" @@ -3080,319 +3085,319 @@ gAreaRoomMap_TempleOfDroplets_0_0:: gAreaRoomMap_TempleOfDroplets_0_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_0_1.bin.lz" .align 2 -unknown_93:: - .incbin "assets/unknown_93.bin" + gDungeonMaps_TempleOfDroplets_WestHole:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_1_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_1_0.bin.lz" gAreaRoomMap_TempleOfDroplets_1_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_1_1.bin.lz" .align 2 -unknown_94:: - .incbin "assets/unknown_94.bin" + gDungeonMaps_TempleOfDroplets_NorthSplitRoom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_2_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_2_0.bin.lz" gAreaRoomMap_TempleOfDroplets_2_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_2_1.bin.lz" .align 2 -unknown_95:: - .incbin "assets/unknown_95.bin" + gDungeonMaps_TempleOfDroplets_EastHole:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_3_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_3_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_3_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_3_1.bin.lz" .align 2 -unknown_96:: - .incbin "assets/unknown_96.bin" + gDungeonMaps_TempleOfDroplets_Entrance:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_4_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_4_0.bin.lz" gAreaRoomMap_TempleOfDroplets_4_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_4_1.bin.lz" .align 2 -unknown_97:: - .incbin "assets/unknown_97.bin" + gDungeonMaps_TempleOfDroplets_NorthwestStairs:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_5_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_5_0.bin.lz" gAreaRoomMap_TempleOfDroplets_5_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_5_1.bin.lz" .align 2 -unknown_98:: - .incbin "assets/unknown_98.bin" + gDungeonMaps_TempleOfDroplets_ScissorsMiniboss:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_6_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_6_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_6_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_6_1.bin.lz" .align 2 -unknown_99:: - .incbin "assets/unknown_99.bin" + gDungeonMaps_TempleOfDroplets_WaterfallNorthwest:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_7_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_7_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_7_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_7_1.bin.lz" .align 2 -unknown_100:: - .incbin "assets/unknown_100.bin" + gDungeonMaps_TempleOfDroplets_WaterfallNortheast:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_8_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_8_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_8_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_8_1.bin.lz" .align 2 -unknown_101:: - .incbin "assets/unknown_101.bin" + gDungeonMaps_TempleOfDroplets_Element:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/08_Element/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_9_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_9_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_9_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_9_1.bin.lz" .align 2 -unknown_102:: - .incbin "assets/unknown_102.bin" + gDungeonMaps_TempleOfDroplets_IceCorner:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_10_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_10_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_10_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_10_1.bin.lz" .align 2 -unknown_103:: - .incbin "assets/unknown_103.bin" + gDungeonMaps_TempleOfDroplets_IcePitMaze:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_11_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_11_0.bin.lz" gAreaRoomMap_TempleOfDroplets_11_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_11_1.bin.lz" .align 2 -unknown_104:: - .incbin "assets/unknown_104.bin" + gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_12_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_12_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_12_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_12_1.bin.lz" .align 2 -unknown_105:: - .incbin "assets/unknown_105.bin" + gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_13_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_13_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_13_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_13_1.bin.lz" .align 2 -unknown_106:: - .incbin "assets/unknown_106.bin" + gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_14_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_14_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_14_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_14_1.bin.lz" .align 2 -unknown_107:: - .incbin "assets/unknown_107.bin" + gDungeonMaps_TempleOfDroplets_BigOcto:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_15_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_15_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_15_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_15_1.bin.lz" .align 2 -unknown_108:: - .incbin "assets/unknown_108.bin" + gDungeonMaps_TempleOfDroplets_ToBlueChu:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_16_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_16_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_16_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_16_1.bin.lz" .align 2 -unknown_109:: - .incbin "assets/unknown_109.bin" + gDungeonMaps_TempleOfDroplets_BlueChu:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_17_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_17_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_17_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_17_1.bin.lz" .align 2 -unknown_110:: - .incbin "assets/unknown_110.bin" + gDungeonMaps_TempleOfDroplets_BlueChuKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_18_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_18_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_18_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_18_1.bin.lz" .align 2 -unknown_111:: - .incbin "assets/unknown_111.bin" + gDungeonMaps_TempleOfDroplets_BossKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_19_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_19_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_19_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_19_1.bin.lz" .align 2 -unknown_112:: - .incbin "assets/unknown_112.bin" + gDungeonMaps_TempleOfDroplets_NorthSmallKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_20_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_20_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_20_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_20_1.bin.lz" .align 2 -unknown_113:: - .incbin "assets/unknown_113.bin" + gDungeonMaps_TempleOfDroplets_BlockCloneButtonPuzzle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_21_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_21_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_21_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_21_1.bin.lz" .align 2 -unknown_114:: - .incbin "assets/unknown_114.bin" + gDungeonMaps_TempleOfDroplets_BlockClonePuzzle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_22_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_22_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_22_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_22_1.bin.lz" .align 2 -unknown_115:: - .incbin "assets/unknown_115.bin" + gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_23_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_23_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_23_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_23_1.bin.lz" .align 2 -unknown_116:: - .incbin "assets/unknown_116.bin" + gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_24_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_24_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_24_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_24_1.bin.lz" .align 2 -unknown_117:: - .incbin "assets/unknown_117.bin" + gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_25_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_25_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_25_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_25_1.bin.lz" .align 2 -unknown_118:: - .incbin "assets/unknown_118.bin" + gDungeonMaps_TempleOfDroplets_9Lanterns:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_26_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_26_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_26_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_26_1.bin.lz" .align 2 -unknown_119:: - .incbin "assets/unknown_119.bin" + gDungeonMaps_TempleOfDroplets_LilypadIceBlocks:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_27_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_27_0.bin.lz" gAreaRoomMap_TempleOfDroplets_27_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_27_1.bin.lz" .align 2 -unknown_120:: - .incbin "assets/unknown_120.bin" + gDungeonMaps_TempleOfDroplets_29:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/41_29/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_28_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_28_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_28_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_28_1.bin.lz" .align 2 -unknown_121:: - .incbin "assets/unknown_121.bin" + gDungeonMaps_TempleOfDroplets_MulldozersFireBars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_29_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_29_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_29_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_29_1.bin.lz" .align 2 -unknown_122:: - .incbin "assets/unknown_122.bin" + gDungeonMaps_TempleOfDroplets_DarkMaze:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_30_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_30_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_30_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_30_1.bin.lz" .align 2 -unknown_123:: - .incbin "assets/unknown_123.bin" + gDungeonMaps_TempleOfDroplets_TwinMadderpillars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_31_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_31_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_31_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_31_1.bin.lz" .align 2 -unknown_124:: - .incbin "assets/unknown_124.bin" + gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_32_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_32_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_32_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_32_1.bin.lz" .align 2 -unknown_125:: - .incbin "assets/unknown_125.bin" + gDungeonMaps_TempleOfDroplets_BlueChuKeyLever:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_33_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_33_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_33_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_33_1.bin.lz" .align 2 -unknown_126:: - .incbin "assets/unknown_126.bin" + gDungeonMaps_TempleOfDroplets_MulldozerKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_34_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_34_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_34_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_34_1.bin.lz" .align 2 -unknown_127:: - .incbin "assets/unknown_127.bin" + gDungeonMaps_TempleOfDroplets_BeforeTwinMadderpillars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_35_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_35_0.bin.lz" gAreaRoomMap_TempleOfDroplets_35_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_35_1.bin.lz" .align 2 -unknown_128:: - .incbin "assets/unknown_128.bin" + gDungeonMaps_TempleOfDroplets_LilypadB2West:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_36_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_36_0.bin.lz" gAreaRoomMap_TempleOfDroplets_36_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_36_1.bin.lz" .align 2 -unknown_129:: - .incbin "assets/unknown_129.bin" + gDungeonMaps_TempleOfDroplets_Compass:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/50_Compass/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_37_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_37_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_37_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_37_1.bin.lz" .align 2 -unknown_130:: - .incbin "assets/unknown_130.bin" + gDungeonMaps_TempleOfDroplets_DarkScissorBeetles:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_38_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_38_0.bin.lz" gAreaRoomMap_TempleOfDroplets_38_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_38_1.bin.lz" .align 2 -unknown_131:: - .incbin "assets/unknown_131.bin" + gDungeonMaps_TempleOfDroplets_LilypadB2Middle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_39_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_39_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_39_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_39_1.bin.lz" .align 2 -unknown_132:: - .incbin "assets/unknown_132.bin" + gDungeonMaps_TempleOfDroplets_IceMadderpillar:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_40_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_40_0.bin.lz" .align 2 gAreaRoomMap_TempleOfDroplets_40_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_40_1.bin.lz" .align 2 -unknown_133:: - .incbin "assets/unknown_133.bin" + gDungeonMaps_TempleOfDroplets_FlamebarBlockPuzzle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/dungeon_map.bin" gAreaRoomMap_61_0_0:: .incbin "assets/gAreaRoomMap_61_0_0.bin.lz" .align 2 @@ -3569,400 +3574,400 @@ gAreaRoomMap_PalaceOfWinds_GyorgTornado_0:: gAreaRoomMap_PalaceOfWinds_GyorgTornado_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_1.bin.lz" .align 2 -unknown_135:: - .incbin "assets/unknown_135.bin" + gDungeonMaps_PalaceOfWinds_GyorgTornado:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BossKey_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BossKey_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_BossKey_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BossKey_1.bin.lz" .align 2 -unknown_136:: - .incbin "assets/unknown_136.bin" + gDungeonMaps_PalaceOfWinds_BossKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0.bin.lz" gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1.bin.lz" .align 2 -unknown_137:: - .incbin "assets/unknown_137.bin" + gDungeonMaps_PalaceOfWinds_BeforeBallAndChainSoldiers:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1.bin.lz" .align 2 -unknown_138:: - .incbin "assets/unknown_138.bin" + gDungeonMaps_PalaceOfWinds_GyorgBossDoor:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1.bin.lz" .align 2 -unknown_139:: - .incbin "assets/unknown_139.bin" + gDungeonMaps_PalaceOfWinds_EastChestFromGyorgBossDoor:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1.bin.lz" .align 2 -unknown_140:: - .incbin "assets/unknown_140.bin" + gDungeonMaps_PalaceOfWinds_MoblinAndWizzrobeFight:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1.bin.lz" .align 2 -unknown_141:: - .incbin "assets/unknown_141.bin" + gDungeonMaps_PalaceOfWinds_FourButtonStalfos:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1.bin.lz" .align 2 -unknown_142:: - .incbin "assets/unknown_142.bin" + gDungeonMaps_PalaceOfWinds_FanAndKeyToBossKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1.bin.lz" .align 2 -unknown_143:: - .incbin "assets/unknown_143.bin" + gDungeonMaps_PalaceOfWinds_BallAndChainSoldiers:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BombarossaPath_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_BombarossaPath_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_1.bin.lz" .align 2 -unknown_144:: - .incbin "assets/unknown_144.bin" + gDungeonMaps_PalaceOfWinds_BombarossaPath:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1.bin.lz" .align 2 -unknown_145:: - .incbin "assets/unknown_145.bin" + gDungeonMaps_PalaceOfWinds_HoleToDarknut:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1.bin.lz" .align 2 -unknown_146:: - .incbin "assets/unknown_146.bin" + gDungeonMaps_PalaceOfWinds_ToBombarossaPath:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1.bin.lz" .align 2 -unknown_147:: - .incbin "assets/unknown_147.bin" + gDungeonMaps_PalaceOfWinds_DarknutMiniboss:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BombWallInside_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_BombWallInside_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_1.bin.lz" .align 2 -unknown_148:: - .incbin "assets/unknown_148.bin" + gDungeonMaps_PalaceOfWinds_BombWallInside:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BombWallOutside_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_0.bin.lz" gAreaRoomMap_PalaceOfWinds_BombWallOutside_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_1.bin.lz" .align 2 -unknown_149:: - .incbin "assets/unknown_149.bin" + gDungeonMaps_PalaceOfWinds_BombWallOutside:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_CloudJumps_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_CloudJumps_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_1.bin.lz" .align 2 -unknown_150:: - .incbin "assets/unknown_150.bin" + gDungeonMaps_PalaceOfWinds_CloudJumps:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1.bin.lz" .align 2 -unknown_151:: - .incbin "assets/unknown_151.bin" + gDungeonMaps_PalaceOfWinds_BlockMazeToBossDoor:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1.bin.lz" .align 2 -unknown_152:: - .incbin "assets/unknown_152.bin" + gDungeonMaps_PalaceOfWinds_CrackedFloorLakitu:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1.bin.lz" .align 2 -unknown_153:: - .incbin "assets/unknown_153.bin" + gDungeonMaps_PalaceOfWinds_HeartPieceBridge:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_FanBridge_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_FanBridge_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_1.bin.lz" .align 2 -unknown_154:: - .incbin "assets/unknown_154.bin" + gDungeonMaps_PalaceOfWinds_FanBridge:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_ToFanBridge_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_ToFanBridge_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_1.bin.lz" .align 2 -unknown_155:: - .incbin "assets/unknown_155.bin" + gDungeonMaps_PalaceOfWinds_ToFanBridge:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_RedWarpHall_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_RedWarpHall_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_1.bin.lz" .align 2 -unknown_156:: - .incbin "assets/unknown_156.bin" + gDungeonMaps_PalaceOfWinds_RedWarpHall:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0.bin.lz" gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1.bin.lz" .align 2 -unknown_157:: - .incbin "assets/unknown_157.bin" + gDungeonMaps_PalaceOfWinds_PlatformCloneRide:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1.bin.lz" .align 2 -unknown_158:: - .incbin "assets/unknown_158.bin" + gDungeonMaps_PalaceOfWinds_PitCornerAfterKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_CrowRide_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_CrowRide_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_1.bin.lz" .align 2 -unknown_159:: - .incbin "assets/unknown_159.bin" + gDungeonMaps_PalaceOfWinds_PlatformCrowRide:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1.bin.lz" .align 2 -unknown_160:: - .incbin "assets/unknown_160.bin" + gDungeonMaps_PalaceOfWinds_GratePlatformRide:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_PotPush_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PotPush_0.bin.lz" gAreaRoomMap_PalaceOfWinds_PotPush_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PotPush_1.bin.lz" .align 2 -unknown_161:: - .incbin "assets/unknown_161.bin" + gDungeonMaps_PalaceOfWinds_PotPush:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_FloormasterLever_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_FloormasterLever_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_1.bin.lz" .align 2 -unknown_162:: - .incbin "assets/unknown_162.bin" + gDungeonMaps_PalaceOfWinds_FloormasterLever:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_Map_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_Map_0.bin.lz" gAreaRoomMap_PalaceOfWinds_Map_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_Map_1.bin.lz" .align 2 -unknown_163:: - .incbin "assets/unknown_163.bin" + gDungeonMaps_PalaceOfWinds_Map:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/28_Map/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_CornerToMap_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_CornerToMap_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_1.bin.lz" .align 2 -unknown_164:: - .incbin "assets/unknown_164.bin" + gDungeonMaps_PalaceOfWinds_CornerToMap:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1.bin.lz" .align 2 -unknown_165:: - .incbin "assets/unknown_165.bin" + gDungeonMaps_PalaceOfWinds_StairsAfterFloormaster:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1.bin.lz" .align 2 -unknown_166:: - .incbin "assets/unknown_166.bin" + gDungeonMaps_PalaceOfWinds_HoleToKinstoneWizzrobe:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1.bin.lz" .align 2 -unknown_167:: - .incbin "assets/unknown_167.bin" + gDungeonMaps_PalaceOfWinds_KeyArrowButton:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_GratesTo3F_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_0.bin.lz" gAreaRoomMap_PalaceOfWinds_GratesTo3F_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_1.bin.lz" .align 2 -unknown_168:: - .incbin "assets/unknown_168.bin" + gDungeonMaps_PalaceOfWinds_GratesTo3f:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_SpinyFight_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_SpinyFight_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_1.bin.lz" .align 2 -unknown_169:: - .incbin "assets/unknown_169.bin" + gDungeonMaps_PalaceOfWinds_SpinyFight:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1.bin.lz" .align 2 -unknown_170:: - .incbin "assets/unknown_170.bin" + gDungeonMaps_PalaceOfWinds_PeahatSwitch:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1.bin.lz" .align 2 -unknown_171:: - .incbin "assets/unknown_171.bin" + gDungeonMaps_PalaceOfWinds_WhirlwindBombarossa:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1.bin.lz" .align 2 -unknown_172:: - .incbin "assets/unknown_172.bin" + gDungeonMaps_PalaceOfWinds_DoorToStalfosFirebar:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1.bin.lz" .align 2 -unknown_173:: - .incbin "assets/unknown_173.bin" + gDungeonMaps_PalaceOfWinds_StalfosFirebarHole:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0.bin.lz" gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1.bin.lz" .align 2 -unknown_174:: - .incbin "assets/unknown_174.bin" + gDungeonMaps_PalaceOfWinds_ShortcutDoorButtons:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1.bin.lz" .align 2 -unknown_175:: - .incbin "assets/unknown_175.bin" + gDungeonMaps_PalaceOfWinds_ToPeahatSwitch:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1.bin.lz" .align 2 -unknown_176:: - .incbin "assets/unknown_176.bin" + gDungeonMaps_PalaceOfWinds_KinstoneWizzrobeFight:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_GibdoStairs_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_GibdoStairs_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_1.bin.lz" .align 2 -unknown_177:: - .incbin "assets/unknown_177.bin" + gDungeonMaps_PalaceOfWinds_GibdoStairs:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1.bin.lz" .align 2 -unknown_178:: - .incbin "assets/unknown_178.bin" + gDungeonMaps_PalaceOfWinds_SpikeBarSmallKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_RocCape_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_RocCape_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_RocCape_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_RocCape_1.bin.lz" .align 2 -unknown_179:: - .incbin "assets/unknown_179.bin" + gDungeonMaps_PalaceOfWinds_RocCape:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_FireBarGrates_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_FireBarGrates_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_1.bin.lz" .align 2 -unknown_180:: - .incbin "assets/unknown_180.bin" + gDungeonMaps_PalaceOfWinds_FireBarGrates:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1.bin.lz" .align 2 -unknown_181:: - .incbin "assets/unknown_181.bin" + gDungeonMaps_PalaceOfWinds_PlatformRideBombarossas:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1.bin.lz" .align 2 -unknown_182:: - .incbin "assets/unknown_182.bin" + gDungeonMaps_PalaceOfWinds_BridgeAfterDarknut:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0.bin.lz" gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1.bin.lz" .align 2 -unknown_183:: - .incbin "assets/unknown_183.bin" + gDungeonMaps_PalaceOfWinds_BridgeSwitchesCloneBlock:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_EntranceRoom_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_EntranceRoom_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_1.bin.lz" .align 2 -unknown_184:: - .incbin "assets/unknown_184.bin" + gDungeonMaps_PalaceOfWinds_EntranceRoom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0.bin.lz" .align 2 gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1.bin.lz" .align 2 -unknown_185:: - .incbin "assets/unknown_185.bin" + gDungeonMaps_PalaceOfWinds_DarkCompassHall:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/dungeon_map.bin" gAreaRoomMap_PalaceOfWindsBoss_0_0:: .incbin "assets/gAreaRoomMap_PalaceOfWindsBoss_0_0.bin.lz" .align 2 @@ -4198,210 +4203,211 @@ gAreaRoomMap_DarkHyruleCastle_1FEntrance_0:: gAreaRoomMap_DarkHyruleCastle_1FEntrance_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_1.bin.lz" .align 2 -unknown_188:: - .incbin "assets/unknown_188.bin" + gDungeonMaps_DarkHyruleCastle_1fEntrance:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1.bin.lz" .align 2 -unknown_189:: - .incbin "assets/unknown_189.bin" + gDungeonMaps_DarkHyruleCastle_3fTopLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1.bin.lz" .align 2 -unknown_190:: - .incbin "assets/unknown_190.bin" + gDungeonMaps_DarkHyruleCastle_3fTopRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1.bin.lz" .align 2 -unknown_191:: - .incbin "assets/unknown_191.bin" + gDungeonMaps_DarkHyruleCastle_3fBottomLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1.bin.lz" .align 2 -unknown_192:: - .incbin "assets/unknown_192.bin" + gDungeonMaps_DarkHyruleCastle_3fBottomRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1.bin.lz" .align 2 -unknown_193:: - .incbin "assets/unknown_193.bin" + gDungeonMaps_DarkHyruleCastle_3fKeatonHallToVaati:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1.bin.lz" .align 2 -unknown_194:: - .incbin "assets/unknown_194.bin" + + gDungeonMaps_DarkHyruleCastle_3fTripleDarknut:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1.bin.lz" .align 2 -unknown_195:: - .incbin "assets/unknown_195.bin" + gDungeonMaps_DarkHyruleCastle_2fTopLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1.bin.lz" .align 2 -unknown_196:: - .incbin "assets/unknown_196.bin" + gDungeonMaps_DarkHyruleCastle_2fTopLeftCorner:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBossKey_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBossKey_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_1.bin.lz" .align 2 -unknown_197:: - .incbin "assets/unknown_197.bin" + gDungeonMaps_DarkHyruleCastle_2fBossKey:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1.bin.lz" .align 2 -unknown_198:: - .incbin "assets/unknown_198.bin" + gDungeonMaps_DarkHyruleCastle_2fBlueWarp:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1.bin.lz" .align 2 -unknown_199:: - .incbin "assets/unknown_199.bin" + gDungeonMaps_DarkHyruleCastle_2fTopRightCornerGhini:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1.bin.lz" .align 2 -unknown_200:: - .incbin "assets/unknown_200.bin" + gDungeonMaps_DarkHyruleCastle_2fTopRightCornerTorches:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1.bin.lz" .align 2 -unknown_201:: - .incbin "assets/unknown_201.bin" + gDungeonMaps_DarkHyruleCastle_2fTopRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1.bin.lz" .align 2 -unknown_202:: - .incbin "assets/unknown_202.bin" + gDungeonMaps_DarkHyruleCastle_2fTopLeftDarknut:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FSparks_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_2FSparks_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_1.bin.lz" .align 2 -unknown_203:: - .incbin "assets/unknown_203.bin" + gDungeonMaps_DarkHyruleCastle_2fSparks:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1.bin.lz" .align 2 -unknown_204:: - .incbin "assets/unknown_204.bin" + gDungeonMaps_DarkHyruleCastle_2fTopRightDarknuts:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FLeft_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FLeft_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_1.bin.lz" .align 2 -unknown_205:: - .incbin "assets/unknown_205.bin" + gDungeonMaps_DarkHyruleCastle_2fLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FRight_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_2FRight_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_1.bin.lz" .align 2 -unknown_206:: - .incbin "assets/unknown_206.bin" + gDungeonMaps_DarkHyruleCastle_2fRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1.bin.lz" .align 2 -unknown_207:: - .incbin "assets/unknown_207.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftDarknuts:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1.bin.lz" .align 2 -unknown_208:: - .incbin "assets/unknown_208.bin" + gDungeonMaps_DarkHyruleCastle_2fBossDoor:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1.bin.lz" .align 2 -unknown_209:: - .incbin "assets/unknown_209.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomRightDarknut:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1.bin.lz" .align 2 -unknown_210:: - .incbin "assets/unknown_210.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftCornerPuzzle:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FEntrance_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FEntrance_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_1.bin.lz" .align 2 -unknown_211:: - .incbin "assets/unknown_211.bin" + gDungeonMaps_DarkHyruleCastle_2fEntrance:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1.bin.lz" .align 2 -unknown_212:: - .incbin "assets/unknown_212.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomRightCorner:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1.bin.lz" .align 2 -unknown_213:: - .incbin "assets/unknown_213.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1.bin.lz" .align 2 -unknown_214:: - .incbin "assets/unknown_214.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftGhini:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1:: @@ -4415,237 +4421,237 @@ gAreaRoomMap_DarkHyruleCastle_B1Entrance_0:: gAreaRoomMap_DarkHyruleCastle_B1Entrance_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_1.bin.lz" .align 2 -unknown_216:: - .incbin "assets/unknown_216.bin" + gDungeonMaps_DarkHyruleCastle_B1Entrance:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1.bin.lz" .align 2 -unknown_217:: - .incbin "assets/unknown_217.bin" + gDungeonMaps_DarkHyruleCastle_2fBottomRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1.bin.lz" .align 2 -unknown_218:: - .incbin "assets/unknown_218.bin" + gDungeonMaps_DarkHyruleCastle_1fTopLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1.bin.lz" .align 2 -unknown_219:: - .incbin "assets/unknown_219.bin" + gDungeonMaps_DarkHyruleCastle_1fThroneRoom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FCompass_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FCompass_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_1.bin.lz" .align 2 -unknown_220:: - .incbin "assets/unknown_220.bin" + gDungeonMaps_DarkHyruleCastle_1fCompass:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1.bin.lz" .align 2 -unknown_221:: - .incbin "assets/unknown_221.bin" + gDungeonMaps_DarkHyruleCastle_1fTopRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1.bin.lz" .align 2 -unknown_222:: - .incbin "assets/unknown_222.bin" + gDungeonMaps_DarkHyruleCastle_1fBeforeThrone:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1.bin.lz" .align 2 -unknown_223:: - .incbin "assets/unknown_223.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopTopLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1.bin.lz" .align 2 -unknown_224:: - .incbin "assets/unknown_224.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopTop:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1.bin.lz" .align 2 -unknown_225:: - .incbin "assets/unknown_225.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopTopRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1.bin.lz" .align 2 -unknown_226:: - .incbin "assets/unknown_226.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1.bin.lz" .align 2 -unknown_227:: - .incbin "assets/unknown_227.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1.bin.lz" .align 2 -unknown_228:: - .incbin "assets/unknown_228.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopBottomLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1.bin.lz" .align 2 -unknown_229:: - .incbin "assets/unknown_229.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopBottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1.bin.lz" .align 2 -unknown_230:: - .incbin "assets/unknown_230.bin" + gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1.bin.lz" .align 2 -unknown_231:: - .incbin "assets/unknown_231.bin" + gDungeonMaps_DarkHyruleCastle_1fBottomLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1.bin.lz" .align 2 -unknown_232:: - .incbin "assets/unknown_232.bin" + gDungeonMaps_DarkHyruleCastle_1fBottomRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1.bin.lz" .align 2 -unknown_233:: - .incbin "assets/unknown_233.bin" + gDungeonMaps_DarkHyruleCastle_B1BelowThrone:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1.bin.lz" .align 2 -unknown_234:: - .incbin "assets/unknown_234.bin" + gDungeonMaps_DarkHyruleCastle_B1BelowCompass:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1.bin.lz" .align 2 -unknown_235:: - .incbin "assets/unknown_235.bin" + gDungeonMaps_DarkHyruleCastle_B1BeforeThrone:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1.bin.lz" .align 2 -unknown_236:: - .incbin "assets/unknown_236.bin" + gDungeonMaps_DarkHyruleCastle_B1ToPrison:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1BombWall_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_B1BombWall_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_1.bin.lz" .align 2 -unknown_237:: - .incbin "assets/unknown_237.bin" + gDungeonMaps_DarkHyruleCastle_B1BombWall:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1Keatons_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_B1Keatons_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_1.bin.lz" .align 2 -unknown_238:: - .incbin "assets/unknown_238.bin" + gDungeonMaps_DarkHyruleCastle_B1Keatons:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1.bin.lz" .align 2 -unknown_239:: - .incbin "assets/unknown_239.bin" + gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1Cannons_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B1Cannons_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_1.bin.lz" .align 2 -unknown_240:: - .incbin "assets/unknown_240.bin" + gDungeonMaps_DarkHyruleCastle_B1Cannons:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1Left_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B1Left_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_1.bin.lz" .align 2 -unknown_241:: - .incbin "assets/unknown_241.bin" + gDungeonMaps_DarkHyruleCastle_B1Left:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1Right_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B1Right_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_1.bin.lz" .align 2 -unknown_242:: - .incbin "assets/unknown_242.bin" + gDungeonMaps_DarkHyruleCastle_B1Right:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1Map_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B1Map_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_1.bin.lz" .align 2 -unknown_243:: - .incbin "assets/unknown_243.bin" + gDungeonMaps_DarkHyruleCastle_B1Map:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1.bin.lz" .align 2 -unknown_244:: - .incbin "assets/unknown_244.bin" + gDungeonMaps_DarkHyruleCastle_B2ToPrison:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B2Prison_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B2Prison_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_1.bin.lz" .align 2 -unknown_245:: - .incbin "assets/unknown_245.bin" + gDungeonMaps_DarkHyruleCastle_B2Prison:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0.bin.lz" .align 2 gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1.bin.lz" .align 2 -unknown_246:: - .incbin "assets/unknown_246.bin" + gDungeonMaps_DarkHyruleCastle_B2Dropdown:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0.bin.lz" gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1:: diff --git a/data/map/tileset_headers.s b/data/map/tileset_headers.s index 2e220697..c4d0bf3e 100755 --- a/data/map/tileset_headers.s +++ b/data/map/tileset_headers.s @@ -16,9 +16,9 @@ gAreaRoomMaps_Unused:: .4byte gAreaTileset_Unused_0 gAreaTileset_MinishWoods_0:: @ 08100CF4 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_2, 0x6008000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_MinishWoods_0_0, 0x6000000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_MinishWoods_0_1, 0x6004000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_MinishWoods_0_2, 0x6008000, 0x4000, 1 tileset_palette_set 28, 1 gAreaTileset_MinishWoods_1:: @ 08100D24 @@ -199,9 +199,9 @@ gAreaTilesets_GreatFairies:: @ 0810115C .4byte gAreaTileset_GreatFairies_2 gAreaTileset_LakeWoodsCave_0:: @ 08101168 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_2, 0x6008000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_MinishWoods_0_0, 0x6000000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_MinishWoods_0_1, 0x6004000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_MinishWoods_0_2, 0x6008000, 0x4000, 1 tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_3, 0x6001000, 0x2000, 1 tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_4, 0x6009000, 0x2000, 1 tileset_palette_set 21, 1 @@ -822,9 +822,9 @@ gAreaTilesets_InnerMazaal:: @ 08102040 .4byte gAreaTileset_InnerMazaal_0 gAreaTileset_TempleOfDroplets_0:: @ 08102044 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_2, 0x6008000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_TempleOfDroplets_0_0, 0x6000000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_TempleOfDroplets_0_1, 0x6004000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_TempleOfDroplets_0_2, 0x6008000, 0x4000, 1 tileset_palette_set 55, 1 gAreaTilesets_TempleOfDroplets:: @ 08102074 @@ -840,9 +840,9 @@ gAreaTilesets_61:: @ 081020A8 .4byte gAreaTileset_61_0 gAreaTileset_HyruleTownMinishCaves_0:: @ 081020AC - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_2, 0x6008000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_TempleOfDroplets_0_0, 0x6000000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_TempleOfDroplets_0_1, 0x6004000, 0x4000, 1 + tileset_tiles offset_gAreaTileset_TempleOfDroplets_0_2, 0x6008000, 0x4000, 1 tileset_palette_set 130, 1 gAreaTilesets_HyruleTownMinishCaves:: @ 081020DC diff --git a/include/area.h b/include/area.h index ce25c8df..d0b12ee7 100644 --- a/include/area.h +++ b/include/area.h @@ -2,6 +2,7 @@ #define AREA_H #include "global.h" +#include "map.h" #include "transitions.h" #define MAX_ROOMS 64 @@ -11,9 +12,9 @@ typedef struct { u16 pixel_height; u16 map_x; u16 map_y; - void* tileset; - void* map; - void* metatiles; + MapDataDefinition* tileset; + MapDataDefinition* map; + MapDataDefinition* metatiles; void* bg_anim; const Transition* exits; void** properties; @@ -80,11 +81,22 @@ typedef struct { u8 flags; u8 location; u8 flag_bank; - u8 _3; + u8 queueBgm; } AreaHeader; extern AreaHeader gAreaMetadata[]; typedef enum { + AR_IS_OVERWORLD = 0x1, + AR_HAS_KEYS = 0x2, + AR_IS_DUNGEON = 0x4, /**< Causes the area to have a red name. */ + AR_HAS_MAP = 0x8, + AR_HAS_ENEMIES = 0x10, + AR_IS_MOLE_CAVE = 0x20, + AR_HAS_NO_ENEMIES = 0x40, + AR_ALLOWS_WARP = 0x80, /**< Not used in EU. Allows to warp in areas that do not have AR_OVERWORLD set. */ +} AreaFlags; + +typedef enum { AREA_MINISH_WOODS, AREA_MINISH_VILLAGE, AREA_HYRULE_TOWN, diff --git a/include/asm.h b/include/asm.h index 837cebca..c05fa5ad 100644 --- a/include/asm.h +++ b/include/asm.h @@ -13,7 +13,7 @@ extern void SetTile(u32 index, u32 position, u32 layer); extern void UpdateScrollVram(void); extern u32 sub_080B1B0C(struct Entity_*); extern u32 sub_080B1BA4(u32, u32, u32); -extern void LoadResourceAsync(const void*, u32, u32); +extern void LoadResourceAsync(const void* src, u32 dest, u32 size); extern void GenericConfused(struct Entity_*); extern void sub_08001290(struct Entity_*, u32); extern void GenericKnockback(struct Entity_*); diff --git a/include/beanstalkSubtask.h b/include/beanstalkSubtask.h index 3f7d452c..f82c83e5 100644 --- a/include/beanstalkSubtask.h +++ b/include/beanstalkSubtask.h @@ -2,6 +2,7 @@ #define BEANSTALKSUBTASK_H #include "global.h" +#include "map.h" /* tiles 0x4000 and above create an entry here @@ -18,10 +19,6 @@ typedef struct { u16 tileIndex; } struct_080B44D0; -typedef struct { - u32 src; - void* dest; - u32 size; -} struct_08109194; +void LoadMapData(MapDataDefinition* dataDefinition); #endif // BEANSTALKSUBTASK_H diff --git a/include/common.h b/include/common.h index 5d68679b..bf27bc8d 100644 --- a/include/common.h +++ b/include/common.h @@ -126,12 +126,21 @@ bool32 sub_0801E810(u32); u32 sub_0801DB94(void); typedef struct { - u8 unk_0; - u8 unk_1; + u8 numFloors; + u8 highestFloor; u8 unk_2; // u8 pad; -} struct_080C9C6C; +} DungeonFloorMetadata; -extern const struct_080C9C6C gUnk_080C9C6C[]; +extern const DungeonFloorMetadata gDungeonFloorMetadatas[]; + + +typedef struct { + u8 area; + u8 room; + u8 unk_2; // TODO u16 pad? + u8 unk_3; + u32 mapDataOffset; +} DungeonLayout; #endif // COMMON_H diff --git a/include/game.h b/include/game.h index 0bdc45e2..43c3a6a3 100644 --- a/include/game.h +++ b/include/game.h @@ -212,7 +212,7 @@ void RoomExitCallback(void); * * @param a1 */ -void RestoreGameTask(u32 a1); +void RestoreGameTask(bool32 loadGfx); /** * Check if an Ezlo message can be displayed. diff --git a/include/main.h b/include/main.h index 4d70beb7..bb301dcc 100644 --- a/include/main.h +++ b/include/main.h @@ -78,7 +78,7 @@ typedef struct { /*0x003*/ u8 field_0x3; /*0x004*/ u8 state; /*0x005*/ u8 field_0x5; - /*0x006*/ u8 field_0x6; + /*0x006*/ bool8 loadGfxOnRestore; // used in Subtask_FadeOut to determine the loadGfx parameter of RestoreGameTask. /*0x007*/ u8 pauseFadeIn; /*0x008*/ u16 fadeType; /*0x00A*/ u16 fadeInTime; diff --git a/include/map.h b/include/map.h index b943ca2e..201346e9 100644 --- a/include/map.h +++ b/include/map.h @@ -6,18 +6,48 @@ typedef struct { /*0x0000*/ BgSettings* bgSettings; - /*0x0004*/ u16 mapData[0x1000]; // tilemap data? <-- gMapDataTop / gMapDataBottom - /*0x2004*/ u8 collisionData[0x1000]; // more tilemap data? <-- gUnk_0200D654 / gUnk_02027EB4 - /*0x3004*/ u16 mapDataClone[0x1000]; // more tilemap data? <-- gUnk_0200E654 / gUnk_02028EB4 - /*0x5004*/ u16 metatileTypes[0x800]; // gMetatileTypesTop, gMetatileTypesBottom - /*0x6004*/ u16 unkData2[0x800]; // gUnk_02011654,gUnk_0202BEB4 - /*0x7004*/ u16 metatiles[0x2000]; // gMetatilesTop, gMetatilesBottom - /*0xb004*/ u8 unkData3[0x1000]; // gUnk_02016654, gUnk_02030EB4 + /*0x0004*/ u16 mapData[0x40*0x40]; /**< MetaTileIndex for each tile on the current layer. */ // tilemap data? <-- gMapDataTop / gMapDataBottom + /*0x2004*/ u8 collisionData[0x40*0x40]; // more tilemap data? <-- gUnk_0200D654 / gUnk_02027EB4 + /*0x3004*/ u16 mapDataClone[0x40*0x40]; // more tilemap data? <-- gUnk_0200E654 / gUnk_02028EB4 + // Tileset + /*0x5004*/ u16 metatileTypes[0x800]; /**< Maps from the MetaTileIndex to the MetaTileType. */ // gMetatileTypesTop, gMetatileTypesBottom + /*0x6004*/ u16 unkData2[0x800]; /**< Maps from a MetaTileType to a MetaTileIndex. */ // gUnk_02011654,gUnk_0202BEB4 // TODO metatile index for the metatile type?? + /*0x7004*/ u16 metatiles[0x800 * 4]; /**< Mapping from a metatile to the four tile_attrs it consists of.*/ // gMetatilesTop, gMetatilesBottom + + + /*0xb004*/ u8 unkData3[0x40*0x40]; /**< Some sort of special behavior for tiles? Falling into holes or jumping off walls does not work when this is all zero.*/ // gUnk_02016654, gUnk_02030EB4 + // TODO check with debugger what accesses this + // 0x637 + // 0x2030eb4 + 0x637 + // 0x20314eb + // e.g. sub_080B1AE0 accesses this + // TODO check whether this also affects sound played when walking? + /* + 0x10: water + 0x12: ice + 0x57: cloning pad + */ } LayerStruct; extern LayerStruct gMapTop; extern LayerStruct gMapBottom; +// Rendered tilemaps https://www.coranac.com/tonc/text/regbg.htm#sec-map +//extern u16 gMapDataTopSpecial[0x4000]; +//extern u16 gMapDataBottomSpecial[0x4000]; + LayerStruct* GetLayerByIndex(u32); + +/* +Definition where some map data is found and where it should be copied to. +Defined using the map_data asm macro, e.g. in map_headers.s +*/ +typedef struct { + u32 src; + void* dest; + u32 size; +} MapDataDefinition; + + #endif // MAP_H diff --git a/include/player.h b/include/player.h index e0cbdcfc..366ae02a 100644 --- a/include/player.h +++ b/include/player.h @@ -475,7 +475,7 @@ void sub_08078850(Entity*, u32, u32, const void*); void sub_08079D84(void); u32 sub_0807953C(void); void sub_0807BB68(const s16*, u32, u32); -void sub_0807B9B8(u32, u32, u32); +void SetMetaTileByIndex(u32 tileIndex, u32 position, u32 layer); void sub_0807B7D8(u32, u32, u32); void RestorePrevTileEntity(u32, u32); void UpdateItemAnim(ItemBehavior*); diff --git a/include/room.h b/include/room.h index 0da81c3e..0a1916d9 100644 --- a/include/room.h +++ b/include/room.h @@ -24,7 +24,7 @@ enum RoomReloadType { }; typedef struct { - /*0x00*/ u16 reload_flags; + /*0x00*/ u16 reload_flags; // anything except for 0x1 prevents the screen from reloading when tiles are changed. /*0x02*/ u8 scrollAction; /*0x03*/ u8 scrollSubAction; /*0x04*/ u8 area; @@ -51,7 +51,7 @@ SECTIONS { . = 0x00018EB0; gUnk_02018EB0 = .; . = 0x00018EE0; gUnk_02018EE0 = .; . = 0x00019EE0; gMapDataBottomSpecial = .; - . = 0x0001AEE0; gUnk_0201AEE0 = .; + . = 0x0001AEE0; gDungeonMap = .; . = 0x00021EE0; gSoundPlayingInfo = .; . = 0x00021F00; gUnk_02021F00 = .; . = 0x00021F20; gUnk_02021F20 = .; @@ -909,7 +909,6 @@ SECTIONS { data/const/collisionMatrix.o(.rodata); data/const/ui.o(.rodata); src/sineTable.o(.rodata); - data/const/common.o(.rodata); src/common.o(.rodata); src/enemy/octorok.o(.rodata); data/animations/enemy/octorok.o(.rodata); diff --git a/src/backgroundAnimations.c b/src/backgroundAnimations.c index 6e48fbe4..81da6078 100644 --- a/src/backgroundAnimations.c +++ b/src/backgroundAnimations.c @@ -2519,4 +2519,5 @@ const u16* const gUnk_080B755C[] = { NULL, NULL, NULL, NULL, NULL, NULL, }; +// TODO gMapTop.bgSettings->control values const u16 gUnk_080B77C0[] = { 0x1c42, 0x1d45, 0x1d46, 0x1e03 }; diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index d09ea3cd..e2b77f97 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -53,7 +53,7 @@ extern const Data gUnk_080B44C2[]; void sub_0801AD6C(const Data*, u32); bool32 sub_0801A4F8(void); bool32 sub_0801AA58(Entity*, u32, u32); -void sub_0801AB08(u16*, LayerStruct*); +void RenderTilemapToScreenblock(u16*, LayerStruct*); u32 sub_0801AC68(u32 position, u32 data); @@ -132,30 +132,30 @@ void SetBGDefaults(void) { gMapTop.bgSettings->control = gUnk_080B77C0[1]; } -void sub_080197D4(struct_08109194* param_1) { +void LoadMapData(MapDataDefinition* dataDefinition) { u32 uVar1; u8* src; void* dest; do { - dest = param_1->dest; + dest = dataDefinition->dest; if (dest != NULL) { - src = &gMapData + (param_1->src & 0x7fffffff); - if ((param_1->size & 0x80000000) != 0) { + src = &gMapData + (dataDefinition->src & 0x7fffffff); + if ((dataDefinition->size & 0x80000000) != 0) { if ((u32)dest >> 0x18 == 6) { LZ77UnCompVram(src, dest); } else { LZ77UnCompWram(src, dest); } } else { - MemCopy(src, dest, param_1->size); + MemCopy(src, dest, dataDefinition->size); } } else { - LoadPaletteGroup(*(u16*)param_1); + LoadPaletteGroup(*(u16*)dataDefinition); sub_080533CC(); } - param_1++; - } while (((param_1 - 1)->src & 0x80000000) != 0); + dataDefinition++; + } while (((dataDefinition - 1)->src & 0x80000000) != 0); } // Has ifdefs for other variants @@ -841,7 +841,7 @@ bool32 sub_0801AA58(Entity* this, u32 param_2, u32 param_3) { return FALSE; } -void sub_0801AB08(u16* specialData, LayerStruct* layer) { +void RenderTilemapToScreenblock(u16* specialData, LayerStruct* layer) { u16* metatiles; u16* mapData; u16* mapDataClone; @@ -1039,10 +1039,10 @@ void sub_0801AE44(bool32 loadGfx) { } if ((gRoomControls.scroll_flags & 1) == 0) { if (gMapBottom.bgSettings != NULL) { - sub_0801AB08(gMapDataBottomSpecial, &gMapBottom); + RenderTilemapToScreenblock(gMapDataBottomSpecial, &gMapBottom); } if (gMapTop.bgSettings != NULL) { - sub_0801AB08(gMapDataTopSpecial, &gMapTop); + RenderTilemapToScreenblock(gMapDataTopSpecial, &gMapTop); } } else { sub_0807C4F8(); diff --git a/src/common.c b/src/common.c index 0ad58ee5..e5e6de1e 100644 --- a/src/common.c +++ b/src/common.c @@ -1,6 +1,8 @@ +#include "common.h" + +#include "assets/map_offsets.h" #include "area.h" #include "asm.h" -#include "common.h" #include "flags.h" #include "functions.h" #include "game.h" @@ -14,17 +16,10 @@ #include "sound.h" #include "structures.h" -typedef struct { - u8 area; - u8 room; - u8 unk_2; - u8 unk_3; - u32 mapDataOffset; -} DungeonLayout; extern u8 gUnk_03003DE0; extern u8 gzHeap[0x1000]; -extern u32 gUnk_0201AEE0[0x800]; +extern u32 gDungeonMap[0x800]; extern s16 gUnk_02018EE0[]; extern void (*const gUnk_080C9CAC[])(void); @@ -75,18 +70,18 @@ void sub_0801E82C(void); extern void* GetRoomProperty(u32, u32, u32); extern u8 gMapData; -extern const DungeonLayout** const gUnk_080C9C50[]; +extern const DungeonLayout* const* const gDungeonLayouts[]; extern u8 gMapDataBottomSpecial[]; u32 sub_0801DF10(const DungeonLayout* lyt); bool32 IsRoomVisited(TileEntity* tileEntity, u32 bank); u32 sub_0801DF60(u32 a1, u8* p); u32 sub_0801DF78(u32 a1, u32 a2); -void sub_0801DF28(u32 x, u32 y, s32 color); +void DrawMapPixel(u32 x, u32 y, s32 color); u32 DecToHex(u32 value) { u32 result; - register u32 r1 asm("r1"); + FORCE_REGISTER(u32 r1, r1); if (value >= 100000000) { return 0x99999999; @@ -330,26 +325,41 @@ void sub_0801D898(void* dest, void* src, u32 word, u32 size) { ASM_FUNC("asm/non_matching/common/zMalloc.inc", void* zMalloc(u32 size)); + +typedef struct { + u16 start; // chunk start (offset from gzHeap) + u16 end; // chunk end (offset from gzHeap) +} HEAP_ENTRY; + +typedef struct { + u16 num_entries; // allocated HEAP_ENTRYs in entries + + // maybe union, HEAP_ENTRY and heap space share the same space + HEAP_ENTRY entries[0]; + u8 buf[4096 - 4]; // pads to 0x1000 +} HEAP; + + void zFree(void* ptr) { u32 uVar1; u32 i; - u16* puVar3; - s32 uVar5; - u16* ptr2; + u16* entryPtr; + s32 numEntries; + u16* lastEntryPtr; uVar1 = (int)ptr - (int)gzHeap; if (uVar1 < 0x1000) { - puVar3 = (u16*)gzHeap; - uVar5 = *puVar3++; - - for (i = 0; i < uVar5; puVar3 += 2, i++) { - if (*puVar3 == uVar1) { - ptr2 = &((u16*)(gzHeap - 2))[uVar5 * 2]; - *puVar3 = *ptr2; - *ptr2++ = 0; - *(puVar3 + 1) = *ptr2; - *ptr2 = 0; - *(u16*)(gzHeap) = uVar5 - 1; + entryPtr = (u16*)gzHeap; + numEntries = *entryPtr++; + + for (i = 0; i < numEntries; entryPtr += 2, i++) { + if (*entryPtr == uVar1) { + lastEntryPtr = &((u16*)(gzHeap - 2))[numEntries * 2]; + *entryPtr = *lastEntryPtr; + *lastEntryPtr++ = 0; + *(entryPtr + 1) = *lastEntryPtr; + *lastEntryPtr = 0; + *(u16*)(gzHeap) = numEntries - 1; break; } } @@ -414,7 +424,7 @@ void sub_0801DD58(u32 area, u32 room) { } void LoadDungeonMap(void) { - LoadResourceAsync(gUnk_0201AEE0, 0x6006000, sizeof(gUnk_0201AEE0)); + LoadResourceAsync(gDungeonMap, 0x6006000, sizeof(gDungeonMap)); } void DrawDungeonFeatures(u32 floor, void* data, u32 size) { @@ -440,7 +450,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) { if (!AreaHasMap()) { return; } - layout = gUnk_080C9C50[gArea.dungeon_idx][floor]; + layout = gDungeonLayouts[gArea.dungeon_idx][floor]; MemClear(gMapDataBottomSpecial, 0x8000); while (layout->area != 0) { // ROOM_VISIT_MARKER has to be first TileEntity in the room. @@ -462,6 +472,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) { } nextLayout = layout + 1; if (features != 0) { + // Copies 0x400 bytes even though the data is less most of the time. DmaCopy32(3, &gMapData + layout->mapDataOffset, &gMapDataBottomSpecial, 0x400); roomHeader = gAreaRoomHeaders[layout->area] + layout->room; @@ -478,7 +489,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) { for (x = 0; x < width; x++) { tmp2 = mapX + x; color = sub_0801DF78(sub_0801DF60(x, ptr), features); - sub_0801DF28(tmp2, mapY + y, color); + DrawMapPixel(tmp2, mapY + y, color); } } } @@ -496,10 +507,10 @@ u32 sub_0801DF10(const DungeonLayout* layout) { return offset; } -void sub_0801DF28(u32 x, u32 y, s32 color) { +void DrawMapPixel(u32 x, u32 y, s32 color) { u32* ptr; u32 tmp; - ptr = &gUnk_0201AEE0[(((y >> 3) * 0x10 + (x >> 3)) * 8)]; + ptr = &gDungeonMap[(((y >> 3) * 0x10 + (x >> 3)) * 8)]; ptr = &ptr[(y & 7)]; tmp = (color << ((x & 7) * 4)); ptr[0] = (ptr[0] & gUnk_080C9460[x & 7]) | tmp; @@ -710,7 +721,7 @@ ASM_FUNC("asm/non_matching/common/sub_0801E49C.inc", void sub_0801E49C(u32 a1, u void sub_0801E64C(s32 param_1, s32 param_2, s32 param_3, s32 param_4, s32 param_5) { s32 sVar1; s32* ptr = (s32*)gUnk_02018EE0; - register s32 tmp asm("r1"); + FORCE_REGISTER(s32 tmp, r1); if ((0 <= param_2 || 0 <= param_4) && (param_2 < 0xa0 || (param_4 < 0xa0))) { if (param_2 > param_4) { @@ -968,7 +979,91 @@ void sub_0801E8D4(void) { ASM_FUNC("asm/non_matching/common/sub_0801E99C.inc", u32 sub_0801E99C(u32 a1)); -const struct_080C9C6C gUnk_080C9C6C[] = { +const u16 gUnk_080C93E0[] = { 3, 9, 16, 22, 28, 35, 41, 48, 54, 61, 67, 74, 81, 88, 95, 102, 110, 117, 125, 133, 141, 149, 158, 167, 176, 185, 195, 205, 215, 226, 238, 250, 262, 276, 290, 304, 320, 336, 354, 373, 394, 415, 439, 465, 493, 525, 559, 597, 640, 689, 744, 808, 883, 971, 1078, 1209, 1375, 1591, 1885, 2308, 2973, 4167, 6950, 20860 }; + +const u32 gUnk_080C9460[] = { + 0xfffffff0, 0xffffff0f, 0xfffff0ff, 0xffff0fff, 0xfff0ffff, 0xff0fffff, 0xf0ffffff, 0xfffffff, +}; + +const DungeonLayout gDungeonLayouts_None_None[] = { { 0, 0, 0, 0, 0 }, }; +const DungeonLayout* const gDungeonLayouts_None[] = {gDungeonLayouts_None_None, }; + +const DungeonLayout gDungeonLayouts_DeepwoodShrine_1F[] = { { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0, 0, offset_gDungeonMaps_DeepwoodShrine_BossDoor }, { AREA_DEEPWOOD_SHRINE_BOSS, ROOM_DEEPWOOD_SHRINE_BOSS_MAIN, 2, 0, offset_gDungeonMaps_DeepwoodShrineBoss_Main }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_DeepwoodShrine_B1[] = { { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MADDERPILLAR, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Madderpillar }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL, 0, 0, offset_gDungeonMaps_DeepwoodShrine_BluePortal }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1, 0, 0, offset_gDungeonMaps_DeepwoodShrine_StairsToB1 }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_POT_BRIDGE, 0, 0, offset_gDungeonMaps_DeepwoodShrine_PotBridge }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_DOUBLE_STATUE, 0, 0, offset_gDungeonMaps_DeepwoodShrine_DoubleStatue }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MAP, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Map }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Barrel }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BUTTON, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Button }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MULLDOZER, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Mulldozer }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_PILLARS, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Pillars }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LEVER, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Lever }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Entrance }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_TORCHES, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Torches }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_DeepwoodShrine_B2[] = { { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_KEY, 0, 0, offset_gDungeonMaps_DeepwoodShrine_BossKey }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_COMPASS, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Compass }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LILY_PAD_WEST, 0, 0, offset_gDungeonMaps_DeepwoodShrine_LilyPadWest }, { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LILY_PAD_EAST, 0, 0, offset_gDungeonMaps_DeepwoodShrine_LilyPadEast }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout* const gDungeonLayouts_DeepwoodShrine[] = {gDungeonLayouts_DeepwoodShrine_1F, gDungeonLayouts_DeepwoodShrine_B1, gDungeonLayouts_DeepwoodShrine_B2, }; + +const DungeonLayout gDungeonLayouts_CaveOfFlames_1F[] = { { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_ENTRANCE, 0, 0, offset_gDungeonMaps_CaveOfFlames_Entrance }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE, 0, 0, offset_gDungeonMaps_CaveOfFlames_NorthEntrance }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_COMPASS, 0, 0, offset_gDungeonMaps_CaveOfFlames_Compass }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOB_OMB_WALL, 0, 0, offset_gDungeonMaps_CaveOfFlames_BobOmbWall }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_CaveOfFlames_B1[] = { { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_AFTER_CANE, 0, 0, offset_gDungeonMaps_CaveOfFlames_AfterCane }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_SPINY_CHU, 0, 0, offset_gDungeonMaps_CaveOfFlames_SpinyChu }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_CART_TO_SPINY_CHU, 0, 0, offset_gDungeonMaps_CaveOfFlames_CartToSpinyChu }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 0, 0, offset_gDungeonMaps_CaveOfFlames_MainCart }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_CART_WEST, 0, 0, offset_gDungeonMaps_CaveOfFlames_CartWest }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_HELMASAUR_FIGHT, 0, 0, offset_gDungeonMaps_CaveOfFlames_HelmasaurFight }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_ROLLOBITE_LAVA_ROOM, 0, 0, offset_gDungeonMaps_CaveOfFlames_RollobiteLavaRoom }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MINISH_LAVA_ROOM, 0, 0, offset_gDungeonMaps_CaveOfFlames_MinishLavaRoom }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_CaveOfFlames_B2[] = { { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MINISH_SPIKES, 0, 0, offset_gDungeonMaps_CaveOfFlames_MinishSpikes }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_TOMPAS_DOOM, 0, 0, offset_gDungeonMaps_CaveOfFlames_TompasDoom }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK, 0, 0, offset_gDungeonMaps_CaveOfFlames_BeforeGleerok }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH1, 0, 0, offset_gDungeonMaps_CaveOfFlames_BosskeyPath1 }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH2, 0, 0, offset_gDungeonMaps_CaveOfFlames_BosskeyPath2 }, { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSS_DOOR, 0, 0, offset_gDungeonMaps_CaveOfFlames_BossDoor }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_CaveOfFlames_B3[] = { { AREA_CAVE_OF_FLAMES_BOSS, ROOM_CAVE_OF_FLAMES_BOSS_0, 2, 0, offset_gDungeonMaps_CaveOfFlamesBoss_0 }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout* const gDungeonLayouts_CaveOfFlames[] = {gDungeonLayouts_CaveOfFlames_1F, gDungeonLayouts_CaveOfFlames_B1, gDungeonLayouts_CaveOfFlames_B2, gDungeonLayouts_CaveOfFlames_B3, }; + + +const DungeonLayout gDungeonLayouts_FortressOfWinds_3F[] = { { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_DOUBLE_EYEGORE, 0, 0, offset_gDungeonMaps_FortressOfWinds_DoubleEyegore }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0, 0, offset_gDungeonMaps_FortressOfWinds_EastKeyLever }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS, 0, 0, offset_gDungeonMaps_FortressOfWinds_PitPlatforms }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER, 0, 0, offset_gDungeonMaps_FortressOfWinds_WestKeyLever }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 2, 0, offset_gDungeonMaps_FortressOfWinds_Mazaal }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL, 0, 0, offset_gDungeonMaps_FortressOfWinds_BeforeMazaal }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_FortressOfWinds_2F[] = { { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_DARKNUT_ROOM, 0, 0, offset_gDungeonMaps_FortressOfWinds_DarknutRoom }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ARROW_EYE_BRIDGE, 0, 0, offset_gDungeonMaps_FortressOfWinds_ArrowEyeBridge }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_NORTH_SPLIT_PATH_PIT, 0, 0, offset_gDungeonMaps_FortressOfWinds_NorthSplitPathPit }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WALLMASTER_MINISH_PORTAL, 0, 0, offset_gDungeonMaps_FortressOfWinds_WallmasterMinishPortal }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_PILLAR_CLONE_BUTTONS, 0, 0, offset_gDungeonMaps_FortressOfWinds_PillarCloneButtons }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ROTATING_SPIKE_TRAPS, 0, 0, offset_gDungeonMaps_FortressOfWinds_RotatingSpikeTraps }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_STALFOS, 0, 0, offset_gDungeonMaps_FortressOfWinds_Stalfos }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS, 0, 0, offset_gDungeonMaps_FortressOfWinds_EntranceMoleMitts }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAIN_2F, 0, 0, offset_gDungeonMaps_FortressOfWinds_Main2f }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MINISH_HOLE, 0, 0, offset_gDungeonMaps_FortressOfWinds_MinishHole }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BOSS_KEY, 0, 0, offset_gDungeonMaps_FortressOfWinds_BossKey }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F, 0, 0, offset_gDungeonMaps_FortressOfWinds_WestStairs2f }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0, 0, offset_gDungeonMaps_FortressOfWinds_EastStairs2f }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_5, 1, 1, offset_gDungeonMaps_FortressOfWinds_5 }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_6, 1, 1, offset_gDungeonMaps_FortressOfWinds_6 }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_FortressOfWinds_1F[] = { { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0, 0, offset_gDungeonMaps_FortressOfWinds_WestStairs1f }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 0, 0, offset_gDungeonMaps_FortressOfWinds_CenterStairs1f }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0, 0, offset_gDungeonMaps_FortressOfWinds_EastStairs1f }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WIZZROBE, 0, 0, offset_gDungeonMaps_FortressOfWinds_Wizzrobe }, { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_HEART_PIECE, 0, 0, offset_gDungeonMaps_FortressOfWinds_HeartPiece }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout* const gDungeonLayouts_FortressOfWinds[] = {gDungeonLayouts_FortressOfWinds_3F, gDungeonLayouts_FortressOfWinds_2F, gDungeonLayouts_FortressOfWinds_1F, }; + + +const DungeonLayout gDungeonLayouts_TempleOfDroplets_B1[] = { { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_WestHole }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTH_SPLIT_ROOM, 0, 0, offset_gDungeonMaps_TempleOfDroplets_NorthSplitRoom }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_EastHole }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_Entrance }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_NorthwestStairs }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_ScissorsMiniboss }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHWEST, 0, 0, offset_gDungeonMaps_TempleOfDroplets_WaterfallNorthwest }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST, 0, 0, offset_gDungeonMaps_TempleOfDroplets_WaterfallNortheast }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0, 0, offset_gDungeonMaps_TempleOfDroplets_Element }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER, 0, 0, offset_gDungeonMaps_TempleOfDroplets_IceCorner }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_PIT_MAZE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_IcePitMaze }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY, 0, 0, offset_gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHEAST, 0, 0, offset_gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST, 0, 0, offset_gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO, 2, 0, offset_gDungeonMaps_TempleOfDroplets_BigOcto }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU, 0, 0, offset_gDungeonMaps_TempleOfDroplets_ToBlueChu }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlueChu }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_TempleOfDroplets_B2[] = { { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BossKey }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY, 0, 0, offset_gDungeonMaps_TempleOfDroplets_NorthSmallKey }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_BUTTON_PUZZLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlockCloneButtonPuzzle }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_PUZZLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlockClonePuzzle }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_SPIKE_BAR_FLIPPER_ROOM, 0, 0, offset_gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_9_LANTERNS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_9Lanterns }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_ICE_BLOCKS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_LilypadIceBlocks }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_29, 0, 0, offset_gDungeonMaps_TempleOfDroplets_29 }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_MULLDOZERS_FIRE_BARS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_MulldozersFireBars }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_DARK_MAZE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_DarkMaze }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TWIN_MADDERPILLARS, 1, 0, offset_gDungeonMaps_TempleOfDroplets_TwinMadderpillars }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_AFTER_TWIN_MADDERPILLARS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlueChuKeyLever }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_MULLDOZER_KEY, 1, 0, offset_gDungeonMaps_TempleOfDroplets_MulldozerKey }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BEFORE_TWIN_MADDERPILLARS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BeforeTwinMadderpillars }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST, 0, 0, offset_gDungeonMaps_TempleOfDroplets_LilypadB2West }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_COMPASS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_Compass }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_DARK_SCISSOR_BEETLES, 0, 0, offset_gDungeonMaps_TempleOfDroplets_DarkScissorBeetles }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_MIDDLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_LilypadB2Middle }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_MADDERPILLAR, 0, 0, offset_gDungeonMaps_TempleOfDroplets_IceMadderpillar }, { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_FLAMEBAR_BLOCK_PUZZLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_FlamebarBlockPuzzle }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_TempleOfDroplets_B3[] = { { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlueChuKey }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout* const gDungeonLayouts_TempleOfDroplets[] = {gDungeonLayouts_TempleOfDroplets_B1, gDungeonLayouts_TempleOfDroplets_B2, gDungeonLayouts_TempleOfDroplets_B3, }; + +const DungeonLayout gDungeonLayouts_PalaceOfWinds_5F[] = { { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_TORNADO, 2, 0, offset_gDungeonMaps_PalaceOfWinds_GyorgTornado }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOSS_KEY, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BossKey }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BEFORE_BALL_AND_CHAIN_SOLDIERS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BeforeBallAndChainSoldiers }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_BOSS_DOOR, 0, 0, offset_gDungeonMaps_PalaceOfWinds_GyorgBossDoor }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_EAST_CHEST_FROM_GYORG_BOSS_DOOR, 0, 0, offset_gDungeonMaps_PalaceOfWinds_EastChestFromGyorgBossDoor }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_MOBLIN_AND_WIZZROBE_FIGHT, 0, 0, offset_gDungeonMaps_PalaceOfWinds_MoblinAndWizzrobeFight }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FOUR_BUTTON_STALFOS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_FourButtonStalfos }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FAN_AND_KEY_TO_BOSS_KEY, 0, 0, offset_gDungeonMaps_PalaceOfWinds_FanAndKeyToBossKey }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BALL_AND_CHAIN_SOLDIERS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BallAndChainSoldiers }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOMBAROSSA_PATH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BombarossaPath }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_HOLE_TO_DARKNUT, 0, 0, offset_gDungeonMaps_PalaceOfWinds_HoleToDarknut }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_TO_BOMBAROSSA_PATH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_ToBombarossaPath }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOMB_WALL_INSIDE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BombWallInside }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOMB_WALL_OUTSIDE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BombWallOutside }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_4F[] = { { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_CLOUD_JUMPS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_CloudJumps }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BLOCK_MAZE_TO_BOSS_DOOR, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BlockMazeToBossDoor }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_CRACKED_FLOOR_LAKITU, 0, 0, offset_gDungeonMaps_PalaceOfWinds_CrackedFloorLakitu }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_HEART_PIECE_BRIDGE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_HeartPieceBridge }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FAN_BRIDGE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_FanBridge }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_TO_FAN_BRIDGE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_ToFanBridge }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_RED_WARP_HALL, 0, 0, offset_gDungeonMaps_PalaceOfWinds_RedWarpHall }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_3F[] = { { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PLATFORM_CLONE_RIDE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PlatformCloneRide }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PIT_CORNER_AFTER_KEY, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PitCornerAfterKey }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PLATFORM_CROW_RIDE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PlatformCrowRide }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GRATE_PLATFORM_RIDE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_GratePlatformRide }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_POT_PUSH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PotPush }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FLOORMASTER_LEVER, 0, 0, offset_gDungeonMaps_PalaceOfWinds_FloormasterLever }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_MAP, 0, 0, offset_gDungeonMaps_PalaceOfWinds_Map }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_CORNER_TO_MAP, 0, 0, offset_gDungeonMaps_PalaceOfWinds_CornerToMap }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_STAIRS_AFTER_FLOORMASTER, 0, 0, offset_gDungeonMaps_PalaceOfWinds_StairsAfterFloormaster }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_HOLE_TO_KINSTONE_WIZZROBE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_HoleToKinstoneWizzrobe }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_KEY_ARROW_BUTTON, 0, 0, offset_gDungeonMaps_PalaceOfWinds_KeyArrowButton }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_2F[] = { { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GRATES_TO_3F, 0, 0, offset_gDungeonMaps_PalaceOfWinds_GratesTo3f }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_SPINY_FIGHT, 0, 0, offset_gDungeonMaps_PalaceOfWinds_SpinyFight }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PEAHAT_SWITCH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PeahatSwitch }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_WHIRLWIND_BOMBAROSSA, 0, 0, offset_gDungeonMaps_PalaceOfWinds_WhirlwindBombarossa }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_DOOR_TO_STALFOS_FIREBAR, 0, 0, offset_gDungeonMaps_PalaceOfWinds_DoorToStalfosFirebar }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_STALFOS_FIREBAR_HOLE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_StalfosFirebarHole }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_SHORTCUT_DOOR_BUTTONS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_ShortcutDoorButtons }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_TO_PEAHAT_SWITCH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_ToPeahatSwitch }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_KINSTONE_WIZZROBE_FIGHT, 0, 0, offset_gDungeonMaps_PalaceOfWinds_KinstoneWizzrobeFight }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GIBDO_STAIRS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_GibdoStairs }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_SPIKE_BAR_SMALL_KEY, 0, 0, offset_gDungeonMaps_PalaceOfWinds_SpikeBarSmallKey }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_1F[] = { { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_DARKNUT_MINIBOSS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_DarknutMiniboss }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ROC_CAPE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_RocCape }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FIRE_BAR_GRATES, 0, 0, offset_gDungeonMaps_PalaceOfWinds_FireBarGrates }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PLATFORM_RIDE_BOMBAROSSAS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PlatformRideBombarossas }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BRIDGE_AFTER_DARKNUT, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BridgeAfterDarknut }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BRIDGE_SWITCHES_CLONE_BLOCK, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BridgeSwitchesCloneBlock }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 0, 0, offset_gDungeonMaps_PalaceOfWinds_EntranceRoom }, { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_DARK_COMPASS_HALL, 0, 0, offset_gDungeonMaps_PalaceOfWinds_DarkCompassHall }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout* const gDungeonLayouts_PalaceOfWinds[] = {gDungeonLayouts_PalaceOfWinds_5F, gDungeonLayouts_PalaceOfWinds_4F, gDungeonLayouts_PalaceOfWinds_3F, gDungeonLayouts_PalaceOfWinds_2F, gDungeonLayouts_PalaceOfWinds_1F, }; + + +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_3F[] = { { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_3fTopLeftTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_3fTopRightTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_3fBottomLeftTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_3fBottomRightTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_3fKeatonHallToVaati }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 2, 0, offset_gDungeonMaps_DarkHyruleCastle_3fTripleDarknut }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_2F[] = { { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopLeftTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_CORNER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopLeftCorner }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOSS_KEY, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBossKey }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BLUE_WARP, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBlueWarp }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_GHINI, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopRightCornerGhini }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_TORCHES, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopRightCornerTorches }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopRightTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopLeftDarknut }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_SPARKS, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fSparks }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fTopRightDarknuts }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fLeft }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fRight }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftDarknuts }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBossDoor }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomRightDarknut }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_CORNER_PUZZLE, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftCornerPuzzle }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fEntrance }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_CORNER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomRightCorner }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftGhini }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fBottomRightTower }, { 0, 0, 0, 0, 0 }, }; +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_1F[] = { { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fEntrance }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fTopLeftTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fThroneRoom }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_COMPASS, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fCompass }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fTopRightTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fBeforeThrone }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopTopLeft }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopTop }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopTopRight }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopLeft }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopRight }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopBottomLeft }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopBottom }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fBottomLeftTower }, { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_1fBottomRightTower }, { 0, 0, 0, 0, 0 }, }; + +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_B1[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1Entrance }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BelowThrone }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BelowCompass }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BeforeThrone }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1ToPrison }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BOMB_WALL, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BombWall }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_KEATONS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1Keatons }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON_FIREBAR, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_CANNONS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1Cannons, }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B1Left }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B1Right }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_MAP, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B1Map }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_B2[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B2ToPrison }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_PRISON, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B2Prison }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_DROPDOWN, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B2Dropdown }, + { 0, 0, 0, 0, 0 }, +}; + +const DungeonLayout* const gDungeonLayouts_DarkHyruleCastle[] = {gDungeonLayouts_DarkHyruleCastle_3F, gDungeonLayouts_DarkHyruleCastle_2F, gDungeonLayouts_DarkHyruleCastle_1F, gDungeonLayouts_DarkHyruleCastle_B1, gDungeonLayouts_DarkHyruleCastle_B2, }; + + +const DungeonLayout* const* const gDungeonLayouts[] = {gDungeonLayouts_None, gDungeonLayouts_DeepwoodShrine, gDungeonLayouts_CaveOfFlames, gDungeonLayouts_FortressOfWinds, gDungeonLayouts_TempleOfDroplets, gDungeonLayouts_PalaceOfWinds, gDungeonLayouts_DarkHyruleCastle, }; + + + +const DungeonFloorMetadata gDungeonFloorMetadatas[] = { { 1, 2, 2 }, { 3, 3, 3 }, { 4, 3, 0 }, { 3, 5, 5 }, { 3, 2, 2 }, { 5, 7, 7 }, { 5, 5, 5 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, }; diff --git a/src/cutscene.c b/src/cutscene.c index 93ea6eac..2cd3755b 100644 --- a/src/cutscene.c +++ b/src/cutscene.c @@ -43,7 +43,7 @@ void CutsceneMain_Init(void) { void sub_080535AC(void) { gMenu.overlayType = 1; gMenu.transitionTimer = 120; - gUI.field_0x6 = 1; + gUI.loadGfxOnRestore = TRUE; gUpdateVisibleTiles = 1; gScreen.lcd.displayControl &= 0xfeff; LoadRoomEntityList(gUnk_080FCB94); @@ -216,7 +216,7 @@ void sub_08053758(void) { gMenu.transitionTimer = 120; gMenu.field_0xa = 0x1e; *((u8*)&gMenu + 0x10) = 0; // TODO - gUI.field_0x6 = 1; + gUI.loadGfxOnRestore = TRUE; gMapBottom.bgSettings = NULL; gMapTop.bgSettings = NULL; gRoomControls.camera_target = NULL; diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index edd88119..2c853edc 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -1,5 +1,6 @@ #define NENT_DEPRECATED #include "asm.h" +#include "beanstalkSubtask.h" #include "collision.h" #include "enemy.h" #include "enemy/gyorg.h" @@ -12,8 +13,6 @@ extern u8 gMapDataTopSpecial[]; extern u16 gMapDataBottomSpecial[]; -extern void sub_080197D4(const void*); - extern u32 sub_08000E62(u32); extern void RegisterTransitionManager(void*, void (*)(), void (*)()); @@ -229,7 +228,7 @@ void sub_080464C0(GyorgFemaleEntity* this) { s32 i; u8* src; u8* dst; - sub_080197D4(gUnk_080D1A74[super->animationState >> 6]); + LoadMapData((MapDataDefinition*)gUnk_080D1A74[super->animationState >> 6]); sub_08046518(); for (i = 0x20, src = ((u8*)&gMapDataBottomSpecial), dst = ((u8*)&gMapDataBottomSpecial) + 0x3260; i != 0; i--) { MemCopy(src, dst, 0x40); diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index fe57c230..94774b42 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -111,7 +111,7 @@ void sub_08033958(SpinyBeetleEntity* this) { u32 direction; if (sub_08033DF0(this)) { sub_08033E1C(this); - sub_0807B9B8(this->tileIndex, this->tile, super->collisionLayer); + SetMetaTileByIndex(this->tileIndex, this->tile, super->collisionLayer); return; } @@ -160,7 +160,7 @@ void sub_08033958(SpinyBeetleEntity* this) { COLLISION_ON(super); super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000; - sub_0807B9B8(this->tileIndex, this->tile, super->collisionLayer); + SetMetaTileByIndex(this->tileIndex, this->tile, super->collisionLayer); InitializeAnimation(super, 2); } diff --git a/src/gameUtils.c b/src/gameUtils.c index dbc22f8b..9e5c834e 100644 --- a/src/gameUtils.c +++ b/src/gameUtils.c @@ -3,6 +3,7 @@ * * @brief Game Utils */ +#include "area.h" #include "backgroundAnimations.h" #include "enemy.h" #include "entity.h" @@ -162,17 +163,17 @@ void InitializePlayer(void) { bool32 AreaIsOverworld(void) { #ifdef EU - return gArea.areaMetadata == 0x01; + return gArea.areaMetadata == AR_IS_OVERWORLD; #else - return gArea.areaMetadata == 0x81; + return gArea.areaMetadata == (AR_ALLOWS_WARP | AR_IS_OVERWORLD); #endif } bool32 CheckAreaOverworld(u32 area) { #if EU - return gAreaMetadata[area].flags == 0x01; + return gAreaMetadata[area].flags == AR_IS_OVERWORLD; #else - return gAreaMetadata[area].flags == 0x81; + return gAreaMetadata[area].flags == (AR_ALLOWS_WARP | AR_IS_OVERWORLD); #endif } @@ -274,20 +275,20 @@ bool32 HasDungeonSmallKey(void) { } extern u8 gPaletteBufferBackup[]; -void RestoreGameTask(u32 a1) { +void RestoreGameTask(bool32 loadGfx) { LoadGfxGroups(); #ifndef EU CleanUpGFXSlots(); #endif sub_080ADE24(); InitUI(TRUE); - sub_0801AE44(a1); + sub_0801AE44(loadGfx); MemCopy(gPaletteBufferBackup, gPaletteBuffer, 1024); gUsedPalettes = 0xffffffff; } void LoadRoomBgm(void) { - gArea.queued_bgm = gAreaMetadata[gRoomControls.area]._3; + gArea.queued_bgm = gAreaMetadata[gRoomControls.area].queueBgm; if (CheckLocalFlagByBank(FLAG_BANK_10, LV6_KANE_START)) { gArea.queued_bgm = BGM_FIGHT_THEME2; } diff --git a/src/manager/hyruleTownTilesetManager.c b/src/manager/hyruleTownTilesetManager.c index 308204f0..fc0a9378 100644 --- a/src/manager/hyruleTownTilesetManager.c +++ b/src/manager/hyruleTownTilesetManager.c @@ -113,32 +113,32 @@ void sub_08059B18(void) { if (CheckGlobalFlag(TATEKAKE_HOUSE) != 0) { for (loopVar = 0; loopVar < 4; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - sub_0807B9B8(loopVar * 0x10 + 0x4ab + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), + SetMetaTileByIndex(loopVar * 0x10 + 0x4ab + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); } } for (loopVar = 0; loopVar < 3; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - sub_0807B9B8(loopVar * 0x10 + 0x440 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), + SetMetaTileByIndex(loopVar * 0x10 + 0x440 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 2); } } - sub_0807B9B8(0xd6, 0x5c2, 2); - sub_0807B9B8(0xd7, 0x5c3, 2); + SetMetaTileByIndex(0xd6, 0x5c2, 2); + SetMetaTileByIndex(0xd7, 0x5c3, 2); LoadResourceAsync(&gUnk_086E8460, 0x6001800, 0x800); } else { if (CheckGlobalFlag(TATEKAKE_TOCHU) != 0) { for (loopVar = 0; loopVar < 5; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - sub_0807B9B8(loopVar * 0x10 + 0x4a6 + innerLoopVar, + SetMetaTileByIndex(loopVar * 0x10 + 0x4a6 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); } } - sub_0807B9B8(0x444, 0x602, 2); - sub_0807B9B8(0x445, 0x605, 2); - sub_0807B9B8(0x454, 0x642, 2); - sub_0807B9B8(0x455, 0x645, 2); + SetMetaTileByIndex(0x444, 0x602, 2); + SetMetaTileByIndex(0x445, 0x605, 2); + SetMetaTileByIndex(0x454, 0x642, 2); + SetMetaTileByIndex(0x455, 0x645, 2); } } } diff --git a/src/menu/pauseMenu.c b/src/menu/pauseMenu.c index 63f22f28..752f8b0c 100644 --- a/src/menu/pauseMenu.c +++ b/src/menu/pauseMenu.c @@ -581,7 +581,7 @@ extern u32 gUnk_085C4620[]; extern void (*const gUnk_08128D58[])(void); extern KeyButtonLayout gUnk_08128D60; -void sub_080A5D1C(); +void DrawDungeonMapActually(); void sub_080A5CFC(u32, void*, u32); void sub_080A6FB4(u32, u32); void DrawDungeonFeatures(u32, void*, u32); @@ -1067,7 +1067,7 @@ void PauseMenu_Screen_5(void) { u32 temp; gUnk_08128D30[gMenu.menuType](); - sub_080A5D1C(); + DrawDungeonMapActually(); temp = gMain.ticks; if ((temp & 7) == 0) { uVar1 = *gUnk_02017830; @@ -1091,10 +1091,10 @@ void sub_080A5C44(u32 param_1, u32 param_2, u32 param_3) { void sub_080A5C9C(void) { s32 newChoice; - const struct_080C9C6C* ptr; + const DungeonFloorMetadata* floorMetadata; if (sub_080A51F4()) { - ptr = &gUnk_080C9C6C[gArea.dungeon_idx]; + floorMetadata = &gDungeonFloorMetadatas[gArea.dungeon_idx]; newChoice = gMenu.field_0x3; switch (gInput.newKeys) { case DPAD_UP: @@ -1103,7 +1103,7 @@ void sub_080A5C9C(void) { } break; case DPAD_DOWN: - if (ptr->unk_0 - 1 > newChoice) { + if (floorMetadata->numFloors - 1 > newChoice) { newChoice++; } break; @@ -1129,7 +1129,7 @@ void sub_080A5CFC(u32 menuType, void* param_2, u32 param_3) { #endif // Actually draw the sprites for the dungeon map. -void sub_080A5D1C(void) { +void DrawDungeonMapActually(void) { extern u8 gUnk_08128D3C[]; u32 bVar1; int frameIndex; @@ -1137,10 +1137,10 @@ void sub_080A5D1C(void) { u32 uVar6; u32 index; u8* puVar8; - const struct_080C9C6C* pbVar9; + const DungeonFloorMetadata* pbVar9; - pbVar9 = &gUnk_080C9C6C[gArea.dungeon_idx]; - bVar1 = gUnk_08128D3C[pbVar9->unk_0]; + pbVar9 = &gDungeonFloorMetadatas[gArea.dungeon_idx]; + bVar1 = gUnk_08128D3C[pbVar9->numFloors]; uVar4 = sub_0801DB94(); gOamCmd._4 = 0x400; gOamCmd._6 = 0; @@ -1171,7 +1171,7 @@ void sub_080A5D1C(void) { if (sub_080A5F24()) { gOamCmd._8 = 0; gOamCmd.x = 0x46; - gOamCmd.y = bVar1 + (pbVar9->unk_1 - pbVar9->unk_2) * 0xc; + gOamCmd.y = bVar1 + (pbVar9->highestFloor - pbVar9->unk_2) * 0xc; if ((gMain.ticks & 0x20) != 0) { uVar6 = 0x7a; } else { @@ -1183,9 +1183,10 @@ void sub_080A5D1C(void) { gOamCmd._8 = 0; gOamCmd.x = 0x34; gOamCmd.y = bVar1; - frameIndex = pbVar9->unk_1 + 0x82; + frameIndex = pbVar9->highestFloor + 0x82; - for (index = 0; index < pbVar9->unk_0; index++) { + // Floor number sprites? + for (index = 0; index < pbVar9->numFloors; index++) { DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex); frameIndex--; gOamCmd.y = gOamCmd.y + 0xc; diff --git a/src/object/bird.c b/src/object/bird.c index e6243f22..6520cea8 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -374,6 +374,7 @@ void Bird_Type10(Entity* this) { void CreateBird(Entity* this) { Entity* birdEnt; + // EU only allows warp from the overworld. This prevents warping from the rooftop of the Wind Tribe's tower. #ifndef EU if (AreaAllowsWarp()) { #else diff --git a/src/object/bush.c b/src/object/bush.c index acdac424..449b332e 100644 --- a/src/object/bush.c +++ b/src/object/bush.c @@ -108,7 +108,7 @@ void Bush_Action2SubAction2(BushEntity* this) { if (this->unk_72 == 0) { this->unk_72 = 1; super->spriteOffsetX = 0; - sub_0807B9B8(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetMetaTileByIndex(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } if (((gPlayerState.field_0x1c & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { Bush_Action2SubAction5(this); diff --git a/src/object/button.c b/src/object/button.c index 33dfcefe..ee153546 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -208,35 +208,36 @@ extern u16 gMapDataTopSpecial[0x2000]; extern u16 gMapDataBottomSpecial[]; void sub_08081E6C(Entity* this) { - u32 r4; + u32 tileType; LayerStruct* r1; u16* tmp2; u16* tmp; u16* tmp3; - u32 r6 = this->field_0x74.HWORD; - u32 r5 = this->collisionLayer; - u32 tile = GetTileType(r6, r5); + u32 tilePosition = this->field_0x74.HWORD; + u32 layer = this->collisionLayer; + u32 tile = GetTileType(tilePosition, layer); if (tile < 0x4000) return; - r1 = GetLayerByIndex(r5); - r4 = (this->type == 0 ? 0x7a : 0x78); + r1 = GetLayerByIndex(layer); + tileType = (this->type == 0 ? 0x7a : 0x78); tmp = r1->metatiles; - tmp = tmp + (r1->unkData2[r4] << 2); - tmp2 = (r5 == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial); - tmp2 += (((0x3f & r6) << 1) + ((0xfc0 & r6) << 2)); + tmp = tmp + (r1->unkData2[tileType] << 2); + tmp2 = (layer == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial); + tmp2 += (((0x3f & tilePosition) << 1) + ((0xfc0 & tilePosition) << 2)); if (sub_08081F00((u32*)tmp2, (u32*)tmp)) return; - SetTileType(r4, r6, r5); - SetTile(tile, r6, r5); + SetTileType(tileType, tilePosition, layer); + SetTile(tile, tilePosition, layer); } -u32 sub_08081F00(u32* unk1, u32* unk2) { - if (*unk1 != *unk2) - return 0; - if (unk1[0x40] != unk2[1]) - return 0; - return 1; +// Are the two tiles already set to the correct one +bool32 sub_08081F00(u32* screenblock, u32* metatileList) { + if (screenblock[0] != metatileList[0]) + return FALSE; + if (screenblock[0x40] != metatileList[1]) + return FALSE; + return TRUE; } void sub_08081F24(Entity* this) { diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c index 22e3561e..05fd362d 100644 --- a/src/object/octorokBossObject.c +++ b/src/object/octorokBossObject.c @@ -340,7 +340,7 @@ bool32 sub_0809A6F8(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { if (sub_0809A758(param_1, param_2) != 0) { if (gUnk_081238A0[param_3] != 0) { if ((param_4 & 1) != 0) { - sub_0807B9B8(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1); + SetMetaTileByIndex(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1); } else { RestorePrevTileEntity((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1); } diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c index 4f185253..3429f656 100644 --- a/src/object/pushableFurniture.c +++ b/src/object/pushableFurniture.c @@ -494,9 +494,9 @@ void sub_08090094(PushableFurnitureEntity* this, u32 param_2, u32 tilePos) { } void sub_08090254(PushableFurnitureEntity* this) { - sub_0807B9B8(this->unk_74, this->unk_70, super->collisionLayer); + SetMetaTileByIndex(this->unk_74, this->unk_70, super->collisionLayer); if (this->unk_80 == 1) { - sub_0807B9B8(this->unk_76, this->unk_72, super->collisionLayer); + SetMetaTileByIndex(this->unk_76, this->unk_72, super->collisionLayer); } } diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index 1cb2ecdf..6452d3db 100644 --- a/src/object/pushableGrave.c +++ b/src/object/pushableGrave.c @@ -157,16 +157,16 @@ bool32 sub_0809785C(PushableGraveEntity* this) { super->direction = 0; super->speed = 0x40; tilePosition = this->unk_68; - sub_0807B9B8(this->unk_72, tilePosition, super->collisionLayer); + SetMetaTileByIndex(this->unk_72, tilePosition, super->collisionLayer); if (super->type2 == 2) { - sub_0807B9B8(this->unk_6a, tilePosition - 0x41, super->collisionLayer); - sub_0807B9B8(this->unk_6c, tilePosition - 0x40, super->collisionLayer); - sub_0807B9B8(this->unk_6e, tilePosition - 0x3f, super->collisionLayer); - sub_0807B9B8(this->unk_70, tilePosition - 1, super->collisionLayer); - sub_0807B9B8(this->unk_74, tilePosition + 1, super->collisionLayer); - sub_0807B9B8(this->unk_76, tilePosition + 0x3f, super->collisionLayer); - sub_0807B9B8(this->unk_78, tilePosition + 0x40, super->collisionLayer); - sub_0807B9B8(this->unk_7a, tilePosition + 0x41, super->collisionLayer); + SetMetaTileByIndex(this->unk_6a, tilePosition - 0x41, super->collisionLayer); + SetMetaTileByIndex(this->unk_6c, tilePosition - 0x40, super->collisionLayer); + SetMetaTileByIndex(this->unk_6e, tilePosition - 0x3f, super->collisionLayer); + SetMetaTileByIndex(this->unk_70, tilePosition - 1, super->collisionLayer); + SetMetaTileByIndex(this->unk_74, tilePosition + 1, super->collisionLayer); + SetMetaTileByIndex(this->unk_76, tilePosition + 0x3f, super->collisionLayer); + SetMetaTileByIndex(this->unk_78, tilePosition + 0x40, super->collisionLayer); + SetMetaTileByIndex(this->unk_7a, tilePosition + 0x41, super->collisionLayer); } SoundReq(SFX_10F); return TRUE; diff --git a/src/playerUtils.c b/src/playerUtils.c index 766da0ff..4433573d 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -1,6 +1,7 @@ #define NENT_DEPRECATED #include "area.h" #include "asm.h" +#include "beanstalkSubtask.h" #include "common.h" #include "collision.h" #include "entity.h" @@ -106,19 +107,17 @@ extern const u16* sub_0806FC50(u32 param_1, u32 param_2); bool32 sub_08079F48(u32 param_1, u32 param_2); -extern void sub_08080B60(LayerStruct*); -extern void sub_0801AB08(u16*, LayerStruct*); +extern void FillUnkData3ForLayer(LayerStruct*); +extern void RenderTilemapToScreenblock(u16*, LayerStruct*); -extern u8 gUnk_02006F00[]; extern u16 gUnk_080B77C0[]; void sub_0807BFA8(void); -void sub_080197D4(const void*); void sub_0807C8B0(u16*, u32, u32); void sub_0807C69C(u8*, u32, u32); void sub_0807C460(void); void sub_0807BBE4(void); -void sub_0807BC84(void); +void CreateCollisionDataBorderAroundRoom(void); void sub_0807C5F4(u16*, u16*); void sub_0807C5B0(void); @@ -127,18 +126,16 @@ extern const u8 gUnk_080B3E80[]; // collisions for tiles > 0x4000 extern const u8 gUnk_080B79A7[]; -extern void sub_0801AB08(u16*, LayerStruct*); +extern void RenderTilemapToScreenblock(u16*, LayerStruct*); -extern u8 gUnk_02006F00[]; extern u16 gUnk_080B77C0[]; void sub_0807BFA8(void); -void sub_080197D4(const void*); void sub_0807C8B0(u16*, u32, u32); void sub_0807C69C(u8*, u32, u32); void sub_0807C460(void); void sub_0807BBE4(void); -void sub_0807BC84(void); +void CreateCollisionDataBorderAroundRoom(void); void sub_0807C5F4(u16*, u16*); void sub_0807C5B0(void); @@ -2906,6 +2903,10 @@ void sub_0807B2F8(PlayerEntity* this) { } } + +// tileType < 0x800 : set the MetaTileType +// tileType >= 0x4000 : call SetTile directly +// else : restore the previous tile entity void SetTileType(u32 tileType, u32 position, u32 layer) { u8 collisionData; u16 metatile; @@ -2932,7 +2933,8 @@ void SetTileType(u32 tileType, u32 position, u32 layer) { dest = gMapDataTopSpecial + offset; } src = data->metatiles + metatile * 4; - *dest = *src; + // Copy over the tilemap entries (tile_attrs) to the special map data but in a different order. + dest[0] = src[0]; dest[1] = src[1]; dest[0x80] = src[2]; dest[0x81] = src[3]; @@ -3126,7 +3128,7 @@ void sub_0807B930(u32 position) { SetTileType(0x292, position + TILE_POS(1, 0), 1); } -void sub_0807B9B8(u32 tileIndex, u32 position, u32 layer) { +void SetMetaTileByIndex(u32 tileIndex, u32 position, u32 layer) { LayerStruct* data; u16* src; u16* dest; @@ -3243,7 +3245,8 @@ void sub_0807BBE4(void) { } } -void sub_0807BC84(void) { +// Set collisionData at the room bounds (?) to 0xff? +void CreateCollisionDataBorderAroundRoom(void) { s32 height; u32 width; u8* puVar3; @@ -3438,7 +3441,10 @@ ASM_FUNC("asm/non_matching/playerUtils/sub_0807BFD0.inc", void sub_0807BFD0()) void LoadRoomGfx(void) { RoomControls* roomControls; - bool32 tmp; + bool32 clearBottomMap; // TODO maybe if it is a 256 bit background? + // So the first u16 being 0xffff indicates this and the rest of the background does not matter? + // Or is it used anywhere else? + // Probaby rather is some sort of different scroll mode where only a small part of the map is used? sub_0807BFA8(); roomControls = &gRoomControls; @@ -3447,14 +3453,14 @@ void LoadRoomGfx(void) { MemClear(gMapTop.collisionData, sizeof(gMapTop.collisionData)); MemClear(&gMapDataBottomSpecial, 0x8000); MemClear(&gMapDataTopSpecial, 0x8000); - sub_080197D4((gArea.pCurrentRoomInfo)->map); + LoadMapData((gArea.pCurrentRoomInfo)->map); if (gMapBottom.mapData[0] != 0xffff) { sub_0807C8B0(gMapBottom.mapData, roomControls->width >> 4, roomControls->height >> 4); sub_0807C8B0(gMapTop.mapData, roomControls->width >> 4, roomControls->height >> 4); - tmp = FALSE; + clearBottomMap = FALSE; } else { MemClear(gMapBottom.mapData, sizeof(gMapBottom.mapData)); - tmp = TRUE; + clearBottomMap = TRUE; } if (gRoomTransition.field_0x2c[0] == 0) { MemCopy(gMapBottom.mapData, gMapBottom.mapDataClone, sizeof(gMapBottom.mapData)); @@ -3473,48 +3479,52 @@ void LoadRoomGfx(void) { MemCopy(gMapTop.mapDataClone + 0x800, gMapTop.mapData + 0x800, 0x1000); MemCopy(gMapTop.unkData3, gMapTop.mapDataClone + 0x800, 0x1000); } - if (!tmp) { + if (!clearBottomMap) { sub_0807BBE4(); } else { sub_0807C69C(gMapBottom.collisionData, roomControls->width >> 4, roomControls->height >> 4); sub_0807C69C(gMapTop.collisionData, roomControls->width >> 4, roomControls->height >> 4); sub_0807C460(); } - sub_0807BC84(); - sub_08080B60(&gMapBottom); - sub_08080B60(&gMapTop); - if (!tmp) { - sub_0801AB08((u16*)&gMapDataBottomSpecial, &gMapBottom); - sub_0801AB08((u16*)&gMapDataTopSpecial, &gMapTop); + CreateCollisionDataBorderAroundRoom(); + FillUnkData3ForLayer(&gMapBottom); + FillUnkData3ForLayer(&gMapTop); + if (!clearBottomMap) { + // Render the complete bottom and top metatilemaps into the tilemaps. + RenderTilemapToScreenblock((u16*)&gMapDataBottomSpecial, &gMapBottom); + RenderTilemapToScreenblock((u16*)&gMapDataTopSpecial, &gMapTop); } else { + // Copy first half to second half. + // Then copy the room back to the first half? + // Then clear the second half. MemCopy(&gMapDataBottomSpecial, &gMapDataBottomSpecial[0x2000], 0x4000); // TODO - sub_0807C5F4((u16*)&gMapDataBottomSpecial, &gMapDataBottomSpecial[0x2000]); + sub_0807C5F4(gMapDataBottomSpecial, &gMapDataBottomSpecial[0x2000]); MemClear(&gMapDataBottomSpecial[0x2000], 0x4000); MemCopy(&gMapDataTopSpecial, &gMapDataTopSpecial[0x2000], 0x4000); - sub_0807C5F4((u16*)&gMapDataTopSpecial, (u16*)&gMapDataTopSpecial[0x2000]); + sub_0807C5F4(gMapDataTopSpecial, &gMapDataTopSpecial[0x2000]); MemClear(&gMapDataTopSpecial[0x2000], 0x4000); } - if (tmp || roomControls->area == 0x71) { + if (clearBottomMap || roomControls->area == AREA_PALACE_OF_WINDS_BOSS) { roomControls->scroll_flags |= 1; } switch (roomControls->area) { - case 0x20: - case 0x2d: + case AREA_MINISH_HOUSE_INTERIORS: + case AREA_TOWN_MINISH_HOLES: if (gMapBottom.bgSettings != NULL) { gMapBottom.bgSettings->control |= 0x80; } gScreen.lcd.displayControl &= 0xfdff; break; - case 0x21: - case 0x22: - case 0x23: - case 0x24: - case 0x25: - case 0x27: - case 0x28: - case 0x30: - case 0x38: + case AREA_HOUSE_INTERIORS_1: + case AREA_HOUSE_INTERIORS_2: + case AREA_HOUSE_INTERIORS_3: + case AREA_TREE_INTERIORS: + case AREA_DOJOS: + case AREA_MINISH_CRACKS: + case AREA_HOUSE_INTERIORS_4: + case AREA_WIND_TRIBE_TOWER: + case AREA_EZLO_CUTSCENE: if (gMapTop.bgSettings != NULL) { gMapTop.bgSettings->control = gUnk_080B77C0[2]; } @@ -3581,7 +3591,7 @@ void sub_0807C4F8(void) { ptr[0] = puVar1[0] & 0x7fffffff; ptr[1] = puVar1[1]; ptr[2] = puVar1[2]; - sub_080197D4(ptr); + LoadMapData((MapDataDefinition*)ptr); } } while ((s32)*puVar1 < 0); MemCopy(gMapDataBottomSpecial, gMapDataBottomSpecial + 0x2000, 0x4000); @@ -3620,55 +3630,55 @@ void sub_0807C5B0(void) { roomControls->scroll_flags |= 2; } -void sub_0807C5F4(u16* param_1, u16* param_2) { - s32 iVar1; - u16* puVar2; - u16* puVar3; - u32 uVar4; - u32 index; - u32 innerIndex; +// Copies parts over +// 0x20 * 0x20 chunk if gRoomControls.width <= 0xff +// more up to 0x40 * 0x40 if the room is bigger +void sub_0807C5F4(u16* dest, u16* src) { + s32 index1; + u32 index2; + u16* ptr; - puVar2 = param_1; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2 = *param_2; - param_2++; - puVar2++; + ptr = dest; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr = *src; + src++; + ptr++; } - puVar2 += 0x60; + ptr += 0x60; } if (gRoomControls.width > 0xff) { - puVar2 = param_1 + 0x20; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2 = *param_2; - param_2++; - puVar2++; + ptr = dest + 0x20; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr = *src; + src++; + ptr++; } - puVar2 += 0x60; + ptr += 0x60; } } if (gRoomControls.height > 0xff) { - puVar2 = param_1 + 0x1000; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2 = *param_2; - param_2++; - puVar2++; + ptr = dest + 0x1000; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr = *src; + src++; + ptr++; } - puVar2 += 0x60; + ptr += 0x60; } } if (gRoomControls.width > 0xff && gRoomControls.height > 0xff) { - param_1 += 0x1020; - puVar2 = param_1; + dest += 0x1020; + ptr = dest; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2++ = *param_2++; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr++ = *src++; } - puVar2 += 0x60; + ptr += 0x60; } } } diff --git a/src/roomInit.c b/src/roomInit.c index fe040744..6075e48d 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -118,7 +118,7 @@ u32 sub_unk3_ArmosInteriors_FortressOfWindsLeft(void) { void sub_StateChange_ArmosInteriors_FortressOfWindsLeft(void) { sub_08030118(9); gArea.dungeon_idx = 3; - gArea.areaMetadata = 0x4e; + gArea.areaMetadata = AR_HAS_NO_ENEMIES | AR_HAS_MAP | AR_IS_DUNGEON | AR_HAS_KEYS; } u32 sub_unk3_ArmosInteriors_FortressOfWindsRight(void) { @@ -128,7 +128,7 @@ u32 sub_unk3_ArmosInteriors_FortressOfWindsRight(void) { void sub_StateChange_ArmosInteriors_FortressOfWindsRight(void) { sub_08030118(10); gArea.dungeon_idx = 3; - gArea.areaMetadata = 0x4e; + gArea.areaMetadata = AR_HAS_NO_ENEMIES | AR_HAS_MAP | AR_IS_DUNGEON | AR_HAS_KEYS; } u32 sub_unk3_CrenelMinishPaths_CrenelBean(void) { @@ -1065,7 +1065,7 @@ u32 sub_unk3_RoyalValley_ForestMaze(void) { } void sub_StateChange_RoyalValley_ForestMaze(void) { - gArea.areaMetadata |= 0x40; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES; gArea.unk_0c_0 = 1; sub_0804C128(); } @@ -2341,7 +2341,7 @@ u32 sub_unk3_DeepwoodShrine_InsideBarrel(void) { void sub_StateChange_DeepwoodShrine_InsideBarrel(void) { sub_08058D34(); - gArea.areaMetadata |= 0x40; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES; gMain.substate = GAMEMAIN_BARRELUPDATE; } @@ -3681,7 +3681,7 @@ extern EntityData gUnk_080EAEC0; extern EntityData gUnk_080EAF20; void sub_StateChange_DarkHyruleCastleOutside_Garden(void) { - gArea.areaMetadata = 0x40; + gArea.areaMetadata = AR_HAS_NO_ENEMIES; gArea.locationIndex = 0; if (CheckGlobalFlag(ENDING)) { if (!CheckLocalFlag(0x7f)) { @@ -5131,7 +5131,7 @@ void sub_StateChange_VeilFallsDigCave_Main(void) { } u32 sub_unk3_OuterFortressOfWinds_EntranceHall(void) { - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5139,7 +5139,7 @@ void sub_StateChange_OuterFortressOfWinds_EntranceHall(void) { } u32 sub_unk3_OuterFortressOfWinds_2F(void) { - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5147,7 +5147,7 @@ void sub_StateChange_OuterFortressOfWinds_2F(void) { } u32 sub_unk3_OuterFortressOfWinds_3F(void) { - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5156,7 +5156,7 @@ void sub_StateChange_OuterFortressOfWinds_3F(void) { u32 sub_unk3_OuterFortressOfWinds_MoleMitts(void) { sub_0801DD58(0x58, 5); - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5165,7 +5165,7 @@ void sub_StateChange_OuterFortressOfWinds_MoleMitts(void) { u32 sub_unk3_OuterFortressOfWinds_SmallKey(void) { sub_0801DD58(0x58, 6); - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5549,7 +5549,7 @@ void sub_StateChange_WindTribeTowerRoof_Main(void) { } SetWorldMapPos(8, 0, 0x1e8, 0x158); #ifndef EU - gArea.areaMetadata |= 0x80; + gArea.areaMetadata |= AR_ALLOWS_WARP; #endif } diff --git a/src/scroll.c b/src/scroll.c index 0ae4b91c..9ff97e39 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,6 +1,7 @@ #include "scroll.h" #include "asm.h" +#include "beanstalkSubtask.h" #include "collision.h" #include "common.h" #include "effects.h" @@ -16,13 +17,12 @@ #include "structures.h" extern void sub_08080BC4(void); -extern void sub_080197D4(const void*); extern void sub_0807C8B0(u16*, u32, u32); -extern void sub_0801AB08(u8*, LayerStruct*); +extern void RenderTilemapToScreenblock(u8*, LayerStruct*); extern void sub_0807C810(); extern void DeleteSleepingEntities(void); extern void sub_0807BBE4(); -extern void sub_0807BC84(); +extern void CreateCollisionDataBorderAroundRoom(); extern void sub_0805E248(); extern u8 gUpdateVisibleTiles; @@ -52,9 +52,9 @@ void sub_08080198(RoomControls*); void sub_080801BC(RoomControls*); u32 sub_080803D0(); u32 sub_08080278(); -void sub_08080C80(u32*); +void sub_08080C80(MapDataDefinition*); void sub_08080368(); -void sub_08080B60(LayerStruct*); +void FillUnkData3ForLayer(LayerStruct*); bool32 sub_08080794(const Transition* transition, u32 param_2, u32 param_3, u32 param_4); bool32 sub_08080808(const Transition* transition, u32 param_2, u32 param_3, u32 param_4); void sub_080808D8(s32); @@ -301,9 +301,9 @@ void sub_0807FFE4(RoomControls* controls) { controls->scrollSubAction = 2; controls->unk_18 = sub_080803D0() + 6; gUnk_0200B640 = sub_08080278(); - sub_080197D4(*gUnk_08109194[gDiggingCaveEntranceTransition.entrance->type]); + LoadMapData((MapDataDefinition*)*gUnk_08109194[gDiggingCaveEntranceTransition.entrance->type]); sub_0807C8B0(gMapTop.mapData, controls->width >> 4, controls->height >> 4); - sub_0801AB08(gMapDataTopSpecial, &gMapTop); + RenderTilemapToScreenblock(gMapDataTopSpecial, &gMapTop); } void sub_08080040(RoomControls* controls) { @@ -342,7 +342,7 @@ void sub_08080040(RoomControls* controls) { controls->scrollSubAction = 3; DeleteSleepingEntities(); sub_0807C810(); - sub_08080C80(*(gUnk_08109194[gDiggingCaveEntranceTransition.entrance->type] + 1)); + sub_08080C80((MapDataDefinition*)*(gUnk_08109194[gDiggingCaveEntranceTransition.entrance->type] + 1)); } else { gUpdateVisibleTiles = 4; } @@ -355,13 +355,13 @@ void sub_08080108(RoomControls* controls) { sub_08080368(); gUnk_02034480.unk_00 = gUnk_0200B640; MemCopy(gUnk_02022830, gUnk_020246B0, 0x1800); - sub_08080B60(&gMapBottom); - sub_08080B60(&gMapTop); + FillUnkData3ForLayer(&gMapBottom); + FillUnkData3ForLayer(&gMapTop); sub_0807BBE4(); - sub_0807BC84(); + CreateCollisionDataBorderAroundRoom(); sub_0805E248(); - sub_0801AB08((u8*)&gMapDataBottomSpecial, &gMapBottom); - sub_0801AB08(gMapDataTopSpecial, &gMapTop); + RenderTilemapToScreenblock((u8*)&gMapDataBottomSpecial, &gMapBottom); + RenderTilemapToScreenblock(gMapDataTopSpecial, &gMapTop); } void sub_08080198(RoomControls* controls) { @@ -433,7 +433,7 @@ void sub_08080368(void) { tmp = gUnk_02034480.unk_00 << 1; index = 0; while (index < tmp) { - sub_0807B9B8(ptr[1], ptr[0] & 0xfff, (ptr[0] >> 0xe)); + SetMetaTileByIndex(ptr[1], ptr[0] & 0xfff, (ptr[0] >> 0xe)); ptr += 2; index += 2; } @@ -637,8 +637,8 @@ void sub_08080930(u32 unused) { SetInitializationPriority(); } -LayerStruct* GetLayerByIndex(u32 param_1) { - if (param_1 == 2) { +LayerStruct* GetLayerByIndex(u32 layerIndex) { + if (layerIndex == 2) { return &gMapTop; } else { return &gMapBottom; @@ -755,18 +755,19 @@ void UpdateDoorTransition() { } } -void sub_08080B60(LayerStruct* layer) { +// fill the unkData3 for the whole layer +void FillUnkData3ForLayer(LayerStruct* layer) { u32 index; u16* metatileTypes = layer->metatileTypes; const u8* ptr = gUnk_080B37A0; u8* ptr3 = layer->unkData3; u16* mapData = layer->mapData; for (index = 0; index < 0x1000; index++) { - u16 val = mapData[index]; - if (val < 0x4000) { - layer->unkData3[index] = ptr[metatileTypes[val]]; + u16 metaTileIndex = mapData[index]; + if (metaTileIndex < 0x4000) { + layer->unkData3[index] = ptr[metatileTypes[metaTileIndex]]; } else { - layer->unkData3[index] = gUnk_080B7910[val - 0x4000]; + layer->unkData3[index] = gUnk_080B7910[metaTileIndex - 0x4000]; } } } @@ -805,8 +806,8 @@ void sub_08080BC4(void) { } } -void sub_08080C80(u32* param_1) { - sub_080197D4(param_1); +void sub_08080C80(MapDataDefinition* param_1) { + LoadMapData(param_1); sub_0807C8B0(gMapBottom.mapData, gRoomControls.width >> 4, gRoomControls.height >> 4); sub_0807C8B0(gMapTop.mapData, gRoomControls.width >> 4, gRoomControls.height >> 4); } diff --git a/src/subtask.c b/src/subtask.c index 054d0c05..7c8d5385 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -151,7 +151,7 @@ void MenuFadeIn(u32 param_1, u32 param_2) { gUI.field_0x5 = param_2; gUI.nextToLoad = 1; // Subtask_Init } - gUI.field_0x6 = 0; + gUI.loadGfxOnRestore = FALSE; gUI.fadeType = -1; gUI.fadeInTime = 0x20; gMain.substate = GAMEMAIN_SUBTASK; @@ -256,7 +256,7 @@ void Subtask_FadeOut(void) { MemCopy(&gUnk_03001020, &gScreen, sizeof(Screen)); gArea.localFlagOffset = GetFlagBankOffset(gRoomControls.area); gArea.pCurrentRoomInfo = GetCurrentRoomInfo(); - RestoreGameTask(gUI.field_0x6); + RestoreGameTask(gUI.loadGfxOnRestore); sub_0801D000(gUI.unk_d != 0); sub_080A74F4(); if (gUI.fadeType != 0xffff) { diff --git a/tools/src/asset_processor/assets/asset.h b/tools/src/asset_processor/assets/asset.h index f34485a2..1b29c03c 100644 --- a/tools/src/asset_processor/assets/asset.h +++ b/tools/src/asset_processor/assets/asset.h @@ -49,7 +49,7 @@ class BaseAsset { } // Returns the base of the filename of the asset. - [[nodiscard]] std::string getSymbol() const { + [[nodiscard]] virtual std::string getSymbol() const { // Need to get the stem twice to remove both of the .4bpp.lz extensions. return (path.stem()).stem(); } diff --git a/tools/src/asset_processor/assets/dungeonmap.cpp b/tools/src/asset_processor/assets/dungeonmap.cpp new file mode 100644 index 00000000..c01db47e --- /dev/null +++ b/tools/src/asset_processor/assets/dungeonmap.cpp @@ -0,0 +1,108 @@ +#include "dungeonmap.h" +#include "util.h" +#include <fmt/format.h> +#include <fstream> +#include <nlohmann/json.hpp> +#include <util/file.h> + +std::filesystem::path DungeonMapAsset::generateAssetPath() { + std::filesystem::path txtPath = path; + txtPath.replace_extension(".txt"); + return txtPath; +} + +void DungeonMapAsset::convertToHumanReadable(const std::vector<char>& baserom) { + (void)baserom; + const char characters[] = {' ', '#', '.', '-'}; + + std::ifstream file(path.string(), std::ios::binary | std::ios::ate); + auto fileSize = file.tellg(); + file.seekg(0, std::ios::beg); + + std::vector<char> data(static_cast<size_t>(fileSize)); + if (!file.read(data.data(), fileSize)) { + fmt::print(stderr, "Can not read dungeon map {}\n", path.string()); + std::exit(1); + } + file.close(); + + auto output_file = util::open_file(assetPath, "w"); + + size_t width = asset["options"]["width"]; + width *= 4; + size_t height = asset["options"]["height"]; + size_t bytesPerRow = (width + 3) / 4; + + for (size_t y = 0; y < height; y++) { + for (size_t x = 0; x < width; x +=4) { + size_t offset = y * bytesPerRow + x / 4; + char byte = data[offset]; + for (size_t i = 0; i < 4; i++) { + int color = (byte >> (6 - i*2)) & 3; + std::fputc(characters[color], output_file.get()); + } + } + std::fputc('\n', output_file.get()); + } +} + +void DungeonMapAsset::buildToBinary() { + std::ifstream file(assetPath.string(), std::ios::binary | std::ios::ate); + auto fileSize = file.tellg(); + file.seekg(0, std::ios::beg); + + std::vector<char> data(static_cast<size_t>(fileSize)); + if (!file.read(data.data(), fileSize)) { + fmt::print(stderr, "Can not read dungeon map {}\n", assetPath.string()); + std::exit(1); + } + file.close(); + + auto output_file = util::open_file(buildPath, "w"); + char byte = 0; + size_t pixels = 0; + for (size_t i = 0; i < static_cast<size_t>(fileSize); i++) { + switch (data[i]) { + case '\n': + continue; + case ' ': + byte <<= 2; + pixels++; + break; + case '#': + byte <<= 2; + byte |= 1; + pixels++; + break; + case '.': + byte <<= 2; + byte |= 2; + pixels++; + break; + case '-': + byte <<= 2; + byte |= 3; + pixels++; + break; + default: + fmt::print(stderr, "Unexpected character {}\n", data[i]); + std::exit(1); + break; + } + + if (pixels % 4 == 0) { + std::fputc(byte, output_file.get()); + byte = 0; + } + } + + // Pad to two bytes. + while ((pixels / 4) % 4 != 0) { + std::fputc(0, output_file.get()); + pixels += 4; + } +} + +std::string DungeonMapAsset::getSymbol() const { + return asset["name"]; +}
\ No newline at end of file diff --git a/tools/src/asset_processor/assets/dungeonmap.h b/tools/src/asset_processor/assets/dungeonmap.h new file mode 100644 index 00000000..1c669636 --- /dev/null +++ b/tools/src/asset_processor/assets/dungeonmap.h @@ -0,0 +1,17 @@ +#ifndef DUNGEONMAP_H +#define DUNGEONMAP_H + +#include "asset.h" + +class DungeonMapAsset : public BaseAsset { + public: + using BaseAsset::BaseAsset; + virtual void convertToHumanReadable(const std::vector<char>& baserom); + virtual void buildToBinary(); + virtual std::string getSymbol() const; + + private: + virtual std::filesystem::path generateAssetPath(); +}; + +#endif // DUNGEONMAP_H diff --git a/tools/src/asset_processor/assets/gfx.cpp b/tools/src/asset_processor/assets/gfx.cpp index ef656e25..ffceefc0 100644 --- a/tools/src/asset_processor/assets/gfx.cpp +++ b/tools/src/asset_processor/assets/gfx.cpp @@ -56,6 +56,7 @@ void GfxAsset::buildToBinary() { check_call(cmd); if (isCompressed()) { + cmd.clear(); // Compress. cmd.push_back(toolsPath / "bin" / "gbagfx"); cmd.push_back(decompressedPath); diff --git a/tools/src/asset_processor/assets/tileset.cpp b/tools/src/asset_processor/assets/tileset.cpp index 56a9bb72..84321b80 100644 --- a/tools/src/asset_processor/assets/tileset.cpp +++ b/tools/src/asset_processor/assets/tileset.cpp @@ -53,6 +53,7 @@ void TilesetAsset::buildToBinary() { if (isCompressed()) { // Compress. + cmd.clear(); cmd.push_back(toolsPath / "bin" / "gbagfx"); cmd.push_back(decompressedPath); cmd.push_back(path); diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index 195c6939..67e1158d 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -1,6 +1,7 @@ #include "main.h" #include "assets/aif.h" #include "assets/animation.h" +#include "assets/dungeonmap.h" #include "assets/frameobjlists.h" #include "assets/gfx.h" #include "assets/map.h" @@ -284,6 +285,8 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa type == "map_mapping1" || type == "map_mapping2" || type == "tileset_mapping3" || type == "map_collision") { assetHandler = std::make_unique<MapAsset>(path, start, size, asset); + } else if (type == "dungeon_map") { + assetHandler = std::make_unique<DungeonMapAsset>(path, start, size, asset); } else if (type == "unknown") { // TODO implement conversions assetHandler = std::make_unique<BaseAsset>(path, start, size, asset); @@ -291,7 +294,7 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa // Unknown binary asset assetHandler = std::make_unique<BaseAsset>(path, start, size, asset); } else { - fmt::print(stderr, "Error: Unimplemented asset type \"{}\"", type); + fmt::print(stderr, "Error: Unimplemented asset type \"{}\"\n", type); std::exit(1); } assetHandler->setup(); |