Split map data into folders

4 files changed, 4592 insertions, 4592 deletions

diff --git a/data/map/map_data.s b/data/map/map_data.s
index 8ff8f837..932fe303 100644
--- a/data/map/map_data.s
+++ b/data/map/map_data.s
@@ -10,3681 +10,3681 @@ gMapData:: @ 08324AE4
 gAreaRoomMap_None::
 	.incbin "assets/gAreaRoomMap_None.bin.lz"
 gAreaTileset_MinishWoods_0_0::
-	.incbin "tilesets/gAreaTileset_MinishWoods_0_0.4bpp.lz"
+	.incbin "maps/areas/000_MinishWoods/tilesets/0/gAreaTileset_MinishWoods_0_0.4bpp.lz"
 gAreaTileset_MinishWoods_0_1::
-	.incbin "tilesets/gAreaTileset_MinishWoods_0_1.4bpp.lz"
+	.incbin "maps/areas/000_MinishWoods/tilesets/0/gAreaTileset_MinishWoods_0_1.4bpp.lz"
 gAreaTileset_MinishWoods_0_2::
-	.incbin "tilesets/gAreaTileset_MinishWoods_0_2.4bpp.lz"
-gAreaMetatiles_MinishWoods_0::
-	.incbin "assets/gAreaMetatiles_MinishWoods_0.bin.lz"
-gAreaMetatiles_MinishWoods_1::
-	.incbin "assets/gAreaMetatiles_MinishWoods_1.bin.lz"
-gAreaMetatiles_MinishWoods_2::
-	.incbin "assets/gAreaMetatiles_MinishWoods_2.bin.lz"
-gAreaMetatiles_MinishWoods_3::
-	.incbin "assets/gAreaMetatiles_MinishWoods_3.bin.lz"
-gAreaRoomMap_MinishWoods_0_0::
-	.incbin "assets/gAreaRoomMap_MinishWoods_0_0.bin.lz"
-gAreaRoomMap_MinishWoods_0_1::
-	.incbin "assets/gAreaRoomMap_MinishWoods_0_1.bin.lz"
+	.incbin "maps/areas/000_MinishWoods/tilesets/0/gAreaTileset_MinishWoods_0_2.4bpp.lz"
+gAreaMetaTileset_MinishWoods_bottom::
+	.incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTileset_MinishWoods_bottom.bin.lz"
+gAreaMetaTileset_MinishWoods_top::
+	.incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTileset_MinishWoods_top.bin.lz"
+gAreaMetaTilesetTypes_MinishWoods_bottom::
+	.incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTilesetTypes_MinishWoods_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishWoods_top::
+	.incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTilesetTypes_MinishWoods_top.bin.lz"
+gAreaRoomMap_MinishWoods_Main_bottom::
+	.incbin "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_bottom.bin.lz"
+gAreaRoomMap_MinishWoods_Main_top::
+	.incbin "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_top.bin.lz"
 unknown_0::
 	.incbin "assets/unknown_0.bin"
-gAreaTileset_HyliaDigCaves_0_0::
-	.incbin "tilesets/gAreaTileset_HyliaDigCaves_0_0.4bpp.lz"
-gAreaTileset_HyliaDigCaves_0_1::
-	.incbin "tilesets/gAreaTileset_HyliaDigCaves_0_1.4bpp.lz"
-gAreaTileset_HyliaDigCaves_0_2::
-	.incbin "tilesets/gAreaTileset_HyliaDigCaves_0_2.4bpp.lz"
-gAreaMetatiles_LakeHylia_0::
-	.incbin "assets/gAreaMetatiles_LakeHylia_0.bin.lz"
-gAreaMetatiles_LakeHylia_1::
-	.incbin "assets/gAreaMetatiles_LakeHylia_1.bin.lz"
-gAreaMetatiles_LakeHylia_2::
-	.incbin "assets/gAreaMetatiles_LakeHylia_2.bin.lz"
-gAreaMetatiles_LakeHylia_3::
-	.incbin "assets/gAreaMetatiles_LakeHylia_3.bin.lz"
-gAreaRoomMap_LakeHylia_0_0::
-	.incbin "assets/gAreaRoomMap_LakeHylia_0_0.bin.lz"
-gAreaRoomMap_LakeHylia_0_1::
-	.incbin "assets/gAreaRoomMap_LakeHylia_0_1.bin.lz"
+gAreaTileset_LakeHylia_0_0::
+	.incbin "maps/areas/011_LakeHylia/tilesets/0/gAreaTileset_LakeHylia_0_0.4bpp.lz"
+gAreaTileset_LakeHylia_0_1::
+	.incbin "maps/areas/011_LakeHylia/tilesets/0/gAreaTileset_LakeHylia_0_1.4bpp.lz"
+gAreaTileset_LakeHylia_0_2::
+	.incbin "maps/areas/011_LakeHylia/tilesets/0/gAreaTileset_LakeHylia_0_2.4bpp.lz"
+gAreaMetaTileset_LakeHylia_bottom::
+	.incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTileset_LakeHylia_bottom.bin.lz"
+gAreaMetaTileset_LakeHylia_top::
+	.incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTileset_LakeHylia_top.bin.lz"
+gAreaMetaTilesetTypes_LakeHylia_bottom::
+	.incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTilesetTypes_LakeHylia_bottom.bin.lz"
+gAreaMetaTilesetTypes_LakeHylia_top::
+	.incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTilesetTypes_LakeHylia_top.bin.lz"
+gAreaRoomMap_LakeHylia_Main_bottom::
+	.incbin "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_bottom.bin.lz"
+gAreaRoomMap_LakeHylia_Main_top::
+	.incbin "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_top.bin.lz"
 unknown_1::
 	.incbin "assets/unknown_1.bin"
-gAreaRoomMap_LakeHylia_1_0::
-	.incbin "assets/gAreaRoomMap_LakeHylia_1_0.bin.lz"
-gAreaRoomMap_LakeHylia_1_1::
-	.incbin "assets/gAreaRoomMap_LakeHylia_1_1.bin.lz"
-gAreaTileset_OuterFortressOfWinds_0_0::
-	.incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_0.4bpp.lz"
-gAreaTileset_OuterFortressOfWinds_0_1::
-	.incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_1.4bpp.lz"
-gAreaTileset_OuterFortressOfWinds_0_2::
-	.incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_2.4bpp.lz"
-gAreaMetatiles_CastorWilds_0::
-	.incbin "assets/gAreaMetatiles_CastorWilds_0.bin.lz"
-gAreaMetatiles_CastorWilds_1::
-	.incbin "assets/gAreaMetatiles_CastorWilds_1.bin.lz"
-gAreaMetatiles_CastorWilds_2::
-	.incbin "assets/gAreaMetatiles_CastorWilds_2.bin.lz"
-gAreaMetatiles_CastorWilds_3::
-	.incbin "assets/gAreaMetatiles_CastorWilds_3.bin.lz"
-gAreaRoomMap_CastorWilds_0_0::
-	.incbin "assets/gAreaRoomMap_CastorWilds_0_0.bin.lz"
-gAreaRoomMap_CastorWilds_0_1::
-	.incbin "assets/gAreaRoomMap_CastorWilds_0_1.bin.lz"
+gAreaRoomMap_LakeHylia_Beanstalk_bottom::
+	.incbin "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_bottom.bin.lz"
+gAreaRoomMap_LakeHylia_Beanstalk_top::
+	.incbin "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_top.bin.lz"
+gAreaTileset_CastorWilds_0_0::
+	.incbin "maps/areas/004_CastorWilds/tilesets/0/gAreaTileset_CastorWilds_0_0.4bpp.lz"
+gAreaTileset_CastorWilds_0_1::
+	.incbin "maps/areas/004_CastorWilds/tilesets/0/gAreaTileset_CastorWilds_0_1.4bpp.lz"
+gAreaTileset_CastorWilds_0_2::
+	.incbin "maps/areas/004_CastorWilds/tilesets/0/gAreaTileset_CastorWilds_0_2.4bpp.lz"
+gAreaMetaTileset_CastorWilds_bottom::
+	.incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTileset_CastorWilds_bottom.bin.lz"
+gAreaMetaTileset_CastorWilds_top::
+	.incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTileset_CastorWilds_top.bin.lz"
+gAreaMetaTilesetTypes_CastorWilds_bottom::
+	.incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTilesetTypes_CastorWilds_bottom.bin.lz"
+gAreaMetaTilesetTypes_CastorWilds_top::
+	.incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTilesetTypes_CastorWilds_top.bin.lz"
+gAreaRoomMap_CastorWilds_Main_bottom::
+	.incbin "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_bottom.bin.lz"
+gAreaRoomMap_CastorWilds_Main_top::
+	.incbin "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_top.bin.lz"
 unknown_2::
 	.incbin "assets/unknown_2.bin"
-gAreaRoomMap_Ruins_0_0::
-	.incbin "assets/gAreaRoomMap_Ruins_0_0.bin.lz"
-gAreaRoomMap_Ruins_0_1::
-	.incbin "assets/gAreaRoomMap_Ruins_0_1.bin.lz"
-gAreaRoomMap_Ruins_1_0::
-	.incbin "assets/gAreaRoomMap_Ruins_1_0.bin.lz"
-gAreaRoomMap_Ruins_1_1::
-	.incbin "assets/gAreaRoomMap_Ruins_1_1.bin.lz"
-gAreaRoomMap_Ruins_2_0::
-	.incbin "assets/gAreaRoomMap_Ruins_2_0.bin.lz"
-gAreaRoomMap_Ruins_2_1::
-	.incbin "assets/gAreaRoomMap_Ruins_2_1.bin.lz"
-gAreaRoomMap_Ruins_3_0::
-	.incbin "assets/gAreaRoomMap_Ruins_3_0.bin.lz"
-gAreaRoomMap_Ruins_3_1::
-	.incbin "assets/gAreaRoomMap_Ruins_3_1.bin.lz"
-gAreaRoomMap_Ruins_4_0::
-	.incbin "assets/gAreaRoomMap_Ruins_4_0.bin.lz"
-gAreaRoomMap_Ruins_4_1::
-	.incbin "assets/gAreaRoomMap_Ruins_4_1.bin.lz"
-gAreaRoomMap_Ruins_5_0::
-	.incbin "assets/gAreaRoomMap_Ruins_5_0.bin.lz"
-gAreaRoomMap_Ruins_5_1::
-	.incbin "assets/gAreaRoomMap_Ruins_5_1.bin.lz"
+gAreaRoomMap_Ruins_Entrance_bottom::
+	.incbin "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_bottom.bin.lz"
+gAreaRoomMap_Ruins_Entrance_top::
+	.incbin "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_top.bin.lz"
+gAreaRoomMap_Ruins_Beanstalk_bottom::
+	.incbin "maps/areas/005_Ruins/rooms/01_Beanstalk/gAreaRoomMap_Ruins_Beanstalk_bottom.bin.lz"
+gAreaRoomMap_Ruins_Beanstalk_top::
+	.incbin "maps/areas/005_Ruins/rooms/01_Beanstalk/gAreaRoomMap_Ruins_Beanstalk_top.bin.lz"
+gAreaRoomMap_Ruins_Tektites_bottom::
+	.incbin "maps/areas/005_Ruins/rooms/02_Tektites/gAreaRoomMap_Ruins_Tektites_bottom.bin.lz"
+gAreaRoomMap_Ruins_Tektites_top::
+	.incbin "maps/areas/005_Ruins/rooms/02_Tektites/gAreaRoomMap_Ruins_Tektites_top.bin.lz"
+gAreaRoomMap_Ruins_LadderToTektites_bottom::
+	.incbin "maps/areas/005_Ruins/rooms/03_LadderToTektites/gAreaRoomMap_Ruins_LadderToTektites_bottom.bin.lz"
+gAreaRoomMap_Ruins_LadderToTektites_top::
+	.incbin "maps/areas/005_Ruins/rooms/03_LadderToTektites/gAreaRoomMap_Ruins_LadderToTektites_top.bin.lz"
+gAreaRoomMap_Ruins_FortressEntrance_bottom::
+	.incbin "maps/areas/005_Ruins/rooms/04_FortressEntrance/gAreaRoomMap_Ruins_FortressEntrance_bottom.bin.lz"
+gAreaRoomMap_Ruins_FortressEntrance_top::
+	.incbin "maps/areas/005_Ruins/rooms/04_FortressEntrance/gAreaRoomMap_Ruins_FortressEntrance_top.bin.lz"
+gAreaRoomMap_Ruins_BelowFortressEntrance_bottom::
+	.incbin "maps/areas/005_Ruins/rooms/05_BelowFortressEntrance/gAreaRoomMap_Ruins_BelowFortressEntrance_bottom.bin.lz"
+gAreaRoomMap_Ruins_BelowFortressEntrance_top::
+	.incbin "maps/areas/005_Ruins/rooms/05_BelowFortressEntrance/gAreaRoomMap_Ruins_BelowFortressEntrance_top.bin.lz"
 unknown_3::
 	.incbin "assets/unknown_3.bin"
-gAreaMetatiles_HyruleTown_0::
-	.incbin "assets/gAreaMetatiles_HyruleTown_0.bin.lz"
-gAreaMetatiles_HyruleTown_1::
-	.incbin "assets/gAreaMetatiles_HyruleTown_1.bin.lz"
-gAreaMetatiles_HyruleTown_2::
-	.incbin "assets/gAreaMetatiles_HyruleTown_2.bin.lz"
-gAreaMetatiles_HyruleTown_3::
-	.incbin "assets/gAreaMetatiles_HyruleTown_3.bin.lz"
-gAreaTileset_HyruleDigCaves_0_0::
-	.incbin "tilesets/gAreaTileset_HyruleDigCaves_0_0.4bpp.lz"
-gAreaTileset_HyruleDigCaves_0_1::
-	.incbin "tilesets/gAreaTileset_HyruleDigCaves_0_1.4bpp.lz"
-gAreaTileset_HyruleDigCaves_0_2::
-	.incbin "tilesets/gAreaTileset_HyruleDigCaves_0_2.4bpp.lz"
+gAreaMetaTileset_HyruleTown_bottom::
+	.incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTileset_HyruleTown_bottom.bin.lz"
+gAreaMetaTileset_HyruleTown_top::
+	.incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTileset_HyruleTown_top.bin.lz"
+gAreaMetaTilesetTypes_HyruleTown_bottom::
+	.incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTilesetTypes_HyruleTown_bottom.bin.lz"
+gAreaMetaTilesetTypes_HyruleTown_top::
+	.incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTilesetTypes_HyruleTown_top.bin.lz"
+gAreaTileset_HyruleTown_0_0::
+	.incbin "maps/areas/002_HyruleTown/tilesets/0/gAreaTileset_HyruleTown_0_0.4bpp.lz"
+gAreaTileset_HyruleTown_0_1::
+	.incbin "maps/areas/002_HyruleTown/tilesets/0/gAreaTileset_HyruleTown_0_1.4bpp.lz"
+gAreaTileset_HyruleTown_0_2::
+	.incbin "maps/areas/002_HyruleTown/tilesets/0/gAreaTileset_HyruleTown_0_2.4bpp.lz"
 gAreaTileset_FestivalTown_0_0::
-	.incbin "tilesets/gAreaTileset_FestivalTown_0_0.4bpp.lz"
+	.incbin "maps/areas/021_FestivalTown/tilesets/0/gAreaTileset_FestivalTown_0_0.4bpp.lz"
 gAreaTileset_FestivalTown_0_1::
-	.incbin "tilesets/gAreaTileset_FestivalTown_0_1.4bpp.lz"
+	.incbin "maps/areas/021_FestivalTown/tilesets/0/gAreaTileset_FestivalTown_0_1.4bpp.lz"
 gAreaTileset_FestivalTown_0_2::
-	.incbin "tilesets/gAreaTileset_FestivalTown_0_2.4bpp.lz"
-gAreaRoomMap_HyruleTown_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleTown_0_0.bin.lz"
-gAreaRoomMap_HyruleTown_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleTown_0_1.bin.lz"
+	.incbin "maps/areas/021_FestivalTown/tilesets/0/gAreaTileset_FestivalTown_0_2.4bpp.lz"
+gAreaRoomMap_HyruleTown_Main_bottom::
+	.incbin "maps/areas/002_HyruleTown/rooms/00_Main/gAreaRoomMap_HyruleTown_Main_bottom.bin.lz"
+gAreaRoomMap_HyruleTown_Main_top::
+	.incbin "maps/areas/002_HyruleTown/rooms/00_Main/gAreaRoomMap_HyruleTown_Main_top.bin.lz"
 unknown_4::
 	.incbin "assets/unknown_4.bin"
-gAreaRoomMap_FestivalTown_0_0::
-	.incbin "assets/gAreaRoomMap_FestivalTown_0_0.bin.lz"
-gAreaRoomMap_FestivalTown_0_1::
-	.incbin "assets/gAreaRoomMap_FestivalTown_0_1.bin.lz"
-gAreaTileset_CrenelDigCave_0_0::
-	.incbin "tilesets/gAreaTileset_CrenelDigCave_0_0.4bpp.lz"
-gAreaTileset_CrenelDigCave_0_1::
-	.incbin "tilesets/gAreaTileset_CrenelDigCave_0_1.4bpp.lz"
-gAreaTileset_CrenelDigCave_0_2::
-	.incbin "tilesets/gAreaTileset_CrenelDigCave_0_2.4bpp.lz"
-gAreaMetatiles_MtCrenel_0::
-	.incbin "assets/gAreaMetatiles_MtCrenel_0.bin.lz"
-gAreaMetatiles_MtCrenel_1::
-	.incbin "assets/gAreaMetatiles_MtCrenel_1.bin.lz"
-gAreaMetatiles_MtCrenel_2::
-	.incbin "assets/gAreaMetatiles_MtCrenel_2.bin.lz"
-gAreaMetatiles_MtCrenel_3::
-	.incbin "assets/gAreaMetatiles_MtCrenel_3.bin.lz"
-gAreaRoomMap_MtCrenel_0_0::
-	.incbin "assets/gAreaRoomMap_MtCrenel_0_0.bin.lz"
-gAreaRoomMap_MtCrenel_0_1::
-	.incbin "assets/gAreaRoomMap_MtCrenel_0_1.bin.lz"
-gAreaRoomMap_MtCrenel_1_0::
-	.incbin "assets/gAreaRoomMap_MtCrenel_1_0.bin.lz"
-gAreaRoomMap_MtCrenel_1_1::
-	.incbin "assets/gAreaRoomMap_MtCrenel_1_1.bin.lz"
+gAreaRoomMap_FestivalTown_Main_bottom::
+	.incbin "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_bottom.bin.lz"
+gAreaRoomMap_FestivalTown_Main_top::
+	.incbin "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_top.bin.lz"
+gAreaTileset_MtCrenel_0_0::
+	.incbin "maps/areas/006_MtCrenel/tilesets/0/gAreaTileset_MtCrenel_0_0.4bpp.lz"
+gAreaTileset_MtCrenel_0_1::
+	.incbin "maps/areas/006_MtCrenel/tilesets/0/gAreaTileset_MtCrenel_0_1.4bpp.lz"
+gAreaTileset_MtCrenel_0_2::
+	.incbin "maps/areas/006_MtCrenel/tilesets/0/gAreaTileset_MtCrenel_0_2.4bpp.lz"
+gAreaMetaTileset_MtCrenel_bottom::
+	.incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTileset_MtCrenel_bottom.bin.lz"
+gAreaMetaTileset_MtCrenel_top::
+	.incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTileset_MtCrenel_top.bin.lz"
+gAreaMetaTilesetTypes_MtCrenel_bottom::
+	.incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTilesetTypes_MtCrenel_bottom.bin.lz"
+gAreaMetaTilesetTypes_MtCrenel_top::
+	.incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTilesetTypes_MtCrenel_top.bin.lz"
+gAreaRoomMap_MtCrenel_Top_bottom::
+	.incbin "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_bottom.bin.lz"
+gAreaRoomMap_MtCrenel_Top_top::
+	.incbin "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_top.bin.lz"
+gAreaRoomMap_MtCrenel_WallClimb_bottom::
+	.incbin "maps/areas/006_MtCrenel/rooms/01_WallClimb/gAreaRoomMap_MtCrenel_WallClimb_bottom.bin.lz"
+gAreaRoomMap_MtCrenel_WallClimb_top::
+	.incbin "maps/areas/006_MtCrenel/rooms/01_WallClimb/gAreaRoomMap_MtCrenel_WallClimb_top.bin.lz"
 unknown_5::
 	.incbin "assets/unknown_5.bin"
-gAreaRoomMap_MtCrenel_2_0::
-	.incbin "assets/gAreaRoomMap_MtCrenel_2_0.bin.lz"
-gAreaRoomMap_MtCrenel_2_1::
-	.incbin "assets/gAreaRoomMap_MtCrenel_2_1.bin.lz"
-gAreaRoomMap_MtCrenel_3_0::
-	.incbin "assets/gAreaRoomMap_MtCrenel_3_0.bin.lz"
-gAreaRoomMap_MtCrenel_3_1::
-	.incbin "assets/gAreaRoomMap_MtCrenel_3_1.bin.lz"
-gAreaRoomMap_MtCrenel_4_0::
-	.incbin "assets/gAreaRoomMap_MtCrenel_4_0.bin.lz"
-gAreaRoomMap_MtCrenel_4_1::
-	.incbin "assets/gAreaRoomMap_MtCrenel_4_1.bin.lz"
-gAreaTileset_HyruleField_7_0::
-	.incbin "tilesets/gAreaTileset_HyruleField_7_0.4bpp.lz"
-gAreaTileset_DigCaves1_0_1::
-	.incbin "tilesets/gAreaTileset_DigCaves1_0_1.4bpp.lz"
-gAreaTileset_HyruleField_7_1::
-	.incbin "tilesets/gAreaTileset_HyruleField_7_1.4bpp.lz"
-gAreaTileset_HyruleField_6_0::
-	.incbin "tilesets/gAreaTileset_HyruleField_6_0.4bpp.lz"
+gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom::
+	.incbin "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom.bin.lz"
+gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top::
+	.incbin "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top.bin.lz"
+gAreaRoomMap_MtCrenel_Center_bottom::
+	.incbin "maps/areas/006_MtCrenel/rooms/03_Center/gAreaRoomMap_MtCrenel_Center_bottom.bin.lz"
+gAreaRoomMap_MtCrenel_Center_top::
+	.incbin "maps/areas/006_MtCrenel/rooms/03_Center/gAreaRoomMap_MtCrenel_Center_top.bin.lz"
+gAreaRoomMap_MtCrenel_Entrance_bottom::
+	.incbin "maps/areas/006_MtCrenel/rooms/04_Entrance/gAreaRoomMap_MtCrenel_Entrance_bottom.bin.lz"
+gAreaRoomMap_MtCrenel_Entrance_top::
+	.incbin "maps/areas/006_MtCrenel/rooms/04_Entrance/gAreaRoomMap_MtCrenel_Entrance_top.bin.lz"
+gAreaTileset_HyruleField_0_0::
+	.incbin "maps/areas/003_HyruleField/tilesets/0/gAreaTileset_HyruleField_0_0.4bpp.lz"
+gAreaTileset_HyruleField_0_1::
+	.incbin "maps/areas/003_HyruleField/tilesets/0/gAreaTileset_HyruleField_0_1.4bpp.lz"
+gAreaTileset_HyruleField_0_2::
+	.incbin "maps/areas/003_HyruleField/tilesets/0/gAreaTileset_HyruleField_0_2.4bpp.lz"
+gAreaTileset_HyruleField_2_0::
+	.incbin "maps/areas/003_HyruleField/tilesets/2/gAreaTileset_HyruleField_2_0.4bpp.lz"
 gAreaTileset_HyruleField_2_1::
-	.incbin "tilesets/gAreaTileset_HyruleField_2_1.4bpp.lz"
-gAreaTileset_HyruleField_6_1::
-	.incbin "tilesets/gAreaTileset_HyruleField_6_1.4bpp.lz"
-gAreaTileset_HyruleField_5_0::
-	.incbin "tilesets/gAreaTileset_HyruleField_5_0.4bpp.lz"
+	.incbin "maps/areas/003_HyruleField/tilesets/2/gAreaTileset_HyruleField_2_1.4bpp.lz"
+gAreaTileset_HyruleField_2_2::
+	.incbin "maps/areas/003_HyruleField/tilesets/2/gAreaTileset_HyruleField_2_2.4bpp.lz"
+gAreaTileset_HyruleField_1_0::
+	.incbin "maps/areas/003_HyruleField/tilesets/1/gAreaTileset_HyruleField_1_0.4bpp.lz"
 gAreaTileset_HyruleField_1_1::
-	.incbin "tilesets/gAreaTileset_HyruleField_1_1.4bpp.lz"
-gAreaTileset_HyruleField_5_1::
-	.incbin "tilesets/gAreaTileset_HyruleField_5_1.4bpp.lz"
-gAreaMetatiles_HyruleField_0::
-	.incbin "assets/gAreaMetatiles_HyruleField_0.bin.lz"
-gAreaMetatiles_HyruleField_1::
-	.incbin "assets/gAreaMetatiles_HyruleField_1.bin.lz"
-gAreaMetatiles_HyruleField_2::
-	.incbin "assets/gAreaMetatiles_HyruleField_2.bin.lz"
-gAreaMetatiles_HyruleField_3::
-	.incbin "assets/gAreaMetatiles_HyruleField_3.bin.lz"
-gAreaTileset_HyruleField_2_3::
-	.incbin "tilesets/gAreaTileset_HyruleField_2_3.bin.lz"
-gAreaRoomMap_HyruleField_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleField_0_0.bin.lz"
-gAreaRoomMap_HyruleField_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleField_0_1.bin.lz"
-gAreaRoomMap_HyruleField_1_3::
-	.incbin "assets/gAreaRoomMap_HyruleField_1_3.bin.lz"
-gAreaRoomMap_HyruleField_1_4::
-	.incbin "assets/gAreaRoomMap_HyruleField_1_4.bin.lz"
-gAreaRoomMap_HyruleField_2_0::
-	.incbin "assets/gAreaRoomMap_HyruleField_2_0.bin.lz"
-gAreaRoomMap_HyruleField_2_1::
-	.incbin "assets/gAreaRoomMap_HyruleField_2_1.bin.lz"
-gAreaRoomMap_HyruleField_3_3::
-	.incbin "assets/gAreaRoomMap_HyruleField_3_3.bin.lz"
-gAreaRoomMap_HyruleField_3_4::
-	.incbin "assets/gAreaRoomMap_HyruleField_3_4.bin.lz"
-gAreaRoomMap_HyruleField_4_3::
-	.incbin "assets/gAreaRoomMap_HyruleField_4_3.bin.lz"
-gAreaRoomMap_HyruleField_4_4::
-	.incbin "assets/gAreaRoomMap_HyruleField_4_4.bin.lz"
+	.incbin "maps/areas/003_HyruleField/tilesets/1/gAreaTileset_HyruleField_1_1.4bpp.lz"
+gAreaTileset_HyruleField_1_2::
+	.incbin "maps/areas/003_HyruleField/tilesets/1/gAreaTileset_HyruleField_1_2.4bpp.lz"
+gAreaMetaTileset_HyruleField_bottom::
+	.incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTileset_HyruleField_bottom.bin.lz"
+gAreaMetaTileset_HyruleField_top::
+	.incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTileset_HyruleField_top.bin.lz"
+gAreaMetaTilesetTypes_HyruleField_bottom::
+	.incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTilesetTypes_HyruleField_bottom.bin.lz"
+gAreaMetaTilesetTypes_HyruleField_top::
+	.incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTilesetTypes_HyruleField_top.bin.lz"
+gAreaTileset_HyruleField_0_3::
+	.incbin "maps/areas/003_HyruleField/tilesets/0/gAreaTileset_HyruleField_0_3.4bpp.lz"
+gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom.bin.lz"
+gAreaRoomMap_HyruleField_WesternWoodsSouth_top::
+	.incbin "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_top.bin.lz"
+gAreaRoomMap_HyruleField_SouthHyruleField_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/01_SouthHyruleField/gAreaRoomMap_HyruleField_SouthHyruleField_bottom.bin.lz"
+gAreaRoomMap_HyruleField_SouthHyruleField_top::
+	.incbin "maps/areas/003_HyruleField/rooms/01_SouthHyruleField/gAreaRoomMap_HyruleField_SouthHyruleField_top.bin.lz"
+gAreaRoomMap_HyruleField_EasternHilllsSouth_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/02_EasternHilllsSouth/gAreaRoomMap_HyruleField_EasternHilllsSouth_bottom.bin.lz"
+gAreaRoomMap_HyruleField_EasternHilllsSouth_top::
+	.incbin "maps/areas/003_HyruleField/rooms/02_EasternHilllsSouth/gAreaRoomMap_HyruleField_EasternHilllsSouth_top.bin.lz"
+gAreaRoomMap_HyruleField_EasternHilllsCenter_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/03_EasternHilllsCenter/gAreaRoomMap_HyruleField_EasternHilllsCenter_bottom.bin.lz"
+gAreaRoomMap_HyruleField_EasternHilllsCenter_top::
+	.incbin "maps/areas/003_HyruleField/rooms/03_EasternHilllsCenter/gAreaRoomMap_HyruleField_EasternHilllsCenter_top.bin.lz"
+gAreaRoomMap_HyruleField_EasternHilllsNorth_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/04_EasternHilllsNorth/gAreaRoomMap_HyruleField_EasternHilllsNorth_bottom.bin.lz"
+gAreaRoomMap_HyruleField_EasternHilllsNorth_top::
+	.incbin "maps/areas/003_HyruleField/rooms/04_EasternHilllsNorth/gAreaRoomMap_HyruleField_EasternHilllsNorth_top.bin.lz"
 unknown_6::
 	.incbin "assets/unknown_6.bin"
-gAreaRoomMap_HyruleField_5_3::
-	.incbin "assets/gAreaRoomMap_HyruleField_5_3.bin.lz"
-gAreaRoomMap_HyruleField_5_4::
-	.incbin "assets/gAreaRoomMap_HyruleField_5_4.bin.lz"
+gAreaRoomMap_HyruleField_LonLonRanch_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gAreaRoomMap_HyruleField_LonLonRanch_bottom.bin.lz"
+gAreaRoomMap_HyruleField_LonLonRanch_top::
+	.incbin "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gAreaRoomMap_HyruleField_LonLonRanch_top.bin.lz"
 unknown_7::
 	.incbin "assets/unknown_7.bin"
-gAreaRoomMap_HyruleField_6_3::
-	.incbin "assets/gAreaRoomMap_HyruleField_6_3.bin.lz"
-gAreaRoomMap_HyruleField_6_4::
-	.incbin "assets/gAreaRoomMap_HyruleField_6_4.bin.lz"
-gAreaRoomMap_HyruleField_7_3::
-	.incbin "assets/gAreaRoomMap_HyruleField_7_3.bin.lz"
-gAreaRoomMap_HyruleField_7_4::
-	.incbin "assets/gAreaRoomMap_HyruleField_7_4.bin.lz"
+gAreaRoomMap_HyruleField_NorthHyruleField_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_bottom.bin.lz"
+gAreaRoomMap_HyruleField_NorthHyruleField_top::
+	.incbin "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_top.bin.lz"
+gAreaRoomMap_HyruleField_TrilbyHighlands_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gAreaRoomMap_HyruleField_TrilbyHighlands_bottom.bin.lz"
+gAreaRoomMap_HyruleField_TrilbyHighlands_top::
+	.incbin "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gAreaRoomMap_HyruleField_TrilbyHighlands_top.bin.lz"
 unknown_8::
 	.incbin "assets/unknown_8.bin"
-gAreaRoomMap_HyruleField_8_0::
-	.incbin "assets/gAreaRoomMap_HyruleField_8_0.bin.lz"
-gAreaRoomMap_HyruleField_8_1::
-	.incbin "assets/gAreaRoomMap_HyruleField_8_1.bin.lz"
-gAreaRoomMap_HyruleField_9_0::
-	.incbin "assets/gAreaRoomMap_HyruleField_9_0.bin.lz"
-gAreaRoomMap_HyruleField_9_1::
-	.incbin "assets/gAreaRoomMap_HyruleField_9_1.bin.lz"
+gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom.bin.lz"
+gAreaRoomMap_HyruleField_WesternWoodsNorth_top::
+	.incbin "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_top.bin.lz"
+gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/09_WesternWoodsCenter/gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom.bin.lz"
+gAreaRoomMap_HyruleField_WesternWoodsCenter_top::
+	.incbin "maps/areas/003_HyruleField/rooms/09_WesternWoodsCenter/gAreaRoomMap_HyruleField_WesternWoodsCenter_top.bin.lz"
 gAreaTileset_CastleGarden_0_0::
-	.incbin "tilesets/gAreaTileset_CastleGarden_0_0.4bpp.lz"
+	.incbin "maps/areas/007_CastleGarden/tilesets/0/gAreaTileset_CastleGarden_0_0.4bpp.lz"
 gAreaTileset_CastleGarden_0_1::
-	.incbin "tilesets/gAreaTileset_CastleGarden_0_1.4bpp.lz"
+	.incbin "maps/areas/007_CastleGarden/tilesets/0/gAreaTileset_CastleGarden_0_1.4bpp.lz"
 gAreaTileset_CastleGarden_0_2::
-	.incbin "tilesets/gAreaTileset_CastleGarden_0_2.4bpp.lz"
-gAreaMetatiles_CastleGarden_0::
-	.incbin "assets/gAreaMetatiles_CastleGarden_0.bin.lz"
-gAreaMetatiles_CastleGarden_1::
-	.incbin "assets/gAreaMetatiles_CastleGarden_1.bin.lz"
-gAreaMetatiles_CastleGarden_2::
-	.incbin "assets/gAreaMetatiles_CastleGarden_2.bin.lz"
-gAreaMetatiles_CastleGarden_3::
-	.incbin "assets/gAreaMetatiles_CastleGarden_3.bin.lz"
-gAreaRoomMap_CastleGarden_0_0::
-	.incbin "assets/gAreaRoomMap_CastleGarden_0_0.bin.lz"
-gAreaRoomMap_CastleGarden_0_1::
-	.incbin "assets/gAreaRoomMap_CastleGarden_0_1.bin.lz"
+	.incbin "maps/areas/007_CastleGarden/tilesets/0/gAreaTileset_CastleGarden_0_2.4bpp.lz"
+gAreaMetaTileset_CastleGarden_bottom::
+	.incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTileset_CastleGarden_bottom.bin.lz"
+gAreaMetaTileset_CastleGarden_top::
+	.incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTileset_CastleGarden_top.bin.lz"
+gAreaMetaTilesetTypes_CastleGarden_bottom::
+	.incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTilesetTypes_CastleGarden_bottom.bin.lz"
+gAreaMetaTilesetTypes_CastleGarden_top::
+	.incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTilesetTypes_CastleGarden_top.bin.lz"
+gAreaRoomMap_CastleGarden_Main_bottom::
+	.incbin "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_bottom.bin.lz"
+gAreaRoomMap_CastleGarden_Main_top::
+	.incbin "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_top.bin.lz"
 gAreaTileset_CloudTops_0_0::
-	.incbin "tilesets/gAreaTileset_CloudTops_0_0.4bpp.lz"
+	.incbin "maps/areas/008_CloudTops/tilesets/0/gAreaTileset_CloudTops_0_0.4bpp.lz"
 gAreaTileset_CloudTops_0_1::
-	.incbin "tilesets/gAreaTileset_CloudTops_0_1.4bpp.lz"
+	.incbin "maps/areas/008_CloudTops/tilesets/0/gAreaTileset_CloudTops_0_1.4bpp.lz"
 gAreaTileset_CloudTops_0_2::
-	.incbin "tilesets/gAreaTileset_CloudTops_0_2.4bpp.lz"
-gAreaMetatiles_CloudTops_0::
-	.incbin "assets/gAreaMetatiles_CloudTops_0.bin.lz"
-gAreaMetatiles_CloudTops_1::
-	.incbin "assets/gAreaMetatiles_CloudTops_1.bin.lz"
-gAreaMetatiles_CloudTops_2::
-	.incbin "assets/gAreaMetatiles_CloudTops_2.bin.lz"
-gAreaMetatiles_CloudTops_3::
-	.incbin "assets/gAreaMetatiles_CloudTops_3.bin.lz"
-gAreaRoomMap_CloudTops_0_0::
-	.incbin "assets/gAreaRoomMap_CloudTops_0_0.bin.lz"
-gAreaRoomMap_CloudTops_0_1::
-	.incbin "assets/gAreaRoomMap_CloudTops_0_1.bin.lz"
-gAreaRoomMap_CloudTops_1_0::
-	.incbin "assets/gAreaRoomMap_CloudTops_1_0.bin.lz"
-gAreaRoomMap_CloudTops_1_1::
-	.incbin "assets/gAreaRoomMap_CloudTops_1_1.bin.lz"
-gAreaRoomMap_CloudTops_2_0::
-	.incbin "assets/gAreaRoomMap_CloudTops_2_0.bin.lz"
-gAreaRoomMap_CloudTops_2_1::
-	.incbin "assets/gAreaRoomMap_CloudTops_2_1.bin.lz"
+	.incbin "maps/areas/008_CloudTops/tilesets/0/gAreaTileset_CloudTops_0_2.4bpp.lz"
+gAreaMetaTileset_CloudTops_bottom::
+	.incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTileset_CloudTops_bottom.bin.lz"
+gAreaMetaTileset_CloudTops_top::
+	.incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTileset_CloudTops_top.bin.lz"
+gAreaMetaTilesetTypes_CloudTops_bottom::
+	.incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTilesetTypes_CloudTops_bottom.bin.lz"
+gAreaMetaTilesetTypes_CloudTops_top::
+	.incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTilesetTypes_CloudTops_top.bin.lz"
+gAreaRoomMap_CloudTops_CloudTops_bottom::
+	.incbin "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_bottom.bin.lz"
+gAreaRoomMap_CloudTops_CloudTops_top::
+	.incbin "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_top.bin.lz"
+gAreaRoomMap_CloudTops_CloudMiddles_bottom::
+	.incbin "maps/areas/008_CloudTops/rooms/01_CloudMiddles/gAreaRoomMap_CloudTops_CloudMiddles_bottom.bin.lz"
+gAreaRoomMap_CloudTops_CloudMiddles_top::
+	.incbin "maps/areas/008_CloudTops/rooms/01_CloudMiddles/gAreaRoomMap_CloudTops_CloudMiddles_top.bin.lz"
+gAreaRoomMap_CloudTops_CloudBottoms_bottom::
+	.incbin "maps/areas/008_CloudTops/rooms/02_CloudBottoms/gAreaRoomMap_CloudTops_CloudBottoms_bottom.bin.lz"
+gAreaRoomMap_CloudTops_CloudBottoms_top::
+	.incbin "maps/areas/008_CloudTops/rooms/02_CloudBottoms/gAreaRoomMap_CloudTops_CloudBottoms_top.bin.lz"
 gAreaTileset_CloudTops_0_3::
-	.incbin "tilesets/gAreaTileset_CloudTops_0_3.bin.lz"
+	.incbin "maps/areas/008_CloudTops/tilesets/0/gAreaTileset_CloudTops_0_3.4bpp.lz"
 gAreaTileset_RoyalValley_0_0::
-	.incbin "tilesets/gAreaTileset_RoyalValley_0_0.4bpp.lz"
+	.incbin "maps/areas/009_RoyalValley/tilesets/0/gAreaTileset_RoyalValley_0_0.4bpp.lz"
 gAreaTileset_RoyalValley_0_1::
-	.incbin "tilesets/gAreaTileset_RoyalValley_0_1.4bpp.lz"
+	.incbin "maps/areas/009_RoyalValley/tilesets/0/gAreaTileset_RoyalValley_0_1.4bpp.lz"
 gAreaTileset_RoyalValley_0_2::
-	.incbin "tilesets/gAreaTileset_RoyalValley_0_2.4bpp.lz"
-gAreaMetatiles_RoyalValley_0::
-	.incbin "assets/gAreaMetatiles_RoyalValley_0.bin.lz"
-gAreaMetatiles_RoyalValley_1::
-	.incbin "assets/gAreaMetatiles_RoyalValley_1.bin.lz"
-gAreaMetatiles_RoyalValley_2::
-	.incbin "assets/gAreaMetatiles_RoyalValley_2.bin.lz"
-gAreaMetatiles_RoyalValley_3::
-	.incbin "assets/gAreaMetatiles_RoyalValley_3.bin.lz"
-gAreaRoomMap_RoyalValley_0_0::
-	.incbin "assets/gAreaRoomMap_RoyalValley_0_0.bin.lz"
-gAreaRoomMap_RoyalValley_0_1::
-	.incbin "assets/gAreaRoomMap_RoyalValley_0_1.bin.lz"
+	.incbin "maps/areas/009_RoyalValley/tilesets/0/gAreaTileset_RoyalValley_0_2.4bpp.lz"
+gAreaMetaTileset_RoyalValley_bottom::
+	.incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTileset_RoyalValley_bottom.bin.lz"
+gAreaMetaTileset_RoyalValley_top::
+	.incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTileset_RoyalValley_top.bin.lz"
+gAreaMetaTilesetTypes_RoyalValley_bottom::
+	.incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTilesetTypes_RoyalValley_bottom.bin.lz"
+gAreaMetaTilesetTypes_RoyalValley_top::
+	.incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTilesetTypes_RoyalValley_top.bin.lz"
+gAreaRoomMap_RoyalValley_Main_bottom::
+	.incbin "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_bottom.bin.lz"
+gAreaRoomMap_RoyalValley_Main_top::
+	.incbin "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_top.bin.lz"
 unknown_9::
 	.incbin "assets/unknown_9.bin"
-gAreaRoomMap_RoyalValley_1_0::
-	.incbin "assets/gAreaRoomMap_RoyalValley_1_0.bin.lz"
-gAreaRoomMap_RoyalValley_1_1::
-	.incbin "assets/gAreaRoomMap_RoyalValley_1_1.bin.lz"
-gAreaTileset_VeilFallsTop_0_0::
-	.incbin "tilesets/gAreaTileset_VeilFallsTop_0_0.4bpp.lz"
-gAreaTileset_VeilFallsTop_0_1::
-	.incbin "tilesets/gAreaTileset_VeilFallsTop_0_1.4bpp.lz"
-gAreaTileset_VeilFallsDigCave_0_2::
-	.incbin "tilesets/gAreaTileset_VeilFallsDigCave_0_2.4bpp.lz"
-gAreaRoomMap_VeilFalls_0_0::
-	.incbin "assets/gAreaRoomMap_VeilFalls_0_0.bin.lz"
-gAreaRoomMap_VeilFalls_0_1::
-	.incbin "assets/gAreaRoomMap_VeilFalls_0_1.bin.lz"
+gAreaRoomMap_RoyalValley_ForestMaze_bottom::
+	.incbin "maps/areas/009_RoyalValley/rooms/01_ForestMaze/gAreaRoomMap_RoyalValley_ForestMaze_bottom.bin.lz"
+gAreaRoomMap_RoyalValley_ForestMaze_top::
+	.incbin "maps/areas/009_RoyalValley/rooms/01_ForestMaze/gAreaRoomMap_RoyalValley_ForestMaze_top.bin.lz"
+gAreaTileset_VeilFalls_0_0::
+	.incbin "maps/areas/010_VeilFalls/tilesets/0/gAreaTileset_VeilFalls_0_0.4bpp.lz"
+gAreaTileset_VeilFalls_0_1::
+	.incbin "maps/areas/010_VeilFalls/tilesets/0/gAreaTileset_VeilFalls_0_1.4bpp.lz"
+gAreaTileset_VeilFalls_0_2::
+	.incbin "maps/areas/010_VeilFalls/tilesets/0/gAreaTileset_VeilFalls_0_2.4bpp.lz"
+gAreaRoomMap_VeilFalls_Main_bottom::
+	.incbin "maps/areas/010_VeilFalls/rooms/00_Main/gAreaRoomMap_VeilFalls_Main_bottom.bin.lz"
+gAreaRoomMap_VeilFalls_Main_top::
+	.incbin "maps/areas/010_VeilFalls/rooms/00_Main/gAreaRoomMap_VeilFalls_Main_top.bin.lz"
 unknown_10::
 	.incbin "assets/unknown_10.bin"
 gAreaTileset_VeilFallsTop_0_2::
-	.incbin "tilesets/gAreaTileset_VeilFallsTop_0_2.4bpp.lz"
-gAreaRoomMap_VeilFallsTop_0_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsTop_0_0.bin.lz"
-gAreaRoomMap_VeilFallsTop_0_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsTop_0_1.bin.lz"
+	.incbin "maps/areas/026_VeilFallsTop/tilesets/0/gAreaTileset_VeilFallsTop_0_2.4bpp.lz"
+gAreaRoomMap_VeilFallsTop_0_bottom::
+	.incbin "maps/areas/026_VeilFallsTop/rooms/00_0/gAreaRoomMap_VeilFallsTop_0_bottom.bin.lz"
+gAreaRoomMap_VeilFallsTop_0_top::
+	.incbin "maps/areas/026_VeilFallsTop/rooms/00_0/gAreaRoomMap_VeilFallsTop_0_top.bin.lz"
 gAreaTileset_Beanstalks_0_0::
-	.incbin "tilesets/gAreaTileset_Beanstalks_0_0.4bpp.lz"
+	.incbin "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_0.4bpp.lz"
 gAreaTileset_Beanstalks_0_1::
-	.incbin "tilesets/gAreaTileset_Beanstalks_0_1.4bpp.lz"
+	.incbin "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_1.4bpp.lz"
 gAreaTileset_Beanstalks_0_2::
-	.incbin "tilesets/gAreaTileset_Beanstalks_0_2.4bpp.lz"
-gAreaMetatiles_Beanstalks_0::
-	.incbin "assets/gAreaMetatiles_Beanstalks_0.bin.lz"
-gAreaMetatiles_Beanstalks_1::
-	.incbin "assets/gAreaMetatiles_Beanstalks_1.bin.lz"
+	.incbin "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_2.4bpp.lz"
+gAreaMetaTileset_Beanstalks_bottom::
+	.incbin "maps/areas/013_Beanstalks/metatilesets/gAreaMetaTileset_Beanstalks_bottom.bin.lz"
+gAreaMetaTilesetTypes_Beanstalks_bottom::
+	.incbin "maps/areas/013_Beanstalks/metatilesets/gAreaMetaTilesetTypes_Beanstalks_bottom.bin.lz"
 gAreaTileset_Beanstalks_0_3::
-	.incbin "tilesets/gAreaTileset_Beanstalks_0_3.bin.lz"
-gAreaRoomMap_Beanstalks_5_1::
-	.incbin "assets/gAreaRoomMap_Beanstalks_5_1.bin.lz"
-gAreaRoomMap_Beanstalks_0_0::
-	.incbin "assets/gAreaRoomMap_Beanstalks_0_0.bin"
-gAreaRoomMap_Beanstalks_1_0::
-	.incbin "assets/gAreaRoomMap_Beanstalks_1_0.bin"
-gAreaRoomMap_Beanstalks_2_0::
-	.incbin "assets/gAreaRoomMap_Beanstalks_2_0.bin"
-gAreaRoomMap_Beanstalks_3_0::
-	.incbin "assets/gAreaRoomMap_Beanstalks_3_0.bin"
-gAreaRoomMap_Beanstalks_4_0::
-	.incbin "assets/gAreaRoomMap_Beanstalks_4_0.bin"
+	.incbin "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_3.4bpp.lz"
+gRoomMapping_Beanstalks_CrenelClimb_top::
+	.incbin "maps/areas/013_Beanstalks/rooms/00_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz"
+gAreaRoomMap_Beanstalks_Crenel_bottom::
+	.incbin "maps/areas/013_Beanstalks/rooms/00_Crenel/gAreaRoomMap_Beanstalks_Crenel_bottom.bin"
+gAreaRoomMap_Beanstalks_LakeHylia_bottom::
+	.incbin "maps/areas/013_Beanstalks/rooms/01_LakeHylia/gAreaRoomMap_Beanstalks_LakeHylia_bottom.bin"
+gAreaRoomMap_Beanstalks_Ruins_bottom::
+	.incbin "maps/areas/013_Beanstalks/rooms/02_Ruins/gAreaRoomMap_Beanstalks_Ruins_bottom.bin"
+gAreaRoomMap_Beanstalks_EasternHills_bottom::
+	.incbin "maps/areas/013_Beanstalks/rooms/03_EasternHills/gAreaRoomMap_Beanstalks_EasternHills_bottom.bin"
+gAreaRoomMap_Beanstalks_WesternWoods_bottom::
+	.incbin "maps/areas/013_Beanstalks/rooms/04_WesternWoods/gAreaRoomMap_Beanstalks_WesternWoods_bottom.bin"
 unknown_11::
 	.incbin "assets/unknown_11.bin"
-gAreaRoomMap_Empty_0_0::
-	.incbin "assets/gAreaRoomMap_Empty_0_0.bin.lz"
-gAreaRoomMap_Empty_0_1::
-	.incbin "assets/gAreaRoomMap_Empty_0_1.bin.lz"
-gAreaTileset_45_0_0::
-	.incbin "tilesets/gAreaTileset_45_0_0.4bpp.lz"
-gAreaTileset_45_0_1::
-	.incbin "tilesets/gAreaTileset_45_0_1.4bpp.lz"
-gAreaTileset_45_0_2::
-	.incbin "tilesets/gAreaTileset_45_0_2.4bpp.lz"
-gAreaMetatiles_CrenelCaves_0::
-	.incbin "assets/gAreaMetatiles_CrenelCaves_0.bin.lz"
-gAreaMetatiles_CrenelCaves_1::
-	.incbin "assets/gAreaMetatiles_CrenelCaves_1.bin.lz"
-gAreaMetatiles_CrenelCaves_2::
-	.incbin "assets/gAreaMetatiles_CrenelCaves_2.bin.lz"
-gAreaMetatiles_CrenelCaves_3::
-	.incbin "assets/gAreaMetatiles_CrenelCaves_3.bin.lz"
-gAreaRoomMap_CrenelCaves_0_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_0_0.bin.lz"
-gAreaRoomMap_CrenelCaves_0_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_0_1.bin.lz"
-gAreaRoomMap_CrenelCaves_1_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_1_0.bin.lz"
-gAreaRoomMap_CrenelCaves_1_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_1_1.bin.lz"
-gAreaRoomMap_CrenelCaves_2_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_2_0.bin.lz"
-gAreaRoomMap_CrenelCaves_2_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_2_1.bin.lz"
-gAreaRoomMap_CrenelCaves_3_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_3_0.bin.lz"
-gAreaRoomMap_CrenelCaves_3_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_3_1.bin.lz"
-gAreaRoomMap_CrenelCaves_4_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_4_0.bin.lz"
-gAreaRoomMap_CrenelCaves_4_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_4_1.bin.lz"
-gAreaRoomMap_CrenelCaves_5_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_5_0.bin.lz"
-gAreaRoomMap_CrenelCaves_5_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_5_1.bin.lz"
-gAreaRoomMap_CrenelCaves_6_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_6_0.bin.lz"
-gAreaRoomMap_CrenelCaves_6_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_6_1.bin.lz"
-gAreaRoomMap_CrenelCaves_7_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_7_0.bin.lz"
-gAreaRoomMap_CrenelCaves_7_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_7_1.bin.lz"
-gAreaRoomMap_CrenelCaves_8_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_8_0.bin.lz"
-gAreaRoomMap_CrenelCaves_8_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_8_1.bin.lz"
-gAreaRoomMap_CrenelCaves_9_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_9_0.bin"
-gAreaRoomMap_CrenelCaves_9_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_9_1.bin.lz"
-gAreaRoomMap_CrenelCaves_10_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_10_0.bin.lz"
-gAreaRoomMap_CrenelCaves_10_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_10_1.bin.lz"
-gAreaRoomMap_CrenelCaves_11_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_11_0.bin.lz"
-gAreaRoomMap_CrenelCaves_11_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_11_1.bin.lz"
-gAreaRoomMap_CrenelCaves_12_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_12_0.bin.lz"
-gAreaRoomMap_CrenelCaves_12_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_12_1.bin.lz"
-gAreaRoomMap_CrenelCaves_13_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_13_0.bin.lz"
-gAreaRoomMap_CrenelCaves_13_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_13_1.bin.lz"
-gAreaRoomMap_CrenelCaves_14_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_14_0.bin.lz"
-gAreaRoomMap_CrenelCaves_14_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_14_1.bin.lz"
-gAreaRoomMap_CrenelCaves_15_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_15_0.bin.lz"
-gAreaRoomMap_CrenelCaves_15_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_15_1.bin.lz"
-gAreaRoomMap_CrenelCaves_16_0::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_16_0.bin.lz"
-gAreaRoomMap_CrenelCaves_16_1::
-	.incbin "assets/gAreaRoomMap_CrenelCaves_16_1.bin.lz"
-gAreaTileset_GreatFairies_2_0::
-	.incbin "tilesets/gAreaTileset_GreatFairies_2_0.4bpp.lz"
-gAreaTileset_GreatFairies_2_1::
-	.incbin "tilesets/gAreaTileset_GreatFairies_2_1.4bpp.lz"
-gAreaTileset_GreatFairies_2_2::
-	.incbin "tilesets/gAreaTileset_GreatFairies_2_2.4bpp.lz"
-gAreaMetatiles_GreatFairies_0::
-	.incbin "assets/gAreaMetatiles_GreatFairies_0.bin.lz"
-gAreaMetatiles_GreatFairies_1::
-	.incbin "assets/gAreaMetatiles_GreatFairies_1.bin.lz"
-gAreaMetatiles_GreatFairies_2::
-	.incbin "assets/gAreaMetatiles_GreatFairies_2.bin.lz"
-gAreaMetatiles_GreatFairies_3::
-	.incbin "assets/gAreaMetatiles_GreatFairies_3.bin.lz"
-gAreaRoomMap_GreatFairies_0_0::
-	.incbin "assets/gAreaRoomMap_GreatFairies_0_0.bin.lz"
-gAreaRoomMap_GreatFairies_0_1::
-	.incbin "assets/gAreaRoomMap_GreatFairies_0_1.bin.lz"
-gAreaRoomMap_GreatFairies_1_0::
-	.incbin "assets/gAreaRoomMap_GreatFairies_1_0.bin.lz"
-gAreaRoomMap_GreatFairies_1_1::
-	.incbin "assets/gAreaRoomMap_GreatFairies_1_1.bin.lz"
-gAreaRoomMap_GreatFairies_2_0::
-	.incbin "assets/gAreaRoomMap_GreatFairies_2_0.bin.lz"
-gAreaRoomMap_GreatFairies_2_1::
-	.incbin "assets/gAreaRoomMap_GreatFairies_2_1.bin.lz"
-gAreaRoomMap_CastorCaves_0_0::
-	.incbin "assets/gAreaRoomMap_CastorCaves_0_0.bin.lz"
-gAreaRoomMap_CastorCaves_0_1::
-	.incbin "assets/gAreaRoomMap_CastorCaves_0_1.bin.lz"
-gAreaRoomMap_CastorCaves_1_0::
-	.incbin "assets/gAreaRoomMap_CastorCaves_1_0.bin.lz"
-gAreaRoomMap_CastorCaves_1_1::
-	.incbin "assets/gAreaRoomMap_CastorCaves_1_1.bin.lz"
-gAreaRoomMap_CastorCaves_2_0::
-	.incbin "assets/gAreaRoomMap_CastorCaves_2_0.bin.lz"
-gAreaRoomMap_CastorCaves_2_1::
-	.incbin "assets/gAreaRoomMap_CastorCaves_2_1.bin.lz"
-gAreaRoomMap_CastorCaves_3_0::
-	.incbin "assets/gAreaRoomMap_CastorCaves_3_0.bin.lz"
-gAreaRoomMap_CastorCaves_3_1::
-	.incbin "assets/gAreaRoomMap_CastorCaves_3_1.bin.lz"
-gAreaRoomMap_CastorCaves_4_0::
-	.incbin "assets/gAreaRoomMap_CastorCaves_4_0.bin.lz"
-gAreaRoomMap_CastorCaves_4_1::
-	.incbin "assets/gAreaRoomMap_CastorCaves_4_1.bin.lz"
-gAreaRoomMap_CastorDarknut_0_0::
-	.incbin "assets/gAreaRoomMap_CastorDarknut_0_0.bin.lz"
-gAreaRoomMap_CastorDarknut_0_1::
-	.incbin "assets/gAreaRoomMap_CastorDarknut_0_1.bin.lz"
-gAreaRoomMap_CastorDarknut_1_0::
-	.incbin "assets/gAreaRoomMap_CastorDarknut_1_0.bin.lz"
-gAreaRoomMap_CastorDarknut_1_1::
-	.incbin "assets/gAreaRoomMap_CastorDarknut_1_1.bin.lz"
+gAreaRoomMap_Empty_0_bottom::
+	.incbin "maps/areas/014_Empty/rooms/00_0/gAreaRoomMap_Empty_0_bottom.bin.lz"
+gAreaRoomMap_Empty_0_top::
+	.incbin "maps/areas/014_Empty/rooms/00_0/gAreaRoomMap_Empty_0_top.bin.lz"
+gAreaTileset_CrenelCaves_0_0::
+	.incbin "maps/areas/038_CrenelCaves/tilesets/0/gAreaTileset_CrenelCaves_0_0.4bpp.lz"
+gAreaTileset_CrenelCaves_0_1::
+	.incbin "maps/areas/038_CrenelCaves/tilesets/0/gAreaTileset_CrenelCaves_0_1.4bpp.lz"
+gAreaTileset_CrenelCaves_0_2::
+	.incbin "maps/areas/038_CrenelCaves/tilesets/0/gAreaTileset_CrenelCaves_0_2.4bpp.lz"
+gAreaMetaTileset_MinishHouseInteriors_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTileset_MinishHouseInteriors_bottom.bin.lz"
+gAreaMetaTileset_MinishHouseInteriors_top::
+	.incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTileset_MinishHouseInteriors_top.bin.lz"
+gAreaMetaTilesetTypes_MinishHouseInteriors_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTilesetTypes_MinishHouseInteriors_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishHouseInteriors_top::
+	.incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTilesetTypes_MinishHouseInteriors_top.bin.lz"
+gAreaRoomMap_CrenelCaves_BlockPushing_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_BlockPushing_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_top.bin.lz"
+gAreaRoomMap_CrenelCaves_PillarCave_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/01_PillarCave/gAreaRoomMap_CrenelCaves_PillarCave_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_PillarCave_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/01_PillarCave/gAreaRoomMap_CrenelCaves_PillarCave_top.bin.lz"
+gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/02_BridgeSwitch/gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_BridgeSwitch_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/02_BridgeSwitch/gAreaRoomMap_CrenelCaves_BridgeSwitch_top.bin.lz"
+gAreaRoomMap_CrenelCaves_ExitToMines_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/03_ExitToMines/gAreaRoomMap_CrenelCaves_ExitToMines_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_ExitToMines_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/03_ExitToMines/gAreaRoomMap_CrenelCaves_ExitToMines_top.bin.lz"
+gAreaRoomMap_CrenelCaves_GripRing_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/04_GripRing/gAreaRoomMap_CrenelCaves_GripRing_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_GripRing_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/04_GripRing/gAreaRoomMap_CrenelCaves_GripRing_top.bin.lz"
+gAreaRoomMap_CrenelCaves_FairyFountain_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/05_FairyFountain/gAreaRoomMap_CrenelCaves_FairyFountain_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_FairyFountain_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/05_FairyFountain/gAreaRoomMap_CrenelCaves_FairyFountain_top.bin.lz"
+gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/06_SpinyChuPuzzle/gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/06_SpinyChuPuzzle/gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top.bin.lz"
+gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/07_ChuchuPotChest/gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_ChuchuPotChest_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/07_ChuchuPotChest/gAreaRoomMap_CrenelCaves_ChuchuPotChest_top.bin.lz"
+gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/08_WaterHeartPiece/gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_WaterHeartPiece_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/08_WaterHeartPiece/gAreaRoomMap_CrenelCaves_WaterHeartPiece_top.bin.lz"
+gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/09_RupeeFairyFouintain/gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom.bin"
+gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/09_RupeeFairyFouintain/gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top.bin.lz"
+gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/10_HelmasaurHallway/gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_HelmasaurHallway_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/10_HelmasaurHallway/gAreaRoomMap_CrenelCaves_HelmasaurHallway_top.bin.lz"
+gAreaRoomMap_CrenelCaves_MushroomKeese_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/11_MushroomKeese/gAreaRoomMap_CrenelCaves_MushroomKeese_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_MushroomKeese_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/11_MushroomKeese/gAreaRoomMap_CrenelCaves_MushroomKeese_top.bin.lz"
+gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/12_LadderToSpringWater/gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_LadderToSpringWater_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/12_LadderToSpringWater/gAreaRoomMap_CrenelCaves_LadderToSpringWater_top.bin.lz"
+gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/13_BombBusinessScrub/gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_BombBusinessScrub_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/13_BombBusinessScrub/gAreaRoomMap_CrenelCaves_BombBusinessScrub_top.bin.lz"
+gAreaRoomMap_CrenelCaves_Hermit_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/14_Hermit/gAreaRoomMap_CrenelCaves_Hermit_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_Hermit_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/14_Hermit/gAreaRoomMap_CrenelCaves_Hermit_top.bin.lz"
+gAreaRoomMap_CrenelCaves_HintScrub_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/15_HintScrub/gAreaRoomMap_CrenelCaves_HintScrub_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_HintScrub_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/15_HintScrub/gAreaRoomMap_CrenelCaves_HintScrub_top.bin.lz"
+gAreaRoomMap_CrenelCaves_ToGrayblade_bottom::
+	.incbin "maps/areas/038_CrenelCaves/rooms/16_ToGrayblade/gAreaRoomMap_CrenelCaves_ToGrayblade_bottom.bin.lz"
+gAreaRoomMap_CrenelCaves_ToGrayblade_top::
+	.incbin "maps/areas/038_CrenelCaves/rooms/16_ToGrayblade/gAreaRoomMap_CrenelCaves_ToGrayblade_top.bin.lz"
+gAreaTileset_GreatFairies_0_0::
+	.incbin "maps/areas/041_GreatFairies/tilesets/0/gAreaTileset_GreatFairies_0_0.4bpp.lz"
+gAreaTileset_GreatFairies_0_1::
+	.incbin "maps/areas/041_GreatFairies/tilesets/0/gAreaTileset_GreatFairies_0_1.4bpp.lz"
+gAreaTileset_GreatFairies_0_2::
+	.incbin "maps/areas/041_GreatFairies/tilesets/0/gAreaTileset_GreatFairies_0_2.4bpp.lz"
+gAreaMetaTileset_GreatFairies_bottom::
+	.incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTileset_GreatFairies_bottom.bin.lz"
+gAreaMetaTileset_GreatFairies_top::
+	.incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTileset_GreatFairies_top.bin.lz"
+gAreaMetaTilesetTypes_GreatFairies_bottom::
+	.incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTilesetTypes_GreatFairies_bottom.bin.lz"
+gAreaMetaTilesetTypes_GreatFairies_top::
+	.incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTilesetTypes_GreatFairies_top.bin.lz"
+gAreaRoomMap_GreatFairies_Graveyard_bottom::
+	.incbin "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_bottom.bin.lz"
+gAreaRoomMap_GreatFairies_Graveyard_top::
+	.incbin "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_top.bin.lz"
+gAreaRoomMap_GreatFairies_MinishWoods_bottom::
+	.incbin "maps/areas/041_GreatFairies/rooms/01_MinishWoods/gAreaRoomMap_GreatFairies_MinishWoods_bottom.bin.lz"
+gAreaRoomMap_GreatFairies_MinishWoods_top::
+	.incbin "maps/areas/041_GreatFairies/rooms/01_MinishWoods/gAreaRoomMap_GreatFairies_MinishWoods_top.bin.lz"
+gAreaRoomMap_GreatFairies_Crenel_bottom::
+	.incbin "maps/areas/041_GreatFairies/rooms/02_Crenel/gAreaRoomMap_GreatFairies_Crenel_bottom.bin.lz"
+gAreaRoomMap_GreatFairies_Crenel_top::
+	.incbin "maps/areas/041_GreatFairies/rooms/02_Crenel/gAreaRoomMap_GreatFairies_Crenel_top.bin.lz"
+gAreaRoomMap_CastorCaves_South_bottom::
+	.incbin "maps/areas/042_CastorCaves/rooms/00_South/gAreaRoomMap_CastorCaves_South_bottom.bin.lz"
+gAreaRoomMap_CastorCaves_South_top::
+	.incbin "maps/areas/042_CastorCaves/rooms/00_South/gAreaRoomMap_CastorCaves_South_top.bin.lz"
+gAreaRoomMap_CastorCaves_North_bottom::
+	.incbin "maps/areas/042_CastorCaves/rooms/01_North/gAreaRoomMap_CastorCaves_North_bottom.bin.lz"
+gAreaRoomMap_CastorCaves_North_top::
+	.incbin "maps/areas/042_CastorCaves/rooms/01_North/gAreaRoomMap_CastorCaves_North_top.bin.lz"
+gAreaRoomMap_CastorCaves_WindRuins_bottom::
+	.incbin "maps/areas/042_CastorCaves/rooms/02_WindRuins/gAreaRoomMap_CastorCaves_WindRuins_bottom.bin.lz"
+gAreaRoomMap_CastorCaves_WindRuins_top::
+	.incbin "maps/areas/042_CastorCaves/rooms/02_WindRuins/gAreaRoomMap_CastorCaves_WindRuins_top.bin.lz"
+gAreaRoomMap_CastorCaves_Darknut_bottom::
+	.incbin "maps/areas/042_CastorCaves/rooms/03_Darknut/gAreaRoomMap_CastorCaves_Darknut_bottom.bin.lz"
+gAreaRoomMap_CastorCaves_Darknut_top::
+	.incbin "maps/areas/042_CastorCaves/rooms/03_Darknut/gAreaRoomMap_CastorCaves_Darknut_top.bin.lz"
+gAreaRoomMap_CastorCaves_HeartPiece_bottom::
+	.incbin "maps/areas/042_CastorCaves/rooms/04_HeartPiece/gAreaRoomMap_CastorCaves_HeartPiece_bottom.bin.lz"
+gAreaRoomMap_CastorCaves_HeartPiece_top::
+	.incbin "maps/areas/042_CastorCaves/rooms/04_HeartPiece/gAreaRoomMap_CastorCaves_HeartPiece_top.bin.lz"
+gAreaRoomMap_CastorDarknut_Main_bottom::
+	.incbin "maps/areas/043_CastorDarknut/rooms/00_Main/gAreaRoomMap_CastorDarknut_Main_bottom.bin.lz"
+gAreaRoomMap_CastorDarknut_Main_top::
+	.incbin "maps/areas/043_CastorDarknut/rooms/00_Main/gAreaRoomMap_CastorDarknut_Main_top.bin.lz"
+gAreaRoomMap_CastorDarknut_Hall_bottom::
+	.incbin "maps/areas/043_CastorDarknut/rooms/01_Hall/gAreaRoomMap_CastorDarknut_Hall_bottom.bin.lz"
+gAreaRoomMap_CastorDarknut_Hall_top::
+	.incbin "maps/areas/043_CastorDarknut/rooms/01_Hall/gAreaRoomMap_CastorDarknut_Hall_top.bin.lz"
 gAreaTileset_ArmosInteriors_0_0::
-	.incbin "tilesets/gAreaTileset_ArmosInteriors_0_0.4bpp.lz"
+	.incbin "maps/areas/044_ArmosInteriors/tilesets/0/gAreaTileset_ArmosInteriors_0_0.4bpp.lz"
 gAreaTileset_ArmosInteriors_0_1::
-	.incbin "tilesets/gAreaTileset_ArmosInteriors_0_1.4bpp.lz"
+	.incbin "maps/areas/044_ArmosInteriors/tilesets/0/gAreaTileset_ArmosInteriors_0_1.4bpp.lz"
 gAreaTileset_ArmosInteriors_0_2::
-	.incbin "tilesets/gAreaTileset_ArmosInteriors_0_2.4bpp.lz"
-gAreaMetatiles_ArmosInteriors_0::
-	.incbin "assets/gAreaMetatiles_ArmosInteriors_0.bin.lz"
-gAreaMetatiles_ArmosInteriors_1::
-	.incbin "assets/gAreaMetatiles_ArmosInteriors_1.bin.lz"
-gAreaMetatiles_ArmosInteriors_2::
-	.incbin "assets/gAreaMetatiles_ArmosInteriors_2.bin.lz"
-gAreaMetatiles_ArmosInteriors_3::
-	.incbin "assets/gAreaMetatiles_ArmosInteriors_3.bin.lz"
-gAreaRoomMap_ArmosInteriors_0_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_0_0.bin"
-gAreaRoomMap_ArmosInteriors_0_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_0_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_1_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_1_0.bin"
-gAreaRoomMap_ArmosInteriors_1_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_1_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_2_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_2_0.bin"
-gAreaRoomMap_ArmosInteriors_2_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_2_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_3_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_3_0.bin"
-gAreaRoomMap_ArmosInteriors_3_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_3_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_4_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_4_0.bin"
-gAreaRoomMap_ArmosInteriors_4_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_4_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_5_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_5_0.bin"
-gAreaRoomMap_ArmosInteriors_5_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_5_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_6_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_6_0.bin"
-gAreaRoomMap_ArmosInteriors_6_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_6_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_7_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_7_0.bin"
-gAreaRoomMap_ArmosInteriors_7_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_7_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_8_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_8_0.bin"
-gAreaRoomMap_ArmosInteriors_8_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_8_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_9_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_9_0.bin"
-gAreaRoomMap_ArmosInteriors_9_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_9_1.bin.lz"
-gAreaRoomMap_ArmosInteriors_10_0::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_10_0.bin"
-gAreaRoomMap_ArmosInteriors_10_1::
-	.incbin "assets/gAreaRoomMap_ArmosInteriors_10_1.bin.lz"
+	.incbin "maps/areas/044_ArmosInteriors/tilesets/0/gAreaTileset_ArmosInteriors_0_2.4bpp.lz"
+gAreaMetaTileset_ArmosInteriors_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTileset_ArmosInteriors_bottom.bin.lz"
+gAreaMetaTileset_ArmosInteriors_top::
+	.incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTileset_ArmosInteriors_top.bin.lz"
+gAreaMetaTilesetTypes_ArmosInteriors_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTilesetTypes_ArmosInteriors_bottom.bin.lz"
+gAreaMetaTilesetTypes_ArmosInteriors_top::
+	.incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTilesetTypes_ArmosInteriors_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/01_RuinsEntranceSouth/gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/01_RuinsEntranceSouth/gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/02_RuinsLeft/gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsLeft_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/02_RuinsLeft/gAreaRoomMap_ArmosInteriors_RuinsLeft_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/03_RuinsMiddleLeft/gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/03_RuinsMiddleLeft/gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/04_RuinsMiddleRight/gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/04_RuinsMiddleRight/gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsRight_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/05_RuinsRight/gAreaRoomMap_ArmosInteriors_RuinsRight_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsRight_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/05_RuinsRight/gAreaRoomMap_ArmosInteriors_RuinsRight_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_6_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/06_6/gAreaRoomMap_ArmosInteriors_6_bottom.bin"
+gAreaRoomMap_ArmosInteriors_6_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/06_6/gAreaRoomMap_ArmosInteriors_6_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/07_RuinsGrassPath/gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom.bin"
+gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/07_RuinsGrassPath/gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_8_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/08_8/gAreaRoomMap_ArmosInteriors_8_bottom.bin"
+gAreaRoomMap_ArmosInteriors_8_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/08_8/gAreaRoomMap_ArmosInteriors_8_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_FortressLeft_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/09_FortressLeft/gAreaRoomMap_ArmosInteriors_FortressLeft_bottom.bin"
+gAreaRoomMap_ArmosInteriors_FortressLeft_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/09_FortressLeft/gAreaRoomMap_ArmosInteriors_FortressLeft_top.bin.lz"
+gAreaRoomMap_ArmosInteriors_FortressRight_bottom::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/10_FortressRight/gAreaRoomMap_ArmosInteriors_FortressRight_bottom.bin"
+gAreaRoomMap_ArmosInteriors_FortressRight_top::
+	.incbin "maps/areas/044_ArmosInteriors/rooms/10_FortressRight/gAreaRoomMap_ArmosInteriors_FortressRight_top.bin.lz"
 gAreaTileset_GoronCave_0_0::
-	.incbin "tilesets/gAreaTileset_GoronCave_0_0.4bpp.lz"
+	.incbin "maps/areas/047_GoronCave/tilesets/0/gAreaTileset_GoronCave_0_0.4bpp.lz"
 gAreaTileset_GoronCave_0_1::
-	.incbin "tilesets/gAreaTileset_GoronCave_0_1.4bpp.lz"
+	.incbin "maps/areas/047_GoronCave/tilesets/0/gAreaTileset_GoronCave_0_1.4bpp.lz"
 gAreaTileset_GoronCave_0_2::
-	.incbin "tilesets/gAreaTileset_GoronCave_0_2.4bpp.lz"
-gAreaMetatiles_GoronCave_0::
-	.incbin "assets/gAreaMetatiles_GoronCave_0.bin.lz"
-gAreaMetatiles_GoronCave_1::
-	.incbin "assets/gAreaMetatiles_GoronCave_1.bin.lz"
-gAreaMetatiles_GoronCave_2::
-	.incbin "assets/gAreaMetatiles_GoronCave_2.bin.lz"
-gAreaMetatiles_GoronCave_3::
-	.incbin "assets/gAreaMetatiles_GoronCave_3.bin.lz"
-gAreaRoomMap_GoronCave_0_0::
-	.incbin "assets/gAreaRoomMap_GoronCave_0_0.bin.lz"
-gAreaRoomMap_GoronCave_0_1::
-	.incbin "assets/gAreaRoomMap_GoronCave_0_1.bin.lz"
-gAreaRoomMap_GoronCave_1_0::
-	.incbin "assets/gAreaRoomMap_GoronCave_1_0.bin.lz"
-gAreaRoomMap_GoronCave_1_1::
-	.incbin "assets/gAreaRoomMap_GoronCave_1_1.bin.lz"
-gAreaRoomMap_Caves_0_0::
-	.incbin "assets/gAreaRoomMap_Caves_0_0.bin.lz"
-gAreaRoomMap_Caves_0_1::
-	.incbin "assets/gAreaRoomMap_Caves_0_1.bin.lz"
-gAreaRoomMap_Caves_1_0::
-	.incbin "assets/gAreaRoomMap_Caves_1_0.bin.lz"
-gAreaRoomMap_Caves_1_1::
-	.incbin "assets/gAreaRoomMap_Caves_1_1.bin.lz"
-gAreaRoomMap_Caves_2_0::
-	.incbin "assets/gAreaRoomMap_Caves_2_0.bin.lz"
-gAreaRoomMap_Caves_2_1::
-	.incbin "assets/gAreaRoomMap_Caves_2_1.bin.lz"
-gAreaRoomMap_Caves_3_0::
-	.incbin "assets/gAreaRoomMap_Caves_3_0.bin.lz"
-gAreaRoomMap_Caves_3_1::
-	.incbin "assets/gAreaRoomMap_Caves_3_1.bin.lz"
-gAreaRoomMap_Caves_4_0::
-	.incbin "assets/gAreaRoomMap_Caves_4_0.bin.lz"
-gAreaRoomMap_Caves_4_1::
-	.incbin "assets/gAreaRoomMap_Caves_4_1.bin.lz"
-gAreaRoomMap_Caves_5_0::
-	.incbin "assets/gAreaRoomMap_Caves_5_0.bin.lz"
-gAreaRoomMap_Caves_5_1::
-	.incbin "assets/gAreaRoomMap_Caves_5_1.bin.lz"
-gAreaRoomMap_Caves_6_0::
-	.incbin "assets/gAreaRoomMap_Caves_6_0.bin.lz"
-gAreaRoomMap_Caves_6_1::
-	.incbin "assets/gAreaRoomMap_Caves_6_1.bin.lz"
-gAreaRoomMap_Caves_7_0::
-	.incbin "assets/gAreaRoomMap_Caves_7_0.bin.lz"
-gAreaRoomMap_Caves_7_1::
-	.incbin "assets/gAreaRoomMap_Caves_7_1.bin.lz"
-gAreaRoomMap_Caves_8_0::
-	.incbin "assets/gAreaRoomMap_Caves_8_0.bin.lz"
-gAreaRoomMap_Caves_8_1::
-	.incbin "assets/gAreaRoomMap_Caves_8_1.bin.lz"
-gAreaRoomMap_Caves_9_0::
-	.incbin "assets/gAreaRoomMap_Caves_9_0.bin.lz"
-gAreaRoomMap_Caves_9_1::
-	.incbin "assets/gAreaRoomMap_Caves_9_1.bin.lz"
-gAreaRoomMap_Caves_10_0::
-	.incbin "assets/gAreaRoomMap_Caves_10_0.bin.lz"
-gAreaRoomMap_Caves_10_1::
-	.incbin "assets/gAreaRoomMap_Caves_10_1.bin.lz"
-gAreaRoomMap_Caves_11_0::
-	.incbin "assets/gAreaRoomMap_Caves_11_0.bin.lz"
-gAreaRoomMap_Caves_11_1::
-	.incbin "assets/gAreaRoomMap_Caves_11_1.bin.lz"
-gAreaRoomMap_Caves_12_0::
-	.incbin "assets/gAreaRoomMap_Caves_12_0.bin.lz"
-gAreaRoomMap_Caves_12_1::
-	.incbin "assets/gAreaRoomMap_Caves_12_1.bin.lz"
-gAreaRoomMap_Caves_13_0::
-	.incbin "assets/gAreaRoomMap_Caves_13_0.bin.lz"
-gAreaRoomMap_Caves_13_1::
-	.incbin "assets/gAreaRoomMap_Caves_13_1.bin.lz"
-gAreaRoomMap_Caves_14_0::
-	.incbin "assets/gAreaRoomMap_Caves_14_0.bin.lz"
-gAreaRoomMap_Caves_14_1::
-	.incbin "assets/gAreaRoomMap_Caves_14_1.bin.lz"
-gAreaRoomMap_Caves_15_0::
-	.incbin "assets/gAreaRoomMap_Caves_15_0.bin.lz"
-gAreaRoomMap_Caves_15_1::
-	.incbin "assets/gAreaRoomMap_Caves_15_1.bin.lz"
-gAreaRoomMap_Caves_16_0::
-	.incbin "assets/gAreaRoomMap_Caves_16_0.bin.lz"
-gAreaRoomMap_Caves_16_1::
-	.incbin "assets/gAreaRoomMap_Caves_16_1.bin.lz"
-gAreaRoomMap_Caves_17_0::
-	.incbin "assets/gAreaRoomMap_Caves_17_0.bin.lz"
-gAreaRoomMap_Caves_17_1::
-	.incbin "assets/gAreaRoomMap_Caves_17_1.bin.lz"
-gAreaRoomMap_Caves_18_0::
-	.incbin "assets/gAreaRoomMap_Caves_18_0.bin.lz"
-gAreaRoomMap_Caves_18_1::
-	.incbin "assets/gAreaRoomMap_Caves_18_1.bin.lz"
-gAreaRoomMap_Caves_19_0::
-	.incbin "assets/gAreaRoomMap_Caves_19_0.bin.lz"
-gAreaRoomMap_Caves_19_1::
-	.incbin "assets/gAreaRoomMap_Caves_19_1.bin.lz"
-gAreaRoomMap_Caves_20_0::
-	.incbin "assets/gAreaRoomMap_Caves_20_0.bin.lz"
-gAreaRoomMap_Caves_20_1::
-	.incbin "assets/gAreaRoomMap_Caves_20_1.bin.lz"
-gAreaRoomMap_Caves_21_0::
-	.incbin "assets/gAreaRoomMap_Caves_21_0.bin.lz"
-gAreaRoomMap_Caves_21_1::
-	.incbin "assets/gAreaRoomMap_Caves_21_1.bin.lz"
-gAreaRoomMap_Caves_22_0::
-	.incbin "assets/gAreaRoomMap_Caves_22_0.bin.lz"
-gAreaRoomMap_Caves_22_1::
-	.incbin "assets/gAreaRoomMap_Caves_22_1.bin.lz"
-gAreaRoomMap_Caves_23_0::
-	.incbin "assets/gAreaRoomMap_Caves_23_0.bin.lz"
-gAreaRoomMap_Caves_23_1::
-	.incbin "assets/gAreaRoomMap_Caves_23_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_0_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_0_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_0_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_0_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_1_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_1_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_1_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_1_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_2_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_2_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_2_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_2_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_3_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_3_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_3_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_3_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_4_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_4_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_4_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_4_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_5_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_5_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_5_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_5_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_6_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_6_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_6_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_6_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_7_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_7_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_7_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_7_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_8_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_8_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_8_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_8_1.bin.lz"
-gAreaRoomMap_VeilFallsCaves_9_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_9_0.bin.lz"
-gAreaRoomMap_VeilFallsCaves_9_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsCaves_9_1.bin.lz"
-gAreaRoomMap_RoyalValleyGraves_0_0::
-	.incbin "assets/gAreaRoomMap_RoyalValleyGraves_0_0.bin.lz"
-gAreaRoomMap_RoyalValleyGraves_0_1::
-	.incbin "assets/gAreaRoomMap_RoyalValleyGraves_0_1.bin.lz"
-gAreaRoomMap_RoyalValleyGraves_1_0::
-	.incbin "assets/gAreaRoomMap_RoyalValleyGraves_1_0.bin.lz"
-gAreaRoomMap_RoyalValleyGraves_1_1::
-	.incbin "assets/gAreaRoomMap_RoyalValleyGraves_1_1.bin.lz"
+	.incbin "maps/areas/047_GoronCave/tilesets/0/gAreaTileset_GoronCave_0_2.4bpp.lz"
+gAreaMetaTileset_GoronCave_bottom::
+	.incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTileset_GoronCave_bottom.bin.lz"
+gAreaMetaTileset_GoronCave_top::
+	.incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTileset_GoronCave_top.bin.lz"
+gAreaMetaTilesetTypes_GoronCave_bottom::
+	.incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTilesetTypes_GoronCave_bottom.bin.lz"
+gAreaMetaTilesetTypes_GoronCave_top::
+	.incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTilesetTypes_GoronCave_top.bin.lz"
+gAreaRoomMap_GoronCave_Stairs_bottom::
+	.incbin "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_bottom.bin.lz"
+gAreaRoomMap_GoronCave_Stairs_top::
+	.incbin "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_top.bin.lz"
+gAreaRoomMap_GoronCave_Main_bottom::
+	.incbin "maps/areas/047_GoronCave/rooms/01_Main/gAreaRoomMap_GoronCave_Main_bottom.bin.lz"
+gAreaRoomMap_GoronCave_Main_top::
+	.incbin "maps/areas/047_GoronCave/rooms/01_Main/gAreaRoomMap_GoronCave_Main_top.bin.lz"
+gAreaRoomMap_Caves_Boomerang_bottom::
+	.incbin "maps/areas/050_Caves/rooms/00_Boomerang/gAreaRoomMap_Caves_Boomerang_bottom.bin.lz"
+gAreaRoomMap_Caves_Boomerang_top::
+	.incbin "maps/areas/050_Caves/rooms/00_Boomerang/gAreaRoomMap_Caves_Boomerang_top.bin.lz"
+gAreaRoomMap_Caves_ToGraveyard_bottom::
+	.incbin "maps/areas/050_Caves/rooms/01_ToGraveyard/gAreaRoomMap_Caves_ToGraveyard_bottom.bin.lz"
+gAreaRoomMap_Caves_ToGraveyard_top::
+	.incbin "maps/areas/050_Caves/rooms/01_ToGraveyard/gAreaRoomMap_Caves_ToGraveyard_top.bin.lz"
+gAreaRoomMap_Caves_2_bottom::
+	.incbin "maps/areas/050_Caves/rooms/02_2/gAreaRoomMap_Caves_2_bottom.bin.lz"
+gAreaRoomMap_Caves_2_top::
+	.incbin "maps/areas/050_Caves/rooms/02_2/gAreaRoomMap_Caves_2_top.bin.lz"
+gAreaRoomMap_Caves_3_bottom::
+	.incbin "maps/areas/050_Caves/rooms/03_3/gAreaRoomMap_Caves_3_bottom.bin.lz"
+gAreaRoomMap_Caves_3_top::
+	.incbin "maps/areas/050_Caves/rooms/03_3/gAreaRoomMap_Caves_3_top.bin.lz"
+gAreaRoomMap_Caves_4_bottom::
+	.incbin "maps/areas/050_Caves/rooms/04_4/gAreaRoomMap_Caves_4_bottom.bin.lz"
+gAreaRoomMap_Caves_4_top::
+	.incbin "maps/areas/050_Caves/rooms/04_4/gAreaRoomMap_Caves_4_top.bin.lz"
+gAreaRoomMap_Caves_5_bottom::
+	.incbin "maps/areas/050_Caves/rooms/05_5/gAreaRoomMap_Caves_5_bottom.bin.lz"
+gAreaRoomMap_Caves_5_top::
+	.incbin "maps/areas/050_Caves/rooms/05_5/gAreaRoomMap_Caves_5_top.bin.lz"
+gAreaRoomMap_Caves_6_bottom::
+	.incbin "maps/areas/050_Caves/rooms/06_6/gAreaRoomMap_Caves_6_bottom.bin.lz"
+gAreaRoomMap_Caves_6_top::
+	.incbin "maps/areas/050_Caves/rooms/06_6/gAreaRoomMap_Caves_6_top.bin.lz"
+gAreaRoomMap_Caves_TrilbyKeeseChest_bottom::
+	.incbin "maps/areas/050_Caves/rooms/07_TrilbyKeeseChest/gAreaRoomMap_Caves_TrilbyKeeseChest_bottom.bin.lz"
+gAreaRoomMap_Caves_TrilbyKeeseChest_top::
+	.incbin "maps/areas/050_Caves/rooms/07_TrilbyKeeseChest/gAreaRoomMap_Caves_TrilbyKeeseChest_top.bin.lz"
+gAreaRoomMap_Caves_TrilbyFairyFountain_bottom::
+	.incbin "maps/areas/050_Caves/rooms/08_TrilbyFairyFountain/gAreaRoomMap_Caves_TrilbyFairyFountain_bottom.bin.lz"
+gAreaRoomMap_Caves_TrilbyFairyFountain_top::
+	.incbin "maps/areas/050_Caves/rooms/08_TrilbyFairyFountain/gAreaRoomMap_Caves_TrilbyFairyFountain_top.bin.lz"
+gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom::
+	.incbin "maps/areas/050_Caves/rooms/09_SouthHyruleFieldFairyFountain/gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom.bin.lz"
+gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top::
+	.incbin "maps/areas/050_Caves/rooms/09_SouthHyruleFieldFairyFountain/gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top.bin.lz"
+gAreaRoomMap_Caves_A_bottom::
+	.incbin "maps/areas/050_Caves/rooms/10_A/gAreaRoomMap_Caves_A_bottom.bin.lz"
+gAreaRoomMap_Caves_A_top::
+	.incbin "maps/areas/050_Caves/rooms/10_A/gAreaRoomMap_Caves_A_top.bin.lz"
+gAreaRoomMap_Caves_HyruleTownWaterfall_bottom::
+	.incbin "maps/areas/050_Caves/rooms/11_HyruleTownWaterfall/gAreaRoomMap_Caves_HyruleTownWaterfall_bottom.bin.lz"
+gAreaRoomMap_Caves_HyruleTownWaterfall_top::
+	.incbin "maps/areas/050_Caves/rooms/11_HyruleTownWaterfall/gAreaRoomMap_Caves_HyruleTownWaterfall_top.bin.lz"
+gAreaRoomMap_Caves_LonLonRanch_bottom::
+	.incbin "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_bottom.bin.lz"
+gAreaRoomMap_Caves_LonLonRanch_top::
+	.incbin "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_top.bin.lz"
+gAreaRoomMap_Caves_LonLonRanchSecret_bottom::
+	.incbin "maps/areas/050_Caves/rooms/12_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz"
+gAreaRoomMap_Caves_LonLonRanchSecret_top::
+	.incbin "maps/areas/050_Caves/rooms/12_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz"
+gAreaRoomMap_Caves_TrilbyHighlands_bottom::
+	.incbin "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_bottom.bin.lz"
+gAreaRoomMap_Caves_TrilbyHighlands_top::
+	.incbin "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_top.bin.lz"
+gAreaRoomMap_Caves_LonLonRanchWallet_bottom::
+	.incbin "maps/areas/050_Caves/rooms/12_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz"
+gAreaRoomMap_Caves_LonLonRanchWallet_top::
+	.incbin "maps/areas/050_Caves/rooms/12_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz"
+gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom::
+	.incbin "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom.bin.lz"
+gAreaRoomMap_Caves_SouthHyruleFieldRupee_top::
+	.incbin "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_top.bin.lz"
+gAreaRoomMap_Caves_TrilbyRupee_bottom::
+	.incbin "maps/areas/050_Caves/rooms/17_TrilbyRupee/gAreaRoomMap_Caves_TrilbyRupee_bottom.bin.lz"
+gAreaRoomMap_Caves_TrilbyRupee_top::
+	.incbin "maps/areas/050_Caves/rooms/17_TrilbyRupee/gAreaRoomMap_Caves_TrilbyRupee_top.bin.lz"
+gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom::
+	.incbin "maps/areas/050_Caves/rooms/18_TrilbyMittsFairyFountain/gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom.bin.lz"
+gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top::
+	.incbin "maps/areas/050_Caves/rooms/18_TrilbyMittsFairyFountain/gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top.bin.lz"
+gAreaRoomMap_Caves_HillsKeeseChest_bottom::
+	.incbin "maps/areas/050_Caves/rooms/19_HillsKeeseChest/gAreaRoomMap_Caves_HillsKeeseChest_bottom.bin.lz"
+gAreaRoomMap_Caves_HillsKeeseChest_top::
+	.incbin "maps/areas/050_Caves/rooms/19_HillsKeeseChest/gAreaRoomMap_Caves_HillsKeeseChest_top.bin.lz"
+gAreaRoomMap_Caves_BottleBusinessScrub_bottom::
+	.incbin "maps/areas/050_Caves/rooms/20_BottleBusinessScrub/gAreaRoomMap_Caves_BottleBusinessScrub_bottom.bin.lz"
+gAreaRoomMap_Caves_BottleBusinessScrub_top::
+	.incbin "maps/areas/050_Caves/rooms/20_BottleBusinessScrub/gAreaRoomMap_Caves_BottleBusinessScrub_top.bin.lz"
+gAreaRoomMap_Caves_HeartPieceHallway_bottom::
+	.incbin "maps/areas/050_Caves/rooms/21_HeartPieceHallway/gAreaRoomMap_Caves_HeartPieceHallway_bottom.bin.lz"
+gAreaRoomMap_Caves_HeartPieceHallway_top::
+	.incbin "maps/areas/050_Caves/rooms/21_HeartPieceHallway/gAreaRoomMap_Caves_HeartPieceHallway_top.bin.lz"
+gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom::
+	.incbin "maps/areas/050_Caves/rooms/22_NorthHyruleFieldFairyFountain/gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom.bin.lz"
+gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top::
+	.incbin "maps/areas/050_Caves/rooms/22_NorthHyruleFieldFairyFountain/gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top.bin.lz"
+gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom::
+	.incbin "maps/areas/050_Caves/rooms/23_KinstoneBusinessScrub/gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom.bin.lz"
+gAreaRoomMap_Caves_KinstoneBusinessScrub_top::
+	.incbin "maps/areas/050_Caves/rooms/23_KinstoneBusinessScrub/gAreaRoomMap_Caves_KinstoneBusinessScrub_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/00_Hallway2f/gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Hallway2f_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/00_Hallway2f/gAreaRoomMap_VeilFallsCaves_Hallway2f_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/01_Hallway1f/gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Hallway1f_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/01_Hallway1f/gAreaRoomMap_VeilFallsCaves_Hallway1f_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/02_HallwaySecretRoom/gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/02_HallwaySecretRoom/gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Entrance_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/03_Entrance/gAreaRoomMap_VeilFallsCaves_Entrance_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Entrance_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/03_Entrance/gAreaRoomMap_VeilFallsCaves_Entrance_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Exit_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/04_Exit/gAreaRoomMap_VeilFallsCaves_Exit_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_Exit_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/04_Exit/gAreaRoomMap_VeilFallsCaves_Exit_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_SecretChest_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/05_SecretChest/gAreaRoomMap_VeilFallsCaves_SecretChest_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_SecretChest_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/05_SecretChest/gAreaRoomMap_VeilFallsCaves_SecretChest_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/06_HallwaySecretStaircase/gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/06_HallwaySecretStaircase/gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/07_HallwayBlockPuzzle/gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/07_HallwayBlockPuzzle/gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/08_HallwayRupeePath/gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/08_HallwayRupeePath/gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/09_HallwayHeartPiece/gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom.bin.lz"
+gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top::
+	.incbin "maps/areas/051_VeilFallsCaves/rooms/09_HallwayHeartPiece/gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top.bin.lz"
+gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom::
+	.incbin "maps/areas/052_RoyalValleyGraves/rooms/00_HeartPiece/gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom.bin.lz"
+gAreaRoomMap_RoyalValleyGraves_HeartPiece_top::
+	.incbin "maps/areas/052_RoyalValleyGraves/rooms/00_HeartPiece/gAreaRoomMap_RoyalValleyGraves_HeartPiece_top.bin.lz"
+gAreaRoomMap_RoyalValleyGraves_Gina_bottom::
+	.incbin "maps/areas/052_RoyalValleyGraves/rooms/01_Gina/gAreaRoomMap_RoyalValleyGraves_Gina_bottom.bin.lz"
+gAreaRoomMap_RoyalValleyGraves_Gina_top::
+	.incbin "maps/areas/052_RoyalValleyGraves/rooms/01_Gina/gAreaRoomMap_RoyalValleyGraves_Gina_top.bin.lz"
 gAreaTileset_MinishCaves_0_0::
-	.incbin "tilesets/gAreaTileset_MinishCaves_0_0.4bpp.lz"
+	.incbin "maps/areas/053_MinishCaves/tilesets/0/gAreaTileset_MinishCaves_0_0.4bpp.lz"
 gAreaTileset_MinishCaves_0_1::
-	.incbin "tilesets/gAreaTileset_MinishCaves_0_1.4bpp.lz"
+	.incbin "maps/areas/053_MinishCaves/tilesets/0/gAreaTileset_MinishCaves_0_1.4bpp.lz"
 gAreaTileset_MinishCaves_0_2::
-	.incbin "tilesets/gAreaTileset_MinishCaves_0_2.4bpp.lz"
-gAreaMetatiles_MinishCaves_0::
-	.incbin "assets/gAreaMetatiles_MinishCaves_0.bin.lz"
-gAreaMetatiles_MinishCaves_1::
-	.incbin "assets/gAreaMetatiles_MinishCaves_1.bin.lz"
-gAreaMetatiles_MinishCaves_2::
-	.incbin "assets/gAreaMetatiles_MinishCaves_2.bin.lz"
-gAreaMetatiles_MinishCaves_3::
-	.incbin "assets/gAreaMetatiles_MinishCaves_3.bin.lz"
-gAreaTileset_37_0_0::
-	.incbin "tilesets/gAreaTileset_37_0_0.4bpp.lz"
-gAreaTileset_37_0_1::
-	.incbin "tilesets/gAreaTileset_37_0_1.4bpp.lz"
-gAreaTileset_37_0_2::
-	.incbin "tilesets/gAreaTileset_37_0_2.4bpp.lz"
-gAreaMetatiles_CastleGardenMinishHoles_0::
-	.incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_0.bin.lz"
-gAreaMetatiles_CastleGardenMinishHoles_1::
-	.incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_1.bin.lz"
-gAreaMetatiles_CastleGardenMinishHoles_2::
-	.incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_2.bin.lz"
-gAreaMetatiles_CastleGardenMinishHoles_3::
-	.incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_3.bin.lz"
-gAreaRoomMap_MinishCaves_0_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_0_0.bin.lz"
-gAreaRoomMap_MinishCaves_0_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_0_1.bin.lz"
-gAreaRoomMap_MinishCaves_1_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_1_0.bin.lz"
-gAreaRoomMap_MinishCaves_1_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_1_1.bin.lz"
-gAreaRoomMap_MinishCaves_2_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_2_0.bin.lz"
-gAreaRoomMap_MinishCaves_2_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_2_1.bin.lz"
-gAreaRoomMap_MinishCaves_3_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_3_0.bin.lz"
-gAreaRoomMap_MinishCaves_3_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_3_1.bin.lz"
-gAreaRoomMap_MinishCaves_4_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_4_0.bin.lz"
-gAreaRoomMap_MinishCaves_4_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_4_1.bin.lz"
-gAreaRoomMap_MinishCaves_5_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_5_0.bin.lz"
-gAreaRoomMap_MinishCaves_5_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_5_1.bin.lz"
-gAreaRoomMap_MinishCaves_6_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_6_0.bin.lz"
-gAreaRoomMap_MinishCaves_6_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_6_1.bin.lz"
-gAreaRoomMap_MinishCaves_7_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_7_0.bin.lz"
-gAreaRoomMap_MinishCaves_7_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_7_1.bin.lz"
-gAreaRoomMap_MinishCaves_8_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_8_0.bin.lz"
-gAreaRoomMap_MinishCaves_8_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_8_1.bin.lz"
-gAreaRoomMap_MinishCaves_9_0::
-	.incbin "assets/gAreaRoomMap_MinishCaves_9_0.bin.lz"
-gAreaRoomMap_MinishCaves_9_1::
-	.incbin "assets/gAreaRoomMap_MinishCaves_9_1.bin.lz"
-gAreaRoomMap_CastleGardenMinishHoles_0_0::
-	.incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_0_0.bin.lz"
-gAreaRoomMap_CastleGardenMinishHoles_0_1::
-	.incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_0_1.bin.lz"
-gAreaRoomMap_CastleGardenMinishHoles_1_0::
-	.incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_1_0.bin.lz"
-gAreaRoomMap_CastleGardenMinishHoles_1_1::
-	.incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_1_1.bin.lz"
-gAreaRoomMap_37_0_0::
-	.incbin "assets/gAreaRoomMap_37_0_0.bin.lz"
-gAreaRoomMap_37_0_1::
-	.incbin "assets/gAreaRoomMap_37_0_1.bin.lz"
-gAreaRoomMap_37_1_0::
-	.incbin "assets/gAreaRoomMap_37_1_0.bin.lz"
-gAreaRoomMap_37_1_1::
-	.incbin "assets/gAreaRoomMap_37_1_1.bin.lz"
-gAreaTileset_LakeWoodsCave_0_3::
-	.incbin "tilesets/gAreaTileset_LakeWoodsCave_0_3.4bpp.lz"
-gAreaTileset_LakeWoodsCave_0_4::
-	.incbin "tilesets/gAreaTileset_LakeWoodsCave_0_4.4bpp.lz"
+	.incbin "maps/areas/053_MinishCaves/tilesets/0/gAreaTileset_MinishCaves_0_2.4bpp.lz"
+gAreaMetaTileset_MinishCaves_bottom::
+	.incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTileset_MinishCaves_bottom.bin.lz"
+gAreaMetaTileset_MinishCaves_top::
+	.incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTileset_MinishCaves_top.bin.lz"
+gAreaMetaTilesetTypes_MinishCaves_bottom::
+	.incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTilesetTypes_MinishCaves_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishCaves_top::
+	.incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTilesetTypes_MinishCaves_top.bin.lz"
+gAreaTileset_CastleGardenMinishHoles_0_0::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/tilesets/0/gAreaTileset_CastleGardenMinishHoles_0_0.4bpp.lz"
+gAreaTileset_CastleGardenMinishHoles_0_1::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/tilesets/0/gAreaTileset_CastleGardenMinishHoles_0_1.4bpp.lz"
+gAreaTileset_CastleGardenMinishHoles_0_2::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/tilesets/0/gAreaTileset_CastleGardenMinishHoles_0_2.4bpp.lz"
+gAreaMetaTileset_CastleGardenMinishHoles_bottom::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTileset_CastleGardenMinishHoles_bottom.bin.lz"
+gAreaMetaTileset_CastleGardenMinishHoles_top::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTileset_CastleGardenMinishHoles_top.bin.lz"
+gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom.bin.lz"
+gAreaMetaTilesetTypes_CastleGardenMinishHoles_top::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTilesetTypes_CastleGardenMinishHoles_top.bin.lz"
+gAreaRoomMap_MinishCaves_BeanPesto_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_BeanPesto_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_top.bin.lz"
+gAreaRoomMap_MinishCaves_SoutheastWater1_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/01_SoutheastWater1/gAreaRoomMap_MinishCaves_SoutheastWater1_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_SoutheastWater1_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/01_SoutheastWater1/gAreaRoomMap_MinishCaves_SoutheastWater1_top.bin.lz"
+gAreaRoomMap_MinishCaves_2_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/02_2/gAreaRoomMap_MinishCaves_2_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_2_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/02_2/gAreaRoomMap_MinishCaves_2_top.bin.lz"
+gAreaRoomMap_MinishCaves_Ruins_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/03_Ruins/gAreaRoomMap_MinishCaves_Ruins_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_Ruins_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/03_Ruins/gAreaRoomMap_MinishCaves_Ruins_top.bin.lz"
+gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/04_OutsideLinksHouse/gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_OutsideLinksHouse_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/04_OutsideLinksHouse/gAreaRoomMap_MinishCaves_OutsideLinksHouse_top.bin.lz"
+gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/05_MinishWoodsNorth1/gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/05_MinishWoodsNorth1/gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top.bin.lz"
+gAreaRoomMap_MinishCaves_6_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/06_6/gAreaRoomMap_MinishCaves_6_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_6_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/06_6/gAreaRoomMap_MinishCaves_6_top.bin.lz"
+gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/07_LakeHyliaNorth/gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_LakeHyliaNorth_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/07_LakeHyliaNorth/gAreaRoomMap_MinishCaves_LakeHyliaNorth_top.bin.lz"
+gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/08_LakeHyliaLibrari/gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/08_LakeHyliaLibrari/gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top.bin.lz"
+gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom::
+	.incbin "maps/areas/053_MinishCaves/rooms/09_MinishWoodsSouthwest/gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom.bin.lz"
+gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top::
+	.incbin "maps/areas/053_MinishCaves/rooms/09_MinishWoodsSouthwest/gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top.bin.lz"
+gAreaRoomMap_CastleGardenMinishHoles_0_bottom::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/rooms/00_0/gAreaRoomMap_CastleGardenMinishHoles_0_bottom.bin.lz"
+gAreaRoomMap_CastleGardenMinishHoles_0_top::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/rooms/00_0/gAreaRoomMap_CastleGardenMinishHoles_0_top.bin.lz"
+gAreaRoomMap_CastleGardenMinishHoles_1_bottom::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/rooms/01_1/gAreaRoomMap_CastleGardenMinishHoles_1_bottom.bin.lz"
+gAreaRoomMap_CastleGardenMinishHoles_1_top::
+	.incbin "maps/areas/054_CastleGardenMinishHoles/rooms/01_1/gAreaRoomMap_CastleGardenMinishHoles_1_top.bin.lz"
+gAreaRoomMap_37_0_bottom::
+	.incbin "maps/areas/055_37/rooms/00_0/gAreaRoomMap_37_0_bottom.bin.lz"
+gAreaRoomMap_37_0_top::
+	.incbin "maps/areas/055_37/rooms/00_0/gAreaRoomMap_37_0_top.bin.lz"
+gAreaRoomMap_37_1_bottom::
+	.incbin "maps/areas/055_37/rooms/01_1/gAreaRoomMap_37_1_bottom.bin.lz"
+gAreaRoomMap_37_1_top::
+	.incbin "maps/areas/055_37/rooms/01_1/gAreaRoomMap_37_1_top.bin.lz"
+gAreaTileset_MinishWoods_1_0::
+	.incbin "maps/areas/000_MinishWoods/tilesets/1/gAreaTileset_MinishWoods_1_0.4bpp.lz"
+gAreaTileset_MinishWoods_1_1::
+	.incbin "maps/areas/000_MinishWoods/tilesets/1/gAreaTileset_MinishWoods_1_1.4bpp.lz"
 gAreaTileset_HyruleDigCaves_0_3::
-	.incbin "tilesets/gAreaTileset_HyruleDigCaves_0_3.4bpp.lz"
+	.incbin "maps/areas/015_HyruleDigCaves/tilesets/0/gAreaTileset_HyruleDigCaves_0_3.4bpp.lz"
 gAreaTileset_HyruleDigCaves_0_4::
-	.incbin "tilesets/gAreaTileset_HyruleDigCaves_0_4.4bpp.lz"
-gAreaTileset_VeilFallsDigCave_0_3::
-	.incbin "tilesets/gAreaTileset_VeilFallsDigCave_0_3.4bpp.lz"
-gAreaTileset_VeilFallsDigCave_0_4::
-	.incbin "tilesets/gAreaTileset_VeilFallsDigCave_0_4.4bpp.lz"
-gAreaTileset_DigCaves1_0_3::
-	.incbin "tilesets/gAreaTileset_DigCaves1_0_3.4bpp.lz"
-gAreaTileset_DigCaves1_0_4::
-	.incbin "tilesets/gAreaTileset_DigCaves1_0_4.4bpp.lz"
-gAreaTileset_OuterFortressOfWinds_0_3::
-	.incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_3.4bpp.lz"
-gAreaTileset_OuterFortressOfWinds_0_4::
-	.incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_4.4bpp.lz"
+	.incbin "maps/areas/015_HyruleDigCaves/tilesets/0/gAreaTileset_HyruleDigCaves_0_4.4bpp.lz"
+gAreaTileset_CrenelDigCave_0_3::
+	.incbin "maps/areas/020_CrenelDigCave/tilesets/0/gAreaTileset_CrenelDigCave_0_3.4bpp.lz"
+gAreaTileset_CrenelDigCave_0_4::
+	.incbin "maps/areas/020_CrenelDigCave/tilesets/0/gAreaTileset_CrenelDigCave_0_4.4bpp.lz"
+gAreaTileset_DigCaves_0_3::
+	.incbin "maps/areas/019_DigCaves/tilesets/0/gAreaTileset_DigCaves_0_3.4bpp.lz"
+gAreaTileset_DigCaves_0_4::
+	.incbin "maps/areas/019_DigCaves/tilesets/0/gAreaTileset_DigCaves_0_4.4bpp.lz"
+gAreaTileset_CastorWildsDigCave_0_3::
+	.incbin "maps/areas/023_CastorWildsDigCave/tilesets/0/gAreaTileset_CastorWildsDigCave_0_3.4bpp.lz"
+gAreaTileset_CastorWildsDigCave_0_4::
+	.incbin "maps/areas/023_CastorWildsDigCave/tilesets/0/gAreaTileset_CastorWildsDigCave_0_4.4bpp.lz"
 gAreaTileset_HyliaDigCaves_0_3::
-	.incbin "tilesets/gAreaTileset_HyliaDigCaves_0_3.4bpp.lz"
+	.incbin "maps/areas/025_HyliaDigCaves/tilesets/0/gAreaTileset_HyliaDigCaves_0_3.4bpp.lz"
 gAreaTileset_HyliaDigCaves_0_4::
-	.incbin "tilesets/gAreaTileset_HyliaDigCaves_0_4.4bpp.lz"
-gAreaRoomMap_LakeWoodsCave_0_0::
-	.incbin "assets/gAreaRoomMap_LakeWoodsCave_0_0.bin.lz"
+	.incbin "maps/areas/025_HyliaDigCaves/tilesets/0/gAreaTileset_HyliaDigCaves_0_4.4bpp.lz"
+gAreaRoomMap_LakeWoodsCave_Main_bottom::
+	.incbin "maps/areas/012_LakeWoodsCave/rooms/00_Main/gAreaRoomMap_LakeWoodsCave_Main_bottom.bin.lz"
 unknown_12::
 	.incbin "assets/unknown_12.bin"
-gAreaRoomMap_LakeWoodsCave_0_1::
-	.incbin "assets/gAreaRoomMap_LakeWoodsCave_0_1.bin.lz"
-gAreaRoomMap_HyliaDigCaves_0_0::
-	.incbin "assets/gAreaRoomMap_HyliaDigCaves_0_0.bin.lz"
+gAreaRoomMap_LakeWoodsCave_Main_top::
+	.incbin "maps/areas/012_LakeWoodsCave/rooms/00_Main/gAreaRoomMap_LakeWoodsCave_Main_top.bin.lz"
+gAreaRoomMap_HyliaDigCaves_0_bottom::
+	.incbin "maps/areas/025_HyliaDigCaves/rooms/00_0/gAreaRoomMap_HyliaDigCaves_0_bottom.bin.lz"
 unknown_13::
 	.incbin "assets/unknown_13.bin"
-gAreaRoomMap_HyliaDigCaves_0_1::
-	.incbin "assets/gAreaRoomMap_HyliaDigCaves_0_1.bin.lz"
-gAreaRoomMap_HyliaDigCaves_1_0::
-	.incbin "assets/gAreaRoomMap_HyliaDigCaves_1_0.bin.lz"
+gAreaRoomMap_HyliaDigCaves_0_top::
+	.incbin "maps/areas/025_HyliaDigCaves/rooms/00_0/gAreaRoomMap_HyliaDigCaves_0_top.bin.lz"
+gAreaRoomMap_HyliaDigCaves_1_bottom::
+	.incbin "maps/areas/025_HyliaDigCaves/rooms/01_1/gAreaRoomMap_HyliaDigCaves_1_bottom.bin.lz"
 unknown_14::
 	.incbin "assets/unknown_14.bin"
-gAreaRoomMap_HyliaDigCaves_1_1::
-	.incbin "assets/gAreaRoomMap_HyliaDigCaves_1_1.bin.lz"
-gAreaRoomMap_CastorWildsDigCave_0_0::
-	.incbin "assets/gAreaRoomMap_CastorWildsDigCave_0_0.bin.lz"
+gAreaRoomMap_HyliaDigCaves_1_top::
+	.incbin "maps/areas/025_HyliaDigCaves/rooms/01_1/gAreaRoomMap_HyliaDigCaves_1_top.bin.lz"
+gAreaRoomMap_CastorWildsDigCave_0_bottom::
+	.incbin "maps/areas/023_CastorWildsDigCave/rooms/00_0/gAreaRoomMap_CastorWildsDigCave_0_bottom.bin.lz"
 unknown_15::
 	.incbin "assets/unknown_15.bin"
-gAreaRoomMap_CastorWildsDigCave_0_1::
-	.incbin "assets/gAreaRoomMap_CastorWildsDigCave_0_1.bin.lz"
-gAreaRoomMap_HyruleDigCaves_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleDigCaves_0_0.bin.lz"
+gAreaRoomMap_CastorWildsDigCave_0_top::
+	.incbin "maps/areas/023_CastorWildsDigCave/rooms/00_0/gAreaRoomMap_CastorWildsDigCave_0_top.bin.lz"
+gAreaRoomMap_HyruleDigCaves_Town_bottom::
+	.incbin "maps/areas/015_HyruleDigCaves/rooms/00_Town/gAreaRoomMap_HyruleDigCaves_Town_bottom.bin.lz"
 unknown_16::
 	.incbin "assets/unknown_16.bin"
-gAreaRoomMap_HyruleDigCaves_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleDigCaves_0_1.bin.lz"
-gAreaRoomMap_CrenelDigCave_0_0::
-	.incbin "assets/gAreaRoomMap_CrenelDigCave_0_0.bin.lz"
+gAreaRoomMap_HyruleDigCaves_Town_top::
+	.incbin "maps/areas/015_HyruleDigCaves/rooms/00_Town/gAreaRoomMap_HyruleDigCaves_Town_top.bin.lz"
+gAreaRoomMap_CrenelDigCave_0_bottom::
+	.incbin "maps/areas/020_CrenelDigCave/rooms/00_0/gAreaRoomMap_CrenelDigCave_0_bottom.bin.lz"
 unknown_17::
 	.incbin "assets/unknown_17.bin"
-gAreaRoomMap_CrenelDigCave_0_1::
-	.incbin "assets/gAreaRoomMap_CrenelDigCave_0_1.bin.lz"
-gAreaRoomMap_DigCaves_0_0::
-	.incbin "assets/gAreaRoomMap_DigCaves_0_0.bin.lz"
+gAreaRoomMap_CrenelDigCave_0_top::
+	.incbin "maps/areas/020_CrenelDigCave/rooms/00_0/gAreaRoomMap_CrenelDigCave_0_top.bin.lz"
+gAreaRoomMap_DigCaves_EasternHills_bottom::
+	.incbin "maps/areas/019_DigCaves/rooms/00_EasternHills/gAreaRoomMap_DigCaves_EasternHills_bottom.bin.lz"
 unknown_18::
 	.incbin "assets/unknown_18.bin"
-gAreaRoomMap_DigCaves_0_1::
-	.incbin "assets/gAreaRoomMap_DigCaves_0_1.bin.lz"
-gAreaRoomMap_DigCaves_1_0::
-	.incbin "assets/gAreaRoomMap_DigCaves_1_0.bin.lz"
+gAreaRoomMap_DigCaves_EasternHills_top::
+	.incbin "maps/areas/019_DigCaves/rooms/00_EasternHills/gAreaRoomMap_DigCaves_EasternHills_top.bin.lz"
+gAreaRoomMap_DigCaves_TrilbyHighlands_bottom::
+	.incbin "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gAreaRoomMap_DigCaves_TrilbyHighlands_bottom.bin.lz"
 unknown_19::
 	.incbin "assets/unknown_19.bin"
-gAreaRoomMap_DigCaves_1_1::
-	.incbin "assets/gAreaRoomMap_DigCaves_1_1.bin.lz"
-gAreaRoomMap_VeilFallsDigCave_0_0::
-	.incbin "assets/gAreaRoomMap_VeilFallsDigCave_0_0.bin.lz"
+gAreaRoomMap_DigCaves_TrilbyHighlands_top::
+	.incbin "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gAreaRoomMap_DigCaves_TrilbyHighlands_top.bin.lz"
+gAreaRoomMap_VeilFallsDigCave_0_bottom::
+	.incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_bottom.bin.lz"
 unknown_20::
 	.incbin "assets/unknown_20.bin"
-gAreaRoomMap_VeilFallsDigCave_0_1::
-	.incbin "assets/gAreaRoomMap_VeilFallsDigCave_0_1.bin.lz"
-gAreaRoomMap_OuterFortressOfWinds_0_0::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_0_0.bin.lz"
+gAreaRoomMap_VeilFallsDigCave_0_top::
+	.incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_top.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/00_EntranceHall/gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom.bin.lz"
 unknown_21::
 	.incbin "assets/unknown_21.bin"
-gAreaRoomMap_OuterFortressOfWinds_0_1::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_0_1.bin.lz"
-gAreaRoomMap_OuterFortressOfWinds_1_0::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_1_0.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/00_EntranceHall/gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_2f_bottom::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/01_2f/gAreaRoomMap_OuterFortressOfWinds_2f_bottom.bin.lz"
 unknown_22::
 	.incbin "assets/unknown_22.bin"
-gAreaRoomMap_OuterFortressOfWinds_1_1::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_1_1.bin.lz"
-gAreaRoomMap_OuterFortressOfWinds_2_0::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_2_0.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_2f_top::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/01_2f/gAreaRoomMap_OuterFortressOfWinds_2f_top.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_3f_bottom::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/02_3f/gAreaRoomMap_OuterFortressOfWinds_3f_bottom.bin.lz"
 unknown_23::
 	.incbin "assets/unknown_23.bin"
-gAreaRoomMap_OuterFortressOfWinds_2_1::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_2_1.bin.lz"
-gAreaRoomMap_OuterFortressOfWinds_3_0::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_3_0.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_3f_top::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/02_3f/gAreaRoomMap_OuterFortressOfWinds_3f_top.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/03_MoleMitts/gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom.bin.lz"
 unknown_24::
 	.incbin "assets/unknown_24.bin"
-gAreaRoomMap_OuterFortressOfWinds_3_1::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_3_1.bin.lz"
-gAreaRoomMap_OuterFortressOfWinds_4_0::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_4_0.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/03_MoleMitts/gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/04_SmallKey/gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom.bin.lz"
 unknown_25::
 	.incbin "assets/unknown_25.bin"
-gAreaRoomMap_OuterFortressOfWinds_4_1::
-	.incbin "assets/gAreaRoomMap_OuterFortressOfWinds_4_1.bin.lz"
+gAreaRoomMap_OuterFortressOfWinds_SmallKey_top::
+	.incbin "maps/areas/024_OuterFortressOfWinds/rooms/04_SmallKey/gAreaRoomMap_OuterFortressOfWinds_SmallKey_top.bin.lz"
 gAreaTileset_MinishVillage_0_0::
-	.incbin "tilesets/gAreaTileset_MinishVillage_0_0.4bpp.lz"
+	.incbin "maps/areas/001_MinishVillage/tilesets/0/gAreaTileset_MinishVillage_0_0.4bpp.lz"
 gAreaTileset_MinishVillage_0_1::
-	.incbin "tilesets/gAreaTileset_MinishVillage_0_1.4bpp.lz"
+	.incbin "maps/areas/001_MinishVillage/tilesets/0/gAreaTileset_MinishVillage_0_1.4bpp.lz"
 gAreaTileset_MinishVillage_0_2::
-	.incbin "tilesets/gAreaTileset_MinishVillage_0_2.4bpp.lz"
-gAreaMetatiles_MinishVillage_0::
-	.incbin "assets/gAreaMetatiles_MinishVillage_0.bin.lz"
-gAreaMetatiles_MinishVillage_1::
-	.incbin "assets/gAreaMetatiles_MinishVillage_1.bin.lz"
-gAreaMetatiles_MinishVillage_2::
-	.incbin "assets/gAreaMetatiles_MinishVillage_2.bin.lz"
-gAreaMetatiles_MinishVillage_3::
-	.incbin "assets/gAreaMetatiles_MinishVillage_3.bin.lz"
+	.incbin "maps/areas/001_MinishVillage/tilesets/0/gAreaTileset_MinishVillage_0_2.4bpp.lz"
+gAreaMetaTileset_MinishVillage_bottom::
+	.incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTileset_MinishVillage_bottom.bin.lz"
+gAreaMetaTileset_MinishVillage_top::
+	.incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTileset_MinishVillage_top.bin.lz"
+gAreaMetaTilesetTypes_MinishVillage_bottom::
+	.incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTilesetTypes_MinishVillage_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishVillage_top::
+	.incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTilesetTypes_MinishVillage_top.bin.lz"
 gAreaTileset_MinishVillage_1_0::
-	.incbin "tilesets/gAreaTileset_MinishVillage_1_0.4bpp.lz"
+	.incbin "maps/areas/001_MinishVillage/tilesets/1/gAreaTileset_MinishVillage_1_0.4bpp.lz"
 gAreaTileset_MinishVillage_1_1::
-	.incbin "tilesets/gAreaTileset_MinishVillage_1_1.4bpp.lz"
+	.incbin "maps/areas/001_MinishVillage/tilesets/1/gAreaTileset_MinishVillage_1_1.4bpp.lz"
 gAreaTileset_MinishVillage_1_2::
-	.incbin "tilesets/gAreaTileset_MinishVillage_1_2.4bpp.lz"
-gAreaRoomMap_MinishVillage_0_0::
-	.incbin "assets/gAreaRoomMap_MinishVillage_0_0.bin.lz"
-gAreaRoomMap_MinishVillage_0_1::
-	.incbin "assets/gAreaRoomMap_MinishVillage_0_1.bin.lz"
-gAreaRoomMap_MinishVillage_1_0::
-	.incbin "assets/gAreaRoomMap_MinishVillage_1_0.bin.lz"
-gAreaRoomMap_MinishVillage_1_1::
-	.incbin "assets/gAreaRoomMap_MinishVillage_1_1.bin.lz"
+	.incbin "maps/areas/001_MinishVillage/tilesets/1/gAreaTileset_MinishVillage_1_2.4bpp.lz"
+gAreaRoomMap_MinishVillage_Main_bottom::
+	.incbin "maps/areas/001_MinishVillage/rooms/00_Main/gAreaRoomMap_MinishVillage_Main_bottom.bin.lz"
+gAreaRoomMap_MinishVillage_Main_top::
+	.incbin "maps/areas/001_MinishVillage/rooms/00_Main/gAreaRoomMap_MinishVillage_Main_top.bin.lz"
+gAreaRoomMap_MinishVillage_SideHouseArea_bottom::
+	.incbin "maps/areas/001_MinishVillage/rooms/01_SideHouseArea/gAreaRoomMap_MinishVillage_SideHouseArea_bottom.bin.lz"
+gAreaRoomMap_MinishVillage_SideHouseArea_top::
+	.incbin "maps/areas/001_MinishVillage/rooms/01_SideHouseArea/gAreaRoomMap_MinishVillage_SideHouseArea_top.bin.lz"
 gAreaTileset_MelarisMine_0_0::
-	.incbin "tilesets/gAreaTileset_MelarisMine_0_0.4bpp.lz"
+	.incbin "maps/areas/016_MelarisMine/tilesets/0/gAreaTileset_MelarisMine_0_0.4bpp.lz"
 gAreaTileset_MelarisMine_0_1::
-	.incbin "tilesets/gAreaTileset_MelarisMine_0_1.4bpp.lz"
+	.incbin "maps/areas/016_MelarisMine/tilesets/0/gAreaTileset_MelarisMine_0_1.4bpp.lz"
 gAreaTileset_MelarisMine_0_2::
-	.incbin "tilesets/gAreaTileset_MelarisMine_0_2.4bpp.lz"
-gAreaMetatiles_MelarisMine_0::
-	.incbin "assets/gAreaMetatiles_MelarisMine_0.bin.lz"
-gAreaMetatiles_MelarisMine_1::
-	.incbin "assets/gAreaMetatiles_MelarisMine_1.bin.lz"
-gAreaMetatiles_MelarisMine_2::
-	.incbin "assets/gAreaMetatiles_MelarisMine_2.bin.lz"
-gAreaMetatiles_MelarisMine_3::
-	.incbin "assets/gAreaMetatiles_MelarisMine_3.bin.lz"
-gAreaRoomMap_MelarisMine_0_0::
-	.incbin "assets/gAreaRoomMap_MelarisMine_0_0.bin.lz"
-gAreaRoomMap_MelarisMine_0_1::
-	.incbin "assets/gAreaRoomMap_MelarisMine_0_1.bin.lz"
-gAreaTileset_MinishPaths_2_0::
-	.incbin "tilesets/gAreaTileset_MinishPaths_2_0.4bpp.lz"
-gAreaTileset_MinishPaths_2_1::
-	.incbin "tilesets/gAreaTileset_MinishPaths_2_1.4bpp.lz"
-gAreaMetatiles_MnishPaths1_0::
-	.incbin "assets/gAreaMetatiles_MnishPaths1_0.bin.lz"
-gAreaMetatiles_MnishPaths1_1::
-	.incbin "assets/gAreaMetatiles_MnishPaths1_1.bin.lz"
-gAreaRoomMap_MinishPaths_0_0::
-	.incbin "assets/gAreaRoomMap_MinishPaths_0_0.bin.lz"
-gAreaRoomMap_MinishPaths_1_0::
-	.incbin "assets/gAreaRoomMap_MinishPaths_1_0.bin.lz"
-gAreaRoomMap_MinishPaths_2_0::
-	.incbin "assets/gAreaRoomMap_MinishPaths_2_0.bin.lz"
-gAreaRoomMap_MinishPaths_3_0::
-	.incbin "assets/gAreaRoomMap_MinishPaths_3_0.bin.lz"
-gAreaRoomMap_MinishPaths_4_0::
-	.incbin "assets/gAreaRoomMap_MinishPaths_4_0.bin.lz"
+	.incbin "maps/areas/016_MelarisMine/tilesets/0/gAreaTileset_MelarisMine_0_2.4bpp.lz"
+gAreaMetaTileset_MelarisMine_bottom::
+	.incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTileset_MelarisMine_bottom.bin.lz"
+gAreaMetaTileset_MelarisMine_top::
+	.incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTileset_MelarisMine_top.bin.lz"
+gAreaMetaTilesetTypes_MelarisMine_bottom::
+	.incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTilesetTypes_MelarisMine_bottom.bin.lz"
+gAreaMetaTilesetTypes_MelarisMine_top::
+	.incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTilesetTypes_MelarisMine_top.bin.lz"
+gAreaRoomMap_MelarisMine_Main_bottom::
+	.incbin "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_bottom.bin.lz"
+gAreaRoomMap_MelarisMine_Main_top::
+	.incbin "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_top.bin.lz"
+gAreaTileset_MinishPaths_0_0::
+	.incbin "maps/areas/017_MinishPaths/tilesets/0/gAreaTileset_MinishPaths_0_0.4bpp.lz"
+gAreaTileset_MinishPaths_0_1::
+	.incbin "maps/areas/017_MinishPaths/tilesets/0/gAreaTileset_MinishPaths_0_1.4bpp.lz"
+gAreaMetaTileset_MinishPaths_bottom::
+	.incbin "maps/areas/017_MinishPaths/metatilesets/gAreaMetaTileset_MinishPaths_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishPaths_bottom::
+	.incbin "maps/areas/017_MinishPaths/metatilesets/gAreaMetaTilesetTypes_MinishPaths_bottom.bin.lz"
+gAreaRoomMap_MinishPaths_MinishVillage_bottom::
+	.incbin "maps/areas/017_MinishPaths/rooms/00_MinishVillage/gAreaRoomMap_MinishPaths_MinishVillage_bottom.bin.lz"
+gAreaRoomMap_MinishPaths_Bow_bottom::
+	.incbin "maps/areas/017_MinishPaths/rooms/01_Bow/gAreaRoomMap_MinishPaths_Bow_bottom.bin.lz"
+gAreaRoomMap_MinishPaths_Schoolyard_bottom::
+	.incbin "maps/areas/017_MinishPaths/rooms/02_Schoolyard/gAreaRoomMap_MinishPaths_Schoolyard_bottom.bin.lz"
+gAreaRoomMap_MinishPaths_LonLonRanch_bottom::
+	.incbin "maps/areas/017_MinishPaths/rooms/03_LonLonRanch/gAreaRoomMap_MinishPaths_LonLonRanch_bottom.bin.lz"
+gAreaRoomMap_MinishPaths_LakeHylia_bottom::
+	.incbin "maps/areas/017_MinishPaths/rooms/04_LakeHylia/gAreaRoomMap_MinishPaths_LakeHylia_bottom.bin.lz"
 gAreaTileset_CrenelMinishPaths_0_0::
-	.incbin "tilesets/gAreaTileset_CrenelMinishPaths_0_0.4bpp.lz"
+	.incbin "maps/areas/018_CrenelMinishPaths/tilesets/0/gAreaTileset_CrenelMinishPaths_0_0.4bpp.lz"
 gAreaTileset_CrenelMinishPaths_0_1::
-	.incbin "tilesets/gAreaTileset_CrenelMinishPaths_0_1.4bpp.lz"
-gAreaTileset_CrenelMinishPaths_2_0::
-	.incbin "tilesets/gAreaTileset_CrenelMinishPaths_2_0.4bpp.lz"
-gAreaTileset_CrenelMinishPaths_2_1::
-	.incbin "tilesets/gAreaTileset_CrenelMinishPaths_2_1.4bpp.lz"
-gAreaMetatiles_CrenelMinishPaths_0::
-	.incbin "assets/gAreaMetatiles_CrenelMinishPaths_0.bin.lz"
-gAreaMetatiles_CrenelMinishPaths_1::
-	.incbin "assets/gAreaMetatiles_CrenelMinishPaths_1.bin.lz"
-gAreaRoomMap_CrenelMinishPaths_0_0::
-	.incbin "assets/gAreaRoomMap_CrenelMinishPaths_0_0.bin.lz"
-gAreaRoomMap_CrenelMinishPaths_1_0::
-	.incbin "assets/gAreaRoomMap_CrenelMinishPaths_1_0.bin.lz"
-gAreaRoomMap_CrenelMinishPaths_2_0::
-	.incbin "assets/gAreaRoomMap_CrenelMinishPaths_2_0.bin.lz"
-gAreaRoomMap_CrenelMinishPaths_3_0::
-	.incbin "assets/gAreaRoomMap_CrenelMinishPaths_3_0.bin.lz"
-gAreaTileset_EzloCutscene_0_2::
-	.incbin "tilesets/gAreaTileset_EzloCutscene_0_2.4bpp.lz"
-gAreaMetatiles_EzloCutscene_1::
-	.incbin "assets/gAreaMetatiles_EzloCutscene_1.bin.lz"
-gAreaMetatiles_EzloCutscene_3::
-	.incbin "assets/gAreaMetatiles_EzloCutscene_3.bin.lz"
+	.incbin "maps/areas/018_CrenelMinishPaths/tilesets/0/gAreaTileset_CrenelMinishPaths_0_1.4bpp.lz"
+gAreaTileset_CrenelMinishPaths_1_0::
+	.incbin "maps/areas/018_CrenelMinishPaths/tilesets/1/gAreaTileset_CrenelMinishPaths_1_0.4bpp.lz"
+gAreaTileset_CrenelMinishPaths_1_1::
+	.incbin "maps/areas/018_CrenelMinishPaths/tilesets/1/gAreaTileset_CrenelMinishPaths_1_1.4bpp.lz"
+gAreaMetaTileset_CrenelMinishPaths_bottom::
+	.incbin "maps/areas/018_CrenelMinishPaths/metatilesets/gAreaMetaTileset_CrenelMinishPaths_bottom.bin.lz"
+gAreaMetaTilesetTypes_CrenelMinishPaths_bottom::
+	.incbin "maps/areas/018_CrenelMinishPaths/metatilesets/gAreaMetaTilesetTypes_CrenelMinishPaths_bottom.bin.lz"
+gAreaRoomMap_CrenelMinishPaths_Bean_bottom::
+	.incbin "maps/areas/018_CrenelMinishPaths/rooms/00_Bean/gAreaRoomMap_CrenelMinishPaths_Bean_bottom.bin.lz"
+gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom::
+	.incbin "maps/areas/018_CrenelMinishPaths/rooms/01_SpringWater/gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom.bin.lz"
+gAreaRoomMap_CrenelMinishPaths_Rain_bottom::
+	.incbin "maps/areas/018_CrenelMinishPaths/rooms/02_Rain/gAreaRoomMap_CrenelMinishPaths_Rain_bottom.bin.lz"
+gAreaRoomMap_CrenelMinishPaths_Melari_bottom::
+	.incbin "maps/areas/018_CrenelMinishPaths/rooms/03_Melari/gAreaRoomMap_CrenelMinishPaths_Melari_bottom.bin.lz"
+gAreaTileset_HouseInteriors1_0_2::
+	.incbin "maps/areas/033_HouseInteriors1/tilesets/0/gAreaTileset_HouseInteriors1_0_2.4bpp.lz"
+gAreaMetaTileset_HouseInteriors1_top::
+	.incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTileset_HouseInteriors1_top.bin.lz"
+gAreaMetaTilesetTypes_HouseInteriors1_top::
+	.incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTilesetTypes_HouseInteriors1_top.bin.lz"
 gAreaTileset_HouseInteriors1_0_0::
-	.incbin "tilesets/gAreaTileset_HouseInteriors1_0_0.4bpp.lz"
+	.incbin "maps/areas/033_HouseInteriors1/tilesets/0/gAreaTileset_HouseInteriors1_0_0.4bpp.lz"
 gAreaTileset_HouseInteriors1_0_1::
-	.incbin "tilesets/gAreaTileset_HouseInteriors1_0_1.4bpp.lz"
-gAreaMetatiles_HouseInteriors1_0::
-	.incbin "assets/gAreaMetatiles_HouseInteriors1_0.bin.lz"
-gAreaMetatiles_HouseInteriors1_2::
-	.incbin "assets/gAreaMetatiles_HouseInteriors1_2.bin.lz"
-gAreaTileset_HouseInteriors2_2_0::
-	.incbin "tilesets/gAreaTileset_HouseInteriors2_2_0.4bpp.lz"
-gAreaTileset_HouseInteriors2_2_1::
-	.incbin "tilesets/gAreaTileset_HouseInteriors2_2_1.4bpp.lz"
-gAreaMetatiles_HouseInteriors2_0::
-	.incbin "assets/gAreaMetatiles_HouseInteriors2_0.bin.lz"
-gAreaMetatiles_HouseInteriors2_2::
-	.incbin "assets/gAreaMetatiles_HouseInteriors2_2.bin.lz"
+	.incbin "maps/areas/033_HouseInteriors1/tilesets/0/gAreaTileset_HouseInteriors1_0_1.4bpp.lz"
+gAreaMetaTileset_HouseInteriors1_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTileset_HouseInteriors1_bottom.bin.lz"
+gAreaMetaTilesetTypes_HouseInteriors1_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTilesetTypes_HouseInteriors1_bottom.bin.lz"
+gAreaTileset_HouseInteriors2_0_0::
+	.incbin "maps/areas/034_HouseInteriors2/tilesets/0/gAreaTileset_HouseInteriors2_0_0.4bpp.lz"
+gAreaTileset_HouseInteriors2_0_1::
+	.incbin "maps/areas/034_HouseInteriors2/tilesets/0/gAreaTileset_HouseInteriors2_0_1.4bpp.lz"
+gAreaMetaTileset_HouseInteriors2_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/metatilesets/gAreaMetaTileset_HouseInteriors2_bottom.bin.lz"
+gAreaMetaTilesetTypes_HouseInteriors2_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/metatilesets/gAreaMetaTilesetTypes_HouseInteriors2_bottom.bin.lz"
 gAreaTileset_HouseInteriors4_0_0::
-	.incbin "tilesets/gAreaTileset_HouseInteriors4_0_0.4bpp.lz"
+	.incbin "maps/areas/040_HouseInteriors4/tilesets/0/gAreaTileset_HouseInteriors4_0_0.4bpp.lz"
 gAreaTileset_HouseInteriors4_0_1::
-	.incbin "tilesets/gAreaTileset_HouseInteriors4_0_1.4bpp.lz"
-gAreaMetatiles_HouseInteriors4_0::
-	.incbin "assets/gAreaMetatiles_HouseInteriors4_0.bin.lz"
-gAreaMetatiles_HouseInteriors4_2::
-	.incbin "assets/gAreaMetatiles_HouseInteriors4_2.bin.lz"
+	.incbin "maps/areas/040_HouseInteriors4/tilesets/0/gAreaTileset_HouseInteriors4_0_1.4bpp.lz"
+gAreaMetaTileset_HouseInteriors4_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/metatilesets/gAreaMetaTileset_HouseInteriors4_bottom.bin.lz"
+gAreaMetaTilesetTypes_HouseInteriors4_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/metatilesets/gAreaMetaTilesetTypes_HouseInteriors4_bottom.bin.lz"
 gAreaTileset_HouseInteriors3_0_0::
-	.incbin "tilesets/gAreaTileset_HouseInteriors3_0_0.4bpp.lz"
+	.incbin "maps/areas/035_HouseInteriors3/tilesets/0/gAreaTileset_HouseInteriors3_0_0.4bpp.lz"
 gAreaTileset_HouseInteriors3_0_1::
-	.incbin "tilesets/gAreaTileset_HouseInteriors3_0_1.4bpp.lz"
-gAreaMetatiles_HouseInteriors3_0::
-	.incbin "assets/gAreaMetatiles_HouseInteriors3_0.bin.lz"
-gAreaMetatiles_HouseInteriors3_2::
-	.incbin "assets/gAreaMetatiles_HouseInteriors3_2.bin.lz"
+	.incbin "maps/areas/035_HouseInteriors3/tilesets/0/gAreaTileset_HouseInteriors3_0_1.4bpp.lz"
+gAreaMetaTileset_HouseInteriors3_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/metatilesets/gAreaMetaTileset_HouseInteriors3_bottom.bin.lz"
+gAreaMetaTilesetTypes_HouseInteriors3_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/metatilesets/gAreaMetaTilesetTypes_HouseInteriors3_bottom.bin.lz"
 gAreaTileset_TreeInteriors_0_0::
-	.incbin "tilesets/gAreaTileset_TreeInteriors_0_0.4bpp.lz"
+	.incbin "maps/areas/036_TreeInteriors/tilesets/0/gAreaTileset_TreeInteriors_0_0.4bpp.lz"
 gAreaTileset_TreeInteriors_0_1::
-	.incbin "tilesets/gAreaTileset_TreeInteriors_0_1.4bpp.lz"
-gAreaMetatiles_TreeInteriors_0::
-	.incbin "assets/gAreaMetatiles_TreeInteriors_0.bin.lz"
-gAreaMetatiles_TreeInteriors_2::
-	.incbin "assets/gAreaMetatiles_TreeInteriors_2.bin.lz"
-gAreaTileset_MinishCracks_4_0::
-	.incbin "tilesets/gAreaTileset_MinishCracks_4_0.4bpp.lz"
-gAreaTileset_MinishCracks_4_1::
-	.incbin "tilesets/gAreaTileset_MinishCracks_4_1.4bpp.lz"
-gAreaMetatiles_MinishCracks_0::
-	.incbin "assets/gAreaMetatiles_MinishCracks_0.bin.lz"
-gAreaMetatiles_MinishCracks_2::
-	.incbin "assets/gAreaMetatiles_MinishCracks_2.bin.lz"
-gAreaTileset_Dojos_5_0::
-	.incbin "tilesets/gAreaTileset_Dojos_5_0.4bpp.lz"
-gAreaTileset_Dojos_5_1::
-	.incbin "tilesets/gAreaTileset_Dojos_5_1.4bpp.lz"
-gAreaMetatiles_Dojos_0::
-	.incbin "assets/gAreaMetatiles_Dojos_0.bin.lz"
-gAreaMetatiles_Dojos_2::
-	.incbin "assets/gAreaMetatiles_Dojos_2.bin.lz"
+	.incbin "maps/areas/036_TreeInteriors/tilesets/0/gAreaTileset_TreeInteriors_0_1.4bpp.lz"
+gAreaMetaTileset_TreeInteriors_bottom::
+	.incbin "maps/areas/036_TreeInteriors/metatilesets/gAreaMetaTileset_TreeInteriors_bottom.bin.lz"
+gAreaMetaTilesetTypes_TreeInteriors_bottom::
+	.incbin "maps/areas/036_TreeInteriors/metatilesets/gAreaMetaTilesetTypes_TreeInteriors_bottom.bin.lz"
+gAreaTileset_MinishCracks_0_0::
+	.incbin "maps/areas/039_MinishCracks/tilesets/0/gAreaTileset_MinishCracks_0_0.4bpp.lz"
+gAreaTileset_MinishCracks_0_1::
+	.incbin "maps/areas/039_MinishCracks/tilesets/0/gAreaTileset_MinishCracks_0_1.4bpp.lz"
+gAreaMetaTileset_MinishCracks_bottom::
+	.incbin "maps/areas/039_MinishCracks/metatilesets/gAreaMetaTileset_MinishCracks_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishCracks_bottom::
+	.incbin "maps/areas/039_MinishCracks/metatilesets/gAreaMetaTilesetTypes_MinishCracks_bottom.bin.lz"
+gAreaTileset_Dojos_0_0::
+	.incbin "maps/areas/037_Dojos/tilesets/0/gAreaTileset_Dojos_0_0.4bpp.lz"
+gAreaTileset_Dojos_0_1::
+	.incbin "maps/areas/037_Dojos/tilesets/0/gAreaTileset_Dojos_0_1.4bpp.lz"
+gAreaMetaTileset_Dojos_bottom::
+	.incbin "maps/areas/037_Dojos/metatilesets/gAreaMetaTileset_Dojos_bottom.bin.lz"
+gAreaMetaTilesetTypes_Dojos_bottom::
+	.incbin "maps/areas/037_Dojos/metatilesets/gAreaMetaTilesetTypes_Dojos_bottom.bin.lz"
 gAreaTileset_MinishRafters_0_0::
-	.incbin "tilesets/gAreaTileset_MinishRafters_0_0.4bpp.lz"
+	.incbin "maps/areas/046_MinishRafters/tilesets/0/gAreaTileset_MinishRafters_0_0.4bpp.lz"
 gAreaTileset_MinishRafters_0_1::
-	.incbin "tilesets/gAreaTileset_MinishRafters_0_1.4bpp.lz"
-gAreaMetatiles_MinishRafters_0::
-	.incbin "assets/gAreaMetatiles_MinishRafters_0.bin.lz"
-gAreaMetatiles_MinishRafters_2::
-	.incbin "assets/gAreaMetatiles_MinishRafters_2.bin.lz"
+	.incbin "maps/areas/046_MinishRafters/tilesets/0/gAreaTileset_MinishRafters_0_1.4bpp.lz"
+gAreaMetaTileset_MinishRafters_bottom::
+	.incbin "maps/areas/046_MinishRafters/metatilesets/gAreaMetaTileset_MinishRafters_bottom.bin.lz"
+gAreaMetaTilesetTypes_MinishRafters_bottom::
+	.incbin "maps/areas/046_MinishRafters/metatilesets/gAreaMetaTilesetTypes_MinishRafters_bottom.bin.lz"
 gAreaTileset_WindTribeTower_0_0::
-	.incbin "tilesets/gAreaTileset_WindTribeTower_0_0.4bpp.lz"
+	.incbin "maps/areas/048_WindTribeTower/tilesets/0/gAreaTileset_WindTribeTower_0_0.4bpp.lz"
 gAreaTileset_WindTribeTower_0_1::
-	.incbin "tilesets/gAreaTileset_WindTribeTower_0_1.4bpp.lz"
-gAreaMetatiles_WindTribeTower_0::
-	.incbin "assets/gAreaMetatiles_WindTribeTower_0.bin.lz"
-gAreaMetatiles_WindTribeTower_2::
-	.incbin "assets/gAreaMetatiles_WindTribeTower_2.bin.lz"
+	.incbin "maps/areas/048_WindTribeTower/tilesets/0/gAreaTileset_WindTribeTower_0_1.4bpp.lz"
+gAreaMetaTileset_WindTribeTower_bottom::
+	.incbin "maps/areas/048_WindTribeTower/metatilesets/gAreaMetaTileset_WindTribeTower_bottom.bin.lz"
+gAreaMetaTilesetTypes_WindTribeTower_bottom::
+	.incbin "maps/areas/048_WindTribeTower/metatilesets/gAreaMetaTilesetTypes_WindTribeTower_bottom.bin.lz"
 gAreaTileset_WindTribeTowerRoof_0_0::
-	.incbin "tilesets/gAreaTileset_WindTribeTowerRoof_0_0.4bpp.lz"
+	.incbin "maps/areas/049_WindTribeTowerRoof/tilesets/0/gAreaTileset_WindTribeTowerRoof_0_0.4bpp.lz"
 gAreaTileset_WindTribeTowerRoof_0_1::
-	.incbin "tilesets/gAreaTileset_WindTribeTowerRoof_0_1.4bpp.lz"
+	.incbin "maps/areas/049_WindTribeTowerRoof/tilesets/0/gAreaTileset_WindTribeTowerRoof_0_1.4bpp.lz"
 gAreaTileset_WindTribeTowerRoof_0_2::
-	.incbin "tilesets/gAreaTileset_WindTribeTowerRoof_0_2.4bpp.lz"
-gAreaMetatiles_WindTribeTowerRoof_0::
-	.incbin "assets/gAreaMetatiles_WindTribeTowerRoof_0.bin.lz"
-gAreaMetatiles_WindTribeTowerRoof_1::
-	.incbin "assets/gAreaMetatiles_WindTribeTowerRoof_1.bin.lz"
-gAreaMetatiles_WindTribeTowerRoof_2::
-	.incbin "assets/gAreaMetatiles_WindTribeTowerRoof_2.bin.lz"
-gAreaMetatiles_WindTribeTowerRoof_3::
-	.incbin "assets/gAreaMetatiles_WindTribeTowerRoof_3.bin.lz"
+	.incbin "maps/areas/049_WindTribeTowerRoof/tilesets/0/gAreaTileset_WindTribeTowerRoof_0_2.4bpp.lz"
+gAreaMetaTileset_WindTribeTowerRoof_bottom::
+	.incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTileset_WindTribeTowerRoof_bottom.bin.lz"
+gAreaMetaTileset_WindTribeTowerRoof_top::
+	.incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTileset_WindTribeTowerRoof_top.bin.lz"
+gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom::
+	.incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom.bin.lz"
+gAreaMetaTilesetTypes_WindTribeTowerRoof_top::
+	.incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTilesetTypes_WindTribeTowerRoof_top.bin.lz"
 unknown_26::
 	.incbin "assets/unknown_26.bin"
 gAreaTileset_EzloCutscene_0_0::
-	.incbin "tilesets/gAreaTileset_EzloCutscene_0_0.4bpp.lz"
+	.incbin "maps/areas/056_EzloCutscene/tilesets/0/gAreaTileset_EzloCutscene_0_0.4bpp.lz"
 gAreaTileset_EzloCutscene_0_1::
-	.incbin "tilesets/gAreaTileset_EzloCutscene_0_1.4bpp.lz"
-gAreaMetatiles_EzloCutscene_0::
-	.incbin "assets/gAreaMetatiles_EzloCutscene_0.bin.lz"
-gAreaMetatiles_EzloCutscene_2::
-	.incbin "assets/gAreaMetatiles_EzloCutscene_2.bin.lz"
+	.incbin "maps/areas/056_EzloCutscene/tilesets/0/gAreaTileset_EzloCutscene_0_1.4bpp.lz"
+gAreaMetaTileset_EzloCutscene_bottom::
+	.incbin "maps/areas/056_EzloCutscene/metatilesets/gAreaMetaTileset_EzloCutscene_bottom.bin.lz"
+gAreaMetaTilesetTypes_EzloCutscene_bottom::
+	.incbin "maps/areas/056_EzloCutscene/metatilesets/gAreaMetaTilesetTypes_EzloCutscene_bottom.bin.lz"
 unknown_27::
 	.incbin "assets/unknown_27.bin"
-gAreaRoomMap_HouseInteriors2_0_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_0_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_0_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_0_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_1_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_1_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_1_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_1_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_2_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_2_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_2_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_2_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_3_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_3_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_3_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_3_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_4_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_4_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_4_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_4_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_5_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_5_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_5_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_5_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_6_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_6_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_6_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_6_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_7_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_7_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_7_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_7_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_8_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_8_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_8_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_8_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_9_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_9_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_9_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_9_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_10_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_10_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_10_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_10_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_11_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_11_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_11_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_11_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_12_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_12_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_12_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_12_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_13_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_13_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_13_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_13_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_14_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_14_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_14_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_14_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_15_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_15_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_15_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_15_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_16_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_16_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_16_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_16_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_17_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_17_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_17_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_17_1.bin.lz"
-gAreaRoomMap_HouseInteriors2_18_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_18_0.bin.lz"
-gAreaRoomMap_HouseInteriors2_18_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors2_18_1.bin.lz"
-gAreaRoomMap_HouseInteriors4_0_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_0_0.bin.lz"
-gAreaRoomMap_HouseInteriors4_0_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_0_1.bin.lz"
-gAreaRoomMap_HouseInteriors4_1_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_1_0.bin.lz"
-gAreaRoomMap_HouseInteriors4_1_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_1_1.bin.lz"
-gAreaRoomMap_HouseInteriors4_2_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_2_0.bin.lz"
-gAreaRoomMap_HouseInteriors4_2_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_2_1.bin.lz"
-gAreaRoomMap_HouseInteriors4_3_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_3_0.bin.lz"
-gAreaRoomMap_HouseInteriors4_3_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_3_1.bin.lz"
-gAreaRoomMap_HouseInteriors4_4_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_4_0.bin.lz"
-gAreaRoomMap_HouseInteriors4_4_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_4_1.bin.lz"
-gAreaRoomMap_HouseInteriors4_5_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_5_0.bin.lz"
-gAreaRoomMap_HouseInteriors4_5_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors4_5_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_0_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_0_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_0_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_0_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_1_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_1_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_1_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_1_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_2_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_2_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_2_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_2_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_3_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_3_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_3_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_3_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_4_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_4_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_4_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_4_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_5_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_5_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_5_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_5_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_6_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_6_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_6_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_6_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_7_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_7_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_7_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_7_1.bin.lz"
-gAreaRoomMap_HouseInteriors3_8_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_8_0.bin.lz"
-gAreaRoomMap_HouseInteriors3_8_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors3_8_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_0_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_0_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_0_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_0_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_1_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_1_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_1_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_1_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_2_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_2_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_2_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_2_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_3_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_3_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_3_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_3_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_4_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_4_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_4_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_4_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_5_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_5_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_5_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_5_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_6_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_6_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_6_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_6_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_7_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_7_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_7_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_7_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_8_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_8_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_8_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_8_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_9_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_9_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_9_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_9_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_10_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_10_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_10_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_10_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_11_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_11_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_11_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_11_1.bin.lz"
-gAreaRoomMap_HouseInteriors1_12_0::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_12_0.bin.lz"
-gAreaRoomMap_HouseInteriors1_12_1::
-	.incbin "assets/gAreaRoomMap_HouseInteriors1_12_1.bin.lz"
-gAreaRoomMap_Dojos_0_0::
-	.incbin "assets/gAreaRoomMap_Dojos_0_0.bin.lz"
-gAreaRoomMap_Dojos_0_1::
-	.incbin "assets/gAreaRoomMap_Dojos_0_1.bin.lz"
-gAreaRoomMap_Dojos_1_0::
-	.incbin "assets/gAreaRoomMap_Dojos_1_0.bin.lz"
-gAreaRoomMap_Dojos_1_1::
-	.incbin "assets/gAreaRoomMap_Dojos_1_1.bin.lz"
-gAreaRoomMap_Dojos_2_0::
-	.incbin "assets/gAreaRoomMap_Dojos_2_0.bin.lz"
-gAreaRoomMap_Dojos_2_1::
-	.incbin "assets/gAreaRoomMap_Dojos_2_1.bin.lz"
-gAreaRoomMap_Dojos_3_0::
-	.incbin "assets/gAreaRoomMap_Dojos_3_0.bin.lz"
-gAreaRoomMap_Dojos_3_1::
-	.incbin "assets/gAreaRoomMap_Dojos_3_1.bin.lz"
-gAreaRoomMap_Dojos_4_0::
-	.incbin "assets/gAreaRoomMap_Dojos_4_0.bin.lz"
-gAreaRoomMap_Dojos_4_1::
-	.incbin "assets/gAreaRoomMap_Dojos_4_1.bin.lz"
-gAreaRoomMap_Dojos_5_0::
-	.incbin "assets/gAreaRoomMap_Dojos_5_0.bin.lz"
-gAreaRoomMap_Dojos_5_1::
-	.incbin "assets/gAreaRoomMap_Dojos_5_1.bin.lz"
-gAreaRoomMap_Dojos_6_0::
-	.incbin "assets/gAreaRoomMap_Dojos_6_0.bin.lz"
-gAreaRoomMap_Dojos_6_1::
-	.incbin "assets/gAreaRoomMap_Dojos_6_1.bin.lz"
-gAreaRoomMap_Dojos_7_0::
-	.incbin "assets/gAreaRoomMap_Dojos_7_0.bin.lz"
-gAreaRoomMap_Dojos_7_1::
-	.incbin "assets/gAreaRoomMap_Dojos_7_1.bin.lz"
-gAreaRoomMap_Dojos_8_0::
-	.incbin "assets/gAreaRoomMap_Dojos_8_0.bin.lz"
-gAreaRoomMap_Dojos_8_1::
-	.incbin "assets/gAreaRoomMap_Dojos_8_1.bin.lz"
-gAreaRoomMap_Dojos_9_0::
-	.incbin "assets/gAreaRoomMap_Dojos_9_0.bin.lz"
-gAreaRoomMap_Dojos_9_1::
-	.incbin "assets/gAreaRoomMap_Dojos_9_1.bin.lz"
-gAreaRoomMap_Dojos_10_0::
-	.incbin "assets/gAreaRoomMap_Dojos_10_0.bin.lz"
-gAreaRoomMap_Dojos_10_1::
-	.incbin "assets/gAreaRoomMap_Dojos_10_1.bin.lz"
-gAreaRoomMap_Dojos_11_0::
-	.incbin "assets/gAreaRoomMap_Dojos_11_0.bin.lz"
-gAreaRoomMap_Dojos_11_1::
-	.incbin "assets/gAreaRoomMap_Dojos_11_1.bin.lz"
-gAreaRoomMap_Dojos_12_0::
-	.incbin "assets/gAreaRoomMap_Dojos_12_0.bin.lz"
-gAreaRoomMap_Dojos_12_1::
-	.incbin "assets/gAreaRoomMap_Dojos_12_1.bin.lz"
-gAreaRoomMap_Dojos_13_0::
-	.incbin "assets/gAreaRoomMap_Dojos_13_0.bin.lz"
-gAreaRoomMap_Dojos_13_1::
-	.incbin "assets/gAreaRoomMap_Dojos_13_1.bin.lz"
-gAreaRoomMap_TreeInteriors_0_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_0_0.bin"
-gAreaRoomMap_TreeInteriors_0_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_0_1.bin.lz"
-gAreaRoomMap_TreeInteriors_1_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_1_0.bin"
-gAreaRoomMap_TreeInteriors_1_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_1_1.bin.lz"
-gAreaRoomMap_TreeInteriors_2_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_2_0.bin"
-gAreaRoomMap_TreeInteriors_2_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_2_1.bin.lz"
-gAreaRoomMap_TreeInteriors_3_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_3_0.bin"
-gAreaRoomMap_TreeInteriors_3_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_3_1.bin.lz"
-gAreaRoomMap_TreeInteriors_4_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_4_0.bin"
-gAreaRoomMap_TreeInteriors_4_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_4_1.bin.lz"
-gAreaRoomMap_TreeInteriors_5_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_5_0.bin"
-gAreaRoomMap_TreeInteriors_5_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_5_1.bin.lz"
-gAreaRoomMap_TreeInteriors_6_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_6_0.bin"
-gAreaRoomMap_TreeInteriors_6_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_6_1.bin.lz"
-gAreaRoomMap_TreeInteriors_7_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_7_0.bin"
-gAreaRoomMap_TreeInteriors_7_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_7_1.bin.lz"
-gAreaRoomMap_TreeInteriors_8_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_8_0.bin"
-gAreaRoomMap_TreeInteriors_8_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_8_1.bin.lz"
-gAreaRoomMap_TreeInteriors_9_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_9_0.bin"
-gAreaRoomMap_TreeInteriors_9_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_9_1.bin.lz"
-gAreaRoomMap_TreeInteriors_10_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_10_0.bin"
-gAreaRoomMap_TreeInteriors_10_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_10_1.bin.lz"
-gAreaRoomMap_TreeInteriors_11_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_11_0.bin"
-gAreaRoomMap_TreeInteriors_11_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_11_1.bin.lz"
-gAreaRoomMap_TreeInteriors_12_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_12_0.bin"
-gAreaRoomMap_TreeInteriors_12_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_12_1.bin.lz"
-gAreaRoomMap_TreeInteriors_13_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_13_0.bin"
-gAreaRoomMap_TreeInteriors_13_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_13_1.bin.lz"
-gAreaRoomMap_TreeInteriors_14_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_14_0.bin"
-gAreaRoomMap_TreeInteriors_14_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_14_1.bin.lz"
-gAreaRoomMap_TreeInteriors_15_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_15_0.bin"
-gAreaRoomMap_TreeInteriors_15_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_15_1.bin.lz"
-gAreaRoomMap_TreeInteriors_16_0::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_16_0.bin"
-gAreaRoomMap_TreeInteriors_16_1::
-	.incbin "assets/gAreaRoomMap_TreeInteriors_16_1.bin.lz"
-gAreaRoomMap_MinishCracks_0_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_0_0.bin"
-gAreaRoomMap_MinishCracks_0_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_0_1.bin.lz"
-gAreaRoomMap_MinishCracks_1_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_1_0.bin"
-gAreaRoomMap_MinishCracks_1_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_1_1.bin.lz"
-gAreaRoomMap_MinishCracks_2_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_2_0.bin"
-gAreaRoomMap_MinishCracks_2_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_2_1.bin.lz"
-gAreaRoomMap_MinishCracks_3_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_3_0.bin"
-gAreaRoomMap_MinishCracks_3_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_3_1.bin.lz"
-gAreaRoomMap_MinishCracks_4_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_4_0.bin"
-gAreaRoomMap_MinishCracks_4_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_4_1.bin.lz"
-gAreaRoomMap_MinishCracks_5_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_5_0.bin.lz"
-gAreaRoomMap_MinishCracks_5_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_5_1.bin.lz"
-gAreaRoomMap_MinishCracks_6_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_6_0.bin"
-gAreaRoomMap_MinishCracks_6_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_6_1.bin.lz"
-gAreaRoomMap_MinishCracks_7_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_7_0.bin"
-gAreaRoomMap_MinishCracks_7_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_7_1.bin.lz"
-gAreaRoomMap_MinishCracks_8_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_8_0.bin"
-gAreaRoomMap_MinishCracks_8_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_8_1.bin.lz"
-gAreaRoomMap_MinishCracks_9_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_9_0.bin"
-gAreaRoomMap_MinishCracks_9_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_9_1.bin.lz"
-gAreaRoomMap_MinishCracks_10_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_10_0.bin"
-gAreaRoomMap_MinishCracks_10_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_10_1.bin.lz"
-gAreaRoomMap_MinishCracks_11_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_11_0.bin"
-gAreaRoomMap_MinishCracks_11_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_11_1.bin.lz"
-gAreaRoomMap_MinishCracks_12_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_12_0.bin"
-gAreaRoomMap_MinishCracks_12_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_12_1.bin.lz"
-gAreaRoomMap_MinishCracks_13_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_13_0.bin"
-gAreaRoomMap_MinishCracks_13_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_13_1.bin.lz"
-gAreaRoomMap_MinishCracks_14_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_14_0.bin.lz"
-gAreaRoomMap_MinishCracks_14_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_14_1.bin.lz"
-gAreaRoomMap_MinishCracks_15_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_15_0.bin.lz"
-gAreaRoomMap_MinishCracks_15_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_15_1.bin.lz"
-gAreaRoomMap_MinishCracks_16_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_16_0.bin.lz"
-gAreaRoomMap_MinishCracks_16_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_16_1.bin.lz"
-gAreaRoomMap_MinishCracks_17_0::
-	.incbin "assets/gAreaRoomMap_MinishCracks_17_0.bin.lz"
-gAreaRoomMap_MinishCracks_17_1::
-	.incbin "assets/gAreaRoomMap_MinishCracks_17_1.bin.lz"
-gAreaRoomMap_MinishRafters_0_0::
-	.incbin "assets/gAreaRoomMap_MinishRafters_0_0.bin.lz"
-gAreaRoomMap_MinishRafters_1_0::
-	.incbin "assets/gAreaRoomMap_MinishRafters_1_0.bin.lz"
-gAreaRoomMap_MinishRafters_2_0::
-	.incbin "assets/gAreaRoomMap_MinishRafters_2_0.bin.lz"
-gAreaRoomMap_MinishRafters_3_0::
-	.incbin "assets/gAreaRoomMap_MinishRafters_3_0.bin.lz"
-gAreaRoomMap_EzloCutscene_0_0::
-	.incbin "assets/gAreaRoomMap_EzloCutscene_0_0.bin.lz"
-gAreaRoomMap_EzloCutscene_0_1::
-	.incbin "assets/gAreaRoomMap_EzloCutscene_0_1.bin.lz"
-gAreaRoomMap_WindTribeTower_0_0::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_0_0.bin.lz"
-gAreaRoomMap_WindTribeTower_0_1::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_0_1.bin.lz"
-gAreaRoomMap_WindTribeTower_1_0::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_1_0.bin.lz"
-gAreaRoomMap_WindTribeTower_1_1::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_1_1.bin.lz"
-gAreaRoomMap_WindTribeTower_2_0::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_2_0.bin.lz"
-gAreaRoomMap_WindTribeTower_2_1::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_2_1.bin.lz"
-gAreaRoomMap_WindTribeTower_3_0::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_3_0.bin.lz"
-gAreaRoomMap_WindTribeTower_3_1::
-	.incbin "assets/gAreaRoomMap_WindTribeTower_3_1.bin.lz"
-gAreaRoomMap_WindTribeTowerRoof_0_0::
-	.incbin "assets/gAreaRoomMap_WindTribeTowerRoof_0_0.bin.lz"
-gAreaRoomMap_WindTribeTowerRoof_0_1::
-	.incbin "assets/gAreaRoomMap_WindTribeTowerRoof_0_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_0_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_0_2.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_0_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_0_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_1_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_1_2.bin.lz"
+gAreaRoomMap_HouseInteriors2_Stranger_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/00_Stranger/gAreaRoomMap_HouseInteriors2_Stranger_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_Stranger_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/00_Stranger/gAreaRoomMap_HouseInteriors2_Stranger_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_WestOracle_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/01_WestOracle/gAreaRoomMap_HouseInteriors2_WestOracle_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_WestOracle_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/01_WestOracle/gAreaRoomMap_HouseInteriors2_WestOracle_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_2_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/02_2/gAreaRoomMap_HouseInteriors2_2_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_2_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/02_2/gAreaRoomMap_HouseInteriors2_2_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_3_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/03_3/gAreaRoomMap_HouseInteriors2_3_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_3_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/03_3/gAreaRoomMap_HouseInteriors2_3_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_DrLeft_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/04_DrLeft/gAreaRoomMap_HouseInteriors2_DrLeft_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_DrLeft_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/04_DrLeft/gAreaRoomMap_HouseInteriors2_DrLeft_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_5_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/05_5/gAreaRoomMap_HouseInteriors2_5_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_5_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/05_5/gAreaRoomMap_HouseInteriors2_5_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_Romio_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/06_Romio/gAreaRoomMap_HouseInteriors2_Romio_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_Romio_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/06_Romio/gAreaRoomMap_HouseInteriors2_Romio_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_Julietta_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/07_Julietta/gAreaRoomMap_HouseInteriors2_Julietta_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_Julietta_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/07_Julietta/gAreaRoomMap_HouseInteriors2_Julietta_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_Percy_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/08_Percy/gAreaRoomMap_HouseInteriors2_Percy_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_Percy_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/08_Percy/gAreaRoomMap_HouseInteriors2_Percy_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_EastOracle_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/09_EastOracle/gAreaRoomMap_HouseInteriors2_EastOracle_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_EastOracle_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/09_EastOracle/gAreaRoomMap_HouseInteriors2_EastOracle_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_A_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/10_A/gAreaRoomMap_HouseInteriors2_A_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_A_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/10_A/gAreaRoomMap_HouseInteriors2_A_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_B_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/11_B/gAreaRoomMap_HouseInteriors2_B_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_B_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/11_B/gAreaRoomMap_HouseInteriors2_B_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_Cucco_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_Cucco_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/34_16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/34_16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/35_17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/35_17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_Dampe_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_Dampe_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_13_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_13_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/32_20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/32_20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz"
+gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/33_21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top::
+	.incbin "maps/areas/034_HouseInteriors2/rooms/33_21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz"
+gAreaRoomMap_HouseInteriors4_Carpenter_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors4_Carpenter_top::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_top.bin.lz"
+gAreaRoomMap_HouseInteriors4_Swiftblade_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/01_Swiftblade/gAreaRoomMap_HouseInteriors4_Swiftblade_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors4_Swiftblade_top::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/01_Swiftblade/gAreaRoomMap_HouseInteriors4_Swiftblade_top.bin.lz"
+gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/02_RanchHouseWest/gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors4_RanchHouseWest_top::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/02_RanchHouseWest/gAreaRoomMap_HouseInteriors4_RanchHouseWest_top.bin.lz"
+gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/03_RanchHouseEast/gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors4_RanchHouseEast_top::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/03_RanchHouseEast/gAreaRoomMap_HouseInteriors4_RanchHouseEast_top.bin.lz"
+gAreaRoomMap_HouseInteriors4_FarmHouse_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/04_FarmHouse/gAreaRoomMap_HouseInteriors4_FarmHouse_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors4_FarmHouse_top::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/04_FarmHouse/gAreaRoomMap_HouseInteriors4_FarmHouse_top.bin.lz"
+gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/05_MayorLakeCabin/gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top::
+	.incbin "maps/areas/040_HouseInteriors4/rooms/05_MayorLakeCabin/gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_StockwellShop_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/00_StockwellShop/gAreaRoomMap_HouseInteriors3_StockwellShop_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_StockwellShop_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/00_StockwellShop/gAreaRoomMap_HouseInteriors3_StockwellShop_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_Cafe_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/01_Cafe/gAreaRoomMap_HouseInteriors3_Cafe_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_Cafe_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/01_Cafe/gAreaRoomMap_HouseInteriors3_Cafe_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/02_RemShoeShop/gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_RemShoeShop_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/02_RemShoeShop/gAreaRoomMap_HouseInteriors3_RemShoeShop_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_Bakery_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/03_Bakery/gAreaRoomMap_HouseInteriors3_Bakery_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_Bakery_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/03_Bakery/gAreaRoomMap_HouseInteriors3_Bakery_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_Simon_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/04_Simon/gAreaRoomMap_HouseInteriors3_Simon_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_Simon_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/04_Simon/gAreaRoomMap_HouseInteriors3_Simon_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/05_FigurineHouse/gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_FigurineHouse_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/05_FigurineHouse/gAreaRoomMap_HouseInteriors3_FigurineHouse_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/06_BorlovEntrance/gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_BorlovEntrance_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/06_BorlovEntrance/gAreaRoomMap_HouseInteriors3_BorlovEntrance_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_Carlov_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/07_Carlov/gAreaRoomMap_HouseInteriors3_Carlov_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_Carlov_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/07_Carlov/gAreaRoomMap_HouseInteriors3_Carlov_top.bin.lz"
+gAreaRoomMap_HouseInteriors3_Borlov_bottom::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/08_Borlov/gAreaRoomMap_HouseInteriors3_Borlov_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors3_Borlov_top::
+	.incbin "maps/areas/035_HouseInteriors3/rooms/08_Borlov/gAreaRoomMap_HouseInteriors3_Borlov_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_Mayor_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/00_Mayor/gAreaRoomMap_HouseInteriors1_Mayor_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_Mayor_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/00_Mayor/gAreaRoomMap_HouseInteriors1_Mayor_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_PostOffice_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/01_PostOffice/gAreaRoomMap_HouseInteriors1_PostOffice_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_PostOffice_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/01_PostOffice/gAreaRoomMap_HouseInteriors1_PostOffice_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_Library2f_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/02_Library2f/gAreaRoomMap_HouseInteriors1_Library2f_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_Library2f_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/02_Library2f/gAreaRoomMap_HouseInteriors1_Library2f_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_Library1f_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/03_Library1f/gAreaRoomMap_HouseInteriors1_Library1f_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_Library1f_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/03_Library1f/gAreaRoomMap_HouseInteriors1_Library1f_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_Inn1f_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/04_Inn1f/gAreaRoomMap_HouseInteriors1_Inn1f_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_Inn1f_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/04_Inn1f/gAreaRoomMap_HouseInteriors1_Inn1f_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/05_InnWestRoom/gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnWestRoom_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/05_InnWestRoom/gAreaRoomMap_HouseInteriors1_InnWestRoom_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/06_InnMiddleRoom/gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/06_InnMiddleRoom/gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/07_InnEastRoom/gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnEastRoom_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/07_InnEastRoom/gAreaRoomMap_HouseInteriors1_InnEastRoom_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnWest2f_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/08_InnWest2f/gAreaRoomMap_HouseInteriors1_InnWest2f_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnWest2f_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/08_InnWest2f/gAreaRoomMap_HouseInteriors1_InnWest2f_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnEast2f_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnEast2f_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/16_10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/16_10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_SchoolWest_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/17_11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_SchoolWest_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/17_11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz"
+gAreaRoomMap_HouseInteriors1_SchoolEast_bottom::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/18_12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz"
+gAreaRoomMap_HouseInteriors1_SchoolEast_top::
+	.incbin "maps/areas/033_HouseInteriors1/rooms/18_12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz"
+gAreaRoomMap_Dojos_Grayblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_Grayblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_top.bin.lz"
+gAreaRoomMap_Dojos_Splitblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/01_Splitblade/gAreaRoomMap_Dojos_Splitblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_Splitblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/01_Splitblade/gAreaRoomMap_Dojos_Splitblade_top.bin.lz"
+gAreaRoomMap_Dojos_Greatblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/02_Greatblade/gAreaRoomMap_Dojos_Greatblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_Greatblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/02_Greatblade/gAreaRoomMap_Dojos_Greatblade_top.bin.lz"
+gAreaRoomMap_Dojos_Scarblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/03_Scarblade/gAreaRoomMap_Dojos_Scarblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_Scarblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/03_Scarblade/gAreaRoomMap_Dojos_Scarblade_top.bin.lz"
+gAreaRoomMap_Dojos_SwiftbladeI_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/04_SwiftbladeI/gAreaRoomMap_Dojos_SwiftbladeI_bottom.bin.lz"
+gAreaRoomMap_Dojos_SwiftbladeI_top::
+	.incbin "maps/areas/037_Dojos/rooms/04_SwiftbladeI/gAreaRoomMap_Dojos_SwiftbladeI_top.bin.lz"
+gAreaRoomMap_Dojos_Grimblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/05_Grimblade/gAreaRoomMap_Dojos_Grimblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_Grimblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/05_Grimblade/gAreaRoomMap_Dojos_Grimblade_top.bin.lz"
+gAreaRoomMap_Dojos_Waveblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/06_Waveblade/gAreaRoomMap_Dojos_Waveblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_Waveblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/06_Waveblade/gAreaRoomMap_Dojos_Waveblade_top.bin.lz"
+gAreaRoomMap_Dojos_7_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/07_7/gAreaRoomMap_Dojos_7_bottom.bin.lz"
+gAreaRoomMap_Dojos_7_top::
+	.incbin "maps/areas/037_Dojos/rooms/07_7/gAreaRoomMap_Dojos_7_top.bin.lz"
+gAreaRoomMap_Dojos_8_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/08_8/gAreaRoomMap_Dojos_8_bottom.bin.lz"
+gAreaRoomMap_Dojos_8_top::
+	.incbin "maps/areas/037_Dojos/rooms/08_8/gAreaRoomMap_Dojos_8_top.bin.lz"
+gAreaRoomMap_Dojos_9_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/09_9/gAreaRoomMap_Dojos_9_bottom.bin.lz"
+gAreaRoomMap_Dojos_9_top::
+	.incbin "maps/areas/037_Dojos/rooms/09_9/gAreaRoomMap_Dojos_9_top.bin.lz"
+gAreaRoomMap_Dojos_ToGrimblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/10_ToGrimblade/gAreaRoomMap_Dojos_ToGrimblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_ToGrimblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/10_ToGrimblade/gAreaRoomMap_Dojos_ToGrimblade_top.bin.lz"
+gAreaRoomMap_Dojos_ToSplitblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/11_ToSplitblade/gAreaRoomMap_Dojos_ToSplitblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_ToSplitblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/11_ToSplitblade/gAreaRoomMap_Dojos_ToSplitblade_top.bin.lz"
+gAreaRoomMap_Dojos_ToGreatblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/12_ToGreatblade/gAreaRoomMap_Dojos_ToGreatblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_ToGreatblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/12_ToGreatblade/gAreaRoomMap_Dojos_ToGreatblade_top.bin.lz"
+gAreaRoomMap_Dojos_ToScarblade_bottom::
+	.incbin "maps/areas/037_Dojos/rooms/13_ToScarblade/gAreaRoomMap_Dojos_ToScarblade_bottom.bin.lz"
+gAreaRoomMap_Dojos_ToScarblade_top::
+	.incbin "maps/areas/037_Dojos/rooms/13_ToScarblade/gAreaRoomMap_Dojos_ToScarblade_top.bin.lz"
+gAreaRoomMap_TreeInteriors_WitchHut_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/00_WitchHut/gAreaRoomMap_TreeInteriors_WitchHut_bottom.bin"
+gAreaRoomMap_TreeInteriors_WitchHut_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/00_WitchHut/gAreaRoomMap_TreeInteriors_WitchHut_top.bin.lz"
+gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/16_StairsToCarlov/gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom.bin"
+gAreaRoomMap_TreeInteriors_StairsToCarlov_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/16_StairsToCarlov/gAreaRoomMap_TreeInteriors_StairsToCarlov_top.bin.lz"
+gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/17_PercysTreehouse/gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom.bin"
+gAreaRoomMap_TreeInteriors_PercysTreehouse_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/17_PercysTreehouse/gAreaRoomMap_TreeInteriors_PercysTreehouse_top.bin.lz"
+gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/18_SouthHyruleFieldHeartPiece/gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom.bin"
+gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/18_SouthHyruleFieldHeartPiece/gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top.bin.lz"
+gAreaRoomMap_TreeInteriors_Waveblade_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_bottom.bin"
+gAreaRoomMap_TreeInteriors_Waveblade_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_top.bin.lz"
+gAreaRoomMap_TreeInteriors_14_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/01_14/gAreaRoomMap_TreeInteriors_14_bottom.bin"
+gAreaRoomMap_TreeInteriors_14_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/01_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz"
+gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin"
+gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz"
+gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin"
+gAreaRoomMap_TreeInteriors_BoomerangNortheast_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz"
+gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin"
+gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz"
+gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin"
+gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz"
+gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom.bin"
+gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top.bin.lz"
+gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/26_NorthHyruleFieldFairyFountain/gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom.bin"
+gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/26_NorthHyruleFieldFairyFountain/gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top.bin.lz"
+gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom.bin"
+gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top.bin.lz"
+gAreaRoomMap_TreeInteriors_1c_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/01_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin"
+gAreaRoomMap_TreeInteriors_1c_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/01_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz"
+gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom.bin"
+gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top.bin.lz"
+gAreaRoomMap_TreeInteriors_1e_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/01_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin"
+gAreaRoomMap_TreeInteriors_1e_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/01_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz"
+gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom::
+	.incbin "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom.bin"
+gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top::
+	.incbin "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top.bin.lz"
+gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/00_LonLonRanchNorth/gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom.bin"
+gAreaRoomMap_MinishCracks_LonLonRanchNorth_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/00_LonLonRanchNorth/gAreaRoomMap_MinishCracks_LonLonRanchNorth_top.bin.lz"
+gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/01_LakeHyliaEast/gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom.bin"
+gAreaRoomMap_MinishCracks_LakeHyliaEast_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/01_LakeHyliaEast/gAreaRoomMap_MinishCracks_LakeHyliaEast_top.bin.lz"
+gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/02_HyruleCastleGarden/gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom.bin"
+gAreaRoomMap_MinishCracks_HyruleCastleGarden_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/02_HyruleCastleGarden/gAreaRoomMap_MinishCracks_HyruleCastleGarden_top.bin.lz"
+gAreaRoomMap_MinishCracks_MtCrenel_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/03_MtCrenel/gAreaRoomMap_MinishCracks_MtCrenel_bottom.bin"
+gAreaRoomMap_MinishCracks_MtCrenel_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/03_MtCrenel/gAreaRoomMap_MinishCracks_MtCrenel_top.bin.lz"
+gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/04_EastHyruleCastle/gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom.bin"
+gAreaRoomMap_MinishCracks_EastHyruleCastle_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/04_EastHyruleCastle/gAreaRoomMap_MinishCracks_EastHyruleCastle_top.bin.lz"
+gAreaRoomMap_MinishCracks_5_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/05_5/gAreaRoomMap_MinishCracks_5_bottom.bin.lz"
+gAreaRoomMap_MinishCracks_5_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/05_5/gAreaRoomMap_MinishCracks_5_top.bin.lz"
+gAreaRoomMap_MinishCracks_CastorWildsBow_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/06_CastorWildsBow/gAreaRoomMap_MinishCracks_CastorWildsBow_bottom.bin"
+gAreaRoomMap_MinishCracks_CastorWildsBow_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/06_CastorWildsBow/gAreaRoomMap_MinishCracks_CastorWildsBow_top.bin.lz"
+gAreaRoomMap_MinishCracks_RuinsEntrance_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/07_RuinsEntrance/gAreaRoomMap_MinishCracks_RuinsEntrance_bottom.bin"
+gAreaRoomMap_MinishCracks_RuinsEntrance_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/07_RuinsEntrance/gAreaRoomMap_MinishCracks_RuinsEntrance_top.bin.lz"
+gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/08_MinishWoodsSouth/gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom.bin"
+gAreaRoomMap_MinishCracks_MinishWoodsSouth_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/08_MinishWoodsSouth/gAreaRoomMap_MinishCracks_MinishWoodsSouth_top.bin.lz"
+gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom.bin"
+gAreaRoomMap_MinishCracks_CastorWildsNorth_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_top.bin.lz"
+gAreaRoomMap_MinishCracks_CastorWildsWest_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/16_10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin"
+gAreaRoomMap_MinishCracks_CastorWildsWest_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/16_10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz"
+gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/17_11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin"
+gAreaRoomMap_MinishCracks_CastorWildsMiddle_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/17_11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz"
+gAreaRoomMap_MinishCracks_RuinsTektite_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/18_12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin"
+gAreaRoomMap_MinishCracks_RuinsTektite_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/18_12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz"
+gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/19_13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin"
+gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/19_13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz"
+gAreaRoomMap_MinishCracks_E_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_bottom.bin.lz"
+gAreaRoomMap_MinishCracks_E_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_top.bin.lz"
+gAreaRoomMap_MinishCracks_F_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/15_F/gAreaRoomMap_MinishCracks_F_bottom.bin.lz"
+gAreaRoomMap_MinishCracks_F_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/15_F/gAreaRoomMap_MinishCracks_F_top.bin.lz"
+gAreaRoomMap_MinishCracks_10_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/16_10/gAreaRoomMap_MinishCracks_10_bottom.bin.lz"
+gAreaRoomMap_MinishCracks_10_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/16_10/gAreaRoomMap_MinishCracks_10_top.bin.lz"
+gAreaRoomMap_MinishCracks_11_bottom::
+	.incbin "maps/areas/039_MinishCracks/rooms/17_11/gAreaRoomMap_MinishCracks_11_bottom.bin.lz"
+gAreaRoomMap_MinishCracks_11_top::
+	.incbin "maps/areas/039_MinishCracks/rooms/17_11/gAreaRoomMap_MinishCracks_11_top.bin.lz"
+gAreaRoomMap_MinishRafters_Cafe_bottom::
+	.incbin "maps/areas/046_MinishRafters/rooms/00_Cafe/gAreaRoomMap_MinishRafters_Cafe_bottom.bin.lz"
+gAreaRoomMap_MinishRafters_Stockwell_bottom::
+	.incbin "maps/areas/046_MinishRafters/rooms/01_Stockwell/gAreaRoomMap_MinishRafters_Stockwell_bottom.bin.lz"
+gAreaRoomMap_MinishRafters_DrLeft_bottom::
+	.incbin "maps/areas/046_MinishRafters/rooms/02_DrLeft/gAreaRoomMap_MinishRafters_DrLeft_bottom.bin.lz"
+gAreaRoomMap_MinishRafters_Bakery_bottom::
+	.incbin "maps/areas/046_MinishRafters/rooms/03_Bakery/gAreaRoomMap_MinishRafters_Bakery_bottom.bin.lz"
+gAreaRoomMap_EzloCutscene_0_bottom::
+	.incbin "maps/areas/056_EzloCutscene/rooms/00_0/gAreaRoomMap_EzloCutscene_0_bottom.bin.lz"
+gAreaRoomMap_EzloCutscene_0_top::
+	.incbin "maps/areas/056_EzloCutscene/rooms/00_0/gAreaRoomMap_EzloCutscene_0_top.bin.lz"
+gAreaRoomMap_WindTribeTower_Entrance_bottom::
+	.incbin "maps/areas/048_WindTribeTower/rooms/00_Entrance/gAreaRoomMap_WindTribeTower_Entrance_bottom.bin.lz"
+gAreaRoomMap_WindTribeTower_Entrance_top::
+	.incbin "maps/areas/048_WindTribeTower/rooms/00_Entrance/gAreaRoomMap_WindTribeTower_Entrance_top.bin.lz"
+gAreaRoomMap_WindTribeTower_Floor1_bottom::
+	.incbin "maps/areas/048_WindTribeTower/rooms/01_Floor1/gAreaRoomMap_WindTribeTower_Floor1_bottom.bin.lz"
+gAreaRoomMap_WindTribeTower_Floor1_top::
+	.incbin "maps/areas/048_WindTribeTower/rooms/01_Floor1/gAreaRoomMap_WindTribeTower_Floor1_top.bin.lz"
+gAreaRoomMap_WindTribeTower_Floor2_bottom::
+	.incbin "maps/areas/048_WindTribeTower/rooms/02_Floor2/gAreaRoomMap_WindTribeTower_Floor2_bottom.bin.lz"
+gAreaRoomMap_WindTribeTower_Floor2_top::
+	.incbin "maps/areas/048_WindTribeTower/rooms/02_Floor2/gAreaRoomMap_WindTribeTower_Floor2_top.bin.lz"
+gAreaRoomMap_WindTribeTower_Floor3_bottom::
+	.incbin "maps/areas/048_WindTribeTower/rooms/03_Floor3/gAreaRoomMap_WindTribeTower_Floor3_bottom.bin.lz"
+gAreaRoomMap_WindTribeTower_Floor3_top::
+	.incbin "maps/areas/048_WindTribeTower/rooms/03_Floor3/gAreaRoomMap_WindTribeTower_Floor3_top.bin.lz"
+gAreaRoomMap_WindTribeTowerRoof_0_bottom::
+	.incbin "maps/areas/049_WindTribeTowerRoof/rooms/00_0/gAreaRoomMap_WindTribeTowerRoof_0_bottom.bin.lz"
+gAreaRoomMap_WindTribeTowerRoof_0_top::
+	.incbin "maps/areas/049_WindTribeTowerRoof/rooms/00_0/gAreaRoomMap_WindTribeTowerRoof_0_top.bin.lz"
+gRoomMapping_MinishHouseInteriors_GentariMain_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/00_GentariMain/gRoomMapping_MinishHouseInteriors_GentariMain_bottom.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_GentariMain::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/00_GentariMain/gRoomCollisionMap_MinishHouseInteriors_GentariMain.bin.lz"
+gRoomMapping_MinishHouseInteriors_GentariExit_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomMapping_MinishHouseInteriors_GentariExit_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_0_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_1_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_1_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_2_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_2_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_GentariExit::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomCollisionMap_MinishHouseInteriors_GentariExit.bin.lz"
+gRoomMapping_MinishHouseInteriors_Festari_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomMapping_MinishHouseInteriors_Festari_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_1_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_2_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_2_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_3_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_3_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_Festari::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomCollisionMap_MinishHouseInteriors_Festari.bin.lz"
+gRoomMapping_MinishHouseInteriors_Red_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomMapping_MinishHouseInteriors_Red_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_2_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_3_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_3_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_4_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_4_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_Red::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomCollisionMap_MinishHouseInteriors_Red.bin.lz"
+gRoomMapping_MinishHouseInteriors_Green_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomMapping_MinishHouseInteriors_Green_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_3_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_4_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_4_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_5_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_5_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_Green::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomCollisionMap_MinishHouseInteriors_Green.bin.lz"
+gRoomMapping_MinishHouseInteriors_Blue_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomMapping_MinishHouseInteriors_Blue_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_4_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_5_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_5_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_6_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_6_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_Blue::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomCollisionMap_MinishHouseInteriors_Blue.bin.lz"
+gRoomMapping_MinishHouseInteriors_SideArea_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomMapping_MinishHouseInteriors_SideArea_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_5_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_6_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_6_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_7_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_7_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_SideArea::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomCollisionMap_MinishHouseInteriors_SideArea.bin.lz"
+gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_6_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_7_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_7_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_8_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_8_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_ShoeMinish::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomCollisionMap_MinishHouseInteriors_ShoeMinish.bin.lz"
+gRoomMapping_MinishHouseInteriors_PotMinish_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomMapping_MinishHouseInteriors_PotMinish_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_7_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_8_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_8_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_9_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_9_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_PotMinish::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomCollisionMap_MinishHouseInteriors_PotMinish.bin.lz"
+gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_8_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_9_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_9_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_10_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_10_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_BarrelMinish::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomCollisionMap_MinishHouseInteriors_BarrelMinish.bin.lz"
+gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_9_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_10_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_10_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_11_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_11_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest.bin.lz"
+gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_10_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_11_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_11_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_12_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_12_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast.bin.lz"
+gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_11_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_12_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_12_1.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast.bin.lz"
 unknown_28::
 	.incbin "assets/unknown_28.bin"
-gAreaRoomMap_MinishHouseInteriors_13_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_13_2.bin.lz"
+gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_12_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_13_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_13_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_14_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_14_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest.bin.lz"
+gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_13_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_14_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_14_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_15_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_15_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField.bin.lz"
+gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_14_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_15_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_15_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_16_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_16_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle.bin.lz"
+gRoomMapping_MinishHouseInteriors_Librari_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomMapping_MinishHouseInteriors_Librari_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_15_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_16_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_16_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_17_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_17_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_Librari::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomCollisionMap_MinishHouseInteriors_Librari.bin.lz"
+gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_16_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_17_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_17_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_18_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_18_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit.bin.lz"
+gRoomMapping_MinishHouseInteriors_HyruleTown_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomMapping_MinishHouseInteriors_HyruleTown_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_17_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_18_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_18_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_19_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_19_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_HyruleTown::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomCollisionMap_MinishHouseInteriors_HyruleTown.bin.lz"
+gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_18_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_19_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_19_1.bin.lz"
-gAreaRoomMap_MinishHouseInteriors_20_2::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_20_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb.bin.lz"
+gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom.bin.lz"
 gAreaTileset_MinishHouseInteriors_19_0::
 	.incbin "tilesets/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz"
-gAreaRoomMap_MinishHouseInteriors_20_1::
-	.incbin "assets/gAreaRoomMap_MinishHouseInteriors_20_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_0_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_0_2.bin.lz"
+gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina::
+	.incbin "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina.bin.lz"
+gRoomMapping_TownMinishHoles_MayorsHouse_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomMapping_TownMinishHoles_MayorsHouse_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_0_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_0_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_0_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_0_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_1_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_1_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_MayorsHouse::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomCollisionMap_TownMinishHoles_MayorsHouse.bin.lz"
+gRoomMapping_TownMinishHoles_WestOracle_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomMapping_TownMinishHoles_WestOracle_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_1_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_1_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_1_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_1_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_2_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_2_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_WestOracle::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomCollisionMap_TownMinishHoles_WestOracle.bin.lz"
+gRoomMapping_TownMinishHoles_DrLeft_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomMapping_TownMinishHoles_DrLeft_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_2_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_2_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_2_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_2_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_3_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_3_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_DrLeft::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomCollisionMap_TownMinishHoles_DrLeft.bin.lz"
+gRoomMapping_TownMinishHoles_Carpenter_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomMapping_TownMinishHoles_Carpenter_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_3_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_3_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_3_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_3_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_4_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_4_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_Carpenter::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomCollisionMap_TownMinishHoles_Carpenter.bin.lz"
+gRoomMapping_TownMinishHoles_Cafe_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomMapping_TownMinishHoles_Cafe_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_4_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_4_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_4_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_4_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_5_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_5_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_Cafe::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomCollisionMap_TownMinishHoles_Cafe.bin.lz"
+gRoomMapping_TownMinishHoles_5_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomMapping_TownMinishHoles_5_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_5_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_5_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_5_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_5_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_6_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_6_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_5::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomCollisionMap_TownMinishHoles_5.bin.lz"
+gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_6_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_6_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_6_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_6_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_7_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_7_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_LibraryBookshelf::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomCollisionMap_TownMinishHoles_LibraryBookshelf.bin.lz"
+gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_7_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_7_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_7_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_7_1.bin.lz"
-gAreaRoomMap_TownMinishHoles_8_2::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_8_2.bin.lz"
+gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse.bin.lz"
+gRoomMapping_TownMinishHoles_RemShoeShop_bottom::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomMapping_TownMinishHoles_RemShoeShop_bottom.bin.lz"
 gAreaTileset_TownMinishHoles_8_0::
 	.incbin "tilesets/gAreaTileset_TownMinishHoles_8_0.8bpp.lz"
-gAreaRoomMap_TownMinishHoles_8_1::
-	.incbin "assets/gAreaRoomMap_TownMinishHoles_8_1.bin.lz"
-gAreaTileset_SimonsSimulation_0_0::
-	.incbin "tilesets/gAreaTileset_SimonsSimulation_0_0.4bpp.lz"
-gAreaTileset_SimonsSimulation_0_1::
-	.incbin "tilesets/gAreaTileset_SimonsSimulation_0_1.4bpp.lz"
-gAreaTileset_SimonsSimulation_0_2::
-	.incbin "tilesets/gAreaTileset_SimonsSimulation_0_2.4bpp.lz"
-gAreaMetatiles_HyruleTownUnderground_0::
-	.incbin "assets/gAreaMetatiles_HyruleTownUnderground_0.bin.lz"
-gAreaMetatiles_HyruleTownUnderground_1::
-	.incbin "assets/gAreaMetatiles_HyruleTownUnderground_1.bin.lz"
-gAreaMetatiles_HyruleTownUnderground_2::
-	.incbin "assets/gAreaMetatiles_HyruleTownUnderground_2.bin.lz"
-gAreaMetatiles_HyruleTownUnderground_3::
-	.incbin "assets/gAreaMetatiles_HyruleTownUnderground_3.bin.lz"
-gAreaRoomMap_40_0_0::
-	.incbin "assets/gAreaRoomMap_40_0_0.bin.lz"
-gAreaRoomMap_40_0_1::
-	.incbin "assets/gAreaRoomMap_40_0_1.bin.lz"
-gAreaRoomMap_40_1_0::
-	.incbin "assets/gAreaRoomMap_40_1_0.bin.lz"
-gAreaRoomMap_40_1_1::
-	.incbin "assets/gAreaRoomMap_40_1_1.bin.lz"
-gAreaRoomMap_40_2_0::
-	.incbin "assets/gAreaRoomMap_40_2_0.bin.lz"
-gAreaRoomMap_40_2_1::
-	.incbin "assets/gAreaRoomMap_40_2_1.bin.lz"
-gAreaRoomMap_40_3_0::
-	.incbin "assets/gAreaRoomMap_40_3_0.bin.lz"
-gAreaRoomMap_40_3_1::
-	.incbin "assets/gAreaRoomMap_40_3_1.bin.lz"
-gAreaRoomMap_40_4_0::
-	.incbin "assets/gAreaRoomMap_40_4_0.bin.lz"
-gAreaRoomMap_40_4_1::
-	.incbin "assets/gAreaRoomMap_40_4_1.bin.lz"
-gAreaRoomMap_40_5_0::
-	.incbin "assets/gAreaRoomMap_40_5_0.bin.lz"
-gAreaRoomMap_40_5_1::
-	.incbin "assets/gAreaRoomMap_40_5_1.bin.lz"
-gAreaRoomMap_40_6_0::
-	.incbin "assets/gAreaRoomMap_40_6_0.bin.lz"
-gAreaRoomMap_40_6_1::
-	.incbin "assets/gAreaRoomMap_40_6_1.bin.lz"
-gAreaRoomMap_40_7_0::
-	.incbin "assets/gAreaRoomMap_40_7_0.bin.lz"
-gAreaRoomMap_40_7_1::
-	.incbin "assets/gAreaRoomMap_40_7_1.bin.lz"
-gAreaRoomMap_40_8_0::
-	.incbin "assets/gAreaRoomMap_40_8_0.bin.lz"
-gAreaRoomMap_40_8_1::
-	.incbin "assets/gAreaRoomMap_40_8_1.bin.lz"
-gAreaRoomMap_HyruleTownUnderground_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownUnderground_0_0.bin.lz"
-gAreaRoomMap_HyruleTownUnderground_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownUnderground_0_1.bin.lz"
-gAreaRoomMap_HyruleTownUnderground_1_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownUnderground_1_0.bin.lz"
-gAreaRoomMap_HyruleTownUnderground_1_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownUnderground_1_1.bin.lz"
-gAreaRoomMap_GardenFountains_0_0::
-	.incbin "assets/gAreaRoomMap_GardenFountains_0_0.bin.lz"
-gAreaRoomMap_GardenFountains_0_1::
-	.incbin "assets/gAreaRoomMap_GardenFountains_0_1.bin.lz"
-gAreaRoomMap_GardenFountains_1_0::
-	.incbin "assets/gAreaRoomMap_GardenFountains_1_0.bin.lz"
-gAreaRoomMap_GardenFountains_1_1::
-	.incbin "assets/gAreaRoomMap_GardenFountains_1_1.bin.lz"
-gAreaRoomMap_HyruleCastleCellar_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastleCellar_0_0.bin.lz"
-gAreaRoomMap_HyruleCastleCellar_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastleCellar_0_1.bin.lz"
-gAreaRoomMap_HyruleCastleCellar_1_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastleCellar_1_0.bin.lz"
-gAreaRoomMap_HyruleCastleCellar_1_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastleCellar_1_1.bin.lz"
-gAreaRoomMap_SimonsSimulation_0_0::
-	.incbin "assets/gAreaRoomMap_SimonsSimulation_0_0.bin.lz"
-gAreaRoomMap_SimonsSimulation_0_1::
-	.incbin "assets/gAreaRoomMap_SimonsSimulation_0_1.bin.lz"
+gRoomCollisionMap_TownMinishHoles_RemShoeShop::
+	.incbin "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomCollisionMap_TownMinishHoles_RemShoeShop.bin.lz"
+gAreaTileset_40_0_0::
+	.incbin "maps/areas/064_40/tilesets/0/gAreaTileset_40_0_0.4bpp.lz"
+gAreaTileset_40_0_1::
+	.incbin "maps/areas/064_40/tilesets/0/gAreaTileset_40_0_1.4bpp.lz"
+gAreaTileset_40_0_2::
+	.incbin "maps/areas/064_40/tilesets/0/gAreaTileset_40_0_2.4bpp.lz"
+gAreaMetaTileset_40_bottom::
+	.incbin "maps/areas/064_40/metatilesets/gAreaMetaTileset_40_bottom.bin.lz"
+gAreaMetaTileset_40_top::
+	.incbin "maps/areas/064_40/metatilesets/gAreaMetaTileset_40_top.bin.lz"
+gAreaMetaTilesetTypes_40_bottom::
+	.incbin "maps/areas/064_40/metatilesets/gAreaMetaTilesetTypes_40_bottom.bin.lz"
+gAreaMetaTilesetTypes_40_top::
+	.incbin "maps/areas/064_40/metatilesets/gAreaMetaTilesetTypes_40_top.bin.lz"
+gAreaRoomMap_40_0_bottom::
+	.incbin "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_bottom.bin.lz"
+gAreaRoomMap_40_0_top::
+	.incbin "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_top.bin.lz"
+gAreaRoomMap_40_1_bottom::
+	.incbin "maps/areas/064_40/rooms/01_1/gAreaRoomMap_40_1_bottom.bin.lz"
+gAreaRoomMap_40_1_top::
+	.incbin "maps/areas/064_40/rooms/01_1/gAreaRoomMap_40_1_top.bin.lz"
+gAreaRoomMap_40_2_bottom::
+	.incbin "maps/areas/064_40/rooms/02_2/gAreaRoomMap_40_2_bottom.bin.lz"
+gAreaRoomMap_40_2_top::
+	.incbin "maps/areas/064_40/rooms/02_2/gAreaRoomMap_40_2_top.bin.lz"
+gAreaRoomMap_40_3_bottom::
+	.incbin "maps/areas/064_40/rooms/03_3/gAreaRoomMap_40_3_bottom.bin.lz"
+gAreaRoomMap_40_3_top::
+	.incbin "maps/areas/064_40/rooms/03_3/gAreaRoomMap_40_3_top.bin.lz"
+gAreaRoomMap_40_4_bottom::
+	.incbin "maps/areas/064_40/rooms/04_4/gAreaRoomMap_40_4_bottom.bin.lz"
+gAreaRoomMap_40_4_top::
+	.incbin "maps/areas/064_40/rooms/04_4/gAreaRoomMap_40_4_top.bin.lz"
+gAreaRoomMap_40_5_bottom::
+	.incbin "maps/areas/064_40/rooms/05_5/gAreaRoomMap_40_5_bottom.bin.lz"
+gAreaRoomMap_40_5_top::
+	.incbin "maps/areas/064_40/rooms/05_5/gAreaRoomMap_40_5_top.bin.lz"
+gAreaRoomMap_40_6_bottom::
+	.incbin "maps/areas/064_40/rooms/06_6/gAreaRoomMap_40_6_bottom.bin.lz"
+gAreaRoomMap_40_6_top::
+	.incbin "maps/areas/064_40/rooms/06_6/gAreaRoomMap_40_6_top.bin.lz"
+gAreaRoomMap_40_7_bottom::
+	.incbin "maps/areas/064_40/rooms/07_7/gAreaRoomMap_40_7_bottom.bin.lz"
+gAreaRoomMap_40_7_top::
+	.incbin "maps/areas/064_40/rooms/07_7/gAreaRoomMap_40_7_top.bin.lz"
+gAreaRoomMap_40_8_bottom::
+	.incbin "maps/areas/064_40/rooms/08_8/gAreaRoomMap_40_8_bottom.bin.lz"
+gAreaRoomMap_40_8_top::
+	.incbin "maps/areas/064_40/rooms/08_8/gAreaRoomMap_40_8_top.bin.lz"
+gAreaRoomMap_HyruleTownUnderground_0_bottom::
+	.incbin "maps/areas/065_HyruleTownUnderground/rooms/00_0/gAreaRoomMap_HyruleTownUnderground_0_bottom.bin.lz"
+gAreaRoomMap_HyruleTownUnderground_0_top::
+	.incbin "maps/areas/065_HyruleTownUnderground/rooms/00_0/gAreaRoomMap_HyruleTownUnderground_0_top.bin.lz"
+gAreaRoomMap_HyruleTownUnderground_1_bottom::
+	.incbin "maps/areas/065_HyruleTownUnderground/rooms/01_1/gAreaRoomMap_HyruleTownUnderground_1_bottom.bin.lz"
+gAreaRoomMap_HyruleTownUnderground_1_top::
+	.incbin "maps/areas/065_HyruleTownUnderground/rooms/01_1/gAreaRoomMap_HyruleTownUnderground_1_top.bin.lz"
+gAreaRoomMap_GardenFountains_East_bottom::
+	.incbin "maps/areas/066_GardenFountains/rooms/00_East/gAreaRoomMap_GardenFountains_East_bottom.bin.lz"
+gAreaRoomMap_GardenFountains_East_top::
+	.incbin "maps/areas/066_GardenFountains/rooms/00_East/gAreaRoomMap_GardenFountains_East_top.bin.lz"
+gAreaRoomMap_GardenFountains_West_bottom::
+	.incbin "maps/areas/066_GardenFountains/rooms/01_West/gAreaRoomMap_GardenFountains_West_bottom.bin.lz"
+gAreaRoomMap_GardenFountains_West_top::
+	.incbin "maps/areas/066_GardenFountains/rooms/01_West/gAreaRoomMap_GardenFountains_West_top.bin.lz"
+gAreaRoomMap_HyruleCastleCellar_0_bottom::
+	.incbin "maps/areas/067_HyruleCastleCellar/rooms/00_0/gAreaRoomMap_HyruleCastleCellar_0_bottom.bin.lz"
+gAreaRoomMap_HyruleCastleCellar_0_top::
+	.incbin "maps/areas/067_HyruleCastleCellar/rooms/00_0/gAreaRoomMap_HyruleCastleCellar_0_top.bin.lz"
+gAreaRoomMap_HyruleCastleCellar_1_bottom::
+	.incbin "maps/areas/067_HyruleCastleCellar/rooms/01_1/gAreaRoomMap_HyruleCastleCellar_1_bottom.bin.lz"
+gAreaRoomMap_HyruleCastleCellar_1_top::
+	.incbin "maps/areas/067_HyruleCastleCellar/rooms/01_1/gAreaRoomMap_HyruleCastleCellar_1_top.bin.lz"
+gAreaRoomMap_SimonsSimulation_0_bottom::
+	.incbin "maps/areas/068_SimonsSimulation/rooms/00_0/gAreaRoomMap_SimonsSimulation_0_bottom.bin.lz"
+gAreaRoomMap_SimonsSimulation_0_top::
+	.incbin "maps/areas/068_SimonsSimulation/rooms/00_0/gAreaRoomMap_SimonsSimulation_0_top.bin.lz"
 gAreaTileset_DeepwoodShrine_0_0::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrine_0_0.4bpp.lz"
+	.incbin "maps/areas/072_DeepwoodShrine/tilesets/0/gAreaTileset_DeepwoodShrine_0_0.4bpp.lz"
 gAreaTileset_DeepwoodShrine_0_1::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrine_0_1.4bpp.lz"
+	.incbin "maps/areas/072_DeepwoodShrine/tilesets/0/gAreaTileset_DeepwoodShrine_0_1.4bpp.lz"
 gAreaTileset_DeepwoodShrine_0_2::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrine_0_2.4bpp.lz"
-gAreaMetatiles_DeepwoodShrine_0::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrine_0.bin.lz"
-gAreaMetatiles_DeepwoodShrine_1::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrine_1.bin.lz"
-gAreaMetatiles_DeepwoodShrine_2::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrine_2.bin.lz"
-gAreaMetatiles_DeepwoodShrine_3::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrine_3.bin.lz"
+	.incbin "maps/areas/072_DeepwoodShrine/tilesets/0/gAreaTileset_DeepwoodShrine_0_2.4bpp.lz"
+gAreaMetaTileset_DeepwoodShrine_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTileset_DeepwoodShrine_bottom.bin.lz"
+gAreaMetaTileset_DeepwoodShrine_top::
+	.incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTileset_DeepwoodShrine_top.bin.lz"
+gAreaMetaTilesetTypes_DeepwoodShrine_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrine_bottom.bin.lz"
+gAreaMetaTilesetTypes_DeepwoodShrine_top::
+	.incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrine_top.bin.lz"
 gAreaTileset_DeepwoodShrineBoss_0_0::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrineBoss_0_0.4bpp.lz"
+	.incbin "maps/areas/073_DeepwoodShrineBoss/tilesets/0/gAreaTileset_DeepwoodShrineBoss_0_0.4bpp.lz"
 gAreaTileset_DeepwoodShrineBoss_0_1::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrineBoss_0_1.4bpp.lz"
+	.incbin "maps/areas/073_DeepwoodShrineBoss/tilesets/0/gAreaTileset_DeepwoodShrineBoss_0_1.4bpp.lz"
 gAreaTileset_DeepwoodShrineBoss_0_2::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrineBoss_0_2.4bpp.lz"
-gAreaMetatiles_DeepwoodShrineBoss_0::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_0.bin.lz"
-gAreaMetatiles_DeepwoodShrineBoss_1::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_1.bin.lz"
-gAreaMetatiles_DeepwoodShrineBoss_2::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_2.bin.lz"
-gAreaMetatiles_DeepwoodShrineBoss_3::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_3.bin.lz"
+	.incbin "maps/areas/073_DeepwoodShrineBoss/tilesets/0/gAreaTileset_DeepwoodShrineBoss_0_2.4bpp.lz"
+gAreaMetaTileset_DeepwoodShrineBoss_bottom::
+	.incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTileset_DeepwoodShrineBoss_bottom.bin.lz"
+gAreaMetaTileset_DeepwoodShrineBoss_top::
+	.incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTileset_DeepwoodShrineBoss_top.bin.lz"
+gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom::
+	.incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom.bin.lz"
+gAreaMetaTilesetTypes_DeepwoodShrineBoss_top::
+	.incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineBoss_top.bin.lz"
 gAreaTileset_DeepwoodShrineEntry_0_0::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrineEntry_0_0.4bpp.lz"
+	.incbin "maps/areas/074_DeepwoodShrineEntry/tilesets/0/gAreaTileset_DeepwoodShrineEntry_0_0.4bpp.lz"
 gAreaTileset_DeepwoodShrineEntry_0_1::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrineEntry_0_1.4bpp.lz"
+	.incbin "maps/areas/074_DeepwoodShrineEntry/tilesets/0/gAreaTileset_DeepwoodShrineEntry_0_1.4bpp.lz"
 gAreaTileset_DeepwoodShrineEntry_0_2::
-	.incbin "tilesets/gAreaTileset_DeepwoodShrineEntry_0_2.4bpp.lz"
-gAreaMetatiles_DeepwoodShrineEntry_0::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_0.bin.lz"
-gAreaMetatiles_DeepwoodShrineEntry_1::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_1.bin.lz"
-gAreaMetatiles_DeepwoodShrineEntry_2::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_2.bin.lz"
-gAreaMetatiles_DeepwoodShrineEntry_3::
-	.incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_3.bin.lz"
-gAreaRoomMap_DeepwoodShrine_0_0::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_0_0.bin.lz"
-gAreaRoomMap_DeepwoodShrine_0_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_0_1.bin.lz"
+	.incbin "maps/areas/074_DeepwoodShrineEntry/tilesets/0/gAreaTileset_DeepwoodShrineEntry_0_2.4bpp.lz"
+gAreaMetaTileset_DeepwoodShrineEntry_bottom::
+	.incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTileset_DeepwoodShrineEntry_bottom.bin.lz"
+gAreaMetaTileset_DeepwoodShrineEntry_top::
+	.incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTileset_DeepwoodShrineEntry_top.bin.lz"
+gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom::
+	.incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom.bin.lz"
+gAreaMetaTilesetTypes_DeepwoodShrineEntry_top::
+	.incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineEntry_top.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Madderpillar_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_1_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_1_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_BluePortal_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/gAreaRoomMap_DeepwoodShrine_BluePortal_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_BluePortal_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/gAreaRoomMap_DeepwoodShrine_BluePortal_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_2_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_2_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_StairsToB1_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/gAreaRoomMap_DeepwoodShrine_StairsToB1_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_3_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_3_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_PotBridge_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/gAreaRoomMap_DeepwoodShrine_PotBridge_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_PotBridge_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/gAreaRoomMap_DeepwoodShrine_PotBridge_top.bin.lz"
  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"
+gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_DoubleStatue_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/gAreaRoomMap_DeepwoodShrine_DoubleStatue_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_5_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_5_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Map_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/05_Map/gAreaRoomMap_DeepwoodShrine_Map_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Map_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/05_Map/gAreaRoomMap_DeepwoodShrine_Map_top.bin.lz"
  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"
+gAreaRoomMap_DeepwoodShrine_Barrel_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/gAreaRoomMap_DeepwoodShrine_Barrel_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Barrel_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/gAreaRoomMap_DeepwoodShrine_Barrel_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_7_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_7_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Button_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/07_Button/gAreaRoomMap_DeepwoodShrine_Button_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Button_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/07_Button/gAreaRoomMap_DeepwoodShrine_Button_top.bin.lz"
  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"
+gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Mulldozer_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/gAreaRoomMap_DeepwoodShrine_Mulldozer_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_9_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_9_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Pillars_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/gAreaRoomMap_DeepwoodShrine_Pillars_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Pillars_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/gAreaRoomMap_DeepwoodShrine_Pillars_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_10_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_10_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Lever_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/10_Lever/gAreaRoomMap_DeepwoodShrine_Lever_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Lever_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/10_Lever/gAreaRoomMap_DeepwoodShrine_Lever_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_11_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_11_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Entrance_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/gAreaRoomMap_DeepwoodShrine_Entrance_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Entrance_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/gAreaRoomMap_DeepwoodShrine_Entrance_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_12_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_12_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Torches_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/16_Torches/gAreaRoomMap_DeepwoodShrine_Torches_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Torches_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/16_Torches/gAreaRoomMap_DeepwoodShrine_Torches_top.bin.lz"
  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"
+gAreaRoomMap_DeepwoodShrine_BossKey_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/gAreaRoomMap_DeepwoodShrine_BossKey_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_BossKey_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/gAreaRoomMap_DeepwoodShrine_BossKey_top.bin.lz"
  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"
+gAreaRoomMap_DeepwoodShrine_Compass_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/12_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_Compass_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/12_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_15_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_15_1.bin.lz"
-unknown_44::
-	.incbin "assets/unknown_44.bin"
-gAreaRoomMap_DeepwoodShrine_16_0::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_16_0.bin.lz"
-gAreaRoomMap_DeepwoodShrine_16_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_16_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_13_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_13_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_top.bin.lz"
+gDungeonMaps_072_DeepwoodShrine_19_13_unused::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/dungeon_map.bin"
+gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_LilyPadWest_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_17_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_17_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_LilyPadEast_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/gAreaRoomMap_DeepwoodShrine_LilyPadEast_top.bin.lz"
  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"
+gAreaRoomMap_DeepwoodShrineBoss_Main_bottom::
+	.incbin "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/gAreaRoomMap_DeepwoodShrineBoss_Main_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrineBoss_Main_top::
+	.incbin "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/gAreaRoomMap_DeepwoodShrineBoss_Main_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_18_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_18_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_BossDoor_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/gAreaRoomMap_DeepwoodShrine_BossDoor_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_BossDoor_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/gAreaRoomMap_DeepwoodShrine_BossDoor_top.bin.lz"
  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"
-gAreaRoomMap_DeepwoodShrine_19_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrine_19_1.bin.lz"
-unknown_49::
-	.incbin "assets/unknown_49.bin"
-gAreaRoomMap_DeepwoodShrineEntry_0_0::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrineEntry_0_0.bin"
-gAreaRoomMap_DeepwoodShrineEntry_0_1::
-	.incbin "assets/gAreaRoomMap_DeepwoodShrineEntry_0_1.bin.lz"
+gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom.bin.lz"
+gAreaRoomMap_DeepwoodShrine_InsideBarrel_top::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/gAreaRoomMap_DeepwoodShrine_InsideBarrel_top.bin.lz"
+gDungeonMaps_DeepwoodShrine_InsideBarrel_unused::
+	.incbin "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/dungeon_map.bin"
+gAreaRoomMap_DeepwoodShrineEntry_Main_bottom::
+	.incbin "maps/areas/074_DeepwoodShrineEntry/rooms/00_Main/gAreaRoomMap_DeepwoodShrineEntry_Main_bottom.bin"
+gAreaRoomMap_DeepwoodShrineEntry_Main_top::
+	.incbin "maps/areas/074_DeepwoodShrineEntry/rooms/00_Main/gAreaRoomMap_DeepwoodShrineEntry_Main_top.bin.lz"
 gAreaTileset_CaveOfFlames_0_0::
-	.incbin "tilesets/gAreaTileset_CaveOfFlames_0_0.4bpp.lz"
+	.incbin "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_0.4bpp.lz"
 gAreaTileset_CaveOfFlames_0_1::
-	.incbin "tilesets/gAreaTileset_CaveOfFlames_0_1.4bpp.lz"
+	.incbin "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_1.4bpp.lz"
 gAreaTileset_CaveOfFlames_0_2::
-	.incbin "tilesets/gAreaTileset_CaveOfFlames_0_2.4bpp.lz"
-gAreaMetatiles_CaveOfFlames_0::
-	.incbin "assets/gAreaMetatiles_CaveOfFlames_0.bin.lz"
-gAreaMetatiles_CaveOfFlames_1::
-	.incbin "assets/gAreaMetatiles_CaveOfFlames_1.bin.lz"
-gAreaMetatiles_CaveOfFlames_2::
-	.incbin "assets/gAreaMetatiles_CaveOfFlames_2.bin.lz"
-gAreaMetatiles_CaveOfFlames_3::
-	.incbin "assets/gAreaMetatiles_CaveOfFlames_3.bin.lz"
+	.incbin "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_2.4bpp.lz"
+gAreaMetaTileset_CaveOfFlames_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTileset_CaveOfFlames_bottom.bin.lz"
+gAreaMetaTileset_CaveOfFlames_top::
+	.incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTileset_CaveOfFlames_top.bin.lz"
+gAreaMetaTilesetTypes_CaveOfFlames_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTilesetTypes_CaveOfFlames_bottom.bin.lz"
+gAreaMetaTilesetTypes_CaveOfFlames_top::
+	.incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTilesetTypes_CaveOfFlames_top.bin.lz"
 gAreaTileset_CaveOfFlamesBoss_0_0::
-	.incbin "tilesets/gAreaTileset_CaveOfFlamesBoss_0_0.4bpp.lz"
+	.incbin "maps/areas/081_CaveOfFlamesBoss/tilesets/0/gAreaTileset_CaveOfFlamesBoss_0_0.4bpp.lz"
 gAreaTileset_CaveOfFlamesBoss_0_1::
-	.incbin "tilesets/gAreaTileset_CaveOfFlamesBoss_0_1.4bpp.lz"
+	.incbin "maps/areas/081_CaveOfFlamesBoss/tilesets/0/gAreaTileset_CaveOfFlamesBoss_0_1.4bpp.lz"
 gAreaTileset_CaveOfFlamesBoss_0_2::
-	.incbin "tilesets/gAreaTileset_CaveOfFlamesBoss_0_2.4bpp.lz"
-gAreaMetatiles_CaveOfFlamesBoss_0::
-	.incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_0.bin.lz"
-gAreaMetatiles_CaveOfFlamesBoss_1::
-	.incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_1.bin.lz"
-gAreaMetatiles_CaveOfFlamesBoss_2::
-	.incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_2.bin.lz"
-gAreaMetatiles_CaveOfFlamesBoss_3::
-	.incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_3.bin.lz"
+	.incbin "maps/areas/081_CaveOfFlamesBoss/tilesets/0/gAreaTileset_CaveOfFlamesBoss_0_2.4bpp.lz"
+gAreaMetaTileset_CaveOfFlamesBoss_bottom::
+	.incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTileset_CaveOfFlamesBoss_bottom.bin.lz"
+gAreaMetaTileset_CaveOfFlamesBoss_top::
+	.incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTileset_CaveOfFlamesBoss_top.bin.lz"
+gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom::
+	.incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom.bin.lz"
+gAreaMetaTilesetTypes_CaveOfFlamesBoss_top::
+	.incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTilesetTypes_CaveOfFlamesBoss_top.bin.lz"
 gAreaTileset_CaveOfFlames_0_3::
-	.incbin "tilesets/gAreaTileset_CaveOfFlames_0_3.bin.lz"
-gAreaRoomMap_CaveOfFlames_0_0::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_0_0.bin.lz"
-gAreaRoomMap_CaveOfFlames_0_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_0_1.bin.lz"
+	.incbin "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_3.4bpp.lz"
+gAreaRoomMap_CaveOfFlames_AfterCane_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_AfterCane_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_SpinyChu_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/gAreaRoomMap_CaveOfFlames_SpinyChu_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_SpinyChu_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/gAreaRoomMap_CaveOfFlames_SpinyChu_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_2_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_2_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_Entrance_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/03_Entrance/gAreaRoomMap_CaveOfFlames_Entrance_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_Entrance_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/03_Entrance/gAreaRoomMap_CaveOfFlames_Entrance_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_4_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_4_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_MainCart_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/04_MainCart/gAreaRoomMap_CaveOfFlames_MainCart_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_MainCart_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/04_MainCart/gAreaRoomMap_CaveOfFlames_MainCart_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_NorthEntrance_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/gAreaRoomMap_CaveOfFlames_NorthEntrance_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_6_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_6_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_CartWest_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/06_CartWest/gAreaRoomMap_CaveOfFlames_CartWest_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_CartWest_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/06_CartWest/gAreaRoomMap_CaveOfFlames_CartWest_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_HelmasaurFight_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/gAreaRoomMap_CaveOfFlames_HelmasaurFight_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_9_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_9_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_MinishSpikes_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/gAreaRoomMap_CaveOfFlames_MinishSpikes_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_TompasDoom_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/gAreaRoomMap_CaveOfFlames_TompasDoom_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_TompasDoom_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/gAreaRoomMap_CaveOfFlames_TompasDoom_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_BeforeGleerok_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_13_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_13_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_BosskeyPath1_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_BosskeyPath2_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_15_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_15_1.bin.lz"
+	.incbin "maps/areas/080_CaveOfFlames/rooms/32_20_BosskeyPath2/dungeon_map.bin"
+gAreaRoomMap_CaveOfFlames_Compass_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/12_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_Compass_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/12_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_16_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_16_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_BobOmbWall_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz"
  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"
-gAreaRoomMap_CaveOfFlames_17_1::
-	.incbin "assets/gAreaRoomMap_CaveOfFlames_17_1.bin.lz"
+gAreaRoomMap_CaveOfFlames_BossDoor_bottom::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlames_BossDoor_top::
+	.incbin "maps/areas/080_CaveOfFlames/rooms/11_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz"
  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"
+gAreaRoomMap_CaveOfFlamesBoss_0_bottom::
+	.incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/gAreaRoomMap_CaveOfFlamesBoss_0_bottom.bin.lz"
+gAreaRoomMap_CaveOfFlamesBoss_0_top::
+	.incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/gAreaRoomMap_CaveOfFlamesBoss_0_top.bin.lz"
  gDungeonMaps_CaveOfFlamesBoss_0::
-	.incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/dungeon_map.bin"
+	.incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_00_0/dungeon_map.bin"
 gAreaTileset_CastorDarknut_0_0::
-	.incbin "tilesets/gAreaTileset_CastorDarknut_0_0.4bpp.lz"
+	.incbin "maps/areas/043_CastorDarknut/tilesets/0/gAreaTileset_CastorDarknut_0_0.4bpp.lz"
 gAreaTileset_CastorDarknut_0_1::
-	.incbin "tilesets/gAreaTileset_CastorDarknut_0_1.4bpp.lz"
+	.incbin "maps/areas/043_CastorDarknut/tilesets/0/gAreaTileset_CastorDarknut_0_1.4bpp.lz"
 gAreaTileset_CastorDarknut_0_2::
-	.incbin "tilesets/gAreaTileset_CastorDarknut_0_2.4bpp.lz"
-gAreaMetatiles_FortressOfWinds_0::
-	.incbin "assets/gAreaMetatiles_FortressOfWinds_0.bin.lz"
-gAreaMetatiles_FortressOfWinds_1::
-	.incbin "assets/gAreaMetatiles_FortressOfWinds_1.bin.lz"
-gAreaMetatiles_FortressOfWinds_2::
-	.incbin "assets/gAreaMetatiles_FortressOfWinds_2.bin.lz"
-gAreaMetatiles_FortressOfWinds_3::
-	.incbin "assets/gAreaMetatiles_FortressOfWinds_3.bin.lz"
+	.incbin "maps/areas/043_CastorDarknut/tilesets/0/gAreaTileset_CastorDarknut_0_2.4bpp.lz"
+gAreaMetaTileset_CastorDarknut_bottom::
+	.incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTileset_CastorDarknut_bottom.bin.lz"
+gAreaMetaTileset_CastorDarknut_top::
+	.incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTileset_CastorDarknut_top.bin.lz"
+gAreaMetaTilesetTypes_CastorDarknut_bottom::
+	.incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTilesetTypes_CastorDarknut_bottom.bin.lz"
+gAreaMetaTilesetTypes_CastorDarknut_top::
+	.incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTilesetTypes_CastorDarknut_top.bin.lz"
 gAreaTileset_InnerMazaal_0_0::
-	.incbin "tilesets/gAreaTileset_InnerMazaal_0_0.4bpp.lz"
+	.incbin "maps/areas/090_InnerMazaal/tilesets/0/gAreaTileset_InnerMazaal_0_0.4bpp.lz"
 gAreaTileset_InnerMazaal_0_1::
-	.incbin "tilesets/gAreaTileset_InnerMazaal_0_1.4bpp.lz"
+	.incbin "maps/areas/090_InnerMazaal/tilesets/0/gAreaTileset_InnerMazaal_0_1.4bpp.lz"
 gAreaTileset_InnerMazaal_0_2::
-	.incbin "tilesets/gAreaTileset_InnerMazaal_0_2.4bpp.lz"
-gAreaMetatiles_InnerMazaal_0::
-	.incbin "assets/gAreaMetatiles_InnerMazaal_0.bin.lz"
-gAreaMetatiles_InnerMazaal_1::
-	.incbin "assets/gAreaMetatiles_InnerMazaal_1.bin.lz"
-gAreaMetatiles_InnerMazaal_2::
-	.incbin "assets/gAreaMetatiles_InnerMazaal_2.bin.lz"
-gAreaMetatiles_InnerMazaal_3::
-	.incbin "assets/gAreaMetatiles_InnerMazaal_3.bin.lz"
+	.incbin "maps/areas/090_InnerMazaal/tilesets/0/gAreaTileset_InnerMazaal_0_2.4bpp.lz"
+gAreaMetaTileset_InnerMazaal_bottom::
+	.incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTileset_InnerMazaal_bottom.bin.lz"
+gAreaMetaTileset_InnerMazaal_top::
+	.incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTileset_InnerMazaal_top.bin.lz"
+gAreaMetaTilesetTypes_InnerMazaal_bottom::
+	.incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTilesetTypes_InnerMazaal_bottom.bin.lz"
+gAreaMetaTilesetTypes_InnerMazaal_top::
+	.incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTilesetTypes_InnerMazaal_top.bin.lz"
 gAreaTileset_FortressOfWindsTop_0_0::
-	.incbin "tilesets/gAreaTileset_FortressOfWindsTop_0_0.4bpp.lz"
+	.incbin "maps/areas/089_FortressOfWindsTop/tilesets/0/gAreaTileset_FortressOfWindsTop_0_0.4bpp.lz"
 gAreaTileset_FortressOfWindsTop_0_1::
-	.incbin "tilesets/gAreaTileset_FortressOfWindsTop_0_1.4bpp.lz"
+	.incbin "maps/areas/089_FortressOfWindsTop/tilesets/0/gAreaTileset_FortressOfWindsTop_0_1.4bpp.lz"
 gAreaTileset_FortressOfWindsTop_0_2::
-	.incbin "tilesets/gAreaTileset_FortressOfWindsTop_0_2.4bpp.lz"
-gAreaMetatiles_FortressOfWindsTop_0::
-	.incbin "assets/gAreaMetatiles_FortressOfWindsTop_0.bin.lz"
-gAreaMetatiles_FortressOfWindsTop_1::
-	.incbin "assets/gAreaMetatiles_FortressOfWindsTop_1.bin.lz"
-gAreaMetatiles_FortressOfWindsTop_2::
-	.incbin "assets/gAreaMetatiles_FortressOfWindsTop_2.bin.lz"
-gAreaMetatiles_FortressOfWindsTop_3::
-	.incbin "assets/gAreaMetatiles_FortressOfWindsTop_3.bin.lz"
-gAreaRoomMap_FortressOfWinds_0_0::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_0_0.bin.lz"
-gAreaRoomMap_FortressOfWinds_0_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_0_1.bin.lz"
+	.incbin "maps/areas/089_FortressOfWindsTop/tilesets/0/gAreaTileset_FortressOfWindsTop_0_2.4bpp.lz"
+gAreaMetaTileset_FortressOfWindsTop_bottom::
+	.incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTileset_FortressOfWindsTop_bottom.bin.lz"
+gAreaMetaTileset_FortressOfWindsTop_top::
+	.incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTileset_FortressOfWindsTop_top.bin.lz"
+gAreaMetaTilesetTypes_FortressOfWindsTop_bottom::
+	.incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTilesetTypes_FortressOfWindsTop_bottom.bin.lz"
+gAreaMetaTilesetTypes_FortressOfWindsTop_top::
+	.incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTilesetTypes_FortressOfWindsTop_top.bin.lz"
+gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_DoubleEyegore_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_1_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_1_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_BeforeMazaal_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/gAreaRoomMap_FortressOfWinds_BeforeMazaal_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_2_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_2_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_EastKeyLever_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/gAreaRoomMap_FortressOfWinds_EastKeyLever_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_3_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_3_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_PitPlatforms_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/gAreaRoomMap_FortressOfWinds_PitPlatforms_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_WestKeyLever_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/gAreaRoomMap_FortressOfWinds_WestKeyLever_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/13_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_DarknutRoom_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/13_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_6_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_6_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/10_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/10_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_9_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_9_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_Mazaal_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/gAreaRoomMap_FortressOfWinds_Mazaal_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_Mazaal_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/gAreaRoomMap_FortressOfWinds_Mazaal_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_12_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_12_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_Stalfos_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/gAreaRoomMap_FortressOfWinds_Stalfos_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_Stalfos_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/gAreaRoomMap_FortressOfWinds_Stalfos_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_13_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_13_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/14_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/14_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_14_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_14_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_Main2f_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_Main2f_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz"
  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"
+	.incbin "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/dungeon_map.bin"
+gAreaRoomMap_FortressOfWinds_MinishHole_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_MinishHole_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_16_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_16_1.bin.lz"
+	.incbin "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/dungeon_map.bin"
+gAreaRoomMap_FortressOfWinds_BossKey_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/11_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_BossKey_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/11_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz"
  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"
+	.incbin "maps/areas/088_FortressOfWinds/rooms/39_27_BossKey/dungeon_map.bin"
+gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_WestStairs2f_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_EastStairs2f_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_19_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_19_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_WestStairs1f_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/gAreaRoomMap_FortressOfWinds_WestStairs1f_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/12_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_CenterStairs1f_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/12_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_21_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_21_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_EastStairs1f_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz"
  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"
+gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_Wizzrobe_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/gAreaRoomMap_FortressOfWinds_Wizzrobe_top.bin.lz"
  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"
-gAreaRoomMap_FortressOfWinds_23_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWinds_23_1.bin.lz"
+gAreaRoomMap_FortressOfWinds_HeartPiece_bottom::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/gAreaRoomMap_FortressOfWinds_HeartPiece_bottom.bin.lz"
+gAreaRoomMap_FortressOfWinds_HeartPiece_top::
+	.incbin "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/gAreaRoomMap_FortressOfWinds_HeartPiece_top.bin.lz"
  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"
-gAreaRoomMap_InnerMazaal_0_1::
-	.incbin "assets/gAreaRoomMap_InnerMazaal_0_1.bin.lz"
-gAreaRoomMap_InnerMazaal_1_0::
-	.incbin "assets/gAreaRoomMap_InnerMazaal_1_0.bin.lz"
-gAreaRoomMap_InnerMazaal_1_1::
-	.incbin "assets/gAreaRoomMap_InnerMazaal_1_1.bin.lz"
-gAreaRoomMap_FortressOfWindsTop_0_0::
-	.incbin "assets/gAreaRoomMap_FortressOfWindsTop_0_0.bin.lz"
-gAreaRoomMap_FortressOfWindsTop_0_1::
-	.incbin "assets/gAreaRoomMap_FortressOfWindsTop_0_1.bin.lz"
+gAreaRoomMap_InnerMazaal_Main_bottom::
+	.incbin "maps/areas/090_InnerMazaal/rooms/00_Main/gAreaRoomMap_InnerMazaal_Main_bottom.bin.lz"
+gAreaRoomMap_InnerMazaal_Main_top::
+	.incbin "maps/areas/090_InnerMazaal/rooms/00_Main/gAreaRoomMap_InnerMazaal_Main_top.bin.lz"
+gAreaRoomMap_InnerMazaal_Phase1_bottom::
+	.incbin "maps/areas/090_InnerMazaal/rooms/01_Phase1/gAreaRoomMap_InnerMazaal_Phase1_bottom.bin.lz"
+gAreaRoomMap_InnerMazaal_Phase1_top::
+	.incbin "maps/areas/090_InnerMazaal/rooms/01_Phase1/gAreaRoomMap_InnerMazaal_Phase1_top.bin.lz"
+gAreaRoomMap_FortressOfWindsTop_Main_bottom::
+	.incbin "maps/areas/089_FortressOfWindsTop/rooms/00_Main/gAreaRoomMap_FortressOfWindsTop_Main_bottom.bin.lz"
+gAreaRoomMap_FortressOfWindsTop_Main_top::
+	.incbin "maps/areas/089_FortressOfWindsTop/rooms/00_Main/gAreaRoomMap_FortressOfWindsTop_Main_top.bin.lz"
 gAreaTileset_TempleOfDroplets_0_0::
-	.incbin "tilesets/gAreaTileset_TempleOfDroplets_0_0.4bpp.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/tilesets/0/gAreaTileset_TempleOfDroplets_0_0.4bpp.lz"
 gAreaTileset_TempleOfDroplets_0_1::
-	.incbin "tilesets/gAreaTileset_TempleOfDroplets_0_1.4bpp.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/tilesets/0/gAreaTileset_TempleOfDroplets_0_1.4bpp.lz"
 gAreaTileset_TempleOfDroplets_0_2::
-	.incbin "tilesets/gAreaTileset_TempleOfDroplets_0_2.4bpp.lz"
-gAreaMetatiles_TempleOfDroplets_0::
-	.incbin "assets/gAreaMetatiles_TempleOfDroplets_0.bin.lz"
-gAreaMetatiles_TempleOfDroplets_1::
-	.incbin "assets/gAreaMetatiles_TempleOfDroplets_1.bin.lz"
-gAreaMetatiles_TempleOfDroplets_2::
-	.incbin "assets/gAreaMetatiles_TempleOfDroplets_2.bin.lz"
-gAreaMetatiles_TempleOfDroplets_3::
-	.incbin "assets/gAreaMetatiles_TempleOfDroplets_3.bin.lz"
-gAreaTileset_61_0_0::
-	.incbin "tilesets/gAreaTileset_61_0_0.4bpp.lz"
-gAreaTileset_61_0_1::
-	.incbin "tilesets/gAreaTileset_61_0_1.4bpp.lz"
-gAreaTileset_61_0_2::
-	.incbin "tilesets/gAreaTileset_61_0_2.4bpp.lz"
-gAreaMetatiles_61_0::
-	.incbin "assets/gAreaMetatiles_61_0.bin.lz"
-gAreaMetatiles_61_1::
-	.incbin "assets/gAreaMetatiles_61_1.bin.lz"
-gAreaMetatiles_61_2::
-	.incbin "assets/gAreaMetatiles_61_2.bin.lz"
-gAreaMetatiles_61_3::
-	.incbin "assets/gAreaMetatiles_61_3.bin.lz"
-gAreaRoomMap_TempleOfDroplets_0_0::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_0_0.bin.lz"
-gAreaRoomMap_TempleOfDroplets_0_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_0_1.bin.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/tilesets/0/gAreaTileset_TempleOfDroplets_0_2.4bpp.lz"
+gAreaMetaTileset_TempleOfDroplets_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTileset_TempleOfDroplets_bottom.bin.lz"
+gAreaMetaTileset_TempleOfDroplets_top::
+	.incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTileset_TempleOfDroplets_top.bin.lz"
+gAreaMetaTilesetTypes_TempleOfDroplets_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTilesetTypes_TempleOfDroplets_bottom.bin.lz"
+gAreaMetaTilesetTypes_TempleOfDroplets_top::
+	.incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTilesetTypes_TempleOfDroplets_top.bin.lz"
+gAreaTileset_Null61_0_0::
+	.incbin "maps/areas/097_Null61/tilesets/0/gAreaTileset_Null61_0_0.4bpp.lz"
+gAreaTileset_Null61_0_1::
+	.incbin "maps/areas/097_Null61/tilesets/0/gAreaTileset_Null61_0_1.4bpp.lz"
+gAreaTileset_Null61_0_2::
+	.incbin "maps/areas/097_Null61/tilesets/0/gAreaTileset_Null61_0_2.4bpp.lz"
+gAreaMetaTileset_Null61_bottom::
+	.incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTileset_Null61_bottom.bin.lz"
+gAreaMetaTileset_Null61_top::
+	.incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTileset_Null61_top.bin.lz"
+gAreaMetaTilesetTypes_Null61_bottom::
+	.incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTilesetTypes_Null61_bottom.bin.lz"
+gAreaMetaTilesetTypes_Null61_top::
+	.incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTilesetTypes_Null61_top.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WestHole_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WestHole_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_EastHole_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/gAreaRoomMap_TempleOfDroplets_EastHole_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_EastHole_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/gAreaRoomMap_TempleOfDroplets_EastHole_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_3_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_3_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_Entrance_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/gAreaRoomMap_TempleOfDroplets_Entrance_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_Entrance_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/gAreaRoomMap_TempleOfDroplets_Entrance_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_6_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_6_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_7_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_7_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_8_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_8_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_Element_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/08_Element/gAreaRoomMap_TempleOfDroplets_Element_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_Element_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/08_Element/gAreaRoomMap_TempleOfDroplets_Element_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_9_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_9_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_IceCorner_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/gAreaRoomMap_TempleOfDroplets_IceCorner_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_IceCorner_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/gAreaRoomMap_TempleOfDroplets_IceCorner_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_10_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_10_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_IcePitMaze_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/gAreaRoomMap_TempleOfDroplets_IcePitMaze_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_12_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_12_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_13_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_13_1.bin.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/dungeon_map.bin"
+gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_14_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_14_1.bin.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/dungeon_map.bin"
+gAreaRoomMap_TempleOfDroplets_BigOcto_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BigOcto_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_15_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_15_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_ToBlueChu_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/gAreaRoomMap_TempleOfDroplets_ToBlueChu_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_16_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_16_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlueChu_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/gAreaRoomMap_TempleOfDroplets_BlueChu_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlueChu_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/gAreaRoomMap_TempleOfDroplets_BlueChu_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_17_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_17_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlueChuKey_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_18_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_18_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BossKey_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/gAreaRoomMap_TempleOfDroplets_BossKey_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BossKey_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/gAreaRoomMap_TempleOfDroplets_BossKey_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_19_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_19_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_20_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_20_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_21_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_21_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_22_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_22_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_23_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_23_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_24_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_24_1.bin.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/dungeon_map.bin"
+gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_25_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_25_1.bin.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/dungeon_map.bin"
+gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_9Lanterns_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_26_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_26_1.bin.lz"
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/dungeon_map.bin"
+gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_29_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/41_29/gAreaRoomMap_TempleOfDroplets_29_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_29_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/41_29/gAreaRoomMap_TempleOfDroplets_29_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_28_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_28_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_29_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_29_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_DarkMaze_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/gAreaRoomMap_TempleOfDroplets_DarkMaze_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_30_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_30_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_31_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_31_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_32_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_32_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_33_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_33_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_MulldozerKey_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/gAreaRoomMap_TempleOfDroplets_MulldozerKey_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_34_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_34_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_LilypadB2West_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/gAreaRoomMap_TempleOfDroplets_LilypadB2West_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_Compass_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/50_Compass/gAreaRoomMap_TempleOfDroplets_Compass_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_Compass_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/50_Compass/gAreaRoomMap_TempleOfDroplets_Compass_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_37_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_37_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top.bin.lz"
  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"
+gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_39_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_39_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top.bin.lz"
  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"
-gAreaRoomMap_TempleOfDroplets_40_1::
-	.incbin "assets/gAreaRoomMap_TempleOfDroplets_40_1.bin.lz"
+gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom.bin.lz"
+gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top::
+	.incbin "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top.bin.lz"
  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"
-gAreaRoomMap_61_0_1::
-	.incbin "assets/gAreaRoomMap_61_0_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_0_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_0_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_1_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_1_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_1_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_1_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_2_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_2_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_2_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_2_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_3_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_3_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_3_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_3_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_4_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_4_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_4_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_4_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_5_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_5_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_5_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_5_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_6_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_6_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_6_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_6_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_7_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_7_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_7_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_7_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_8_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_8_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_8_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_8_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_9_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_9_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_9_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_9_1.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_10_0::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_10_0.bin.lz"
-gAreaRoomMap_HyruleTownMinishCaves_10_1::
-	.incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_10_1.bin.lz"
+gAreaRoomMap_Null61_0_bottom::
+	.incbin "maps/areas/097_Null61/rooms/00_0/gAreaRoomMap_Null61_0_bottom.bin.lz"
+gAreaRoomMap_Null61_0_top::
+	.incbin "maps/areas/097_Null61/rooms/00_0/gAreaRoomMap_Null61_0_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_0_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_0_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_1_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_1/gAreaRoomMap_HyruleTownMinishCaves_1_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_1_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_1/gAreaRoomMap_HyruleTownMinishCaves_1_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_2_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/02_2/gAreaRoomMap_HyruleTownMinishCaves_2_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_2_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/02_2/gAreaRoomMap_HyruleTownMinishCaves_2_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_3_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/03_3/gAreaRoomMap_HyruleTownMinishCaves_3_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_3_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/03_3/gAreaRoomMap_HyruleTownMinishCaves_3_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_4_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_4_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/07_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_Unused10_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/07_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_6_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_6_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_7_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/18_7/gAreaRoomMap_HyruleTownMinishCaves_7_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_7_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/18_7/gAreaRoomMap_HyruleTownMinishCaves_7_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_8_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/19_8/gAreaRoomMap_HyruleTownMinishCaves_8_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_8_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/19_8/gAreaRoomMap_HyruleTownMinishCaves_8_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_9_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_9_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_top.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_10_bottom::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz"
+gAreaRoomMap_HyruleTownMinishCaves_10_top::
+	.incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz"
 gAreaTileset_RoyalCrypt_0_0::
-	.incbin "tilesets/gAreaTileset_RoyalCrypt_0_0.4bpp.lz"
+	.incbin "maps/areas/104_RoyalCrypt/tilesets/0/gAreaTileset_RoyalCrypt_0_0.4bpp.lz"
 gAreaTileset_RoyalCrypt_0_1::
-	.incbin "tilesets/gAreaTileset_RoyalCrypt_0_1.4bpp.lz"
+	.incbin "maps/areas/104_RoyalCrypt/tilesets/0/gAreaTileset_RoyalCrypt_0_1.4bpp.lz"
 gAreaTileset_RoyalCrypt_0_2::
-	.incbin "tilesets/gAreaTileset_RoyalCrypt_0_2.4bpp.lz"
-gAreaMetatiles_RoyalCrypt_0::
-	.incbin "assets/gAreaMetatiles_RoyalCrypt_0.bin.lz"
-gAreaMetatiles_RoyalCrypt_1::
-	.incbin "assets/gAreaMetatiles_RoyalCrypt_1.bin.lz"
-gAreaMetatiles_RoyalCrypt_2::
-	.incbin "assets/gAreaMetatiles_RoyalCrypt_2.bin.lz"
-gAreaMetatiles_RoyalCrypt_3::
-	.incbin "assets/gAreaMetatiles_RoyalCrypt_3.bin.lz"
-gAreaRoomMap_RoyalCrypt_0_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_0_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_0_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_0_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_1_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_1_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_1_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_1_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_2_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_2_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_2_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_2_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_3_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_3_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_3_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_3_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_4_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_4_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_4_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_4_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_5_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_5_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_5_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_5_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_6_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_6_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_6_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_6_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_7_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_7_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_7_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_7_1.bin.lz"
-gAreaRoomMap_RoyalCrypt_8_0::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_8_0.bin.lz"
-gAreaRoomMap_RoyalCrypt_8_1::
-	.incbin "assets/gAreaRoomMap_RoyalCrypt_8_1.bin.lz"
-gAreaTileset_PalaceOfWinds_GyorgTornado_0::
-	.incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_0.4bpp.lz"
-gAreaTileset_PalaceOfWinds_GyorgTornado_1::
-	.incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_1.4bpp.lz"
-gAreaTileset_PalaceOfWinds_GyorgTornado_2::
-	.incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_2.4bpp.lz"
-gAreaMetatiles_PalaceOfWinds_GyorgTornado::
-	.incbin "assets/gAreaMetatiles_PalaceOfWinds_GyorgTornado.bin.lz"
-gAreaMetatiles_PalaceOfWinds_BossKey::
-	.incbin "assets/gAreaMetatiles_PalaceOfWinds_BossKey.bin.lz"
-gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers::
-	.incbin "assets/gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers.bin.lz"
-gAreaMetatiles_PalaceOfWinds_GyorgBossDoor::
-	.incbin "assets/gAreaMetatiles_PalaceOfWinds_GyorgBossDoor.bin.lz"
-gAreaTileset_PalaceOfWinds_GyorgTornado_3::
-	.incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_3.bin.lz"
+	.incbin "maps/areas/104_RoyalCrypt/tilesets/0/gAreaTileset_RoyalCrypt_0_2.4bpp.lz"
+gAreaMetaTileset_RoyalCrypt_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTileset_RoyalCrypt_bottom.bin.lz"
+gAreaMetaTileset_RoyalCrypt_top::
+	.incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTileset_RoyalCrypt_top.bin.lz"
+gAreaMetaTilesetTypes_RoyalCrypt_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTilesetTypes_RoyalCrypt_bottom.bin.lz"
+gAreaMetaTilesetTypes_RoyalCrypt_top::
+	.incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTilesetTypes_RoyalCrypt_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_0_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_0_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_WaterRope_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/01_WaterRope/gAreaRoomMap_RoyalCrypt_WaterRope_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_WaterRope_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/01_WaterRope/gAreaRoomMap_RoyalCrypt_WaterRope_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_Gibdo_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/02_Gibdo/gAreaRoomMap_RoyalCrypt_Gibdo_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_Gibdo_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/02_Gibdo/gAreaRoomMap_RoyalCrypt_Gibdo_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_3_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/03_3/gAreaRoomMap_RoyalCrypt_3_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_3_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/03_3/gAreaRoomMap_RoyalCrypt_3_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_KeyBlock_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/04_KeyBlock/gAreaRoomMap_RoyalCrypt_KeyBlock_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_KeyBlock_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/04_KeyBlock/gAreaRoomMap_RoyalCrypt_KeyBlock_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_5_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/05_5/gAreaRoomMap_RoyalCrypt_5_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_5_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/05_5/gAreaRoomMap_RoyalCrypt_5_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_6_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/06_6/gAreaRoomMap_RoyalCrypt_6_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_6_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/06_6/gAreaRoomMap_RoyalCrypt_6_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_MushroomPit_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/07_MushroomPit/gAreaRoomMap_RoyalCrypt_MushroomPit_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_MushroomPit_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/07_MushroomPit/gAreaRoomMap_RoyalCrypt_MushroomPit_top.bin.lz"
+gAreaRoomMap_RoyalCrypt_Entrance_bottom::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/08_Entrance/gAreaRoomMap_RoyalCrypt_Entrance_bottom.bin.lz"
+gAreaRoomMap_RoyalCrypt_Entrance_top::
+	.incbin "maps/areas/104_RoyalCrypt/rooms/08_Entrance/gAreaRoomMap_RoyalCrypt_Entrance_top.bin.lz"
+gAreaTileset_PalaceOfWinds_0_0::
+	.incbin "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_0.4bpp.lz"
+gAreaTileset_PalaceOfWinds_0_1::
+	.incbin "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_1.4bpp.lz"
+gAreaTileset_PalaceOfWinds_0_2::
+	.incbin "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_2.4bpp.lz"
+gAreaMetaTileset_PalaceOfWinds_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTileset_PalaceOfWinds_bottom.bin.lz"
+gAreaMetaTileset_PalaceOfWinds_top::
+	.incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTileset_PalaceOfWinds_top.bin.lz"
+gAreaMetaTilesetTypes_PalaceOfWinds_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTilesetTypes_PalaceOfWinds_bottom.bin.lz"
+gAreaMetaTilesetTypes_PalaceOfWinds_top::
+	.incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTilesetTypes_PalaceOfWinds_top.bin.lz"
+gAreaTileset_PalaceOfWinds_0_3::
+	.incbin "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_3.4bpp.lz"
 gAreaTileset_PalaceOfWindsBoss_0_0::
-	.incbin "tilesets/gAreaTileset_PalaceOfWindsBoss_0_0.4bpp.lz"
+	.incbin "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_0.4bpp.lz"
 gAreaTileset_PalaceOfWindsBoss_0_1::
-	.incbin "tilesets/gAreaTileset_PalaceOfWindsBoss_0_1.4bpp.lz"
-gAreaMetatiles_PalaceOfWindsBoss_0::
-	.incbin "assets/gAreaMetatiles_PalaceOfWindsBoss_0.bin.lz"
-gAreaMetatiles_PalaceOfWindsBoss_1::
-	.incbin "assets/gAreaMetatiles_PalaceOfWindsBoss_1.bin.lz"
+	.incbin "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_1.4bpp.lz"
+gAreaMetaTileset_PalaceOfWindsBoss_top::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/metatilesets/gAreaMetaTileset_PalaceOfWindsBoss_top.bin.lz"
+gAreaMetaTilesetTypes_PalaceOfWindsBoss_top::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/metatilesets/gAreaMetaTilesetTypes_PalaceOfWindsBoss_top.bin.lz"
 unknown_134::
 	.incbin "assets/unknown_134.bin"
 gAreaTileset_PalaceOfWindsBoss_0_2::
-	.incbin "tilesets/gAreaTileset_PalaceOfWindsBoss_0_2.bin.lz"
-gAreaRoomMap_PalaceOfWinds_GyorgTornado_0::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_0.bin.lz"
-gAreaRoomMap_PalaceOfWinds_GyorgTornado_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_1.bin.lz"
+	.incbin "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_2.4bpp.lz"
+gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GyorgTornado_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_BossKey_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_BossKey_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BossKey_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/gAreaRoomMap_PalaceOfWinds_BossKey_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BossKey_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/gAreaRoomMap_PalaceOfWinds_BossKey_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_BombarossaPath_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BombarossaPath_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/gAreaRoomMap_PalaceOfWinds_BombarossaPath_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_BombWallInside_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BombWallInside_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/gAreaRoomMap_PalaceOfWinds_BombWallInside_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BombWallOutside_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/gAreaRoomMap_PalaceOfWinds_BombWallOutside_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_CloudJumps_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_CloudJumps_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/gAreaRoomMap_PalaceOfWinds_CloudJumps_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_FanBridge_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FanBridge_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/gAreaRoomMap_PalaceOfWinds_FanBridge_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FanBridge_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/gAreaRoomMap_PalaceOfWinds_FanBridge_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_ToFanBridge_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ToFanBridge_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/gAreaRoomMap_PalaceOfWinds_ToFanBridge_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_RedWarpHall_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_RedWarpHall_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/gAreaRoomMap_PalaceOfWinds_RedWarpHall_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_CrowRide_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_PotPush_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/gAreaRoomMap_PalaceOfWinds_PotPush_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PotPush_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/gAreaRoomMap_PalaceOfWinds_PotPush_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_FloormasterLever_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FloormasterLever_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/gAreaRoomMap_PalaceOfWinds_FloormasterLever_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_Map_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/28_Map/gAreaRoomMap_PalaceOfWinds_Map_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_Map_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/28_Map/gAreaRoomMap_PalaceOfWinds_Map_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_CornerToMap_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_CornerToMap_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/gAreaRoomMap_PalaceOfWinds_CornerToMap_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GratesTo3f_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_SpinyFight_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_1.bin.lz"
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/dungeon_map.bin"
+gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_SpinyFight_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_GibdoStairs_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_GibdoStairs_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/gAreaRoomMap_PalaceOfWinds_GibdoStairs_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_RocCape_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_RocCape_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_RocCape_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_RocCape_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_FireBarGrates_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_FireBarGrates_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/gAreaRoomMap_PalaceOfWinds_FireBarGrates_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_EntranceRoom_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_EntranceRoom_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/gAreaRoomMap_PalaceOfWinds_EntranceRoom_top.bin.lz"
  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"
-gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1::
-	.incbin "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1.bin.lz"
+gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom.bin.lz"
+gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top::
+	.incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top.bin.lz"
  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"
+gAreaRoomMap_PalaceOfWindsBoss_0_top::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gAreaRoomMap_PalaceOfWindsBoss_0_top.bin.lz"
 unknown_186::
 	.incbin "assets/unknown_186.bin"
 gAreaTileset_Sanctuary_0_0::
-	.incbin "tilesets/gAreaTileset_Sanctuary_0_0.4bpp.lz"
+	.incbin "maps/areas/120_Sanctuary/tilesets/0/gAreaTileset_Sanctuary_0_0.4bpp.lz"
 gAreaTileset_Sanctuary_0_1::
-	.incbin "tilesets/gAreaTileset_Sanctuary_0_1.4bpp.lz"
+	.incbin "maps/areas/120_Sanctuary/tilesets/0/gAreaTileset_Sanctuary_0_1.4bpp.lz"
 gAreaTileset_Sanctuary_0_2::
-	.incbin "tilesets/gAreaTileset_Sanctuary_0_2.4bpp.lz"
-gAreaMetatiles_Sanctuary_0::
-	.incbin "assets/gAreaMetatiles_Sanctuary_0.bin.lz"
-gAreaMetatiles_Sanctuary_1::
-	.incbin "assets/gAreaMetatiles_Sanctuary_1.bin.lz"
-gAreaMetatiles_Sanctuary_2::
-	.incbin "assets/gAreaMetatiles_Sanctuary_2.bin.lz"
-gAreaMetatiles_Sanctuary_3::
-	.incbin "assets/gAreaMetatiles_Sanctuary_3.bin.lz"
-gAreaRoomMap_Sanctuary_0_0::
-	.incbin "assets/gAreaRoomMap_Sanctuary_0_0.bin.lz"
-gAreaRoomMap_Sanctuary_0_1::
-	.incbin "assets/gAreaRoomMap_Sanctuary_0_1.bin.lz"
-gAreaRoomMap_Sanctuary_1_0::
-	.incbin "assets/gAreaRoomMap_Sanctuary_1_0.bin.lz"
-gAreaRoomMap_Sanctuary_1_1::
-	.incbin "assets/gAreaRoomMap_Sanctuary_1_1.bin.lz"
-gAreaRoomMap_Sanctuary_2_0::
-	.incbin "assets/gAreaRoomMap_Sanctuary_2_0.bin.lz"
-gAreaRoomMap_Sanctuary_2_1::
-	.incbin "assets/gAreaRoomMap_Sanctuary_2_1.bin.lz"
+	.incbin "maps/areas/120_Sanctuary/tilesets/0/gAreaTileset_Sanctuary_0_2.4bpp.lz"
+gAreaMetaTileset_Sanctuary_bottom::
+	.incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTileset_Sanctuary_bottom.bin.lz"
+gAreaMetaTileset_Sanctuary_top::
+	.incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTileset_Sanctuary_top.bin.lz"
+gAreaMetaTilesetTypes_Sanctuary_bottom::
+	.incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTilesetTypes_Sanctuary_bottom.bin.lz"
+gAreaMetaTilesetTypes_Sanctuary_top::
+	.incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTilesetTypes_Sanctuary_top.bin.lz"
+gAreaRoomMap_Sanctuary_Hall_bottom::
+	.incbin "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_bottom.bin.lz"
+gAreaRoomMap_Sanctuary_Hall_top::
+	.incbin "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_top.bin.lz"
+gAreaRoomMap_Sanctuary_Main_bottom::
+	.incbin "maps/areas/120_Sanctuary/rooms/01_Main/gAreaRoomMap_Sanctuary_Main_bottom.bin.lz"
+gAreaRoomMap_Sanctuary_Main_top::
+	.incbin "maps/areas/120_Sanctuary/rooms/01_Main/gAreaRoomMap_Sanctuary_Main_top.bin.lz"
+gAreaRoomMap_Sanctuary_StainedGlass_bottom::
+	.incbin "maps/areas/120_Sanctuary/rooms/02_StainedGlass/gAreaRoomMap_Sanctuary_StainedGlass_bottom.bin.lz"
+gAreaRoomMap_Sanctuary_StainedGlass_top::
+	.incbin "maps/areas/120_Sanctuary/rooms/02_StainedGlass/gAreaRoomMap_Sanctuary_StainedGlass_top.bin.lz"
 gAreaTileset_HyruleCastle_0_0::
-	.incbin "tilesets/gAreaTileset_HyruleCastle_0_0.4bpp.lz"
+	.incbin "maps/areas/128_HyruleCastle/tilesets/0/gAreaTileset_HyruleCastle_0_0.4bpp.lz"
 gAreaTileset_HyruleCastle_0_1::
-	.incbin "tilesets/gAreaTileset_HyruleCastle_0_1.4bpp.lz"
+	.incbin "maps/areas/128_HyruleCastle/tilesets/0/gAreaTileset_HyruleCastle_0_1.4bpp.lz"
 gAreaTileset_HyruleCastle_0_2::
-	.incbin "tilesets/gAreaTileset_HyruleCastle_0_2.4bpp.lz"
-gAreaMetatiles_HyruleCastle_0::
-	.incbin "assets/gAreaMetatiles_HyruleCastle_0.bin.lz"
-gAreaMetatiles_HyruleCastle_1::
-	.incbin "assets/gAreaMetatiles_HyruleCastle_1.bin.lz"
-gAreaMetatiles_HyruleCastle_2::
-	.incbin "assets/gAreaMetatiles_HyruleCastle_2.bin.lz"
-gAreaMetatiles_HyruleCastle_3::
-	.incbin "assets/gAreaMetatiles_HyruleCastle_3.bin.lz"
-gAreaRoomMap_HyruleCastle_0_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_0_0.bin.lz"
-gAreaRoomMap_HyruleCastle_0_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_0_1.bin.lz"
-gAreaRoomMap_HyruleCastle_1_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_1_0.bin.lz"
-gAreaRoomMap_HyruleCastle_1_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_1_1.bin.lz"
-gAreaRoomMap_HyruleCastle_2_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_2_0.bin.lz"
-gAreaRoomMap_HyruleCastle_2_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_2_1.bin.lz"
-gAreaRoomMap_HyruleCastle_3_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_3_0.bin.lz"
-gAreaRoomMap_HyruleCastle_3_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_3_1.bin.lz"
-gAreaRoomMap_HyruleCastle_4_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_4_0.bin.lz"
-gAreaRoomMap_HyruleCastle_4_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_4_1.bin.lz"
-gAreaRoomMap_HyruleCastle_5_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_5_0.bin.lz"
-gAreaRoomMap_HyruleCastle_5_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_5_1.bin.lz"
-gAreaRoomMap_HyruleCastle_6_0::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_6_0.bin.lz"
-gAreaRoomMap_HyruleCastle_6_1::
-	.incbin "assets/gAreaRoomMap_HyruleCastle_6_1.bin.lz"
+	.incbin "maps/areas/128_HyruleCastle/tilesets/0/gAreaTileset_HyruleCastle_0_2.4bpp.lz"
+gAreaMetaTileset_HyruleCastle_bottom::
+	.incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTileset_HyruleCastle_bottom.bin.lz"
+gAreaMetaTileset_HyruleCastle_top::
+	.incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTileset_HyruleCastle_top.bin.lz"
+gAreaMetaTilesetTypes_HyruleCastle_bottom::
+	.incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTilesetTypes_HyruleCastle_bottom.bin.lz"
+gAreaMetaTilesetTypes_HyruleCastle_top::
+	.incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTilesetTypes_HyruleCastle_top.bin.lz"
+gAreaRoomMap_HyruleCastle_0_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_0_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_top.bin.lz"
+gAreaRoomMap_HyruleCastle_1_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/01_1/gAreaRoomMap_HyruleCastle_1_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_1_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/01_1/gAreaRoomMap_HyruleCastle_1_top.bin.lz"
+gAreaRoomMap_HyruleCastle_2_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/02_2/gAreaRoomMap_HyruleCastle_2_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_2_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/02_2/gAreaRoomMap_HyruleCastle_2_top.bin.lz"
+gAreaRoomMap_HyruleCastle_3_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/03_3/gAreaRoomMap_HyruleCastle_3_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_3_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/03_3/gAreaRoomMap_HyruleCastle_3_top.bin.lz"
+gAreaRoomMap_HyruleCastle_4_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/04_4/gAreaRoomMap_HyruleCastle_4_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_4_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/04_4/gAreaRoomMap_HyruleCastle_4_top.bin.lz"
+gAreaRoomMap_HyruleCastle_5_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/05_5/gAreaRoomMap_HyruleCastle_5_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_5_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/05_5/gAreaRoomMap_HyruleCastle_5_top.bin.lz"
+gAreaRoomMap_HyruleCastle_6_bottom::
+	.incbin "maps/areas/128_HyruleCastle/rooms/06_6/gAreaRoomMap_HyruleCastle_6_bottom.bin.lz"
+gAreaRoomMap_HyruleCastle_6_top::
+	.incbin "maps/areas/128_HyruleCastle/rooms/06_6/gAreaRoomMap_HyruleCastle_6_top.bin.lz"
 unknown_187::
 	.incbin "assets/unknown_187.bin"
 gAreaTileset_SanctuaryEntrance_0_0::
-	.incbin "tilesets/gAreaTileset_SanctuaryEntrance_0_0.4bpp.lz"
+	.incbin "maps/areas/129_SanctuaryEntrance/tilesets/0/gAreaTileset_SanctuaryEntrance_0_0.4bpp.lz"
 gAreaTileset_SanctuaryEntrance_0_1::
-	.incbin "tilesets/gAreaTileset_SanctuaryEntrance_0_1.4bpp.lz"
+	.incbin "maps/areas/129_SanctuaryEntrance/tilesets/0/gAreaTileset_SanctuaryEntrance_0_1.4bpp.lz"
 gAreaTileset_SanctuaryEntrance_0_2::
-	.incbin "tilesets/gAreaTileset_SanctuaryEntrance_0_2.4bpp.lz"
-gAreaMetatiles_SanctuaryEntrance_0::
-	.incbin "assets/gAreaMetatiles_SanctuaryEntrance_0.bin.lz"
-gAreaMetatiles_SanctuaryEntrance_1::
-	.incbin "assets/gAreaMetatiles_SanctuaryEntrance_1.bin.lz"
-gAreaMetatiles_SanctuaryEntrance_2::
-	.incbin "assets/gAreaMetatiles_SanctuaryEntrance_2.bin.lz"
-gAreaMetatiles_SanctuaryEntrance_3::
-	.incbin "assets/gAreaMetatiles_SanctuaryEntrance_3.bin.lz"
-gAreaRoomMap_SanctuaryEntrance_0_0::
-	.incbin "assets/gAreaRoomMap_SanctuaryEntrance_0_0.bin.lz"
-gAreaRoomMap_SanctuaryEntrance_0_1::
-	.incbin "assets/gAreaRoomMap_SanctuaryEntrance_0_1.bin.lz"
-gAreaTileset_DarkHyruleCastle_1FEntrance_0::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_0.4bpp.lz"
-gAreaTileset_DarkHyruleCastle_1FEntrance_1::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_1.4bpp.lz"
-gAreaTileset_DarkHyruleCastle_1FEntrance_2::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_2.4bpp.lz"
-gAreaMetatiles_DarkHyruleCastle_1FEntrance::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_1FEntrance.bin.lz"
-gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower.bin.lz"
-gAreaMetatiles_DarkHyruleCastle_3FTopRightTower::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FTopRightTower.bin.lz"
-gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower.bin.lz"
+	.incbin "maps/areas/129_SanctuaryEntrance/tilesets/0/gAreaTileset_SanctuaryEntrance_0_2.4bpp.lz"
+gAreaMetaTileset_SanctuaryEntrance_bottom::
+	.incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTileset_SanctuaryEntrance_bottom.bin.lz"
+gAreaMetaTileset_SanctuaryEntrance_top::
+	.incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTileset_SanctuaryEntrance_top.bin.lz"
+gAreaMetaTilesetTypes_SanctuaryEntrance_bottom::
+	.incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTilesetTypes_SanctuaryEntrance_bottom.bin.lz"
+gAreaMetaTilesetTypes_SanctuaryEntrance_top::
+	.incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTilesetTypes_SanctuaryEntrance_top.bin.lz"
+gAreaRoomMap_SanctuaryEntrance_Main_bottom::
+	.incbin "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_bottom.bin.lz"
+gAreaRoomMap_SanctuaryEntrance_Main_top::
+	.incbin "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_top.bin.lz"
+gAreaTileset_DarkHyruleCastle_0_0::
+	.incbin "maps/areas/136_DarkHyruleCastle/tilesets/0/gAreaTileset_DarkHyruleCastle_0_0.4bpp.lz"
+gAreaTileset_DarkHyruleCastle_0_1::
+	.incbin "maps/areas/136_DarkHyruleCastle/tilesets/0/gAreaTileset_DarkHyruleCastle_0_1.4bpp.lz"
+gAreaTileset_DarkHyruleCastle_0_2::
+	.incbin "maps/areas/136_DarkHyruleCastle/tilesets/0/gAreaTileset_DarkHyruleCastle_0_2.4bpp.lz"
+gAreaMetaTileset_DarkHyruleCastle_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTileset_DarkHyruleCastle_bottom.bin.lz"
+gAreaMetaTileset_DarkHyruleCastle_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTileset_DarkHyruleCastle_top.bin.lz"
+gAreaMetaTilesetTypes_DarkHyruleCastle_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastle_bottom.bin.lz"
+gAreaMetaTilesetTypes_DarkHyruleCastle_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastle_top.bin.lz"
 gAreaTileset_DarkHyruleCastleBridge_0_0::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_0.4bpp.lz"
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/tilesets/0/gAreaTileset_DarkHyruleCastleBridge_0_0.4bpp.lz"
 gAreaTileset_DarkHyruleCastleBridge_0_1::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_1.4bpp.lz"
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/tilesets/0/gAreaTileset_DarkHyruleCastleBridge_0_1.4bpp.lz"
 gAreaTileset_DarkHyruleCastleBridge_0_2::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_2.4bpp.lz"
-gAreaMetatiles_DarkHyruleCastleBridge_0::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_0.bin.lz"
-gAreaMetatiles_DarkHyruleCastleBridge_1::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_1.bin.lz"
-gAreaMetatiles_DarkHyruleCastleBridge_2::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_2.bin.lz"
-gAreaMetatiles_DarkHyruleCastleBridge_3::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_3.bin.lz"
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/tilesets/0/gAreaTileset_DarkHyruleCastleBridge_0_2.4bpp.lz"
+gAreaMetaTileset_DarkHyruleCastleBridge_bottom::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTileset_DarkHyruleCastleBridge_bottom.bin.lz"
+gAreaMetaTileset_DarkHyruleCastleBridge_top::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTileset_DarkHyruleCastleBridge_top.bin.lz"
+gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom.bin.lz"
+gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top.bin.lz"
 gAreaTileset_Vaati3_0_0::
-	.incbin "tilesets/gAreaTileset_Vaati3_0_0.4bpp.lz"
+	.incbin "maps/areas/139_Vaati3/tilesets/0/gAreaTileset_Vaati3_0_0.4bpp.lz"
 gAreaTileset_Vaati3_0_1::
-	.incbin "tilesets/gAreaTileset_Vaati3_0_1.4bpp.lz"
+	.incbin "maps/areas/139_Vaati3/tilesets/0/gAreaTileset_Vaati3_0_1.4bpp.lz"
 gAreaTileset_Vaati3_0_2::
-	.incbin "tilesets/gAreaTileset_Vaati3_0_2.4bpp.lz"
-gAreaMetatiles_Vaati3_0::
-	.incbin "assets/gAreaMetatiles_Vaati3_0.bin.lz"
-gAreaMetatiles_Vaati3_1::
-	.incbin "assets/gAreaMetatiles_Vaati3_1.bin.lz"
-gAreaMetatiles_Vaati3_2::
-	.incbin "assets/gAreaMetatiles_Vaati3_2.bin.lz"
-gAreaMetatiles_Vaati3_3::
-	.incbin "assets/gAreaMetatiles_Vaati3_3.bin.lz"
+	.incbin "maps/areas/139_Vaati3/tilesets/0/gAreaTileset_Vaati3_0_2.4bpp.lz"
+gAreaMetaTileset_Vaati3_bottom::
+	.incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTileset_Vaati3_bottom.bin.lz"
+gAreaMetaTileset_Vaati3_top::
+	.incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTileset_Vaati3_top.bin.lz"
+gAreaMetaTilesetTypes_Vaati3_bottom::
+	.incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTilesetTypes_Vaati3_bottom.bin.lz"
+gAreaMetaTilesetTypes_Vaati3_top::
+	.incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTilesetTypes_Vaati3_top.bin.lz"
 gAreaTileset_Vaati2_0_0::
-	.incbin "tilesets/gAreaTileset_Vaati2_0_0.4bpp.lz"
+	.incbin "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_0.4bpp.lz"
 gAreaTileset_Vaati2_0_1::
-	.incbin "tilesets/gAreaTileset_Vaati2_0_1.4bpp.lz"
+	.incbin "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_1.4bpp.lz"
 gAreaTileset_Vaati2_0_2::
-	.incbin "tilesets/gAreaTileset_Vaati2_0_2.4bpp.lz"
-gAreaMetatiles_Vaati2_0::
-	.incbin "assets/gAreaMetatiles_Vaati2_0.bin.lz"
-gAreaMetatiles_Vaati2_1::
-	.incbin "assets/gAreaMetatiles_Vaati2_1.bin.lz"
-gAreaMetatiles_Vaati2_2::
-	.incbin "assets/gAreaMetatiles_Vaati2_2.bin.lz"
-gAreaMetatiles_Vaati2_3::
-	.incbin "assets/gAreaMetatiles_Vaati2_3.bin.lz"
+	.incbin "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_2.4bpp.lz"
+gAreaMetaTileset_Vaati2_bottom::
+	.incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTileset_Vaati2_bottom.bin.lz"
+gAreaMetaTileset_Vaati2_top::
+	.incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTileset_Vaati2_top.bin.lz"
+gAreaMetaTilesetTypes_Vaati2_bottom::
+	.incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTilesetTypes_Vaati2_bottom.bin.lz"
+gAreaMetaTilesetTypes_Vaati2_top::
+	.incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTilesetTypes_Vaati2_top.bin.lz"
 gAreaTileset_VaatisArms_0_0::
-	.incbin "tilesets/gAreaTileset_VaatisArms_0_0.4bpp.lz"
+	.incbin "maps/areas/138_VaatisArms/tilesets/0/gAreaTileset_VaatisArms_0_0.4bpp.lz"
 gAreaTileset_VaatisArms_0_1::
-	.incbin "tilesets/gAreaTileset_VaatisArms_0_1.4bpp.lz"
+	.incbin "maps/areas/138_VaatisArms/tilesets/0/gAreaTileset_VaatisArms_0_1.4bpp.lz"
 gAreaTileset_VaatisArms_0_2::
-	.incbin "tilesets/gAreaTileset_VaatisArms_0_2.4bpp.lz"
-gAreaMetatiles_VaatisArms_0::
-	.incbin "assets/gAreaMetatiles_VaatisArms_0.bin.lz"
-gAreaMetatiles_VaatisArms_1::
-	.incbin "assets/gAreaMetatiles_VaatisArms_1.bin.lz"
-gAreaMetatiles_VaatisArms_2::
-	.incbin "assets/gAreaMetatiles_VaatisArms_2.bin.lz"
-gAreaMetatiles_VaatisArms_3::
-	.incbin "assets/gAreaMetatiles_VaatisArms_3.bin.lz"
-gAreaRoomMap_DarkHyruleCastle_1FEntrance_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastle_1FEntrance_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_1.bin.lz"
+	.incbin "maps/areas/138_VaatisArms/tilesets/0/gAreaTileset_VaatisArms_0_2.4bpp.lz"
+gAreaMetaTileset_VaatisArms_bottom::
+	.incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTileset_VaatisArms_bottom.bin.lz"
+gAreaMetaTileset_VaatisArms_top::
+	.incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTileset_VaatisArms_top.bin.lz"
+gAreaMetaTilesetTypes_VaatisArms_bottom::
+	.incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTilesetTypes_VaatisArms_bottom.bin.lz"
+gAreaMetaTilesetTypes_VaatisArms_top::
+	.incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTilesetTypes_VaatisArms_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fEntrance_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top.bin.lz"
 
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBossKey_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBossKey_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/gAreaRoomMap_DarkHyruleCastle_2fBossKey_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fSparks_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/gAreaRoomMap_DarkHyruleCastle_2fSparks_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FLeft_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fLeft_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/gAreaRoomMap_DarkHyruleCastle_2fLeft_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_2fRight_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/gAreaRoomMap_DarkHyruleCastle_2fRight_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fRight_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/gAreaRoomMap_DarkHyruleCastle_2fRight_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FEntrance_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fEntrance_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/gAreaRoomMap_DarkHyruleCastle_2fEntrance_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top.bin.lz"
  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::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1.bin.lz"
-unknown_215::
-	.incbin "assets/unknown_215.bin"
-gAreaRoomMap_DarkHyruleCastle_B1Entrance_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastle_B1Entrance_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1b_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/27_1b/gAreaRoomMap_DarkHyruleCastle_1b_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1b_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/27_1b/gAreaRoomMap_DarkHyruleCastle_1b_top.bin.lz"
+gDungeonMaps_DarkHyruleCastle_1b_unused::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/27_1b/dungeon_map.bin"
+gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Entrance_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/gAreaRoomMap_DarkHyruleCastle_B1Entrance_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FCompass_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fCompass_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/gAreaRoomMap_DarkHyruleCastle_1fCompass_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1BombWall_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/gAreaRoomMap_DarkHyruleCastle_B1BombWall_top.bin.lz"
  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"
+gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Keatons_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/gAreaRoomMap_DarkHyruleCastle_B1Keatons_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B1Cannons_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Cannons_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/gAreaRoomMap_DarkHyruleCastle_B1Cannons_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B1Left_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Left_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/gAreaRoomMap_DarkHyruleCastle_B1Left_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Left_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/gAreaRoomMap_DarkHyruleCastle_B1Left_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B1Right_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Right_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/gAreaRoomMap_DarkHyruleCastle_B1Right_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Right_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/gAreaRoomMap_DarkHyruleCastle_B1Right_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B1Map_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Map_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/gAreaRoomMap_DarkHyruleCastle_B1Map_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B1Map_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/gAreaRoomMap_DarkHyruleCastle_B1Map_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B2Prison_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B2Prison_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/gAreaRoomMap_DarkHyruleCastle_B2Prison_top.bin.lz"
  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"
-gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top.bin.lz"
  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::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1.bin.lz"
-unknown_247::
-	.incbin "assets/unknown_247.bin"
-gAreaRoomMap_DarkHyruleCastleBridge_0_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleBridge_0_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_1.bin.lz"
-unknown_248::
-	.incbin "assets/unknown_248.bin"
-gAreaRoomMap_Vaati3_0_0::
-	.incbin "assets/gAreaRoomMap_Vaati3_0_0.bin.lz"
-gAreaRoomMap_Vaati3_0_1::
-	.incbin "assets/gAreaRoomMap_Vaati3_0_1.bin.lz"
-gAreaRoomMap_Vaati3_1_0::
-	.incbin "assets/gAreaRoomMap_Vaati3_1_0.bin.lz"
-gAreaRoomMap_Vaati3_1_1::
-	.incbin "assets/gAreaRoomMap_Vaati3_1_1.bin.lz"
-gAreaRoomMap_Vaati2_0_0::
-	.incbin "assets/gAreaRoomMap_Vaati2_0_0.bin.lz"
-gAreaRoomMap_Vaati2_0_1::
-	.incbin "assets/gAreaRoomMap_Vaati2_0_1.bin.lz"
-gAreaRoomMap_VaatisArms_0_0::
-	.incbin "assets/gAreaRoomMap_VaatisArms_0_0.bin.lz"
-gAreaRoomMap_VaatisArms_0_1::
-	.incbin "assets/gAreaRoomMap_VaatisArms_0_1.bin.lz"
-gAreaRoomMap_VaatisArms_1_0::
-	.incbin "assets/gAreaRoomMap_VaatisArms_1_0.bin.lz"
-gAreaRoomMap_VaatisArms_1_1::
-	.incbin "assets/gAreaRoomMap_VaatisArms_1_1.bin.lz"
-gAreaRoomMap_VaatisArms_2_0::
-	.incbin "assets/gAreaRoomMap_VaatisArms_2_0.bin.lz"
-gAreaRoomMap_VaatisArms_2_1::
-	.incbin "assets/gAreaRoomMap_VaatisArms_2_1.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3b_bottom::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/59_3b/gAreaRoomMap_DarkHyruleCastle_3b_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastle_3b_top::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/59_3b/gAreaRoomMap_DarkHyruleCastle_3b_top.bin.lz"
+gDungeonMaps_DarkHyruleCastle_3b_unused::
+	.incbin "maps/areas/136_DarkHyruleCastle/rooms/59_3b/dungeon_map.bin"
+gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleBridge_Main_top::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/gAreaRoomMap_DarkHyruleCastleBridge_Main_top.bin.lz"
+gDungeonMaps_DarkHyruleCastleBridge_Main_unused::
+	.incbin "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/dungeon_map.bin"
+gAreaRoomMap_Vaati3_0_bottom::
+	.incbin "maps/areas/139_Vaati3/rooms/00_0/gAreaRoomMap_Vaati3_0_bottom.bin.lz"
+gAreaRoomMap_Vaati3_0_top::
+	.incbin "maps/areas/139_Vaati3/rooms/00_0/gAreaRoomMap_Vaati3_0_top.bin.lz"
+gAreaRoomMap_Vaati3_1_bottom::
+	.incbin "maps/areas/139_Vaati3/rooms/01_1/gAreaRoomMap_Vaati3_1_bottom.bin.lz"
+gAreaRoomMap_Vaati3_1_top::
+	.incbin "maps/areas/139_Vaati3/rooms/01_1/gAreaRoomMap_Vaati3_1_top.bin.lz"
+gAreaRoomMap_Vaati2_0_bottom::
+	.incbin "maps/areas/140_Vaati2/rooms/00_0/gAreaRoomMap_Vaati2_0_bottom.bin.lz"
+gAreaRoomMap_Vaati2_0_top::
+	.incbin "maps/areas/140_Vaati2/rooms/00_0/gAreaRoomMap_Vaati2_0_top.bin.lz"
+gAreaRoomMap_VaatisArms_First_bottom::
+	.incbin "maps/areas/138_VaatisArms/rooms/00_First/gAreaRoomMap_VaatisArms_First_bottom.bin.lz"
+gAreaRoomMap_VaatisArms_First_top::
+	.incbin "maps/areas/138_VaatisArms/rooms/00_First/gAreaRoomMap_VaatisArms_First_top.bin.lz"
+gAreaRoomMap_VaatisArms_Second_bottom::
+	.incbin "maps/areas/138_VaatisArms/rooms/01_Second/gAreaRoomMap_VaatisArms_Second_bottom.bin.lz"
+gAreaRoomMap_VaatisArms_Second_top::
+	.incbin "maps/areas/138_VaatisArms/rooms/01_Second/gAreaRoomMap_VaatisArms_Second_top.bin.lz"
+gAreaRoomMap_VaatisArms_3_bottom::
+	.incbin "maps/areas/138_VaatisArms/rooms/02_3/gAreaRoomMap_VaatisArms_3_bottom.bin.lz"
+gAreaRoomMap_VaatisArms_3_top::
+	.incbin "maps/areas/138_VaatisArms/rooms/02_3/gAreaRoomMap_VaatisArms_3_top.bin.lz"
 gAreaTileset_Vaati2_0_3::
-	.incbin "tilesets/gAreaTileset_Vaati2_0_3.bin.lz"
+	.incbin "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_3.4bpp.lz"
 gAreaTileset_DarkHyruleCastleOutside_0_0::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_0.4bpp.lz"
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/tilesets/0/gAreaTileset_DarkHyruleCastleOutside_0_0.4bpp.lz"
 gAreaTileset_DarkHyruleCastleOutside_0_1::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_1.4bpp.lz"
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/tilesets/0/gAreaTileset_DarkHyruleCastleOutside_0_1.4bpp.lz"
 gAreaTileset_DarkHyruleCastleOutside_0_2::
-	.incbin "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_2.4bpp.lz"
-gAreaMetatiles_DarkHyruleCastleOutside_0::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_0.bin.lz"
-gAreaMetatiles_DarkHyruleCastleOutside_1::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_1.bin.lz"
-gAreaMetatiles_DarkHyruleCastleOutside_2::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_2.bin.lz"
-gAreaMetatiles_DarkHyruleCastleOutside_3::
-	.incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_3.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_0_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_0_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_0_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_0_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_1_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_1_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_1_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_1_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_2_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_2_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_2_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_2_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_3_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_3_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_3_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_3_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_4_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_4_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_4_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_4_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_5_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_5_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_5_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_5_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_6_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_6_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_6_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_6_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_7_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_7_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_7_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_7_1.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_8_0::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_8_0.bin.lz"
-gAreaRoomMap_DarkHyruleCastleOutside_8_1::
-	.incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_8_1.bin.lz"
-gAreaRoomMap_47_0_0::
-	.incbin "assets/gAreaRoomMap_47_0_0.bin.lz"
-gAreaRoomMap_47_0_1::
-	.incbin "assets/gAreaRoomMap_47_0_1.bin.lz"
-gAreaRoomMap_47_1_0::
-	.incbin "assets/gAreaRoomMap_47_1_0.bin.lz"
-gAreaRoomMap_47_1_1::
-	.incbin "assets/gAreaRoomMap_47_1_1.bin.lz"
-gAreaRoomMap_47_2_0::
-	.incbin "assets/gAreaRoomMap_47_2_0.bin.lz"
-gAreaRoomMap_47_2_1::
-	.incbin "assets/gAreaRoomMap_47_2_1.bin.lz"
-gAreaRoomMap_45_0_0::
-	.incbin "assets/gAreaRoomMap_45_0_0.bin.lz"
-gAreaRoomMap_45_0_1::
-	.incbin "assets/gAreaRoomMap_45_0_1.bin.lz"
-gAreaRoomMap_46_0_0::
-	.incbin "assets/gAreaRoomMap_46_0_0.bin.lz"
-gAreaRoomMap_46_0_1::
-	.incbin "assets/gAreaRoomMap_46_0_1.bin.lz"
-gAreaRoomMap_46_1_0::
-	.incbin "assets/gAreaRoomMap_46_1_0.bin.lz"
-gAreaRoomMap_46_1_1::
-	.incbin "assets/gAreaRoomMap_46_1_1.bin.lz"
-gAreaRoomMap_46_2_0::
-	.incbin "assets/gAreaRoomMap_46_2_0.bin.lz"
-gAreaRoomMap_46_2_1::
-	.incbin "assets/gAreaRoomMap_46_2_1.bin.lz"
-gAreaRoomMap_46_3_0::
-	.incbin "assets/gAreaRoomMap_46_3_0.bin.lz"
-gAreaRoomMap_46_3_1::
-	.incbin "assets/gAreaRoomMap_46_3_1.bin.lz"
-gAreaRoomMap_46_4_0::
-	.incbin "assets/gAreaRoomMap_46_4_0.bin.lz"
-gAreaRoomMap_46_4_1::
-	.incbin "assets/gAreaRoomMap_46_4_1.bin.lz"
-gAreaRoomMap_46_5_0::
-	.incbin "assets/gAreaRoomMap_46_5_0.bin.lz"
-gAreaRoomMap_46_5_1::
-	.incbin "assets/gAreaRoomMap_46_5_1.bin.lz"
-gAreaRoomMap_46_6_0::
-	.incbin "assets/gAreaRoomMap_46_6_0.bin.lz"
-gAreaRoomMap_46_6_1::
-	.incbin "assets/gAreaRoomMap_46_6_1.bin.lz"
-gAreaRoomMap_46_7_0::
-	.incbin "assets/gAreaRoomMap_46_7_0.bin.lz"
-gAreaRoomMap_46_7_1::
-	.incbin "assets/gAreaRoomMap_46_7_1.bin.lz"
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/tilesets/0/gAreaTileset_DarkHyruleCastleOutside_0_2.4bpp.lz"
+gAreaMetaTileset_DarkHyruleCastleOutside_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTileset_DarkHyruleCastleOutside_bottom.bin.lz"
+gAreaMetaTileset_DarkHyruleCastleOutside_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTileset_DarkHyruleCastleOutside_top.bin.lz"
+gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom.bin.lz"
+gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/01_Garden/gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Garden_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/01_Garden/gAreaRoomMap_DarkHyruleCastleOutside_Garden_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/02_Northwest/gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/02_Northwest/gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/03_Northeast/gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/03_Northeast/gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_East_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/04_East/gAreaRoomMap_DarkHyruleCastleOutside_East_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_East_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/04_East/gAreaRoomMap_DarkHyruleCastleOutside_East_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/05_Southwest/gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/05_Southwest/gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_South_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_South_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_8_bottom::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_bottom.bin.lz"
+gAreaRoomMap_DarkHyruleCastleOutside_8_top::
+	.incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_top.bin.lz"
+gAreaRoomMap_47_0_bottom::
+	.incbin "maps/areas/071_47/rooms/00_0/gAreaRoomMap_47_0_bottom.bin.lz"
+gAreaRoomMap_47_0_top::
+	.incbin "maps/areas/071_47/rooms/00_0/gAreaRoomMap_47_0_top.bin.lz"
+gAreaRoomMap_47_1_bottom::
+	.incbin "maps/areas/071_47/rooms/01_1/gAreaRoomMap_47_1_bottom.bin.lz"
+gAreaRoomMap_47_1_top::
+	.incbin "maps/areas/071_47/rooms/01_1/gAreaRoomMap_47_1_top.bin.lz"
+gAreaRoomMap_47_2_bottom::
+	.incbin "maps/areas/071_47/rooms/02_2/gAreaRoomMap_47_2_bottom.bin.lz"
+gAreaRoomMap_47_2_top::
+	.incbin "maps/areas/071_47/rooms/02_2/gAreaRoomMap_47_2_top.bin.lz"
+gAreaRoomMap_45_0_bottom::
+	.incbin "maps/areas/069_45/rooms/00_0/gAreaRoomMap_45_0_bottom.bin.lz"
+gAreaRoomMap_45_0_top::
+	.incbin "maps/areas/069_45/rooms/00_0/gAreaRoomMap_45_0_top.bin.lz"
+gAreaRoomMap_Null46_0_bottom::
+	.incbin "maps/areas/070_Null46/rooms/00_0/gAreaRoomMap_Null46_0_bottom.bin.lz"
+gAreaRoomMap_Null46_0_top::
+	.incbin "maps/areas/070_Null46/rooms/00_0/gAreaRoomMap_Null46_0_top.bin.lz"
+gAreaRoomMap_Null46_1_bottom::
+	.incbin "maps/areas/070_Null46/rooms/01_1/gAreaRoomMap_Null46_1_bottom.bin.lz"
+gAreaRoomMap_Null46_1_top::
+	.incbin "maps/areas/070_Null46/rooms/01_1/gAreaRoomMap_Null46_1_top.bin.lz"
+gAreaRoomMap_Null46_2_bottom::
+	.incbin "maps/areas/070_Null46/rooms/02_2/gAreaRoomMap_Null46_2_bottom.bin.lz"
+gAreaRoomMap_Null46_2_top::
+	.incbin "maps/areas/070_Null46/rooms/02_2/gAreaRoomMap_Null46_2_top.bin.lz"
+gAreaRoomMap_Null46_3_bottom::
+	.incbin "maps/areas/070_Null46/rooms/03_3/gAreaRoomMap_Null46_3_bottom.bin.lz"
+gAreaRoomMap_Null46_3_top::
+	.incbin "maps/areas/070_Null46/rooms/03_3/gAreaRoomMap_Null46_3_top.bin.lz"
+gAreaRoomMap_Null46_4_bottom::
+	.incbin "maps/areas/070_Null46/rooms/04_4/gAreaRoomMap_Null46_4_bottom.bin.lz"
+gAreaRoomMap_Null46_4_top::
+	.incbin "maps/areas/070_Null46/rooms/04_4/gAreaRoomMap_Null46_4_top.bin.lz"
+gAreaRoomMap_Null46_5_bottom::
+	.incbin "maps/areas/070_Null46/rooms/05_5/gAreaRoomMap_Null46_5_bottom.bin.lz"
+gAreaRoomMap_Null46_5_top::
+	.incbin "maps/areas/070_Null46/rooms/05_5/gAreaRoomMap_Null46_5_top.bin.lz"
+gAreaRoomMap_Null46_6_bottom::
+	.incbin "maps/areas/070_Null46/rooms/06_6/gAreaRoomMap_Null46_6_bottom.bin.lz"
+gAreaRoomMap_Null46_6_top::
+	.incbin "maps/areas/070_Null46/rooms/06_6/gAreaRoomMap_Null46_6_top.bin.lz"
+gAreaRoomMap_Null46_7_bottom::
+	.incbin "maps/areas/070_Null46/rooms/07_7/gAreaRoomMap_Null46_7_bottom.bin.lz"
+gAreaRoomMap_Null46_7_top::
+	.incbin "maps/areas/070_Null46/rooms/07_7/gAreaRoomMap_Null46_7_top.bin.lz"
 gAreaRoomMap_08107870_0::
 	.incbin "assets/gAreaRoomMap_08107870_0.bin.lz"
 gAreaRoomMap_08107870_1::
 	.incbin "assets/gAreaRoomMap_08107870_1.bin.lz"
-gAreaRoomMap_4D_0_0::
-	.incbin "assets/gAreaRoomMap_4D_0_0.bin.lz"
-gAreaRoomMap_4D_0_1::
-	.incbin "assets/gAreaRoomMap_4D_0_1.bin.lz"
-gAreaRoomMap_57_0_0::
-	.incbin "assets/gAreaRoomMap_57_0_0.bin.lz"
-gAreaRoomMap_57_0_1::
-	.incbin "assets/gAreaRoomMap_57_0_1.bin.lz"
-gAreaRoomMap_5F_0_0::
-	.incbin "assets/gAreaRoomMap_5F_0_0.bin.lz"
-gAreaRoomMap_5F_0_1::
-	.incbin "assets/gAreaRoomMap_5F_0_1.bin.lz"
-gAreaRoomMap_67_0_0::
-	.incbin "assets/gAreaRoomMap_67_0_0.bin.lz"
-gAreaRoomMap_67_0_1::
-	.incbin "assets/gAreaRoomMap_67_0_1.bin.lz"
-gAreaRoomMap_6F_0_0::
-	.incbin "assets/gAreaRoomMap_6F_0_0.bin.lz"
-gAreaRoomMap_6F_0_1::
-	.incbin "assets/gAreaRoomMap_6F_0_1.bin.lz"
-gAreaRoomMap_77_0_0::
-	.incbin "assets/gAreaRoomMap_77_0_0.bin.lz"
-gAreaRoomMap_77_0_1::
-	.incbin "assets/gAreaRoomMap_77_0_1.bin.lz"
-gAreaRoomMap_7F_0_0::
-	.incbin "assets/gAreaRoomMap_7F_0_0.bin.lz"
-gAreaRoomMap_7F_0_1::
-	.incbin "assets/gAreaRoomMap_7F_0_1.bin.lz"
-gAreaRoomMap_87_0_0::
-	.incbin "assets/gAreaRoomMap_87_0_0.bin.lz"
-gAreaRoomMap_87_0_1::
-	.incbin "assets/gAreaRoomMap_87_0_1.bin.lz"
-gAreaRoomMap_8F_0_0::
-	.incbin "assets/gAreaRoomMap_8F_0_0.bin.lz"
-gAreaRoomMap_8F_0_1::
-	.incbin "assets/gAreaRoomMap_8F_0_1.bin.lz"
+gAreaRoomMap_4d_0_bottom::
+	.incbin "maps/areas/077_4d/rooms/00_0/gAreaRoomMap_4d_0_bottom.bin.lz"
+gAreaRoomMap_4d_0_top::
+	.incbin "maps/areas/077_4d/rooms/00_0/gAreaRoomMap_4d_0_top.bin.lz"
+gAreaRoomMap_57_0_bottom::
+	.incbin "maps/areas/087_57/rooms/00_0/gAreaRoomMap_57_0_bottom.bin.lz"
+gAreaRoomMap_57_0_top::
+	.incbin "maps/areas/087_57/rooms/00_0/gAreaRoomMap_57_0_top.bin.lz"
+gAreaRoomMap_5f_0_bottom::
+	.incbin "maps/areas/095_5f/rooms/00_0/gAreaRoomMap_5f_0_bottom.bin.lz"
+gAreaRoomMap_5f_0_top::
+	.incbin "maps/areas/095_5f/rooms/00_0/gAreaRoomMap_5f_0_top.bin.lz"
+gAreaRoomMap_67_0_bottom::
+	.incbin "maps/areas/103_67/rooms/00_0/gAreaRoomMap_67_0_bottom.bin.lz"
+gAreaRoomMap_67_0_top::
+	.incbin "maps/areas/103_67/rooms/00_0/gAreaRoomMap_67_0_top.bin.lz"
+gAreaRoomMap_6f_0_bottom::
+	.incbin "maps/areas/111_6f/rooms/00_0/gAreaRoomMap_6f_0_bottom.bin.lz"
+gAreaRoomMap_6f_0_top::
+	.incbin "maps/areas/111_6f/rooms/00_0/gAreaRoomMap_6f_0_top.bin.lz"
+gAreaRoomMap_77_0_bottom::
+	.incbin "maps/areas/119_77/rooms/00_0/gAreaRoomMap_77_0_bottom.bin.lz"
+gAreaRoomMap_77_0_top::
+	.incbin "maps/areas/119_77/rooms/00_0/gAreaRoomMap_77_0_top.bin.lz"
+gAreaRoomMap_7f_0_bottom::
+	.incbin "maps/areas/127_7f/rooms/00_0/gAreaRoomMap_7f_0_bottom.bin.lz"
+gAreaRoomMap_7f_0_top::
+	.incbin "maps/areas/127_7f/rooms/00_0/gAreaRoomMap_7f_0_top.bin.lz"
+gAreaRoomMap_87_0_bottom::
+	.incbin "maps/areas/135_87/rooms/00_0/gAreaRoomMap_87_0_bottom.bin.lz"
+gAreaRoomMap_87_0_top::
+	.incbin "maps/areas/135_87/rooms/00_0/gAreaRoomMap_87_0_top.bin.lz"
+gAreaRoomMap_8f_0_bottom::
+	.incbin "maps/areas/143_8f/rooms/00_0/gAreaRoomMap_8f_0_bottom.bin.lz"
+gAreaRoomMap_8f_0_top::
+	.incbin "maps/areas/143_8f/rooms/00_0/gAreaRoomMap_8f_0_top.bin.lz"
diff --git a/data/map/map_headers.s b/data/map/map_headers.s
index 0df32e45..f1c8118c 100755
--- a/data/map/map_headers.s
+++ b/data/map/map_headers.s
@@ -7,54 +7,54 @@
 	.include "map_offsets.inc"
 
 gAreaRoomMap_MinishWoods_0:: @ 081032DC
-	map_bottom offset_gAreaRoomMap_MinishWoods_0_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_MinishWoods_0_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishWoods_Main_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_MinishWoods_Main_top, 0x1F02, 1, 1
 
 gAreaRoomMaps_MinishWoods:: @ 081032F4
 	.4byte gAreaRoomMap_MinishWoods_0
 
 gAreaRoomMap_LakeHylia_0:: @ 081032F8
-	map_bottom offset_gAreaRoomMap_LakeHylia_0_0, 0x1680, 1
-	map_top offset_gAreaRoomMap_LakeHylia_0_1, 0x1680, 1, 1
+	map_bottom offset_gAreaRoomMap_LakeHylia_Main_bottom, 0x1680, 1
+	map_top offset_gAreaRoomMap_LakeHylia_Main_top, 0x1680, 1, 1
 
 gAreaRoomMap_LakeHylia_1:: @ 08103310
-	map_bottom offset_gAreaRoomMap_LakeHylia_1_0, 0x5E8, 1
-	map_top offset_gAreaRoomMap_LakeHylia_1_1, 0x5E8, 1, 1
+	map_bottom offset_gAreaRoomMap_LakeHylia_Beanstalk_bottom, 0x5E8, 1
+	map_top offset_gAreaRoomMap_LakeHylia_Beanstalk_top, 0x5E8, 1, 1
 
 gAreaRoomMaps_LakeHylia:: @ 08103328
 	.4byte gAreaRoomMap_LakeHylia_0
 	.4byte gAreaRoomMap_LakeHylia_1
 
 gAreaRoomMap_CastorWilds_0:: @ 08103330
-	map_bottom offset_gAreaRoomMap_CastorWilds_0_0, 0x1D88, 1
-	map_top offset_gAreaRoomMap_CastorWilds_0_1, 0x1D88, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorWilds_Main_bottom, 0x1D88, 1
+	map_top offset_gAreaRoomMap_CastorWilds_Main_top, 0x1D88, 1, 1
 
 gAreaRoomMaps_CastorWilds:: @ 08103348
 	.4byte gAreaRoomMap_CastorWilds_0
 
 gAreaRoomMap_Ruins_0:: @ 0810334C
-	map_bottom offset_gAreaRoomMap_Ruins_0_0, 0x3DE, 1
-	map_top offset_gAreaRoomMap_Ruins_0_1, 0x3DE, 1, 1
+	map_bottom offset_gAreaRoomMap_Ruins_Entrance_bottom, 0x3DE, 1
+	map_top offset_gAreaRoomMap_Ruins_Entrance_top, 0x3DE, 1, 1
 
 gAreaRoomMap_Ruins_1:: @ 08103364
-	map_bottom offset_gAreaRoomMap_Ruins_1_0, 0x186, 1
-	map_top offset_gAreaRoomMap_Ruins_1_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_Ruins_Beanstalk_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_Ruins_Beanstalk_top, 0x186, 1, 1
 
 gAreaRoomMap_Ruins_2:: @ 0810337C
-	map_bottom offset_gAreaRoomMap_Ruins_2_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Ruins_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Ruins_Tektites_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Ruins_Tektites_top, 0x12C, 1, 1
 
 gAreaRoomMap_Ruins_3:: @ 08103394
-	map_bottom offset_gAreaRoomMap_Ruins_3_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Ruins_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Ruins_LadderToTektites_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Ruins_LadderToTektites_top, 0x12C, 1, 1
 
 gAreaRoomMap_Ruins_4:: @ 081033AC
-	map_bottom offset_gAreaRoomMap_Ruins_4_0, 0x420, 1
-	map_top offset_gAreaRoomMap_Ruins_4_1, 0x420, 1, 1
+	map_bottom offset_gAreaRoomMap_Ruins_FortressEntrance_bottom, 0x420, 1
+	map_top offset_gAreaRoomMap_Ruins_FortressEntrance_top, 0x420, 1, 1
 
 gAreaRoomMap_Ruins_5:: @ 081033C4
-	map_bottom offset_gAreaRoomMap_Ruins_5_0, 0x462, 1
-	map_top offset_gAreaRoomMap_Ruins_5_1, 0x462, 1, 1
+	map_bottom offset_gAreaRoomMap_Ruins_BelowFortressEntrance_bottom, 0x462, 1
+	map_top offset_gAreaRoomMap_Ruins_BelowFortressEntrance_top, 0x462, 1, 1
 
 gAreaRoomMaps_Ruins:: @ 081033DC
 	.4byte gAreaRoomMap_Ruins_0
@@ -65,38 +65,38 @@ gAreaRoomMaps_Ruins:: @ 081033DC
 	.4byte gAreaRoomMap_Ruins_5
 
 gAreaRoomMap_HyruleTown_0:: @ 081033F4
-	map_bottom offset_gAreaRoomMap_HyruleTown_0_0, 0x1D88, 1
-	map_top offset_gAreaRoomMap_HyruleTown_0_1, 0x1D88, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTown_Main_bottom, 0x1D88, 1
+	map_top offset_gAreaRoomMap_HyruleTown_Main_top, 0x1D88, 1, 1
 
 gAreaRoomMaps_HyruleTown:: @ 0810340C
 	.4byte gAreaRoomMap_HyruleTown_0
 
 gAreaRoomMap_FestivalTown_0:: @ 08103410
-	map_bottom offset_gAreaRoomMap_FestivalTown_0_0, 0xBB8, 1
-	map_top offset_gAreaRoomMap_FestivalTown_0_1, 0xBB8, 1, 1
+	map_bottom offset_gAreaRoomMap_FestivalTown_Main_bottom, 0xBB8, 1
+	map_top offset_gAreaRoomMap_FestivalTown_Main_top, 0xBB8, 1, 1
 
 gAreaRoomMaps_FestivalTown:: @ 08103428
 	.4byte gAreaRoomMap_FestivalTown_0
 
 gAreaRoomMap_MtCrenel_0:: @ 0810342C
-	map_bottom offset_gAreaRoomMap_MtCrenel_0_0, 0x6E4, 1
-	map_top offset_gAreaRoomMap_MtCrenel_0_1, 0x6E4, 1, 1
+	map_bottom offset_gAreaRoomMap_MtCrenel_Top_bottom, 0x6E4, 1
+	map_top offset_gAreaRoomMap_MtCrenel_Top_top, 0x6E4, 1, 1
 
 gAreaRoomMap_MtCrenel_1:: @ 08103444
-	map_bottom offset_gAreaRoomMap_MtCrenel_1_0, 0x720, 1
-	map_top offset_gAreaRoomMap_MtCrenel_1_1, 0x720, 1, 1
+	map_bottom offset_gAreaRoomMap_MtCrenel_WallClimb_bottom, 0x720, 1
+	map_top offset_gAreaRoomMap_MtCrenel_WallClimb_top, 0x720, 1, 1
 
 gAreaRoomMap_MtCrenel_2:: @ 0810345C
-	map_bottom offset_gAreaRoomMap_MtCrenel_2_0, 0xB94, 1
-	map_top offset_gAreaRoomMap_MtCrenel_2_1, 0xB94, 1, 1
+	map_bottom offset_gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom, 0xB94, 1
+	map_top offset_gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top, 0xB94, 1, 1
 
 gAreaRoomMap_MtCrenel_3:: @ 08103474
-	map_bottom offset_gAreaRoomMap_MtCrenel_3_0, 0xB52, 1
-	map_top offset_gAreaRoomMap_MtCrenel_3_1, 0xB52, 1, 1
+	map_bottom offset_gAreaRoomMap_MtCrenel_Center_bottom, 0xB52, 1
+	map_top offset_gAreaRoomMap_MtCrenel_Center_top, 0xB52, 1, 1
 
 gAreaRoomMap_MtCrenel_4:: @ 0810348C
-	map_bottom offset_gAreaRoomMap_MtCrenel_4_0, 0xEC4, 1
-	map_top offset_gAreaRoomMap_MtCrenel_4_1, 0xEC4, 1, 1
+	map_bottom offset_gAreaRoomMap_MtCrenel_Entrance_bottom, 0xEC4, 1
+	map_top offset_gAreaRoomMap_MtCrenel_Entrance_top, 0xEC4, 1, 1
 
 gAreaRoomMaps_MtCrenel:: @ 081034A4
 	.4byte gAreaRoomMap_MtCrenel_0
@@ -106,62 +106,62 @@ gAreaRoomMaps_MtCrenel:: @ 081034A4
 	.4byte gAreaRoomMap_MtCrenel_4
 
 gAreaRoomMap_HyruleField_0:: @ 081034B8
-	map_bottom offset_gAreaRoomMap_HyruleField_0_0, 0x30C, 1
-	map_top offset_gAreaRoomMap_HyruleField_0_1, 0x30C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom, 0x30C, 1
+	map_top offset_gAreaRoomMap_HyruleField_WesternWoodsSouth_top, 0x30C, 1, 1
 
 gAreaRoomMap_HyruleField_1:: @ 081034D0
-	tileset_tiles offset_gAreaTileset_HyruleField_7_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_7_1, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_2, 0x6008000, 0x4000, 1
 	.4byte 0x80000010, 0x0, 0x0
-	map_bottom offset_gAreaRoomMap_HyruleField_1_3, 0x152A, 1
-	map_top offset_gAreaRoomMap_HyruleField_1_4, 0x152A, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_SouthHyruleField_bottom, 0x152A, 1
+	map_top offset_gAreaRoomMap_HyruleField_SouthHyruleField_top, 0x152A, 1, 1
 
 gAreaRoomMap_HyruleField_2:: @ 0810350C
-	map_bottom offset_gAreaRoomMap_HyruleField_2_0, 0x30C, 1
-	map_top offset_gAreaRoomMap_HyruleField_2_1, 0x30C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_EasternHilllsSouth_bottom, 0x30C, 1
+	map_top offset_gAreaRoomMap_HyruleField_EasternHilllsSouth_top, 0x30C, 1, 1
 
 gAreaRoomMap_HyruleField_3:: @ 08103524
-	tileset_tiles offset_gAreaTileset_HyruleField_7_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_7_1, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_2, 0x6008000, 0x4000, 1
 	.4byte 0x80000010, 0x0, 0x0
-	map_bottom offset_gAreaRoomMap_HyruleField_3_3, 0x3C0, 1
-	map_top offset_gAreaRoomMap_HyruleField_3_4, 0x3C0, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_EasternHilllsCenter_bottom, 0x3C0, 1
+	map_top offset_gAreaRoomMap_HyruleField_EasternHilllsCenter_top, 0x3C0, 1, 1
 
 gAreaRoomMap_HyruleField_4:: @ 08103560
-	tileset_tiles offset_gAreaTileset_HyruleField_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_5_1, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_1_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_1_2, 0x6008000, 0x4000, 1
 	.4byte 0x80000043, 0x0, 0x0
-	map_bottom offset_gAreaRoomMap_HyruleField_4_3, 0x7F8, 1
-	map_top offset_gAreaRoomMap_HyruleField_4_4, 0x7F8, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_EasternHilllsNorth_bottom, 0x7F8, 1
+	map_top offset_gAreaRoomMap_HyruleField_EasternHilllsNorth_top, 0x7F8, 1, 1
 
 gAreaRoomMap_HyruleField_5:: @ 0810359C
-	tileset_tiles offset_gAreaTileset_HyruleField_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_5_1, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_1_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_1_2, 0x6008000, 0x4000, 1
 	.4byte 0x80000043, 0x0, 0x0
-	map_bottom offset_gAreaRoomMap_HyruleField_5_3, 0x1518, 1
-	map_top offset_gAreaRoomMap_HyruleField_5_4, 0x1518, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_LonLonRanch_bottom, 0x1518, 1
+	map_top offset_gAreaRoomMap_HyruleField_LonLonRanch_top, 0x1518, 1, 1
 
 gAreaRoomMap_HyruleField_6:: @ 081035D8
-	tileset_tiles offset_gAreaTileset_HyruleField_6_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_6_1, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_2_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_2_2, 0x6008000, 0x4000, 1
 	.4byte 0x8000002E, 0x0, 0x0
-	map_bottom offset_gAreaRoomMap_HyruleField_6_3, 0x189C, 1
-	map_top offset_gAreaRoomMap_HyruleField_6_4, 0x189C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_NorthHyruleField_bottom, 0x189C, 1
+	map_top offset_gAreaRoomMap_HyruleField_NorthHyruleField_top, 0x189C, 1, 1
 
 gAreaRoomMap_HyruleField_7:: @ 08103614
-	tileset_tiles offset_gAreaTileset_HyruleField_7_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_7_1, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_2, 0x6008000, 0x4000, 1
 	.4byte 0x80000010, 0x0, 0x0
-	map_bottom offset_gAreaRoomMap_HyruleField_7_3, 0xE10, 1
-	map_top offset_gAreaRoomMap_HyruleField_7_4, 0xE10, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_TrilbyHighlands_bottom, 0xE10, 1
+	map_top offset_gAreaRoomMap_HyruleField_TrilbyHighlands_top, 0xE10, 1, 1
 
 gAreaRoomMap_HyruleField_8:: @ 08103650
-	map_bottom offset_gAreaRoomMap_HyruleField_8_0, 0x960, 1
-	map_top offset_gAreaRoomMap_HyruleField_8_1, 0x960, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom, 0x960, 1
+	map_top offset_gAreaRoomMap_HyruleField_WesternWoodsNorth_top, 0x960, 1, 1
 
 gAreaRoomMap_HyruleField_9:: @ 08103668
-	map_bottom offset_gAreaRoomMap_HyruleField_9_0, 0x258, 1
-	map_top offset_gAreaRoomMap_HyruleField_9_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_HyruleField_WesternWoodsCenter_top, 0x258, 1, 1
 
 gAreaRoomMaps_HyruleField:: @ 08103680
 	.4byte gAreaRoomMap_HyruleField_0
@@ -176,23 +176,23 @@ gAreaRoomMaps_HyruleField:: @ 08103680
 	.4byte gAreaRoomMap_HyruleField_9
 
 gAreaRoomMap_CastleGarden_0:: @ 081036A8
-	map_bottom offset_gAreaRoomMap_CastleGarden_0_0, 0x103E, 1
-	map_top offset_gAreaRoomMap_CastleGarden_0_1, 0x103E, 1, 1
+	map_bottom offset_gAreaRoomMap_CastleGarden_Main_bottom, 0x103E, 1
+	map_top offset_gAreaRoomMap_CastleGarden_Main_top, 0x103E, 1, 1
 
 gAreaRoomMaps_CastleGarden:: @ 081036C0
 	.4byte gAreaRoomMap_CastleGarden_0
 
 gAreaRoomMap_CloudTops_0:: @ 081036C4
-	map_bottom offset_gAreaRoomMap_CloudTops_0_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_CloudTops_0_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_CloudTops_CloudTops_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_CloudTops_CloudTops_top, 0x1F02, 1, 1
 
 gAreaRoomMap_CloudTops_1:: @ 081036DC
-	map_bottom offset_gAreaRoomMap_CloudTops_1_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_CloudTops_1_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_CloudTops_CloudMiddles_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_CloudTops_CloudMiddles_top, 0x1F02, 1, 1
 
 gAreaRoomMap_CloudTops_2:: @ 081036F4
-	map_bottom offset_gAreaRoomMap_CloudTops_2_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_CloudTops_2_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_CloudTops_CloudBottoms_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_CloudTops_CloudBottoms_top, 0x1F02, 1, 1
 
 gAreaRoomMaps_CloudTops:: @ 0810370C
 	.4byte gAreaRoomMap_CloudTops_0
@@ -200,49 +200,49 @@ gAreaRoomMaps_CloudTops:: @ 0810370C
 	.4byte gAreaRoomMap_CloudTops_2
 
 gAreaRoomMap_RoyalValley_0:: @ 08103718
-	map_bottom offset_gAreaRoomMap_RoyalValley_0_0, 0xEC4, 1
-	map_top offset_gAreaRoomMap_RoyalValley_0_1, 0xEC4, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalValley_Main_bottom, 0xEC4, 1
+	map_top offset_gAreaRoomMap_RoyalValley_Main_top, 0xEC4, 1, 1
 
 gAreaRoomMap_RoyalValley_1:: @ 08103730
-	map_bottom offset_gAreaRoomMap_RoyalValley_1_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_RoyalValley_1_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalValley_ForestMaze_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_RoyalValley_ForestMaze_top, 0x12C, 1, 1
 
 gAreaRoomMaps_RoyalValley:: @ 08103748
 	.4byte gAreaRoomMap_RoyalValley_0
 	.4byte gAreaRoomMap_RoyalValley_1
 
 gAreaRoomMap_VeilFalls_0:: @ 08103750
-	map_bottom offset_gAreaRoomMap_VeilFalls_0_0, 0xEC4, 1
-	map_top offset_gAreaRoomMap_VeilFalls_0_1, 0xEC4, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFalls_Main_bottom, 0xEC4, 1
+	map_top offset_gAreaRoomMap_VeilFalls_Main_top, 0xEC4, 1, 1
 
 gAreaRoomMaps_VeilFalls:: @ 08103768
 	.4byte gAreaRoomMap_VeilFalls_0
 
 gAreaRoomMap_VeilFallsTop_0:: @ 0810376C
-	map_bottom offset_gAreaRoomMap_VeilFallsTop_0_0, 0x2D0, 1
-	map_top offset_gAreaRoomMap_VeilFallsTop_0_1, 0x2D0, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsTop_0_bottom, 0x2D0, 1
+	map_top offset_gAreaRoomMap_VeilFallsTop_0_top, 0x2D0, 1, 1
 
 gAreaRoomMaps_VeilFallsTop:: @ 08103784
 	.4byte gAreaRoomMap_VeilFallsTop_0
 
 gAreaRoomMap_Beanstalks_0:: @ 08103788
-	map_bottom offset_gAreaRoomMap_Beanstalks_0_0, 0x12C, 0, 1
+	map_bottom offset_gAreaRoomMap_Beanstalks_Crenel_bottom, 0x12C, 0, 1
 
 gAreaRoomMap_Beanstalks_1:: @ 08103794
-	map_bottom offset_gAreaRoomMap_Beanstalks_1_0, 0x12C, 0, 1
+	map_bottom offset_gAreaRoomMap_Beanstalks_LakeHylia_bottom, 0x12C, 0, 1
 
 gAreaRoomMap_Beanstalks_2:: @ 081037A0
-	map_bottom offset_gAreaRoomMap_Beanstalks_2_0, 0x12C, 0, 1
+	map_bottom offset_gAreaRoomMap_Beanstalks_Ruins_bottom, 0x12C, 0, 1
 
 gAreaRoomMap_Beanstalks_3:: @ 081037AC
-	map_bottom offset_gAreaRoomMap_Beanstalks_3_0, 0x12C, 0, 1
+	map_bottom offset_gAreaRoomMap_Beanstalks_EasternHills_bottom, 0x12C, 0, 1
 
 gAreaRoomMap_Beanstalks_4:: @ 081037B8
-	map_bottom offset_gAreaRoomMap_Beanstalks_4_0, 0x12C, 0, 1
+	map_bottom offset_gAreaRoomMap_Beanstalks_WesternWoods_bottom, 0x12C, 0, 1
 
 gAreaRoomMap_Beanstalks_5:: @ 081037C4
 	.4byte 0x80000000, gMapBottom+0x0004, 0x80002000
-	map_top_special offset_gAreaRoomMap_Beanstalks_5_1, 0x800, 1, 1
+	map_top_special offset_gRoomMapping_Beanstalks_CrenelClimb_top, 0x800, 1, 1
 
 gAreaRoomMaps_Beanstalks:: @ 081037DC
 	.4byte gAreaRoomMap_Beanstalks_0
@@ -279,72 +279,72 @@ gAreaRoomMaps_Beanstalks:: @ 081037DC
 	.4byte gAreaRoomMap_Beanstalks_5
 
 gAreaRoomMap_CrenelCaves_0:: @ 0810385C
-	map_bottom offset_gAreaRoomMap_CrenelCaves_0_0, 0xA8C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_0_1, 0xA8C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_BlockPushing_bottom, 0xA8C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_BlockPushing_top, 0xA8C, 1, 1
 
 gAreaRoomMap_CrenelCaves_1:: @ 08103874
-	map_bottom offset_gAreaRoomMap_CrenelCaves_1_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_1_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_PillarCave_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_PillarCave_top, 0x14A, 1, 1
 
 gAreaRoomMap_CrenelCaves_2:: @ 0810388C
-	map_bottom offset_gAreaRoomMap_CrenelCaves_2_0, 0x3A2, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_2_1, 0x3A2, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom, 0x3A2, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_BridgeSwitch_top, 0x3A2, 1, 1
 
 gAreaRoomMap_CrenelCaves_3:: @ 081038A4
-	map_bottom offset_gAreaRoomMap_CrenelCaves_3_0, 0x168, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_3_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_ExitToMines_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_ExitToMines_top, 0x168, 1, 1
 
 gAreaRoomMap_CrenelCaves_4:: @ 081038BC
-	map_bottom offset_gAreaRoomMap_CrenelCaves_4_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_GripRing_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_GripRing_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_5:: @ 081038D4
-	map_bottom offset_gAreaRoomMap_CrenelCaves_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_FairyFountain_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_FairyFountain_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_6:: @ 081038EC
-	map_bottom offset_gAreaRoomMap_CrenelCaves_6_0, 0x168, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_6_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top, 0x168, 1, 1
 
 gAreaRoomMap_CrenelCaves_7:: @ 08103904
-	map_bottom offset_gAreaRoomMap_CrenelCaves_7_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_7_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_ChuchuPotChest_top, 0x14A, 1, 1
 
 gAreaRoomMap_CrenelCaves_8:: @ 0810391C
-	map_bottom offset_gAreaRoomMap_CrenelCaves_8_0, 0x258, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_8_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_WaterHeartPiece_top, 0x258, 1, 1
 
 gAreaRoomMap_CrenelCaves_9:: @ 08103934
-	map_bottom offset_gAreaRoomMap_CrenelCaves_9_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_CrenelCaves_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_10:: @ 0810394C
-	map_bottom offset_gAreaRoomMap_CrenelCaves_10_0, 0x2BC, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_10_1, 0x2BC, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom, 0x2BC, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_HelmasaurHallway_top, 0x2BC, 1, 1
 
 gAreaRoomMap_CrenelCaves_11:: @ 08103964
-	map_bottom offset_gAreaRoomMap_CrenelCaves_11_0, 0x294, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_11_1, 0x294, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_MushroomKeese_bottom, 0x294, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_MushroomKeese_top, 0x294, 1, 1
 
 gAreaRoomMap_CrenelCaves_12:: @ 0810397C
-	map_bottom offset_gAreaRoomMap_CrenelCaves_12_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_12_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_LadderToSpringWater_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_13:: @ 08103994
-	map_bottom offset_gAreaRoomMap_CrenelCaves_13_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_13_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_BombBusinessScrub_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_14:: @ 081039AC
-	map_bottom offset_gAreaRoomMap_CrenelCaves_14_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_14_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_Hermit_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_Hermit_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_15:: @ 081039C4
-	map_bottom offset_gAreaRoomMap_CrenelCaves_15_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_15_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_HintScrub_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_HintScrub_top, 0x12C, 1, 1
 
 gAreaRoomMap_CrenelCaves_16:: @ 081039DC
-	map_bottom offset_gAreaRoomMap_CrenelCaves_16_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_CrenelCaves_16_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelCaves_ToGrayblade_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_CrenelCaves_ToGrayblade_top, 0x1FE, 1, 1
 
 gAreaRoomMaps_CrenelCaves:: @ 081039F4
 	.4byte gAreaRoomMap_CrenelCaves_0
@@ -366,16 +366,16 @@ gAreaRoomMaps_CrenelCaves:: @ 081039F4
 	.4byte gAreaRoomMap_CrenelCaves_16
 
 gAreaRoomMap_GreatFairies_0:: @ 08103A38
-	map_bottom offset_gAreaRoomMap_GreatFairies_0_0, 0x21C, 1
-	map_top offset_gAreaRoomMap_GreatFairies_0_1, 0x21C, 1, 1
+	map_bottom offset_gAreaRoomMap_GreatFairies_Graveyard_bottom, 0x21C, 1
+	map_top offset_gAreaRoomMap_GreatFairies_Graveyard_top, 0x21C, 1, 1
 
 gAreaRoomMap_GreatFairies_1:: @ 08103A50
-	map_bottom offset_gAreaRoomMap_GreatFairies_1_0, 0x21C, 1
-	map_top offset_gAreaRoomMap_GreatFairies_1_1, 0x21C, 1, 1
+	map_bottom offset_gAreaRoomMap_GreatFairies_MinishWoods_bottom, 0x21C, 1
+	map_top offset_gAreaRoomMap_GreatFairies_MinishWoods_top, 0x21C, 1, 1
 
 gAreaRoomMap_GreatFairies_2:: @ 08103A68
-	map_bottom offset_gAreaRoomMap_GreatFairies_2_0, 0x21C, 1
-	map_top offset_gAreaRoomMap_GreatFairies_2_1, 0x21C, 1, 1
+	map_bottom offset_gAreaRoomMap_GreatFairies_Crenel_bottom, 0x21C, 1
+	map_top offset_gAreaRoomMap_GreatFairies_Crenel_top, 0x21C, 1, 1
 
 gAreaRoomMaps_GreatFairies:: @ 08103A80
 	.4byte gAreaRoomMap_GreatFairies_0
@@ -388,26 +388,26 @@ gAreaRoomMaps_GreatFairies:: @ 08103A80
 	.4byte gAreaRoomMap_Unused
 
 gAreaRoomMap_LakeWoodsCave_0:: @ 08103AA0
-	map_bottom offset_gAreaRoomMap_LakeWoodsCave_0_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_LakeWoodsCave_0_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_LakeWoodsCave_Main_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_LakeWoodsCave_Main_top, 0x1F02, 1, 1
 
 gAreaRoomMaps_LakeWoodsCave:: @ 08103AB8
 	.4byte gAreaRoomMap_LakeWoodsCave_0
 
 gAreaRoomMap_HyruleDigCaves_0:: @ 08103ABC
-	map_bottom offset_gAreaRoomMap_HyruleDigCaves_0_0, 0x1D88, 1
-	map_top offset_gAreaRoomMap_HyruleDigCaves_0_1, 0x1D88, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleDigCaves_Town_bottom, 0x1D88, 1
+	map_top offset_gAreaRoomMap_HyruleDigCaves_Town_top, 0x1D88, 1, 1
 
 gAreaRoomMaps_HyruleDigCaves:: @ 08103AD4
 	.4byte gAreaRoomMap_HyruleDigCaves_0
 
 gAreaRoomMap_DigCaves_0:: @ 08103AD8
-	map_bottom offset_gAreaRoomMap_DigCaves_0_0, 0x7F8, 1
-	map_top offset_gAreaRoomMap_DigCaves_0_1, 0x7F8, 1, 1
+	map_bottom offset_gAreaRoomMap_DigCaves_EasternHills_bottom, 0x7F8, 1
+	map_top offset_gAreaRoomMap_DigCaves_EasternHills_top, 0x7F8, 1, 1
 
 gAreaRoomMap_DigCaves_1:: @ 08103AF0
-	map_bottom offset_gAreaRoomMap_DigCaves_1_0, 0xE10, 1
-	map_top offset_gAreaRoomMap_DigCaves_1_1, 0xE10, 1, 1
+	map_bottom offset_gAreaRoomMap_DigCaves_TrilbyHighlands_bottom, 0xE10, 1
+	map_top offset_gAreaRoomMap_DigCaves_TrilbyHighlands_top, 0xE10, 1, 1
 
 gAreaRoomMaps_DigCaves1:: @ 08103B08
 	.4byte gAreaRoomMap_DigCaves_0
@@ -416,45 +416,45 @@ gAreaRoomMaps_DigCaves1:: @ 08103B08
 	.4byte gAreaRoomMap_DigCaves_1
 
 gAreaRoomMap_CrenelDigCave_0:: @ 08103B18
-	map_bottom offset_gAreaRoomMap_CrenelDigCave_0_0, 0x7C0, 1
-	map_top offset_gAreaRoomMap_CrenelDigCave_0_1, 0x7C0, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelDigCave_0_bottom, 0x7C0, 1
+	map_top offset_gAreaRoomMap_CrenelDigCave_0_top, 0x7C0, 1, 1
 
 gAreaRoomMaps_CrenelDigCave:: @ 08103B30
 	.4byte gAreaRoomMap_CrenelDigCave_0
 
 gAreaRoomMap_VeilFallsDigCave_0:: @ 08103B34
-	map_bottom offset_gAreaRoomMap_VeilFallsDigCave_0_0, 0xEC4, 1
-	map_top offset_gAreaRoomMap_VeilFallsDigCave_0_1, 0xEC4, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsDigCave_0_bottom, 0xEC4, 1
+	map_top offset_gAreaRoomMap_VeilFallsDigCave_0_top, 0xEC4, 1, 1
 
 gAreaRoomMaps_VeilFallsDigCave:: @ 08103B4C
 	.4byte gAreaRoomMap_VeilFallsDigCave_0
 
 gAreaRoomMap_CastorWildsDigCave_0:: @ 08103B50
-	map_bottom offset_gAreaRoomMap_CastorWildsDigCave_0_0, 0x1D88, 1
-	map_top offset_gAreaRoomMap_CastorWildsDigCave_0_1, 0x1D88, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorWildsDigCave_0_bottom, 0x1D88, 1
+	map_top offset_gAreaRoomMap_CastorWildsDigCave_0_top, 0x1D88, 1, 1
 
 gAreaRoomMaps_CastorWildsDigCave:: @ 08103B68
 	.4byte gAreaRoomMap_CastorWildsDigCave_0
 
 gAreaRoomMap_OuterFortressOfWinds_0:: @ 08103B6C
-	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_0_0, 0x5FE, 1
-	map_top offset_gAreaRoomMap_OuterFortressOfWinds_0_1, 0x5FE, 1, 1
+	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom, 0x5FE, 1
+	map_top offset_gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top, 0x5FE, 1, 1
 
 gAreaRoomMap_OuterFortressOfWinds_1:: @ 08103B84
-	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_1_0, 0x938, 1
-	map_top offset_gAreaRoomMap_OuterFortressOfWinds_1_1, 0x938, 1, 1
+	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_2f_bottom, 0x938, 1
+	map_top offset_gAreaRoomMap_OuterFortressOfWinds_2f_top, 0x938, 1, 1
 
 gAreaRoomMap_OuterFortressOfWinds_2:: @ 08103B9C
-	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_2_0, 0x5FE, 1
-	map_top offset_gAreaRoomMap_OuterFortressOfWinds_2_1, 0x5FE, 1, 1
+	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_3f_bottom, 0x5FE, 1
+	map_top offset_gAreaRoomMap_OuterFortressOfWinds_3f_top, 0x5FE, 1, 1
 
 gAreaRoomMap_OuterFortressOfWinds_3:: @ 08103BB4
-	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_3_0, 0x1EE, 1
-	map_top offset_gAreaRoomMap_OuterFortressOfWinds_3_1, 0x1EE, 1, 1
+	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom, 0x1EE, 1
+	map_top offset_gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top, 0x1EE, 1, 1
 
 gAreaRoomMap_OuterFortressOfWinds_4:: @ 08103BCC
-	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_4_0, 0x186, 1
-	map_top offset_gAreaRoomMap_OuterFortressOfWinds_4_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_OuterFortressOfWinds_SmallKey_top, 0x186, 1, 1
 
 gAreaRoomMaps_OuterFortressOfWinds:: @ 08103BE4
 	.4byte gAreaRoomMap_OuterFortressOfWinds_0
@@ -464,58 +464,58 @@ gAreaRoomMaps_OuterFortressOfWinds:: @ 08103BE4
 	.4byte gAreaRoomMap_OuterFortressOfWinds_4
 
 gAreaRoomMap_HyliaDigCaves_0:: @ 08103BF8
-	map_bottom offset_gAreaRoomMap_HyliaDigCaves_0_0, 0x220, 1
-	map_top offset_gAreaRoomMap_HyliaDigCaves_0_1, 0x220, 1, 1
+	map_bottom offset_gAreaRoomMap_HyliaDigCaves_0_bottom, 0x220, 1
+	map_top offset_gAreaRoomMap_HyliaDigCaves_0_top, 0x220, 1, 1
 
 gAreaRoomMap_HyliaDigCaves_1:: @ 08103C10
-	map_bottom offset_gAreaRoomMap_HyliaDigCaves_1_0, 0xD4A, 1
-	map_top offset_gAreaRoomMap_HyliaDigCaves_1_1, 0xD4A, 1, 1
+	map_bottom offset_gAreaRoomMap_HyliaDigCaves_1_bottom, 0xD4A, 1
+	map_top offset_gAreaRoomMap_HyliaDigCaves_1_top, 0xD4A, 1, 1
 
 gAreaRoomMaps_HyliaDigCaves:: @ 08103C28
 	.4byte gAreaRoomMap_HyliaDigCaves_0
 	.4byte gAreaRoomMap_HyliaDigCaves_1
 
 gAreaRoomMap_Empty_0:: @ 08103C30
-	map_bottom offset_gAreaRoomMap_Empty_0_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_Empty_0_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_Empty_0_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_Empty_0_top, 0x1F02, 1, 1
 
 gAreaRoomMaps_Empty:: @ 08103C48
 	.4byte gAreaRoomMap_Empty_0
 	.4byte gAreaRoomMap_Empty_0
 
 gAreaRoomMap_MinishVillage_0:: @ 08103C50
-	map_bottom offset_gAreaRoomMap_MinishVillage_0_0, 0x1F02, 1
-	map_top offset_gAreaRoomMap_MinishVillage_0_1, 0x1F02, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishVillage_Main_bottom, 0x1F02, 1
+	map_top offset_gAreaRoomMap_MinishVillage_Main_top, 0x1F02, 1, 1
 
 gAreaRoomMap_MinishVillage_1:: @ 08103C68
-	map_bottom offset_gAreaRoomMap_MinishVillage_1_0, 0x618, 1
-	map_top offset_gAreaRoomMap_MinishVillage_1_1, 0x618, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishVillage_SideHouseArea_bottom, 0x618, 1
+	map_top offset_gAreaRoomMap_MinishVillage_SideHouseArea_top, 0x618, 1, 1
 
 gAreaRoomMaps_MinishVillage:: @ 08103C80
 	.4byte gAreaRoomMap_MinishVillage_0
 	.4byte gAreaRoomMap_MinishVillage_1
 
 gAreaRoomMap_MelarisMine_0:: @ 08103C88
-	map_bottom offset_gAreaRoomMap_MelarisMine_0_0, 0xDB6, 1
-	map_top offset_gAreaRoomMap_MelarisMine_0_1, 0xDB6, 1, 1
+	map_bottom offset_gAreaRoomMap_MelarisMine_Main_bottom, 0xDB6, 1
+	map_top offset_gAreaRoomMap_MelarisMine_Main_top, 0xDB6, 1, 1
 
 gAreaRoomMaps_MelarisMine:: @ 08103CA0
 	.4byte gAreaRoomMap_MelarisMine_0
 
 gAreaRoomMap_MinishPaths_0:: @ 08103CA4
-	map_bottom offset_gAreaRoomMap_MinishPaths_0_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishPaths_MinishVillage_bottom, 0x5DC, 1, 1
 
 gAreaRoomMap_MinishPaths_1:: @ 08103CB0
-	map_bottom offset_gAreaRoomMap_MinishPaths_1_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishPaths_Bow_bottom, 0x5DC, 1, 1
 
 gAreaRoomMap_MinishPaths_2:: @ 08103CBC
-	map_bottom offset_gAreaRoomMap_MinishPaths_2_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishPaths_Schoolyard_bottom, 0x5DC, 1, 1
 
 gAreaRoomMap_MinishPaths_3:: @ 08103CC8
-	map_bottom offset_gAreaRoomMap_MinishPaths_3_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishPaths_LonLonRanch_bottom, 0x5DC, 1, 1
 
 gAreaRoomMap_MinishPaths_4:: @ 08103CD4
-	map_bottom offset_gAreaRoomMap_MinishPaths_4_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishPaths_LakeHylia_bottom, 0x5DC, 1, 1
 
 gAreaRoomMaps_MinishPaths:: @ 08103CE0
 	.4byte gAreaRoomMap_MinishPaths_0
@@ -525,16 +525,16 @@ gAreaRoomMaps_MinishPaths:: @ 08103CE0
 	.4byte gAreaRoomMap_MinishPaths_4
 
 gAreaRoomMap_CrenelMinishPaths_0:: @ 08103CF4
-	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_0_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_Bean_bottom, 0x5DC, 1, 1
 
 gAreaRoomMap_CrenelMinishPaths_1:: @ 08103D00
-	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_1_0, 0x5DC, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom, 0x5DC, 1, 1
 
 gAreaRoomMap_CrenelMinishPaths_2:: @ 08103D0C
-	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_2_0, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_Rain_bottom, 0x4B0, 1, 1
 
 gAreaRoomMap_CrenelMinishPaths_3:: @ 08103D18
-	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_3_0, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_CrenelMinishPaths_Melari_bottom, 0x4B0, 1, 1
 
 gAreaRoomMaps_CrenelMinishPaths:: @ 08103D24
 	.4byte gAreaRoomMap_CrenelMinishPaths_0
@@ -544,108 +544,108 @@ gAreaRoomMaps_CrenelMinishPaths:: @ 08103D24
 
 gAreaRoomMap_MinishHouseInteriors_0:: @ 08103D34
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_0_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_0_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_GentariMain, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_GentariMain_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_1:: @ 08103D58
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_1_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_1_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_GentariExit, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_GentariExit_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_2:: @ 08103D7C
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_2_1, 0x1D0, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_2_2, 0x1000, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Festari, 0x1D0, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Festari_bottom, 0x1000, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_3:: @ 08103DA0
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_3_1, 0xA0, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_3_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Red, 0xA0, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Red_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_4:: @ 08103DC4
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_4_1, 0xA0, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_4_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Green, 0xA0, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Green_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_5:: @ 08103DE8
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_5_1, 0xA0, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_5_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Blue, 0xA0, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Blue_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_6:: @ 08103E0C
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_6_1, 0xA0, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_6_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_SideArea, 0xA0, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_SideArea_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_8:: @ 08103E30
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_8_1, 0xE1, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_8_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_PotMinish, 0xE1, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_PotMinish_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_7:: @ 08103E54
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_7_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_7_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_ShoeMinish, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_9:: @ 08103E78
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_9_1, 0x159, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_9_2, 0x1000, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_BarrelMinish, 0x159, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom, 0x1000, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_10:: @ 08103E9C
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_10_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_10_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_11:: @ 08103EC0
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_11_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_11_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_12:: @ 08103EE4
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_12_1, 0xDC, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_12_2, 0x1000, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast, 0xDC, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom, 0x1000, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_13:: @ 08103F08
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_13_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_13_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_14:: @ 08103F2C
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_14_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_14_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_15:: @ 08103F50
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_15_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_15_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_16:: @ 08103F74
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_16_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_16_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Librari, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Librari_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_17:: @ 08103F98
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_17_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_17_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_18:: @ 08103FBC
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_18_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_18_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_HyruleTown, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_HyruleTown_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_19:: @ 08103FE0
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_19_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_19_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom, 0x800, 1, 1
 
 gAreaRoomMap_MinishHouseInteriors_20:: @ 08104004
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_20_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_20_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina, 0x96, 1
+	map_bottom_special offset_gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom, 0x800, 1, 1
 
 gAreaRoomMaps_MinishHouseInteriors:: @ 08104028
 	.4byte gAreaRoomMap_MinishHouseInteriors_0
@@ -691,48 +691,48 @@ gAreaRoomMaps_MinishHouseInteriors:: @ 08104028
 
 gAreaRoomMap_TownMinishHoles_0:: @ 081040C8
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_0_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_0_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_MayorsHouse, 0x96, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_MayorsHouse_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_1:: @ 081040EC
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_1_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_1_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_WestOracle, 0x96, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_WestOracle_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_2:: @ 08104110
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_2_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_2_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_DrLeft, 0x96, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_DrLeft_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_3:: @ 08104134
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_3_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_3_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_Carpenter, 0x96, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_Carpenter_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_4:: @ 08104158
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_4_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_4_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_Cafe, 0x96, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_Cafe_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_5:: @ 0810417C
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_5_1, 0x96, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_5_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_5, 0x96, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_5_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_6:: @ 081041A0
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_6_1, 0x24C, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_6_2, 0x2000, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_LibraryBookshelf, 0x24C, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom, 0x2000, 1, 1
 
 gAreaRoomMap_TownMinishHoles_7:: @ 081041C4
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_7_1, 0xE1, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_7_2, 0x800, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse, 0xE1, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom, 0x800, 1, 1
 
 gAreaRoomMap_TownMinishHoles_8:: @ 081041E8
 	map_bottom offset_gAreaRoomMap_None, 0x2000, 1
-	collision_bottom offset_gAreaRoomMap_TownMinishHoles_8_1, 0x190, 1
-	map_bottom_special offset_gAreaRoomMap_TownMinishHoles_8_2, 0x2000, 1, 1
+	collision_bottom offset_gRoomCollisionMap_TownMinishHoles_RemShoeShop, 0x190, 1
+	map_bottom_special offset_gRoomMapping_TownMinishHoles_RemShoeShop_bottom, 0x2000, 1, 1
 
 gAreaRoomMaps_TownMinishHoles:: @ 0810420C
 	.4byte gAreaRoomMap_TownMinishHoles_0
@@ -785,56 +785,56 @@ gAreaRoomMaps_TownMinishHoles:: @ 0810420C
 	.4byte 0x0
 
 gAreaRoomMap_HouseInteriors1_0:: @ 081042CC
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_0_0, 0x198, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_0_1, 0x198, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_Mayor_bottom, 0x198, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_Mayor_top, 0x198, 1, 1
 
 gAreaRoomMap_HouseInteriors1_1:: @ 081042E4
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_1_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_1_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_PostOffice_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_PostOffice_top, 0x14A, 1, 1
 
 gAreaRoomMap_HouseInteriors1_2:: @ 081042FC
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_2_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_2_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_Library2f_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_Library2f_top, 0x14A, 1, 1
 
 gAreaRoomMap_HouseInteriors1_3:: @ 08104314
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_3_0, 0x2C0, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_3_1, 0x2C0, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_Library1f_bottom, 0x2C0, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_Library1f_top, 0x2C0, 1, 1
 
 gAreaRoomMap_HouseInteriors1_4:: @ 0810432C
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_4_0, 0x1A4, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_4_1, 0x1A4, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_Inn1f_bottom, 0x1A4, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_Inn1f_top, 0x1A4, 1, 1
 
 gAreaRoomMap_HouseInteriors1_5:: @ 08104344
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_InnWestRoom_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors1_6:: @ 0810435C
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_6_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors1_7:: @ 08104374
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_7_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_InnEastRoom_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors1_8:: @ 0810438C
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_8_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_8_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_InnWest2f_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_InnWest2f_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors1_9:: @ 081043A4
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_9_0, 0x348, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_9_1, 0x348, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_InnEast2f_bottom, 0x348, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_InnEast2f_top, 0x348, 1, 1
 
 gAreaRoomMap_HouseInteriors1_10:: @ 081043BC
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_10_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors1_11:: @ 081043D4
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_11_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_11_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_SchoolWest_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_SchoolWest_top, 0x1C2, 1, 1
 
 gAreaRoomMap_HouseInteriors1_12:: @ 081043EC
-	map_bottom offset_gAreaRoomMap_HouseInteriors1_12_0, 0x1B8, 1
-	map_top offset_gAreaRoomMap_HouseInteriors1_12_1, 0x1B8, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors1_SchoolEast_bottom, 0x1B8, 1
+	map_top offset_gAreaRoomMap_HouseInteriors1_SchoolEast_top, 0x1B8, 1, 1
 
 gAreaRoomMaps_HouseInteriors1:: @ 08104404
 	.4byte gAreaRoomMap_HouseInteriors1_0
@@ -855,80 +855,80 @@ gAreaRoomMaps_HouseInteriors1:: @ 08104404
 	.4byte 0x0
 
 gAreaRoomMap_HouseInteriors2_0:: @ 08104444
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_0_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_Stranger_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_Stranger_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_1:: @ 0810445C
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_1_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_1_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_WestOracle_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_WestOracle_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors2_2:: @ 08104474
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_2_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_2_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_2_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_2_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors2_3:: @ 0810448C
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_3_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_3_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_3_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_3_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors2_4:: @ 081044A4
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_4_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_4_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_DrLeft_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_DrLeft_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors2_5:: @ 081044BC
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_5_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_5_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_5_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_5_top, 0x14A, 1, 1
 
 gAreaRoomMap_HouseInteriors2_6:: @ 081044D4
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_6_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_Romio_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_Romio_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_7:: @ 081044EC
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_7_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_7_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_Julietta_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_Julietta_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors2_8:: @ 08104504
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_8_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_8_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_Percy_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_Percy_top, 0x14A, 1, 1
 
 gAreaRoomMap_HouseInteriors2_9:: @ 0810451C
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_9_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_EastOracle_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_EastOracle_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_10:: @ 08104534
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_10_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_A_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_A_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_11:: @ 0810454C
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_11_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_11_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_B_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_B_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_12:: @ 08104564
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_12_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_12_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_Cucco_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_Cucco_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_13:: @ 0810457C
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_13_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_13_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_14:: @ 08104594
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_14_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_14_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_15:: @ 081045AC
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_15_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_15_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_Dampe_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_Dampe_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_16:: @ 081045C4
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_16_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_16_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_13_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_13_top, 0x14A, 1, 1
 
 gAreaRoomMap_HouseInteriors2_17:: @ 081045DC
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_17_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_17_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors2_18:: @ 081045F4
-	map_bottom offset_gAreaRoomMap_HouseInteriors2_18_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors2_18_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top, 0x12C, 1, 1
 
 gAreaRoomMaps_HouseInteriors2:: @ 0810460C
 	.4byte gAreaRoomMap_HouseInteriors2_0
@@ -981,28 +981,28 @@ gAreaRoomMaps_HouseInteriors2:: @ 0810460C
 	.4byte gAreaRoomMap_HouseInteriors2_0
 
 gAreaRoomMap_HouseInteriors4_0:: @ 081046CC
-	map_bottom offset_gAreaRoomMap_HouseInteriors4_0_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors4_0_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors4_Carpenter_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors4_Carpenter_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors4_1:: @ 081046E4
-	map_bottom offset_gAreaRoomMap_HouseInteriors4_1_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors4_1_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors4_Swiftblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors4_Swiftblade_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors4_2:: @ 081046FC
-	map_bottom offset_gAreaRoomMap_HouseInteriors4_2_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors4_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors4_RanchHouseWest_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors4_3:: @ 08104714
-	map_bottom offset_gAreaRoomMap_HouseInteriors4_3_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors4_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors4_RanchHouseEast_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors4_4:: @ 0810472C
-	map_bottom offset_gAreaRoomMap_HouseInteriors4_4_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors4_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors4_FarmHouse_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors4_FarmHouse_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors4_5:: @ 08104744
-	map_bottom offset_gAreaRoomMap_HouseInteriors4_5_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors4_5_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top, 0x168, 1, 1
 
 gAreaRoomMaps_HouseInteriors4:: @ 0810475C
 	.4byte gAreaRoomMap_HouseInteriors4_0
@@ -1023,40 +1023,40 @@ gAreaRoomMaps_HouseInteriors4:: @ 0810475C
 	.4byte gAreaRoomMap_HouseInteriors4_0
 
 gAreaRoomMap_HouseInteriors3_0:: @ 0810479C
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_0_0, 0x186, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_0_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_StockwellShop_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_StockwellShop_top, 0x186, 1, 1
 
 gAreaRoomMap_HouseInteriors3_1:: @ 081047B4
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_1_0, 0x186, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_1_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_Cafe_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_Cafe_top, 0x186, 1, 1
 
 gAreaRoomMap_HouseInteriors3_2:: @ 081047CC
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_2_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_RemShoeShop_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors3_3:: @ 081047E4
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_3_0, 0x168, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_3_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_Bakery_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_Bakery_top, 0x168, 1, 1
 
 gAreaRoomMap_HouseInteriors3_4:: @ 081047FC
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_4_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_Simon_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_Simon_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors3_5:: @ 08104814
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_FigurineHouse_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors3_6:: @ 0810482C
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_6_0, 0x14A, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_6_1, 0x14A, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom, 0x14A, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_BorlovEntrance_top, 0x14A, 1, 1
 
 gAreaRoomMap_HouseInteriors3_7:: @ 08104844
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_7_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_Carlov_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_Carlov_top, 0x12C, 1, 1
 
 gAreaRoomMap_HouseInteriors3_8:: @ 0810485C
-	map_bottom offset_gAreaRoomMap_HouseInteriors3_8_0, 0x140, 1
-	map_top offset_gAreaRoomMap_HouseInteriors3_8_1, 0x140, 1, 1
+	map_bottom offset_gAreaRoomMap_HouseInteriors3_Borlov_bottom, 0x140, 1
+	map_top offset_gAreaRoomMap_HouseInteriors3_Borlov_top, 0x140, 1, 1
 
 gAreaRoomMaps_HouseInteriors3:: @ 08104874
 	.4byte gAreaRoomMap_HouseInteriors3_0
@@ -1070,72 +1070,72 @@ gAreaRoomMaps_HouseInteriors3:: @ 08104874
 	.4byte gAreaRoomMap_HouseInteriors3_8
 
 gAreaRoomMap_TreeInteriors_0:: @ 08104898
-	map_bottom offset_gAreaRoomMap_TreeInteriors_0_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_WitchHut_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_WitchHut_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_1:: @ 081048B0
-	map_bottom offset_gAreaRoomMap_TreeInteriors_1_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_1_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_StairsToCarlov_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_2:: @ 081048C8
-	map_bottom offset_gAreaRoomMap_TreeInteriors_2_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_PercysTreehouse_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_3:: @ 081048E0
-	map_bottom offset_gAreaRoomMap_TreeInteriors_3_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_4:: @ 081048F8
-	map_bottom offset_gAreaRoomMap_TreeInteriors_4_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_Waveblade_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_Waveblade_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_5:: @ 08104910
-	map_bottom offset_gAreaRoomMap_TreeInteriors_5_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_14_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_14_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_6:: @ 08104928
-	map_bottom offset_gAreaRoomMap_TreeInteriors_6_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_7:: @ 08104940
-	map_bottom offset_gAreaRoomMap_TreeInteriors_7_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_BoomerangNortheast_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_8:: @ 08104958
-	map_bottom offset_gAreaRoomMap_TreeInteriors_8_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_8_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_9:: @ 08104970
-	map_bottom offset_gAreaRoomMap_TreeInteriors_9_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_10:: @ 08104988
-	map_bottom offset_gAreaRoomMap_TreeInteriors_10_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_11:: @ 081049A0
-	map_bottom offset_gAreaRoomMap_TreeInteriors_11_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_11_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_12:: @ 081049B8
-	map_bottom offset_gAreaRoomMap_TreeInteriors_12_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_12_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_13:: @ 081049D0
-	map_bottom offset_gAreaRoomMap_TreeInteriors_13_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_13_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_1c_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_1c_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_14:: @ 081049E8
-	map_bottom offset_gAreaRoomMap_TreeInteriors_14_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_14_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_15:: @ 08104A00
-	map_bottom offset_gAreaRoomMap_TreeInteriors_15_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_15_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_1e_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_1e_top, 0x12C, 1, 1
 
 gAreaRoomMap_TreeInteriors_16:: @ 08104A18
-	map_bottom offset_gAreaRoomMap_TreeInteriors_16_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_TreeInteriors_16_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top, 0x12C, 1, 1
 
 gAreaRoomMaps_TreeInteriors:: @ 08104A30
 	.4byte gAreaRoomMap_TreeInteriors_0
@@ -1172,60 +1172,60 @@ gAreaRoomMaps_TreeInteriors:: @ 08104A30
 	.4byte gAreaRoomMap_TreeInteriors_16
 
 gAreaRoomMap_Dojos_0:: @ 08104AB0
-	map_bottom offset_gAreaRoomMap_Dojos_0_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_0_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_Grayblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_Grayblade_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_1:: @ 08104AC8
-	map_bottom offset_gAreaRoomMap_Dojos_1_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_1_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_Splitblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_Splitblade_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_2:: @ 08104AE0
-	map_bottom offset_gAreaRoomMap_Dojos_2_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_2_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_Greatblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_Greatblade_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_3:: @ 08104AF8
-	map_bottom offset_gAreaRoomMap_Dojos_3_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_3_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_Scarblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_Scarblade_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_4:: @ 08104B10
-	map_bottom offset_gAreaRoomMap_Dojos_4_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_4_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_SwiftbladeI_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_SwiftbladeI_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_5:: @ 08104B28
-	map_bottom offset_gAreaRoomMap_Dojos_5_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_5_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_Grimblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_Grimblade_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_6:: @ 08104B40
-	map_bottom offset_gAreaRoomMap_Dojos_6_0, 0x168, 1
-	map_top offset_gAreaRoomMap_Dojos_6_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_Waveblade_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_Dojos_Waveblade_top, 0x168, 1, 1
 
 gAreaRoomMap_Dojos_7:: @ 08104B58
-	map_bottom offset_gAreaRoomMap_Dojos_7_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_7_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_7_top, 0x12C, 1, 1
 
 gAreaRoomMap_Dojos_8:: @ 08104B70
-	map_bottom offset_gAreaRoomMap_Dojos_8_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_8_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_8_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_8_top, 0x12C, 1, 1
 
 gAreaRoomMap_Dojos_9:: @ 08104B88
-	map_bottom offset_gAreaRoomMap_Dojos_9_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_9_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_9_top, 0x12C, 1, 1
 
 gAreaRoomMap_Dojos_10:: @ 08104BA0
-	map_bottom offset_gAreaRoomMap_Dojos_10_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_ToGrimblade_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_ToGrimblade_top, 0x12C, 1, 1
 
 gAreaRoomMap_Dojos_11:: @ 08104BB8
-	map_bottom offset_gAreaRoomMap_Dojos_11_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_11_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_ToSplitblade_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_ToSplitblade_top, 0x12C, 1, 1
 
 gAreaRoomMap_Dojos_12:: @ 08104BD0
-	map_bottom offset_gAreaRoomMap_Dojos_12_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_12_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_ToGreatblade_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_ToGreatblade_top, 0x12C, 1, 1
 
 gAreaRoomMap_Dojos_13:: @ 08104BE8
-	map_bottom offset_gAreaRoomMap_Dojos_13_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Dojos_13_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Dojos_ToScarblade_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Dojos_ToScarblade_top, 0x12C, 1, 1
 
 gAreaRoomMaps_Dojos:: @ 08104C00
 	.4byte gAreaRoomMap_Dojos_0
@@ -1246,76 +1246,76 @@ gAreaRoomMaps_Dojos:: @ 08104C00
 	.4byte gAreaRoomMap_Dojos_0
 
 gAreaRoomMap_MinishCracks_0:: @ 08104C40
-	map_bottom offset_gAreaRoomMap_MinishCracks_0_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_LonLonRanchNorth_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_1:: @ 08104C58
-	map_bottom offset_gAreaRoomMap_MinishCracks_1_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_1_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_LakeHyliaEast_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_2:: @ 08104C70
-	map_bottom offset_gAreaRoomMap_MinishCracks_2_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_HyruleCastleGarden_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_3:: @ 08104C88
-	map_bottom offset_gAreaRoomMap_MinishCracks_3_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_MtCrenel_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_MtCrenel_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_4:: @ 08104CA0
-	map_bottom offset_gAreaRoomMap_MinishCracks_4_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_EastHyruleCastle_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_5:: @ 08104CB8
-	map_bottom offset_gAreaRoomMap_MinishCracks_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_MinishCracks_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_5_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_MinishCracks_5_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_6:: @ 08104CD0
-	map_bottom offset_gAreaRoomMap_MinishCracks_6_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsBow_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_CastorWildsBow_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_7:: @ 08104CE8
-	map_bottom offset_gAreaRoomMap_MinishCracks_7_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_RuinsEntrance_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_RuinsEntrance_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_8:: @ 08104D00
-	map_bottom offset_gAreaRoomMap_MinishCracks_8_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_8_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_MinishWoodsSouth_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_9:: @ 08104D18
-	map_bottom offset_gAreaRoomMap_MinishCracks_9_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_CastorWildsNorth_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_10:: @ 08104D30
-	map_bottom offset_gAreaRoomMap_MinishCracks_10_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsWest_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_CastorWildsWest_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_11:: @ 08104D48
-	map_bottom offset_gAreaRoomMap_MinishCracks_11_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_11_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_CastorWildsMiddle_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_12:: @ 08104D60
-	map_bottom offset_gAreaRoomMap_MinishCracks_12_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_12_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_RuinsTektite_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_RuinsTektite_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_13:: @ 08104D78
-	map_bottom offset_gAreaRoomMap_MinishCracks_13_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_MinishCracks_13_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_14:: @ 08104D90
-	map_bottom offset_gAreaRoomMap_MinishCracks_14_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_MinishCracks_14_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_E_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_MinishCracks_E_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_15:: @ 08104DA8
-	map_bottom offset_gAreaRoomMap_MinishCracks_15_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_MinishCracks_15_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_F_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_MinishCracks_F_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_16:: @ 08104DC0
-	map_bottom offset_gAreaRoomMap_MinishCracks_16_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_MinishCracks_16_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_10_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_MinishCracks_10_top, 0x12C, 1, 1
 
 gAreaRoomMap_MinishCracks_17:: @ 08104DD8
-	map_bottom offset_gAreaRoomMap_MinishCracks_17_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_MinishCracks_17_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCracks_11_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_MinishCracks_11_top, 0x12C, 1, 1
 
 gAreaRoomMaps_MinishCracks:: @ 08104DF0
 	.4byte gAreaRoomMap_MinishCracks_0
@@ -1338,48 +1338,48 @@ gAreaRoomMaps_MinishCracks:: @ 08104DF0
 	.4byte gAreaRoomMap_MinishCracks_17
 
 gAreaRoomMap_ArmosInteriors_0:: @ 08104E38
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_0_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_1:: @ 08104E50
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_1_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_1_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_2:: @ 08104E68
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_2_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsLeft_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_3:: @ 08104E80
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_3_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_4:: @ 08104E98
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_4_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_5:: @ 08104EB0
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_5_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsRight_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsRight_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_6:: @ 08104EC8
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_6_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_6_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_6_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_7:: @ 08104EE0
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_7_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_8:: @ 08104EF8
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_8_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_8_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_8_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_8_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_9:: @ 08104F10
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_9_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_FortressLeft_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_FortressLeft_top, 0x12C, 1, 1
 
 gAreaRoomMap_ArmosInteriors_10:: @ 08104F28
-	map_bottom offset_gAreaRoomMap_ArmosInteriors_10_0, 0x12C, 0
-	map_top offset_gAreaRoomMap_ArmosInteriors_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_ArmosInteriors_FortressRight_bottom, 0x12C, 0
+	map_top offset_gAreaRoomMap_ArmosInteriors_FortressRight_top, 0x12C, 1, 1
 
 gAreaRoomMaps_ArmosInteriors:: @ 08104F40
 	.4byte gAreaRoomMap_ArmosInteriors_0
@@ -1395,16 +1395,16 @@ gAreaRoomMaps_ArmosInteriors:: @ 08104F40
 	.4byte gAreaRoomMap_ArmosInteriors_10
 
 gAreaRoomMap_MinishRafters_0:: @ 08104F6C
-	map_bottom offset_gAreaRoomMap_MinishRafters_0_0, 0x3E0, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishRafters_Cafe_bottom, 0x3E0, 1, 1
 
 gAreaRoomMap_MinishRafters_1:: @ 08104F78
-	map_bottom offset_gAreaRoomMap_MinishRafters_1_0, 0x3E0, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishRafters_Stockwell_bottom, 0x3E0, 1, 1
 
 gAreaRoomMap_MinishRafters_2:: @ 08104F84
-	map_bottom offset_gAreaRoomMap_MinishRafters_2_0, 0x3E0, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishRafters_DrLeft_bottom, 0x3E0, 1, 1
 
 gAreaRoomMap_MinishRafters_3:: @ 08104F90
-	map_bottom offset_gAreaRoomMap_MinishRafters_3_0, 0x3E0, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishRafters_Bakery_bottom, 0x3E0, 1, 1
 
 gAreaRoomMaps_MinishRafters:: @ 08104F9C
 	.4byte gAreaRoomMap_MinishRafters_0
@@ -1413,32 +1413,32 @@ gAreaRoomMaps_MinishRafters:: @ 08104F9C
 	.4byte gAreaRoomMap_MinishRafters_3
 
 gAreaRoomMap_GoronCave_0:: @ 08104FAC
-	map_bottom offset_gAreaRoomMap_GoronCave_0_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_GoronCave_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_GoronCave_Stairs_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_GoronCave_Stairs_top, 0x12C, 1, 1
 
 gAreaRoomMap_GoronCave_1:: @ 08104FC4
-	map_bottom offset_gAreaRoomMap_GoronCave_1_0, 0x546, 1
-	map_top offset_gAreaRoomMap_GoronCave_1_1, 0x546, 1, 1
+	map_bottom offset_gAreaRoomMap_GoronCave_Main_bottom, 0x546, 1
+	map_top offset_gAreaRoomMap_GoronCave_Main_top, 0x546, 1, 1
 
 gAreaRoomMaps_GoronCave:: @ 08104FDC
 	.4byte gAreaRoomMap_GoronCave_0
 	.4byte gAreaRoomMap_GoronCave_1
 
 gAreaRoomMap_WindTribeTower_0:: @ 08104FE4
-	map_bottom offset_gAreaRoomMap_WindTribeTower_0_0, 0x276, 1
-	map_top offset_gAreaRoomMap_WindTribeTower_0_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_WindTribeTower_Entrance_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_WindTribeTower_Entrance_top, 0x276, 1, 1
 
 gAreaRoomMap_WindTribeTower_1:: @ 08104FFC
-	map_bottom offset_gAreaRoomMap_WindTribeTower_1_0, 0x276, 1
-	map_top offset_gAreaRoomMap_WindTribeTower_1_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_WindTribeTower_Floor1_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_WindTribeTower_Floor1_top, 0x276, 1, 1
 
 gAreaRoomMap_WindTribeTower_2:: @ 08105014
-	map_bottom offset_gAreaRoomMap_WindTribeTower_2_0, 0x276, 1
-	map_top offset_gAreaRoomMap_WindTribeTower_2_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_WindTribeTower_Floor2_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_WindTribeTower_Floor2_top, 0x276, 1, 1
 
 gAreaRoomMap_WindTribeTower_3:: @ 0810502C
-	map_bottom offset_gAreaRoomMap_WindTribeTower_3_0, 0x276, 1
-	map_top offset_gAreaRoomMap_WindTribeTower_3_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_WindTribeTower_Floor3_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_WindTribeTower_Floor3_top, 0x276, 1, 1
 
 gAreaRoomMaps_WindTribeTower:: @ 08105044
 	.4byte gAreaRoomMap_WindTribeTower_0
@@ -1447,51 +1447,51 @@ gAreaRoomMaps_WindTribeTower:: @ 08105044
 	.4byte gAreaRoomMap_WindTribeTower_3
 
 gAreaRoomMap_WindTribeTowerRoof_0:: @ 08105054
-	map_bottom offset_gAreaRoomMap_WindTribeTowerRoof_0_0, 0x30C, 1
-	map_top offset_gAreaRoomMap_WindTribeTowerRoof_0_1, 0x30C, 1, 1
+	map_bottom offset_gAreaRoomMap_WindTribeTowerRoof_0_bottom, 0x30C, 1
+	map_top offset_gAreaRoomMap_WindTribeTowerRoof_0_top, 0x30C, 1, 1
 
 gAreaRoomMaps_WindTribeTowerRoof:: @ 0810506C
 	.4byte gAreaRoomMap_WindTribeTowerRoof_0
 
 gAreaRoomMap_MinishCaves_0:: @ 08105070
-	map_bottom offset_gAreaRoomMap_MinishCaves_0_0, 0x474, 1
-	map_top offset_gAreaRoomMap_MinishCaves_0_1, 0x474, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_BeanPesto_bottom, 0x474, 1
+	map_top offset_gAreaRoomMap_MinishCaves_BeanPesto_top, 0x474, 1, 1
 
 gAreaRoomMap_MinishCaves_1:: @ 08105088
-	map_bottom offset_gAreaRoomMap_MinishCaves_1_0, 0x41A, 1
-	map_top offset_gAreaRoomMap_MinishCaves_1_1, 0x41A, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_SoutheastWater1_bottom, 0x41A, 1
+	map_top offset_gAreaRoomMap_MinishCaves_SoutheastWater1_top, 0x41A, 1, 1
 
 gAreaRoomMap_MinishCaves_2:: @ 081050A0
-	map_bottom offset_gAreaRoomMap_MinishCaves_2_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_MinishCaves_2_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_2_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_MinishCaves_2_top, 0x1FE, 1, 1
 
 gAreaRoomMap_MinishCaves_3:: @ 081050B8
-	map_bottom offset_gAreaRoomMap_MinishCaves_3_0, 0x4CE, 1
-	map_top offset_gAreaRoomMap_MinishCaves_3_1, 0x4CE, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_Ruins_bottom, 0x4CE, 1
+	map_top offset_gAreaRoomMap_MinishCaves_Ruins_top, 0x4CE, 1, 1
 
 gAreaRoomMap_MinishCaves_4:: @ 081050D0
-	map_bottom offset_gAreaRoomMap_MinishCaves_4_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_MinishCaves_4_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_MinishCaves_OutsideLinksHouse_top, 0x1C2, 1, 1
 
 gAreaRoomMap_MinishCaves_5:: @ 081050E8
-	map_bottom offset_gAreaRoomMap_MinishCaves_5_0, 0x258, 1
-	map_top offset_gAreaRoomMap_MinishCaves_5_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top, 0x258, 1, 1
 
 gAreaRoomMap_MinishCaves_6:: @ 08105100
-	map_bottom offset_gAreaRoomMap_MinishCaves_6_0, 0x258, 1
-	map_top offset_gAreaRoomMap_MinishCaves_6_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_6_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_MinishCaves_6_top, 0x258, 1, 1
 
 gAreaRoomMap_MinishCaves_7:: @ 08105118
-	map_bottom offset_gAreaRoomMap_MinishCaves_7_0, 0x744, 1
-	map_top offset_gAreaRoomMap_MinishCaves_7_1, 0x744, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom, 0x744, 1
+	map_top offset_gAreaRoomMap_MinishCaves_LakeHyliaNorth_top, 0x744, 1, 1
 
 gAreaRoomMap_MinishCaves_8:: @ 08105130
-	map_bottom offset_gAreaRoomMap_MinishCaves_8_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_MinishCaves_8_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top, 0x4B0, 1, 1
 
 gAreaRoomMap_MinishCaves_9:: @ 08105148
-	map_bottom offset_gAreaRoomMap_MinishCaves_9_0, 0x618, 1
-	map_top offset_gAreaRoomMap_MinishCaves_9_1, 0x618, 1, 1
+	map_bottom offset_gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom, 0x618, 1
+	map_top offset_gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top, 0x618, 1, 1
 
 gAreaRoomMaps_MinishCaves:: @ 08105160
 	.4byte gAreaRoomMap_MinishCaves_0
@@ -1506,114 +1506,114 @@ gAreaRoomMaps_MinishCaves:: @ 08105160
 	.4byte gAreaRoomMap_MinishCaves_9
 
 gAreaRoomMap_CastleGardenMinishHoles_0:: @ 08105188
-	map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_0_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_CastleGardenMinishHoles_0_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_0_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_CastleGardenMinishHoles_0_top, 0x1C2, 1, 1
 
 gAreaRoomMap_CastleGardenMinishHoles_1:: @ 081051A0
-	map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_1_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_CastleGardenMinishHoles_1_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_1_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_CastleGardenMinishHoles_1_top, 0x1C2, 1, 1
 
 gAreaRoomMaps_CastleGardenMinishHoles:: @ 081051B8
 	.4byte gAreaRoomMap_CastleGardenMinishHoles_0
 	.4byte gAreaRoomMap_CastleGardenMinishHoles_1
 
 gAreaRoomMap_37_0:: @ 081051C0
-	map_bottom offset_gAreaRoomMap_37_0_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_37_0_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_37_0_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_37_0_top, 0x1C2, 1, 1
 
 gAreaRoomMap_37_1:: @ 081051D8
-	map_bottom offset_gAreaRoomMap_37_1_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_37_1_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_37_1_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_37_1_top, 0x1C2, 1, 1
 
 gAreaRoomMaps_37:: @ 081051F0
 	.4byte gAreaRoomMap_37_0
 	.4byte gAreaRoomMap_37_1
 
 gAreaRoomMap_EzloCutscene_0:: @ 081051F8
-	map_bottom offset_gAreaRoomMap_EzloCutscene_0_0, 0x258, 1
-	map_top offset_gAreaRoomMap_EzloCutscene_0_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_EzloCutscene_0_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_EzloCutscene_0_top, 0x258, 1, 1
 
 gAreaRoomMaps_EzloCutscene:: @ 08105210
 	.4byte gAreaRoomMap_EzloCutscene_0
 
 gAreaRoomMap_HyruleTownUnderground_0:: @ 08105214
-	map_bottom offset_gAreaRoomMap_HyruleTownUnderground_0_0, 0xE10, 1
-	map_top offset_gAreaRoomMap_HyruleTownUnderground_0_1, 0xE10, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownUnderground_0_bottom, 0xE10, 1
+	map_top offset_gAreaRoomMap_HyruleTownUnderground_0_top, 0xE10, 1, 1
 
 gAreaRoomMap_HyruleTownUnderground_1:: @ 0810522C
-	map_bottom offset_gAreaRoomMap_HyruleTownUnderground_1_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HyruleTownUnderground_1_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownUnderground_1_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HyruleTownUnderground_1_top, 0x12C, 1, 1
 
 gAreaRoomMaps_HyruleTownUnderground:: @ 08105244
 	.4byte gAreaRoomMap_HyruleTownUnderground_0
 	.4byte gAreaRoomMap_HyruleTownUnderground_1
 
 gAreaRoomMap_GardenFountains_0:: @ 0810524C
-	map_bottom offset_gAreaRoomMap_GardenFountains_0_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_GardenFountains_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_GardenFountains_East_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_GardenFountains_East_top, 0x12C, 1, 1
 
 gAreaRoomMap_GardenFountains_1:: @ 08105264
-	map_bottom offset_gAreaRoomMap_GardenFountains_1_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_GardenFountains_1_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_GardenFountains_West_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_GardenFountains_West_top, 0x12C, 1, 1
 
 gAreaRoomMaps_GardenFountains:: @ 0810527C
 	.4byte gAreaRoomMap_GardenFountains_0
 	.4byte gAreaRoomMap_GardenFountains_1
 
 gAreaRoomMap_HyruleCastleCellar_0:: @ 08105284
-	map_bottom offset_gAreaRoomMap_HyruleCastleCellar_0_0, 0x3C0, 1
-	map_top offset_gAreaRoomMap_HyruleCastleCellar_0_1, 0x3C0, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastleCellar_0_bottom, 0x3C0, 1
+	map_top offset_gAreaRoomMap_HyruleCastleCellar_0_top, 0x3C0, 1, 1
 
 gAreaRoomMap_HyruleCastleCellar_1:: @ 0810529C
-	map_bottom offset_gAreaRoomMap_HyruleCastleCellar_1_0, 0x1E0, 1
-	map_top offset_gAreaRoomMap_HyruleCastleCellar_1_1, 0x1E0, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastleCellar_1_bottom, 0x1E0, 1
+	map_top offset_gAreaRoomMap_HyruleCastleCellar_1_top, 0x1E0, 1, 1
 
 gAreaRoomMaps_HyruleCastleCellar:: @ 081052B4
 	.4byte gAreaRoomMap_HyruleCastleCellar_0
 	.4byte gAreaRoomMap_HyruleCastleCellar_1
 
 gAreaRoomMap_SimonsSimulation_0:: @ 081052BC
-	map_bottom offset_gAreaRoomMap_SimonsSimulation_0_0, 0x23A, 1
-	map_top offset_gAreaRoomMap_SimonsSimulation_0_1, 0x23A, 1, 1
+	map_bottom offset_gAreaRoomMap_SimonsSimulation_0_bottom, 0x23A, 1
+	map_top offset_gAreaRoomMap_SimonsSimulation_0_top, 0x23A, 1, 1
 
 gAreaRoomMaps_SimonsSimulation:: @ 081052D4
 	.4byte gAreaRoomMap_SimonsSimulation_0
 
 gAreaRoomMap_40_0:: @ 081052D8
-	map_bottom offset_gAreaRoomMap_40_0_0, 0x286, 1
-	map_top offset_gAreaRoomMap_40_0_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_40_0_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_40_0_top, 0x286, 1, 1
 
 gAreaRoomMap_40_1:: @ 081052F0
-	map_bottom offset_gAreaRoomMap_40_1_0, 0x30E, 1
-	map_top offset_gAreaRoomMap_40_1_1, 0x30E, 1, 1
+	map_bottom offset_gAreaRoomMap_40_1_bottom, 0x30E, 1
+	map_top offset_gAreaRoomMap_40_1_top, 0x30E, 1, 1
 
 gAreaRoomMap_40_2:: @ 08105308
-	map_bottom offset_gAreaRoomMap_40_2_0, 0x286, 1
-	map_top offset_gAreaRoomMap_40_2_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_40_2_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_40_2_top, 0x286, 1, 1
 
 gAreaRoomMap_40_3:: @ 08105320
-	map_bottom offset_gAreaRoomMap_40_3_0, 0x286, 1
-	map_top offset_gAreaRoomMap_40_3_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_40_3_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_40_3_top, 0x286, 1, 1
 
 gAreaRoomMap_40_4:: @ 08105338
-	map_bottom offset_gAreaRoomMap_40_4_0, 0x30E, 1
-	map_top offset_gAreaRoomMap_40_4_1, 0x30E, 1, 1
+	map_bottom offset_gAreaRoomMap_40_4_bottom, 0x30E, 1
+	map_top offset_gAreaRoomMap_40_4_top, 0x30E, 1, 1
 
 gAreaRoomMap_40_5:: @ 08105350
-	map_bottom offset_gAreaRoomMap_40_5_0, 0x286, 1
-	map_top offset_gAreaRoomMap_40_5_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_40_5_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_40_5_top, 0x286, 1, 1
 
 gAreaRoomMap_40_6:: @ 08105368
-	map_bottom offset_gAreaRoomMap_40_6_0, 0x520, 1
-	map_top offset_gAreaRoomMap_40_6_1, 0x520, 1, 1
+	map_bottom offset_gAreaRoomMap_40_6_bottom, 0x520, 1
+	map_top offset_gAreaRoomMap_40_6_top, 0x520, 1, 1
 
 gAreaRoomMap_40_7:: @ 08105380
-	map_bottom offset_gAreaRoomMap_40_7_0, 0x28A, 1
-	map_top offset_gAreaRoomMap_40_7_1, 0x28A, 1, 1
+	map_bottom offset_gAreaRoomMap_40_7_bottom, 0x28A, 1
+	map_top offset_gAreaRoomMap_40_7_top, 0x28A, 1, 1
 
 gAreaRoomMap_40_8:: @ 08105398
-	map_bottom offset_gAreaRoomMap_40_8_0, 0x200, 1
-	map_top offset_gAreaRoomMap_40_8_1, 0x200, 1, 1
+	map_bottom offset_gAreaRoomMap_40_8_bottom, 0x200, 1
+	map_top offset_gAreaRoomMap_40_8_top, 0x200, 1, 1
 
 gAreaRoomMaps_40:: @ 081053B0
 	.4byte gAreaRoomMap_40_0
@@ -1627,92 +1627,92 @@ gAreaRoomMaps_40:: @ 081053B0
 	.4byte gAreaRoomMap_40_8
 
 gAreaRoomMap_DeepwoodShrine_0:: @ 081053D4
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_0_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_0_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Madderpillar_top, 0x1FE, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_1:: @ 081053EC
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_1_0, 0x2EE, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_1_1, 0x2EE, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_BluePortal_bottom, 0x2EE, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_BluePortal_top, 0x2EE, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_2:: @ 08105404
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_2_0, 0x276, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_2_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_StairsToB1_top, 0x276, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_3:: @ 0810541C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_3_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_3_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_PotBridge_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_PotBridge_top, 0x1FE, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_4:: @ 08105434
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_4_0, 0x154, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_4_1, 0x154, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom, 0x154, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_DoubleStatue_top, 0x154, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_5:: @ 0810544C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_5_0, 0x352, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_5_1, 0x352, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Map_bottom, 0x352, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Map_top, 0x352, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_6:: @ 08105464
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_6_0, 0x5AA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_6_1, 0x5AA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Barrel_bottom, 0x5AA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Barrel_top, 0x5AA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_7:: @ 0810547C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_7_0, 0x352, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_7_1, 0x352, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Button_bottom, 0x352, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Button_top, 0x352, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_8:: @ 08105494
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_8_0, 0x198, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_8_1, 0x198, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom, 0x198, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Mulldozer_top, 0x198, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_9:: @ 081054AC
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_9_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_9_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Pillars_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Pillars_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_10:: @ 081054C4
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_10_0, 0x2CA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_10_1, 0x2CA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Lever_bottom, 0x2CA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Lever_top, 0x2CA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_11:: @ 081054DC
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_11_0, 0x2CA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_11_1, 0x2CA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Entrance_bottom, 0x2CA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Entrance_top, 0x2CA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_12:: @ 081054F4
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_12_0, 0x2CA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_12_1, 0x2CA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Torches_bottom, 0x2CA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Torches_top, 0x2CA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_13:: @ 0810550C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_13_0, 0x2EE, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_13_1, 0x2EE, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_BossKey_bottom, 0x2EE, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_BossKey_top, 0x2EE, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_14:: @ 08105524
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_14_0, 0x276, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_14_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_Compass_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_Compass_top, 0x276, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_15:: @ 0810553C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_15_0, 0x198, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_15_1, 0x198, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_13_bottom, 0x198, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_13_top, 0x198, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_16:: @ 08105554
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_16_0, 0x5AA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_16_1, 0x5AA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom, 0x5AA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_LilyPadWest_top, 0x5AA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_17:: @ 0810556C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_17_0, 0x264, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_17_1, 0x264, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom, 0x264, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_LilyPadEast_top, 0x264, 1, 1
 
 gAreaRoomMap_DeepwoodShrineBoss_0:: @ 08105584
-	map_bottom offset_gAreaRoomMap_DeepwoodShrineBoss_0_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrineBoss_0_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrineBoss_Main_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrineBoss_Main_top, 0x1FE, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_18:: @ 0810559C
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_18_0, 0x2CA, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_18_1, 0x2CA, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_BossDoor_bottom, 0x2CA, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_BossDoor_top, 0x2CA, 1, 1
 
 gAreaRoomMap_DeepwoodShrine_19:: @ 081055B4
-	map_bottom offset_gAreaRoomMap_DeepwoodShrine_19_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_DeepwoodShrine_19_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_DeepwoodShrine_InsideBarrel_top, 0x12C, 1, 1
 
 gAreaRoomMap_DeepwoodShrineEntry_0:: @ 081055CC
-	map_bottom offset_gAreaRoomMap_DeepwoodShrineEntry_0_0, 0x1C2, 0
-	map_top offset_gAreaRoomMap_DeepwoodShrineEntry_0_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_DeepwoodShrineEntry_Main_bottom, 0x1C2, 0
+	map_top offset_gAreaRoomMap_DeepwoodShrineEntry_Main_top, 0x1C2, 1, 1
 
 gAreaRoomMaps_DeepwoodShrine:: @ 081055E4
 	.4byte gAreaRoomMap_DeepwoodShrine_0
@@ -1756,76 +1756,76 @@ gAreaRoomMaps_DeepwoodShrineEntry:: @ 0810566C
 	.4byte gAreaRoomMap_DeepwoodShrineEntry_0
 
 gAreaRoomMap_CaveOfFlames_0:: @ 08105670
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_0_0, 0x30E, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_0_1, 0x30E, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_AfterCane_bottom, 0x30E, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_AfterCane_top, 0x30E, 1, 1
 
 gAreaRoomMap_CaveOfFlames_1:: @ 08105688
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_1_0, 0x30E, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_1_1, 0x30E, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_SpinyChu_bottom, 0x30E, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_SpinyChu_top, 0x30E, 1, 1
 
 gAreaRoomMap_CaveOfFlames_2:: @ 081056A0
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_2_0, 0x4AC, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_2_1, 0x4AC, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom, 0x4AC, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top, 0x4AC, 1, 1
 
 gAreaRoomMap_CaveOfFlames_3:: @ 081056B8
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_3_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_3_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_Entrance_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_Entrance_top, 0x1BA, 1, 1
 
 gAreaRoomMap_CaveOfFlames_4:: @ 081056D0
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_4_0, 0x74E, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_4_1, 0x74E, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_MainCart_bottom, 0x74E, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_MainCart_top, 0x74E, 1, 1
 
 gAreaRoomMap_CaveOfFlames_5:: @ 081056E8
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_5_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_5_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_NorthEntrance_top, 0x1BA, 1, 1
 
 gAreaRoomMap_CaveOfFlames_6:: @ 08105700
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_6_0, 0x5B6, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_6_1, 0x5B6, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_CartWest_bottom, 0x5B6, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_CartWest_top, 0x5B6, 1, 1
 
 gAreaRoomMap_CaveOfFlames_7:: @ 08105718
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_7_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_7_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_HelmasaurFight_top, 0x1FE, 1, 1
 
 gAreaRoomMap_CaveOfFlames_8:: @ 08105730
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_8_0, 0x508, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_8_1, 0x508, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom, 0x508, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top, 0x508, 1, 1
 
 gAreaRoomMap_CaveOfFlames_9:: @ 08105748
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_9_0, 0x508, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_9_1, 0x508, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom, 0x508, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top, 0x508, 1, 1
 
 gAreaRoomMap_CaveOfFlames_10:: @ 08105760
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_10_0, 0x9D8, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_10_1, 0x9D8, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom, 0x9D8, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_MinishSpikes_top, 0x9D8, 1, 1
 
 gAreaRoomMap_CaveOfFlames_11:: @ 08105778
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_11_0, 0x4EC, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_11_1, 0x4EC, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_TompasDoom_bottom, 0x4EC, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_TompasDoom_top, 0x4EC, 1, 1
 
 gAreaRoomMap_CaveOfFlames_12:: @ 08105790
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_12_0, 0x276, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_12_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_BeforeGleerok_top, 0x276, 1, 1
 
 gAreaRoomMap_CaveOfFlames_13:: @ 081057A8
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_13_0, 0x276, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_13_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_BosskeyPath1_top, 0x276, 1, 1
 
 gAreaRoomMap_CaveOfFlames_14:: @ 081057C0
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_14_0, 0x276, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_14_1, 0x276, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom, 0x276, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_BosskeyPath2_top, 0x276, 1, 1
 
 gAreaRoomMap_CaveOfFlames_15:: @ 081057D8
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_15_0, 0x186, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_15_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_Compass_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_Compass_top, 0x186, 1, 1
 
 gAreaRoomMap_CaveOfFlames_16:: @ 081057F0
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_16_0, 0x186, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_16_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_BobOmbWall_top, 0x186, 1, 1
 
 gAreaRoomMap_CaveOfFlames_17:: @ 08105808
-	map_bottom offset_gAreaRoomMap_CaveOfFlames_17_0, 0x9D8, 1
-	map_top offset_gAreaRoomMap_CaveOfFlames_17_1, 0x9D8, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlames_BossDoor_bottom, 0x9D8, 1
+	map_top offset_gAreaRoomMap_CaveOfFlames_BossDoor_top, 0x9D8, 1, 1
 
 gAreaRoomMaps_CaveOfFlames:: @ 08105820
 	.4byte gAreaRoomMap_CaveOfFlames_0
@@ -1854,107 +1854,107 @@ gAreaRoomMaps_CaveOfFlames:: @ 08105820
 	.4byte gAreaRoomMap_CaveOfFlames_17
 
 gAreaRoomMap_CaveOfFlamesBoss_0:: @ 08105880
-	map_bottom offset_gAreaRoomMap_CaveOfFlamesBoss_0_0, 0x360, 1
-	map_top offset_gAreaRoomMap_CaveOfFlamesBoss_0_1, 0x360, 1, 1
+	map_bottom offset_gAreaRoomMap_CaveOfFlamesBoss_0_bottom, 0x360, 1
+	map_top offset_gAreaRoomMap_CaveOfFlamesBoss_0_top, 0x360, 1, 1
 
 gAreaRoomMaps_CaveOfFlamesBoss:: @ 08105898
 	.4byte gAreaRoomMap_CaveOfFlamesBoss_0
 
 gAreaRoomMap_FortressOfWinds_0:: @ 0810589C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_0_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_0_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_DoubleEyegore_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_1:: @ 081058B4
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_1_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_1_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_BeforeMazaal_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_2:: @ 081058CC
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_2_0, 0x804, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_2_1, 0x804, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom, 0x804, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_EastKeyLever_top, 0x804, 1, 1
 
 gAreaRoomMap_FortressOfWinds_3:: @ 081058E4
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_3_0, 0x1DC, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_3_1, 0x1DC, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom, 0x1DC, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_PitPlatforms_top, 0x1DC, 1, 1
 
 gAreaRoomMap_FortressOfWinds_4:: @ 081058FC
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_4_0, 0x364, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_4_1, 0x364, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom, 0x364, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_WestKeyLever_top, 0x364, 1, 1
 
 gAreaRoomMap_FortressOfWinds_5:: @ 08105914
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_5_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_5_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_DarknutRoom_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_6:: @ 0810592C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_6_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_6_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_7:: @ 08105944
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_7_0, 0x374, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_7_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top, 0x374, 1, 1
 
 gAreaRoomMap_FortressOfWinds_8:: @ 0810595C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_8_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_8_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_9:: @ 08105974
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_9_0, 0x374, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_9_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top, 0x374, 1, 1
 
 gAreaRoomMap_FortressOfWinds_10:: @ 0810598C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_10_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_10_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_11:: @ 081059A4
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_11_0, 0x256, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_11_1, 0x256, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_Mazaal_bottom, 0x256, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_Mazaal_top, 0x256, 1, 1
 
 gAreaRoomMap_FortressOfWinds_12:: @ 081059BC
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_12_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_12_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_Stalfos_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_Stalfos_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_13:: @ 081059D4
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_13_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_13_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_14:: @ 081059EC
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_14_0, 0x374, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_14_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_Main2f_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_Main2f_top, 0x374, 1, 1
 
 gAreaRoomMap_FortressOfWinds_15:: @ 08105A04
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_15_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_15_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_MinishHole_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_MinishHole_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_16:: @ 08105A1C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_16_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_16_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_BossKey_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_BossKey_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_17:: @ 08105A34
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_17_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_17_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_WestStairs2f_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_18:: @ 08105A4C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_18_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_18_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_EastStairs2f_top, 0x1BA, 1, 1
 
 gAreaRoomMap_FortressOfWinds_19:: @ 08105A64
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_19_0, 0x186, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_19_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_WestStairs1f_top, 0x186, 1, 1
 
 gAreaRoomMap_FortressOfWinds_20:: @ 08105A7C
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_20_0, 0x186, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_20_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_CenterStairs1f_top, 0x186, 1, 1
 
 gAreaRoomMap_FortressOfWinds_21:: @ 08105A94
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_21_0, 0x186, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_21_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_EastStairs1f_top, 0x186, 1, 1
 
 gAreaRoomMap_FortressOfWinds_22:: @ 08105AAC
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_22_0, 0x186, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_22_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_Wizzrobe_top, 0x186, 1, 1
 
 gAreaRoomMap_FortressOfWinds_23:: @ 08105AC4
-	map_bottom offset_gAreaRoomMap_FortressOfWinds_23_0, 0x1A0, 1
-	map_top offset_gAreaRoomMap_FortressOfWinds_23_1, 0x1A0, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWinds_HeartPiece_bottom, 0x1A0, 1
+	map_top offset_gAreaRoomMap_FortressOfWinds_HeartPiece_top, 0x1A0, 1, 1
 
 gAreaRoomMaps_FortressOfWinds:: @ 08105ADC
 	.4byte gAreaRoomMap_FortressOfWinds_0
@@ -1996,187 +1996,187 @@ gAreaRoomMaps_FortressOfWinds:: @ 08105ADC
 	.4byte gAreaRoomMap_FortressOfWinds_23
 
 gAreaRoomMap_FortressOfWindsTop_0:: @ 08105B70
-	map_bottom offset_gAreaRoomMap_FortressOfWindsTop_0_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_FortressOfWindsTop_0_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_FortressOfWindsTop_Main_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_FortressOfWindsTop_Main_top, 0x4B0, 1, 1
 
 gAreaRoomMaps_FortressOfWindsTop:: @ 08105B88
 	.4byte gAreaRoomMap_FortressOfWindsTop_0
 
 gAreaRoomMap_InnerMazaal_0:: @ 08105B8C
-	map_bottom offset_gAreaRoomMap_InnerMazaal_0_0, 0x286, 1
-	map_top offset_gAreaRoomMap_InnerMazaal_0_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_InnerMazaal_Main_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_InnerMazaal_Main_top, 0x286, 1, 1
 
 gAreaRoomMap_InnerMazaal_1:: @ 08105BA4
-	map_bottom offset_gAreaRoomMap_InnerMazaal_1_0, 0x286, 1
-	map_top offset_gAreaRoomMap_InnerMazaal_1_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_InnerMazaal_Phase1_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_InnerMazaal_Phase1_top, 0x286, 1, 1
 
 gAreaRoomMaps_InnerMazaal:: @ 08105BBC
 	.4byte gAreaRoomMap_InnerMazaal_0
 	.4byte gAreaRoomMap_InnerMazaal_1
 
 gAreaRoomMap_TempleOfDroplets_0:: @ 08105BC4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_0_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_0_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_WestHole_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_WestHole_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_1:: @ 08105BDC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_1_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_1_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_2:: @ 08105BF4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_2_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_2_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_EastHole_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_EastHole_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_3:: @ 08105C0C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_3_0, 0x6B4, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_3_1, 0x6B4, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_Entrance_bottom, 0x6B4, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_Entrance_top, 0x6B4, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_4:: @ 08105C24
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_4_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_4_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_5:: @ 08105C3C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_5_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_5_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_6:: @ 08105C54
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_6_0, 0x30C, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_6_1, 0x30C, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom, 0x30C, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top, 0x30C, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_7:: @ 08105C6C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_7_0, 0x374, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_7_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top, 0x374, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_8:: @ 08105C84
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_8_0, 0x948, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_8_1, 0x948, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_Element_bottom, 0x948, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_Element_top, 0x948, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_9:: @ 08105C9C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_9_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_9_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_IceCorner_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_IceCorner_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_10:: @ 08105CB4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_10_0, 0x492, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_10_1, 0x492, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom, 0x492, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_IcePitMaze_top, 0x492, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_11:: @ 08105CCC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_11_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_11_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_12:: @ 08105CE4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_12_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_12_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_13:: @ 08105CFC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_13_0, 0x374, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_13_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top, 0x374, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_14:: @ 08105D14
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_14_0, 0x420, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_14_1, 0x420, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BigOcto_bottom, 0x420, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BigOcto_top, 0x420, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_15:: @ 08105D2C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_15_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_15_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_ToBlueChu_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_16:: @ 08105D44
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_16_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_16_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlueChu_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BlueChu_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_17:: @ 08105D5C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_17_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_17_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BlueChuKey_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_18:: @ 08105D74
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_18_0, 0x374, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_18_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BossKey_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BossKey_top, 0x374, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_19:: @ 08105D8C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_19_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_19_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_20:: @ 08105DA4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_20_0, 0x35A, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_20_1, 0x35A, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom, 0x35A, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top, 0x35A, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_21:: @ 08105DBC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_21_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_21_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_22:: @ 08105DD4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_22_0, 0x374, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_22_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top, 0x374, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_23:: @ 08105DEC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_23_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_23_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_24:: @ 08105E04
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_24_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_24_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top, 0x4B0, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_25:: @ 08105E1C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_25_0, 0x1A4, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_25_1, 0x1A4, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom, 0x1A4, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_9Lanterns_top, 0x1A4, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_26:: @ 08105E34
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_26_0, 0xA0E, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_26_1, 0xA0E, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom, 0xA0E, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top, 0xA0E, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_27:: @ 08105E4C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_27_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_27_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_29_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_29_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_28:: @ 08105E64
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_28_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_28_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_29:: @ 08105E7C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_29_0, 0x492, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_29_1, 0x492, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom, 0x492, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_DarkMaze_top, 0x492, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_30:: @ 08105E94
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_30_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_30_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_31:: @ 08105EAC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_31_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_31_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_32:: @ 08105EC4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_32_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_32_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_33:: @ 08105EDC
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_33_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_33_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_MulldozerKey_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_34:: @ 08105EF4
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_34_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_34_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_35:: @ 08105F0C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_35_0, 0x396, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_35_1, 0x396, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom, 0x396, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_LilypadB2West_top, 0x396, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_36:: @ 08105F24
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_36_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_36_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_Compass_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_Compass_top, 0x1BA, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_37:: @ 08105F3C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_37_0, 0x186, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_37_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top, 0x186, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_38:: @ 08105F54
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_38_0, 0x39C, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_38_1, 0x39C, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom, 0x39C, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top, 0x39C, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_39:: @ 08105F6C
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_39_0, 0x1DC, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_39_1, 0x1DC, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom, 0x1DC, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top, 0x1DC, 1, 1
 
 gAreaRoomMap_TempleOfDroplets_40:: @ 08105F84
-	map_bottom offset_gAreaRoomMap_TempleOfDroplets_40_0, 0x1A0, 1
-	map_top offset_gAreaRoomMap_TempleOfDroplets_40_1, 0x1A0, 1, 1
+	map_bottom offset_gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom, 0x1A0, 1
+	map_top offset_gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top, 0x1A0, 1, 1
 
 gAreaRoomMaps_TempleOfDroplets:: @ 08105F9C
 	.4byte gAreaRoomMap_TempleOfDroplets_0
@@ -2236,55 +2236,55 @@ gAreaRoomMaps_TempleOfDroplets:: @ 08105F9C
 	.4byte gAreaRoomMap_TempleOfDroplets_40
 
 gAreaRoomMap_61_0:: @ 08106078
-	map_bottom offset_gAreaRoomMap_61_0_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_61_0_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_Null61_0_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_Null61_0_top, 0x1C2, 1, 1
 
 gAreaRoomMaps_61:: @ 08106090
 	.4byte gAreaRoomMap_61_0
 
 gAreaRoomMap_HyruleTownMinishCaves_0:: @ 08106094
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_0_0, 0x330, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_0_1, 0x330, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_0_bottom, 0x330, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_0_top, 0x330, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_1:: @ 081060AC
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_1_0, 0x2D0, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_1_1, 0x2D0, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_1_bottom, 0x2D0, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_1_top, 0x2D0, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_2:: @ 081060C4
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_2_0, 0x242, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_2_1, 0x242, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_2_bottom, 0x242, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_2_top, 0x242, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_3:: @ 081060DC
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_3_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_3_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_3_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_3_top, 0x1FE, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_4:: @ 081060F4
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_4_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_4_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_4_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_4_top, 0x1C2, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_5:: @ 0810610C
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_5_0, 0x222, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_5_1, 0x222, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom, 0x222, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_Unused10_top, 0x222, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_6:: @ 08106124
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_6_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_6_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_6_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_6_top, 0x1BA, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_7:: @ 0810613C
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_7_0, 0x186, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_7_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_7_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_7_top, 0x186, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_8:: @ 08106154
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_8_0, 0x24C, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_8_1, 0x24C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_8_bottom, 0x24C, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_8_top, 0x24C, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_9:: @ 0810616C
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_9_0, 0x1DC, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_9_1, 0x1DC, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_9_bottom, 0x1DC, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_9_top, 0x1DC, 1, 1
 
 gAreaRoomMap_HyruleTownMinishCaves_10:: @ 08106184
-	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_10_0, 0x348, 1
-	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_10_1, 0x348, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_10_bottom, 0x348, 1
+	map_top offset_gAreaRoomMap_HyruleTownMinishCaves_10_top, 0x348, 1, 1
 
 gAreaRoomMaps_HyruleTownMinishCaves:: @ 0810619C
 	.4byte gAreaRoomMap_HyruleTownMinishCaves_0
@@ -2311,40 +2311,40 @@ gAreaRoomMaps_HyruleTownMinishCaves:: @ 0810619C
 	.4byte gAreaRoomMap_HyruleTownMinishCaves_10
 
 gAreaRoomMap_RoyalCrypt_0:: @ 081061F4
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_0_0, 0x532, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_0_1, 0x532, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_0_bottom, 0x532, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_0_top, 0x532, 1, 1
 
 gAreaRoomMap_RoyalCrypt_1:: @ 0810620C
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_1_0, 0x1DC, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_1_1, 0x1DC, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_WaterRope_bottom, 0x1DC, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_WaterRope_top, 0x1DC, 1, 1
 
 gAreaRoomMap_RoyalCrypt_2:: @ 08106224
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_2_0, 0x348, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_2_1, 0x348, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_Gibdo_bottom, 0x348, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_Gibdo_top, 0x348, 1, 1
 
 gAreaRoomMap_RoyalCrypt_3:: @ 0810623C
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_3_0, 0x2F4, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_3_1, 0x2F4, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_3_bottom, 0x2F4, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_3_top, 0x2F4, 1, 1
 
 gAreaRoomMap_RoyalCrypt_4:: @ 08106254
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_4_0, 0x6F0, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_4_1, 0x6F0, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_KeyBlock_bottom, 0x6F0, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_KeyBlock_top, 0x6F0, 1, 1
 
 gAreaRoomMap_RoyalCrypt_5:: @ 0810626C
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_5_0, 0x2E4, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_5_1, 0x2E4, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_5_bottom, 0x2E4, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_5_top, 0x2E4, 1, 1
 
 gAreaRoomMap_RoyalCrypt_6:: @ 08106284
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_6_0, 0x2E4, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_6_1, 0x2E4, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_6_bottom, 0x2E4, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_6_top, 0x2E4, 1, 1
 
 gAreaRoomMap_RoyalCrypt_7:: @ 0810629C
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_7_0, 0x2EC, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_7_1, 0x2EC, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_MushroomPit_bottom, 0x2EC, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_MushroomPit_top, 0x2EC, 1, 1
 
 gAreaRoomMap_RoyalCrypt_8:: @ 081062B4
-	map_bottom offset_gAreaRoomMap_RoyalCrypt_8_0, 0x154, 1
-	map_top offset_gAreaRoomMap_RoyalCrypt_8_1, 0x154, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalCrypt_Entrance_bottom, 0x154, 1
+	map_top offset_gAreaRoomMap_RoyalCrypt_Entrance_top, 0x154, 1, 1
 
 gAreaRoomMaps_RoyalCrypt:: @ 081062CC
 	.4byte gAreaRoomMap_RoyalCrypt_0
@@ -2365,208 +2365,208 @@ gAreaRoomMaps_RoyalCrypt:: @ 081062CC
 	.4byte 0x0
 
 gAreaRoomMap_PalaceOfWinds_GyorgTornado:: @ 0810630C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_0, 0xA8C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_1, 0xA8C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom, 0xA8C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_top, 0xA8C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BossKey:: @ 08106324
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BossKey_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BossKey_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BossKey_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BossKey_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers:: @ 0810633C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0, 0x1A4, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1, 0x1A4, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom, 0x1A4, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top, 0x1A4, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_GyorgBossDoor:: @ 08106354
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0, 0x384, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1, 0x384, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom, 0x384, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top, 0x384, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor:: @ 0810636C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight:: @ 08106384
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0, 0x384, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1, 0x384, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom, 0x384, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top, 0x384, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_FourButtonStalfos:: @ 0810639C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0, 0x384, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1, 0x384, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom, 0x384, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top, 0x384, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey:: @ 081063B4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0, 0x384, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1, 0x384, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom, 0x384, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top, 0x384, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers:: @ 081063CC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BombarossaPath:: @ 081063E4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_HoleToDarknut:: @ 081063FC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0, 0x186, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top, 0x186, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_ToBombarossaPath:: @ 08106414
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_DarknutMiniboss:: @ 0810642C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0, 0x1E0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1, 0x1E0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom, 0x1E0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top, 0x1E0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BombWallInside:: @ 08106444
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BombWallOutside:: @ 0810645C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_CloudJumps:: @ 08106474
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_0, 0x708, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_1, 0x708, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom, 0x708, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_top, 0x708, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor:: @ 0810648C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0, 0xA8C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1, 0xA8C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom, 0xA8C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top, 0xA8C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu:: @ 081064A4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0, 0x384, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1, 0x384, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom, 0x384, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top, 0x384, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_HeartPieceBridge:: @ 081064BC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_FanBridge:: @ 081064D4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanBridge_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_FanBridge_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanBridge_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_FanBridge_top, 0x4B0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_ToFanBridge:: @ 081064EC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_RedWarpHall:: @ 08106504
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_0, 0x708, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_1, 0x708, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom, 0x708, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_top, 0x708, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_PlatformCloneRide:: @ 0810651C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top, 0x4B0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey:: @ 08106534
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_CrowRide:: @ 0810654C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CrowRide_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_CrowRide_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top, 0x4B0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_GratePlatformRide:: @ 08106564
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top, 0x4B0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_PotPush:: @ 0810657C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PotPush_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_PotPush_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PotPush_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_PotPush_top, 0x4B0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_FloormasterLever:: @ 08106594
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_Map:: @ 081065AC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_Map_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_Map_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_Map_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_Map_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_CornerToMap:: @ 081065C4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster:: @ 081065DC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe:: @ 081065F4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_KeyArrowButton:: @ 0810660C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_GratesTo3F:: @ 08106624
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratesTo3F_0, 0xA8C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_GratesTo3F_1, 0xA8C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom, 0xA8C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_GratesTo3f_top, 0xA8C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_SpinyFight:: @ 0810663C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_0, 0x708, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_1, 0x708, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom, 0x708, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_top, 0x708, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_PeahatSwitch:: @ 08106654
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa:: @ 0810666C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0, 0x4B0, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1, 0x4B0, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom, 0x4B0, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top, 0x4B0, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar:: @ 08106684
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_StalfosFireborHole:: @ 0810669C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons:: @ 081066B4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch:: @ 081066CC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight:: @ 081066E4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_GibdoStairs:: @ 081066FC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey:: @ 08106714
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0, 0x258, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top, 0x258, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_RocCape:: @ 0810672C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_RocCape_0, 0x708, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_RocCape_1, 0x708, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_RocCape_bottom, 0x708, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_RocCape_top, 0x708, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_FireBarGrates:: @ 08106744
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_0, 0x708, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_1, 0x708, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom, 0x708, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_top, 0x708, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas:: @ 0810675C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0, 0x550, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1, 0x550, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom, 0x550, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top, 0x550, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut:: @ 08106774
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top, 0x12C, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock:: @ 0810678C
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0, 0x500, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1, 0x500, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom, 0x500, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top, 0x500, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_EntranceRoom:: @ 081067A4
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_0, 0x3DE, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_1, 0x3DE, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom, 0x3DE, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_top, 0x3DE, 1, 1
 
 gAreaRoomMap_PalaceOfWinds_DarkCompassHall:: @ 081067BC
-	map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0, 0x708, 1
-	map_top offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1, 0x708, 1, 1
+	map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom, 0x708, 1
+	map_top offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top, 0x708, 1, 1
 
 gAreaRoomMaps_PalaceOfWinds:: @ 081067D4
 	.4byte gAreaRoomMap_PalaceOfWinds_GyorgTornado
@@ -2622,21 +2622,21 @@ gAreaRoomMaps_PalaceOfWinds:: @ 081067D4
 	.4byte gAreaRoomMap_PalaceOfWinds_DarkCompassHall
 
 gAreaRoomMap_PalaceOfWindsBoss_0:: @ 081068A0
-	map_top offset_gAreaRoomMap_PalaceOfWindsBoss_0_0, 0x1F80, 1, 1
+	map_top offset_gAreaRoomMap_PalaceOfWindsBoss_0_top, 0x1F80, 1, 1
 gAreaRoomMaps_PalaceOfWindsBoss:: @ 081068AC
 	.4byte gAreaRoomMap_PalaceOfWindsBoss_0
 
 gAreaRoomMap_Sanctuary_0:: @ 081068B0
-	map_bottom offset_gAreaRoomMap_Sanctuary_0_0, 0x6D6, 1
-	map_top offset_gAreaRoomMap_Sanctuary_0_1, 0x6D6, 1, 1
+	map_bottom offset_gAreaRoomMap_Sanctuary_Hall_bottom, 0x6D6, 1
+	map_top offset_gAreaRoomMap_Sanctuary_Hall_top, 0x6D6, 1, 1
 
 gAreaRoomMap_Sanctuary_1:: @ 081068C8
-	map_bottom offset_gAreaRoomMap_Sanctuary_1_0, 0x910, 1
-	map_top offset_gAreaRoomMap_Sanctuary_1_1, 0x910, 1, 1
+	map_bottom offset_gAreaRoomMap_Sanctuary_Main_bottom, 0x910, 1
+	map_top offset_gAreaRoomMap_Sanctuary_Main_top, 0x910, 1, 1
 
 gAreaRoomMap_Sanctuary_2:: @ 081068E0
-	map_bottom offset_gAreaRoomMap_Sanctuary_2_0, 0x344, 1
-	map_top offset_gAreaRoomMap_Sanctuary_2_1, 0x344, 1, 1
+	map_bottom offset_gAreaRoomMap_Sanctuary_StainedGlass_bottom, 0x344, 1
+	map_top offset_gAreaRoomMap_Sanctuary_StainedGlass_top, 0x344, 1, 1
 
 gAreaRoomMaps_Sanctuary:: @ 081068F8
 	.4byte gAreaRoomMap_Sanctuary_0
@@ -2649,32 +2649,32 @@ gAreaRoomMaps_Sanctuary:: @ 081068F8
 	.4byte 0x0
 
 gAreaRoomMap_HyruleCastle_0:: @ 08106918
-	map_bottom offset_gAreaRoomMap_HyruleCastle_0_0, 0x7CE, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_0_1, 0x7CE, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_0_bottom, 0x7CE, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_0_top, 0x7CE, 1, 1
 
 gAreaRoomMap_HyruleCastle_1:: @ 08106930
-	map_bottom offset_gAreaRoomMap_HyruleCastle_1_0, 0x7FE, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_1_1, 0x7FE, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_1_bottom, 0x7FE, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_1_top, 0x7FE, 1, 1
 
 gAreaRoomMap_HyruleCastle_2:: @ 08106948
-	map_bottom offset_gAreaRoomMap_HyruleCastle_2_0, 0x2EC, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_2_1, 0x2EC, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_2_bottom, 0x2EC, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_2_top, 0x2EC, 1, 1
 
 gAreaRoomMap_HyruleCastle_3:: @ 08106960
-	map_bottom offset_gAreaRoomMap_HyruleCastle_3_0, 0xC94, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_3_1, 0xC94, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_3_bottom, 0xC94, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_3_top, 0xC94, 1, 1
 
 gAreaRoomMap_HyruleCastle_4:: @ 08106978
-	map_bottom offset_gAreaRoomMap_HyruleCastle_4_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_4_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_4_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_4_top, 0x1FE, 1, 1
 
 gAreaRoomMap_HyruleCastle_5:: @ 08106990
-	map_bottom offset_gAreaRoomMap_HyruleCastle_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_5_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_5_top, 0x12C, 1, 1
 
 gAreaRoomMap_HyruleCastle_6:: @ 081069A8
-	map_bottom offset_gAreaRoomMap_HyruleCastle_6_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_HyruleCastle_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleCastle_6_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_HyruleCastle_6_top, 0x12C, 1, 1
 
 gAreaRoomMaps_HyruleCastle:: @ 081069C0
 	.4byte gAreaRoomMap_HyruleCastle_0
@@ -2695,251 +2695,251 @@ gAreaRoomMaps_HyruleCastle:: @ 081069C0
 	.4byte 0x0
 
 gAreaRoomMap_SanctuaryEntrance_0:: @ 08106A00
-	map_bottom offset_gAreaRoomMap_SanctuaryEntrance_0_0, 0x396, 1
-	map_top offset_gAreaRoomMap_SanctuaryEntrance_0_1, 0x396, 1, 1
+	map_bottom offset_gAreaRoomMap_SanctuaryEntrance_Main_bottom, 0x396, 1
+	map_top offset_gAreaRoomMap_SanctuaryEntrance_Main_top, 0x396, 1, 1
 
 gAreaRoomMaps_SanctuaryEntrance:: @ 08106A18
 	.4byte gAreaRoomMap_SanctuaryEntrance_0
 
 gAreaRoomMap_DarkHyruleCastle_1FEntrance:: @ 08106A1C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FEntrance_0, 0xE58, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FEntrance_1, 0xE58, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom, 0xE58, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fEntrance_top, 0xE58, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower:: @ 08106A34
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FTopRightTower:: @ 08106A4C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower:: @ 08106A64
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower:: @ 08106A7C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati:: @ 08106A94
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0, 0x444, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1, 0x444, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom, 0x444, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top, 0x444, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut:: @ 08106AAC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0, 0x2A0, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1, 0x2A0, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom, 0x2A0, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top, 0x2A0, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower:: @ 08106AC4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner:: @ 08106ADC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBossKey:: @ 08106AF4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBossKey_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBossKey_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBossKey_top, 0x1FE, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBlueWarp:: @ 08106B0C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini:: @ 08106B24
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches:: @ 08106B3C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopRightTower:: @ 08106B54
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut:: @ 08106B6C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FSparks:: @ 08106B84
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FSparks_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FSparks_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fSparks_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts:: @ 08106B9C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FLeft:: @ 08106BB4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FLeft_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FLeft_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fLeft_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FRight:: @ 08106BCC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FRight_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FRight_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fRight_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fRight_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 08106BE4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBossDoor:: @ 08106BFC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut:: @ 08106C14
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle:: @ 08106C2C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FEntrance:: @ 08106C44
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FEntrance_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FEntrance_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fEntrance_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner:: @ 08106C5C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower:: @ 08106C74
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini:: @ 08106C8C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7:: @ 08106CA4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1b_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1b_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1Entrance:: @ 08106CBC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower:: @ 08106CD4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower:: @ 08106CEC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FThroneRoom:: @ 08106D04
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FCompass:: @ 08106D1C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FCompass_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FCompass_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fCompass_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FTopRightTower:: @ 08106D34
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone:: @ 08106D4C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft:: @ 08106D64
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopTop:: @ 08106D7C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight:: @ 08106D94
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopLeft:: @ 08106DAC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopRight:: @ 08106DC4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft:: @ 08106DDC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopBottom:: @ 08106DF4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight:: @ 08106E0C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower:: @ 08106E24
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower:: @ 08106E3C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1BelowThrone:: @ 08106E54
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1BelowCompass:: @ 08106E6C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone:: @ 08106E84
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1ToPrison:: @ 08106E9C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1BombWall:: @ 08106EB4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1Keatons:: @ 08106ECC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar:: @ 08106EE4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1Cannons:: @ 08106EFC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1Left:: @ 08106F14
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Left_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Left_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Left_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Left_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1Right:: @ 08106F2C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Right_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Right_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Right_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Right_top, 0x1BA, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B1Map:: @ 08106F44
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Map_0, 0xA5C, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Map_1, 0xA5C, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Map_bottom, 0xA5C, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Map_top, 0xA5C, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B2ToPrison:: @ 08106F5C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top, 0x1FE, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B2Prison:: @ 08106F74
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_0, 0x3FC, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_1, 0x3FC, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom, 0x3FC, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_top, 0x3FC, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_B2Dropdown:: @ 08106F8C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0, 0x264, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1, 0x264, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom, 0x264, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top, 0x264, 1, 1
 
 gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9:: @ 08106FA4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3b_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastle_3b_top, 0x1BA, 1, 1
 
 gAreaRoomMaps_DarkHyruleCastle:: @ 08106FBC
 	.4byte gAreaRoomMap_DarkHyruleCastle_1FEntrance
@@ -3004,40 +3004,40 @@ gAreaRoomMaps_DarkHyruleCastle:: @ 08106FBC
 	.4byte gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9
 
 gAreaRoomMap_DarkHyruleCastleOutside_0:: @ 081070AC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_0_0, 0x2EE, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_0_1, 0x2EE, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom, 0x2EE, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top, 0x2EE, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_1:: @ 081070C4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_1_0, 0x396, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_1_1, 0x396, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom, 0x396, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Garden_top, 0x396, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_2:: @ 081070DC
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_2_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_2_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_3:: @ 081070F4
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_3_0, 0x52E, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_3_1, 0x52E, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom, 0x52E, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top, 0x52E, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_4:: @ 0810710C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_4_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_4_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_East_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_East_top, 0x2A8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_5:: @ 08107124
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_5_0, 0x374, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_5_1, 0x374, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom, 0x374, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top, 0x374, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_6:: @ 0810713C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_6_0, 0xA5C, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_6_1, 0xA5C, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_South_bottom, 0xA5C, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_South_top, 0xA5C, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_7:: @ 08107154
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_7_0, 0x6E8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_7_1, 0x6E8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom, 0x6E8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top, 0x6E8, 1, 1
 
 gAreaRoomMap_DarkHyruleCastleOutside_8:: @ 0810716C
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_8_0, 0x630, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_8_1, 0x630, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_8_bottom, 0x630, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_8_top, 0x630, 1, 1
 
 gAreaRoomMaps_DarkHyruleCastleOutside:: @ 08107184
 	.4byte gAreaRoomMap_DarkHyruleCastleOutside_0
@@ -3051,23 +3051,23 @@ gAreaRoomMaps_DarkHyruleCastleOutside:: @ 08107184
 	.4byte gAreaRoomMap_DarkHyruleCastleOutside_8
 
 gAreaRoomMap_DarkHyruleCastleBridge_0:: @ 081071A8
-	map_bottom offset_gAreaRoomMap_DarkHyruleCastleBridge_0_0, 0x2A8, 1
-	map_top offset_gAreaRoomMap_DarkHyruleCastleBridge_0_1, 0x2A8, 1, 1
+	map_bottom offset_gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom, 0x2A8, 1
+	map_top offset_gAreaRoomMap_DarkHyruleCastleBridge_Main_top, 0x2A8, 1, 1
 
 gAreaRoomMaps_DarkHyruleCastleBridge:: @ 081071C0
 	.4byte gAreaRoomMap_DarkHyruleCastleBridge_0
 
 gAreaRoomMap_VaatisArms_0:: @ 081071C4
-	map_bottom offset_gAreaRoomMap_VaatisArms_0_0, 0x214, 1
-	map_top offset_gAreaRoomMap_VaatisArms_0_1, 0x214, 1, 1
+	map_bottom offset_gAreaRoomMap_VaatisArms_First_bottom, 0x214, 1
+	map_top offset_gAreaRoomMap_VaatisArms_First_top, 0x214, 1, 1
 
 gAreaRoomMap_VaatisArms_1:: @ 081071DC
-	map_bottom offset_gAreaRoomMap_VaatisArms_1_0, 0x214, 1
-	map_top offset_gAreaRoomMap_VaatisArms_1_1, 0x214, 1, 1
+	map_bottom offset_gAreaRoomMap_VaatisArms_Second_bottom, 0x214, 1
+	map_top offset_gAreaRoomMap_VaatisArms_Second_top, 0x214, 1, 1
 
 gAreaRoomMap_VaatisArms_2:: @ 081071F4
-	map_bottom offset_gAreaRoomMap_VaatisArms_2_0, 0x214, 1
-	map_top offset_gAreaRoomMap_VaatisArms_2_1, 0x214, 1, 1
+	map_bottom offset_gAreaRoomMap_VaatisArms_3_bottom, 0x214, 1
+	map_top offset_gAreaRoomMap_VaatisArms_3_top, 0x214, 1, 1
 
 gAreaRoomMaps_VaatisArms:: @ 0810720C
 	.4byte gAreaRoomMap_VaatisArms_0
@@ -3075,35 +3075,35 @@ gAreaRoomMaps_VaatisArms:: @ 0810720C
 	.4byte gAreaRoomMap_VaatisArms_2
 
 gAreaRoomMap_Vaati3_0:: @ 08107218
-	map_bottom offset_gAreaRoomMap_Vaati3_0_0, 0x294, 1
-	map_top offset_gAreaRoomMap_Vaati3_0_1, 0x294, 1, 1
+	map_bottom offset_gAreaRoomMap_Vaati3_0_bottom, 0x294, 1
+	map_top offset_gAreaRoomMap_Vaati3_0_top, 0x294, 1, 1
 
 gAreaRoomMap_Vaati3_1:: @ 08107230
-	map_bottom offset_gAreaRoomMap_Vaati3_1_0, 0x210, 1
-	map_top offset_gAreaRoomMap_Vaati3_1_1, 0x210, 1, 1
+	map_bottom offset_gAreaRoomMap_Vaati3_1_bottom, 0x210, 1
+	map_top offset_gAreaRoomMap_Vaati3_1_top, 0x210, 1, 1
 
 gAreaRoomMaps_Vaati3:: @ 08107248
 	.4byte gAreaRoomMap_Vaati3_0
 	.4byte gAreaRoomMap_Vaati3_1
 
 gAreaRoomMap_Vaati2_0:: @ 08107250
-	map_bottom offset_gAreaRoomMap_Vaati2_0_0, 0x294, 1
-	map_top offset_gAreaRoomMap_Vaati2_0_1, 0x294, 1, 1
+	map_bottom offset_gAreaRoomMap_Vaati2_0_bottom, 0x294, 1
+	map_top offset_gAreaRoomMap_Vaati2_0_top, 0x294, 1, 1
 
 gAreaRoomMaps_Vaati2:: @ 08107268
 	.4byte gAreaRoomMap_Vaati2_0
 
 gAreaRoomMap_47_0:: @ 0810726C
-	map_bottom offset_gAreaRoomMap_47_0_0, 0x256, 1
-	map_top offset_gAreaRoomMap_47_0_1, 0x256, 1, 1
+	map_bottom offset_gAreaRoomMap_47_0_bottom, 0x256, 1
+	map_top offset_gAreaRoomMap_47_0_top, 0x256, 1, 1
 
 gAreaRoomMap_47_1:: @ 08107284
-	map_bottom offset_gAreaRoomMap_47_1_0, 0x2B2, 1
-	map_top offset_gAreaRoomMap_47_1_1, 0x2B2, 1, 1
+	map_bottom offset_gAreaRoomMap_47_1_bottom, 0x2B2, 1
+	map_top offset_gAreaRoomMap_47_1_top, 0x2B2, 1, 1
 
 gAreaRoomMap_47_2:: @ 0810729C
-	map_bottom offset_gAreaRoomMap_47_2_0, 0x47E, 1
-	map_top offset_gAreaRoomMap_47_2_1, 0x47E, 1, 1
+	map_bottom offset_gAreaRoomMap_47_2_bottom, 0x47E, 1
+	map_top offset_gAreaRoomMap_47_2_top, 0x47E, 1, 1
 
 gAreaRoomMaps_47:: @ 081072B4
 	.4byte gAreaRoomMap_47_0
@@ -3111,24 +3111,24 @@ gAreaRoomMaps_47:: @ 081072B4
 	.4byte gAreaRoomMap_47_2
 
 gAreaRoomMap_CastorCaves_0:: @ 081072C0
-	map_bottom offset_gAreaRoomMap_CastorCaves_0_0, 0x168, 1
-	map_top offset_gAreaRoomMap_CastorCaves_0_1, 0x168, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorCaves_South_bottom, 0x168, 1
+	map_top offset_gAreaRoomMap_CastorCaves_South_top, 0x168, 1, 1
 
 gAreaRoomMap_CastorCaves_1:: @ 081072D8
-	map_bottom offset_gAreaRoomMap_CastorCaves_1_0, 0x1B8, 1
-	map_top offset_gAreaRoomMap_CastorCaves_1_1, 0x1B8, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorCaves_North_bottom, 0x1B8, 1
+	map_top offset_gAreaRoomMap_CastorCaves_North_top, 0x1B8, 1, 1
 
 gAreaRoomMap_CastorCaves_2:: @ 081072F0
-	map_bottom offset_gAreaRoomMap_CastorCaves_2_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CastorCaves_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorCaves_WindRuins_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CastorCaves_WindRuins_top, 0x12C, 1, 1
 
 gAreaRoomMap_CastorCaves_3:: @ 08107308
-	map_bottom offset_gAreaRoomMap_CastorCaves_3_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CastorCaves_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorCaves_Darknut_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CastorCaves_Darknut_top, 0x12C, 1, 1
 
 gAreaRoomMap_CastorCaves_4:: @ 08107320
-	map_bottom offset_gAreaRoomMap_CastorCaves_4_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_CastorCaves_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorCaves_HeartPiece_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_CastorCaves_HeartPiece_top, 0x12C, 1, 1
 
 gAreaRoomMaps_CastorCaves:: @ 08107338
 	.4byte gAreaRoomMap_CastorCaves_0
@@ -3138,112 +3138,112 @@ gAreaRoomMaps_CastorCaves:: @ 08107338
 	.4byte gAreaRoomMap_CastorCaves_4
 
 gAreaRoomMap_CastorDarknut_0:: @ 0810734C
-	map_bottom offset_gAreaRoomMap_CastorDarknut_0_0, 0x1BA, 1
-	map_top offset_gAreaRoomMap_CastorDarknut_0_1, 0x1BA, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorDarknut_Main_bottom, 0x1BA, 1
+	map_top offset_gAreaRoomMap_CastorDarknut_Main_top, 0x1BA, 1, 1
 
 gAreaRoomMap_CastorDarknut_1:: @ 08107364
-	map_bottom offset_gAreaRoomMap_CastorDarknut_1_0, 0x280, 1
-	map_top offset_gAreaRoomMap_CastorDarknut_1_1, 0x280, 1, 1
+	map_bottom offset_gAreaRoomMap_CastorDarknut_Hall_bottom, 0x280, 1
+	map_top offset_gAreaRoomMap_CastorDarknut_Hall_top, 0x280, 1, 1
 
 gAreaRoomMaps_CastorDarknut:: @ 0810737C
 	.4byte gAreaRoomMap_CastorDarknut_0
 	.4byte gAreaRoomMap_CastorDarknut_1
 
 gAreaRoomMap_Caves_0:: @ 08107384
-	map_bottom offset_gAreaRoomMap_Caves_0_0, 0x372, 1
-	map_top offset_gAreaRoomMap_Caves_0_1, 0x372, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_Boomerang_bottom, 0x372, 1
+	map_top offset_gAreaRoomMap_Caves_Boomerang_top, 0x372, 1, 1
 
 gAreaRoomMap_Caves_1:: @ 0810739C
-	map_bottom offset_gAreaRoomMap_Caves_1_0, 0x2B2, 1
-	map_top offset_gAreaRoomMap_Caves_1_1, 0x2B2, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_ToGraveyard_bottom, 0x2B2, 1
+	map_top offset_gAreaRoomMap_Caves_ToGraveyard_top, 0x2B2, 1, 1
 
 gAreaRoomMap_Caves_2:: @ 081073B4
-	map_bottom offset_gAreaRoomMap_Caves_2_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_2_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_2_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_2_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_3:: @ 081073CC
-	map_bottom offset_gAreaRoomMap_Caves_3_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_3_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_3_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_3_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_4:: @ 081073E4
-	map_bottom offset_gAreaRoomMap_Caves_4_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_4_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_4_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_5:: @ 081073FC
-	map_bottom offset_gAreaRoomMap_Caves_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_5_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_5_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_6:: @ 08107414
-	map_bottom offset_gAreaRoomMap_Caves_6_0, 0x1A4, 1
-	map_top offset_gAreaRoomMap_Caves_6_1, 0x1A4, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_6_bottom, 0x1A4, 1
+	map_top offset_gAreaRoomMap_Caves_6_top, 0x1A4, 1, 1
 
 gAreaRoomMap_Caves_7:: @ 0810742C
-	map_bottom offset_gAreaRoomMap_Caves_7_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_7_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_TrilbyKeeseChest_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_TrilbyKeeseChest_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_8:: @ 08107444
-	map_bottom offset_gAreaRoomMap_Caves_8_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_8_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_TrilbyFairyFountain_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_TrilbyFairyFountain_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_9:: @ 0810745C
-	map_bottom offset_gAreaRoomMap_Caves_9_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_10:: @ 08107474
-	map_bottom offset_gAreaRoomMap_Caves_10_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_10_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_A_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_A_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_11:: @ 0810748C
-	map_bottom offset_gAreaRoomMap_Caves_11_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_11_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_HyruleTownWaterfall_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_HyruleTownWaterfall_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_12:: @ 081074A4
-	map_bottom offset_gAreaRoomMap_Caves_12_0, 0x1E0, 1
-	map_top offset_gAreaRoomMap_Caves_12_1, 0x1E0, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_LonLonRanch_bottom, 0x1E0, 1
+	map_top offset_gAreaRoomMap_Caves_LonLonRanch_top, 0x1E0, 1, 1
 
 gAreaRoomMap_Caves_13:: @ 081074BC
-	map_bottom offset_gAreaRoomMap_Caves_13_0, 0x1E0, 1
-	map_top offset_gAreaRoomMap_Caves_13_1, 0x1E0, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_LonLonRanchSecret_bottom, 0x1E0, 1
+	map_top offset_gAreaRoomMap_Caves_LonLonRanchSecret_top, 0x1E0, 1, 1
 
 gAreaRoomMap_Caves_14:: @ 081074D4
-	map_bottom offset_gAreaRoomMap_Caves_14_0, 0x208, 1
-	map_top offset_gAreaRoomMap_Caves_14_1, 0x208, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_TrilbyHighlands_bottom, 0x208, 1
+	map_top offset_gAreaRoomMap_Caves_TrilbyHighlands_top, 0x208, 1, 1
 
 gAreaRoomMap_Caves_15:: @ 081074EC
-	map_bottom offset_gAreaRoomMap_Caves_15_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_15_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_LonLonRanchWallet_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_LonLonRanchWallet_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_16:: @ 08107504
-	map_bottom offset_gAreaRoomMap_Caves_16_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_16_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_SouthHyruleFieldRupee_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_17:: @ 0810751C
-	map_bottom offset_gAreaRoomMap_Caves_17_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_17_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_TrilbyRupee_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_TrilbyRupee_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_18:: @ 08107534
-	map_bottom offset_gAreaRoomMap_Caves_18_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_18_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_19:: @ 0810754C
-	map_bottom offset_gAreaRoomMap_Caves_19_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_19_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_HillsKeeseChest_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_HillsKeeseChest_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_20:: @ 08107564
-	map_bottom offset_gAreaRoomMap_Caves_20_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_20_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_BottleBusinessScrub_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_BottleBusinessScrub_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_21:: @ 0810757C
-	map_bottom offset_gAreaRoomMap_Caves_21_0, 0x1C2, 1
-	map_top offset_gAreaRoomMap_Caves_21_1, 0x1C2, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_HeartPieceHallway_bottom, 0x1C2, 1
+	map_top offset_gAreaRoomMap_Caves_HeartPieceHallway_top, 0x1C2, 1, 1
 
 gAreaRoomMap_Caves_22:: @ 08107594
-	map_bottom offset_gAreaRoomMap_Caves_22_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_22_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top, 0x12C, 1, 1
 
 gAreaRoomMap_Caves_23:: @ 081075AC
-	map_bottom offset_gAreaRoomMap_Caves_23_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_Caves_23_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_Caves_KinstoneBusinessScrub_top, 0x12C, 1, 1
 
 gAreaRoomMaps_Caves:: @ 081075C4
 	.4byte gAreaRoomMap_Caves_0
@@ -3272,44 +3272,44 @@ gAreaRoomMaps_Caves:: @ 081075C4
 	.4byte gAreaRoomMap_Caves_23
 
 gAreaRoomMap_VeilFallsCaves_0:: @ 08107624
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_0_0, 0x1A4, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_0_1, 0x1A4, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom, 0x1A4, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_Hallway2f_top, 0x1A4, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_1:: @ 0810763C
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_1_0, 0x2D0, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_1_1, 0x2D0, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom, 0x2D0, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_Hallway1f_top, 0x2D0, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_2:: @ 08107654
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_2_0, 0x186, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_2_1, 0x186, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom, 0x186, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top, 0x186, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_3:: @ 0810766C
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_3_0, 0x1E0, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_3_1, 0x1E0, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_Entrance_bottom, 0x1E0, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_Entrance_top, 0x1E0, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_4:: @ 08107684
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_4_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_4_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_Exit_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_Exit_top, 0x12C, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_5:: @ 0810769C
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_5_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_5_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_SecretChest_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_SecretChest_top, 0x12C, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_6:: @ 081076B4
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_6_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_6_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top, 0x12C, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_7:: @ 081076CC
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_7_0, 0x258, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_7_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top, 0x258, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_8:: @ 081076E4
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_8_0, 0x258, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_8_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top, 0x258, 1, 1
 
 gAreaRoomMap_VeilFallsCaves_9:: @ 081076FC
-	map_bottom offset_gAreaRoomMap_VeilFallsCaves_9_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_VeilFallsCaves_9_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top, 0x12C, 1, 1
 
 gAreaRoomMaps_VeilFallsCaves:: @ 08107714
 	.4byte gAreaRoomMap_VeilFallsCaves_0
@@ -3324,55 +3324,55 @@ gAreaRoomMaps_VeilFallsCaves:: @ 08107714
 	.4byte gAreaRoomMap_VeilFallsCaves_9
 
 gAreaRoomMap_RoyalValleyGraves_0:: @ 0810773C
-	map_bottom offset_gAreaRoomMap_RoyalValleyGraves_0_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_RoyalValleyGraves_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_RoyalValleyGraves_HeartPiece_top, 0x12C, 1, 1
 
 gAreaRoomMap_RoyalValleyGraves_1:: @ 08107754
-	map_bottom offset_gAreaRoomMap_RoyalValleyGraves_1_0, 0x258, 1
-	map_top offset_gAreaRoomMap_RoyalValleyGraves_1_1, 0x258, 1, 1
+	map_bottom offset_gAreaRoomMap_RoyalValleyGraves_Gina_bottom, 0x258, 1
+	map_top offset_gAreaRoomMap_RoyalValleyGraves_Gina_top, 0x258, 1, 1
 
 gAreaRoomMaps_RoyalValleyGraves:: @ 0810776C
 	.4byte gAreaRoomMap_RoyalValleyGraves_0
 	.4byte gAreaRoomMap_RoyalValleyGraves_1
 
 gAreaRoomMap_45_0:: @ 08107774
-	map_bottom offset_gAreaRoomMap_45_0_0, 0x1FE, 1
-	map_top offset_gAreaRoomMap_45_0_1, 0x1FE, 1, 1
+	map_bottom offset_gAreaRoomMap_45_0_bottom, 0x1FE, 1
+	map_top offset_gAreaRoomMap_45_0_top, 0x1FE, 1, 1
 
 gAreaRoomMaps_45:: @ 0810778C
 	.4byte gAreaRoomMap_45_0
 
 gAreaRoomMap_46_0:: @ 08107790
-	map_bottom offset_gAreaRoomMap_46_0_0, 0x286, 1
-	map_top offset_gAreaRoomMap_46_0_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_0_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_Null46_0_top, 0x286, 1, 1
 
 gAreaRoomMap_46_1:: @ 081077A8
-	map_bottom offset_gAreaRoomMap_46_1_0, 0x30E, 1
-	map_top offset_gAreaRoomMap_46_1_1, 0x30E, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_1_bottom, 0x30E, 1
+	map_top offset_gAreaRoomMap_Null46_1_top, 0x30E, 1, 1
 
 gAreaRoomMap_46_2:: @ 081077C0
-	map_bottom offset_gAreaRoomMap_46_2_0, 0x286, 1
-	map_top offset_gAreaRoomMap_46_2_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_2_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_Null46_2_top, 0x286, 1, 1
 
 gAreaRoomMap_46_3:: @ 081077D8
-	map_bottom offset_gAreaRoomMap_46_3_0, 0x286, 1
-	map_top offset_gAreaRoomMap_46_3_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_3_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_Null46_3_top, 0x286, 1, 1
 
 gAreaRoomMap_46_4:: @ 081077F0
-	map_bottom offset_gAreaRoomMap_46_4_0, 0x30E, 1
-	map_top offset_gAreaRoomMap_46_4_1, 0x30E, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_4_bottom, 0x30E, 1
+	map_top offset_gAreaRoomMap_Null46_4_top, 0x30E, 1, 1
 
 gAreaRoomMap_46_5:: @ 08107808
-	map_bottom offset_gAreaRoomMap_46_5_0, 0x286, 1
-	map_top offset_gAreaRoomMap_46_5_1, 0x286, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_5_bottom, 0x286, 1
+	map_top offset_gAreaRoomMap_Null46_5_top, 0x286, 1, 1
 
 gAreaRoomMap_46_6:: @ 08107820
-	map_bottom offset_gAreaRoomMap_46_6_0, 0x720, 1
-	map_top offset_gAreaRoomMap_46_6_1, 0x720, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_6_bottom, 0x720, 1
+	map_top offset_gAreaRoomMap_Null46_6_top, 0x720, 1, 1
 
 gAreaRoomMap_46_7:: @ 08107838
-	map_bottom offset_gAreaRoomMap_46_7_0, 0x2F2, 1
-	map_top offset_gAreaRoomMap_46_7_1, 0x2F2, 1, 1
+	map_bottom offset_gAreaRoomMap_Null46_7_bottom, 0x2F2, 1
+	map_top offset_gAreaRoomMap_Null46_7_top, 0x2F2, 1, 1
 
 gAreaRoomMaps_46:: @ 08107850
 	.4byte gAreaRoomMap_46_0
@@ -3392,64 +3392,64 @@ gAreaRoomMap_08107870:: @ 08107870
 	.4byte gAreaRoomMap_08107870
 
 gAreaRoomMap_4D_0:: @ 0810788C
-	map_bottom offset_gAreaRoomMap_4D_0_0, 0xCD0, 1
-	map_top offset_gAreaRoomMap_4D_0_1, 0xCD0, 1, 1
+	map_bottom offset_gAreaRoomMap_4d_0_bottom, 0xCD0, 1
+	map_top offset_gAreaRoomMap_4d_0_top, 0xCD0, 1, 1
 
 gAreaRoomMaps_4D:: @ 081078A4
 	.4byte gAreaRoomMap_4D_0
 
 gAreaRoomMap_57_0:: @ 081078A8
-	map_bottom offset_gAreaRoomMap_57_0_0, 0xC80, 1
-	map_top offset_gAreaRoomMap_57_0_1, 0xC80, 1, 1
+	map_bottom offset_gAreaRoomMap_57_0_bottom, 0xC80, 1
+	map_top offset_gAreaRoomMap_57_0_top, 0xC80, 1, 1
 
 gAreaRoomMaps_57:: @ 081078C0
 	.4byte gAreaRoomMap_57_0
 
 gAreaRoomMap_5F_0:: @ 081078C4
-	map_bottom offset_gAreaRoomMap_5F_0_0, 0xC80, 1
-	map_top offset_gAreaRoomMap_5F_0_1, 0xC80, 1, 1
+	map_bottom offset_gAreaRoomMap_5f_0_bottom, 0xC80, 1
+	map_top offset_gAreaRoomMap_5f_0_top, 0xC80, 1, 1
 
 gAreaRoomMaps_5F:: @ 081078DC
 	.4byte gAreaRoomMap_5F_0
 
 gAreaRoomMap_67_0:: @ 081078E0
-	map_bottom offset_gAreaRoomMap_67_0_0, 0x12C, 1
-	map_top offset_gAreaRoomMap_67_0_1, 0x12C, 1, 1
+	map_bottom offset_gAreaRoomMap_67_0_bottom, 0x12C, 1
+	map_top offset_gAreaRoomMap_67_0_top, 0x12C, 1, 1
 
 gAreaRoomMaps_67:: @ 081078F8
 	.4byte gAreaRoomMap_67_0
 
 gAreaRoomMap_6F_0:: @ 081078FC
-	map_bottom offset_gAreaRoomMap_6F_0_0, 0xC80, 1
-	map_top offset_gAreaRoomMap_6F_0_1, 0xC80, 1, 1
+	map_bottom offset_gAreaRoomMap_6f_0_bottom, 0xC80, 1
+	map_top offset_gAreaRoomMap_6f_0_top, 0xC80, 1, 1
 
 gAreaRoomMaps_6F:: @ 08107914
 	.4byte gAreaRoomMap_6F_0
 
 gAreaRoomMap_77_0:: @ 08107918
-	map_bottom offset_gAreaRoomMap_77_0_0, 0x1040, 1
-	map_top offset_gAreaRoomMap_77_0_1, 0x1040, 1, 1
+	map_bottom offset_gAreaRoomMap_77_0_bottom, 0x1040, 1
+	map_top offset_gAreaRoomMap_77_0_top, 0x1040, 1, 1
 
 gAreaRoomMaps_77:: @ 08107930
 	.4byte gAreaRoomMap_77_0
 
 gAreaRoomMap_7F_0:: @ 08107934
-	map_bottom offset_gAreaRoomMap_7F_0_0, 0xC80, 1
-	map_top offset_gAreaRoomMap_7F_0_1, 0xC80, 1, 1
+	map_bottom offset_gAreaRoomMap_7f_0_bottom, 0xC80, 1
+	map_top offset_gAreaRoomMap_7f_0_top, 0xC80, 1, 1
 
 gAreaRoomMaps_7F:: @ 0810794C
 	.4byte gAreaRoomMap_7F_0
 
 gAreaRoomMap_87_0:: @ 08107950
-	map_bottom offset_gAreaRoomMap_87_0_0, 0xF3C, 1
-	map_top offset_gAreaRoomMap_87_0_1, 0xF3C, 1, 1
+	map_bottom offset_gAreaRoomMap_87_0_bottom, 0xF3C, 1
+	map_top offset_gAreaRoomMap_87_0_top, 0xF3C, 1, 1
 
 gAreaRoomMaps_87:: @ 08107968
 	.4byte gAreaRoomMap_87_0
 
 gAreaRoomMap_8F_0:: @ 0810796C
-	map_bottom offset_gAreaRoomMap_8F_0_0, 0xFA0, 1
-	map_top offset_gAreaRoomMap_8F_0_1, 0xFA0, 1, 1
+	map_bottom offset_gAreaRoomMap_8f_0_bottom, 0xFA0, 1
+	map_top offset_gAreaRoomMap_8f_0_top, 0xFA0, 1, 1
 
 gAreaRoomMaps_8F:: @ 08107984
 	.4byte gAreaRoomMap_8F_0
diff --git a/data/map/metatile_headers.s b/data/map/metatile_headers.s
index d5fbf8ff..c3a50916 100755
--- a/data/map/metatile_headers.s
+++ b/data/map/metatile_headers.s
@@ -7,326 +7,326 @@
 	.include "map_offsets.inc"
 
 gAreaMetatiles_MinishWoods:: @ 081026AC
-	metatiles_bottom offset_gAreaMetatiles_MinishWoods_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_MinishWoods_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_MinishWoods_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_MinishWoods_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishWoods_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_MinishWoods_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishWoods_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MinishWoods_top, 0xFFC, 1, 1
 
 gAreaMetatiles_LakeHylia:: @ 081026DC
-	metatiles_bottom offset_gAreaMetatiles_LakeHylia_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_LakeHylia_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_LakeHylia_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_LakeHylia_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_LakeHylia_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_LakeHylia_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_LakeHylia_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_LakeHylia_top, 0xFFC, 1, 1
 
 gAreaMetatiles_CastorWilds:: @ 0810270C
-	metatiles_bottom offset_gAreaMetatiles_CastorWilds_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_CastorWilds_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_CastorWilds_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_CastorWilds_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CastorWilds_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_CastorWilds_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CastorWilds_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CastorWilds_top, 0xFFC, 1, 1
 
 gAreaMetatiles_HyruleTown:: @ 0810273C
-	metatiles_bottom offset_gAreaMetatiles_HyruleTown_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_HyruleTown_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_HyruleTown_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_HyruleTown_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HyruleTown_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_HyruleTown_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HyruleTown_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HyruleTown_top, 0xFFC, 1, 1
 
 gAreaMetatiles_MtCrenel:: @ 0810276C
-	metatiles_bottom offset_gAreaMetatiles_MtCrenel_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_MtCrenel_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_MtCrenel_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_MtCrenel_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MtCrenel_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_MtCrenel_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MtCrenel_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MtCrenel_top, 0xFFC, 1, 1
 
 gAreaMetatiles_HyruleField:: @ 0810279C
-	metatiles_bottom offset_gAreaMetatiles_HyruleField_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_HyruleField_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_HyruleField_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_HyruleField_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HyruleField_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_HyruleField_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HyruleField_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HyruleField_top, 0xFFC, 1, 1
 
 gAreaMetatiles_CastleGarden:: @ 081027CC
-	metatiles_bottom offset_gAreaMetatiles_CastleGarden_0, 0x3000, 1
-	metatiles_top offset_gAreaMetatiles_CastleGarden_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_CastleGarden_2, 0xC00, 1
-	metatile_types_top offset_gAreaMetatiles_CastleGarden_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CastleGarden_bottom, 0x3000, 1
+	metatiles_top offset_gAreaMetaTileset_CastleGarden_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CastleGarden_bottom, 0xC00, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CastleGarden_top, 0xFFC, 1, 1
 
 gAreaMetatiles_CloudTops:: @ 081027FC
-	metatiles_bottom offset_gAreaMetatiles_CloudTops_0, 0x3FB0, 1
-	metatiles_top offset_gAreaMetatiles_CloudTops_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_CloudTops_2, 0xFEC, 1
-	metatile_types_top offset_gAreaMetatiles_CloudTops_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CloudTops_bottom, 0x3FB0, 1
+	metatiles_top offset_gAreaMetaTileset_CloudTops_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CloudTops_bottom, 0xFEC, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CloudTops_top, 0xFFC, 1, 1
 
 gAreaMetatiles_RoyalValley:: @ 0810282C
-	metatiles_bottom offset_gAreaMetatiles_RoyalValley_0, 0x4000, 1
-	metatiles_top offset_gAreaMetatiles_RoyalValley_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_RoyalValley_2, 0x1000, 1
-	metatile_types_top offset_gAreaMetatiles_RoyalValley_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_RoyalValley_bottom, 0x4000, 1
+	metatiles_top offset_gAreaMetaTileset_RoyalValley_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_RoyalValley_bottom, 0x1000, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_RoyalValley_top, 0xFFC, 1, 1
 
 gAreaMetatiles_Beanstalks:: @ 0810285C
-	metatiles_bottom offset_gAreaMetatiles_Beanstalks_0, 0x5A8, 1
-	metatile_types_bottom offset_gAreaMetatiles_Beanstalks_1, 0x16A, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_Beanstalks_bottom, 0x5A8, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_Beanstalks_bottom, 0x16A, 1, 1
 
 gAreaMetatiles_CrenelCaves:: @ 08102874
-	metatiles_bottom offset_gAreaMetatiles_CrenelCaves_0, 0x3F80, 1
-	metatiles_top offset_gAreaMetatiles_CrenelCaves_1, 0x3F40, 1
-	metatile_types_bottom offset_gAreaMetatiles_CrenelCaves_2, 0xFE0, 1
-	metatile_types_top offset_gAreaMetatiles_CrenelCaves_3, 0xFD0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishHouseInteriors_bottom, 0x3F80, 1
+	metatiles_top offset_gAreaMetaTileset_MinishHouseInteriors_top, 0x3F40, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishHouseInteriors_bottom, 0xFE0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MinishHouseInteriors_top, 0xFD0, 1, 1
 
 gAreaMetatiles_GreatFairies:: @ 081028A4
-	metatiles_bottom offset_gAreaMetatiles_GreatFairies_0, 0x17A8, 1
-	metatiles_top offset_gAreaMetatiles_GreatFairies_1, 0x1070, 1
-	metatile_types_bottom offset_gAreaMetatiles_GreatFairies_2, 0x5EA, 1
-	metatile_types_top offset_gAreaMetatiles_GreatFairies_3, 0x41C, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_GreatFairies_bottom, 0x17A8, 1
+	metatiles_top offset_gAreaMetaTileset_GreatFairies_top, 0x1070, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_GreatFairies_bottom, 0x5EA, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_GreatFairies_top, 0x41C, 1, 1
 
 gAreaMetatiles_MinishVillage:: @ 081028D4
-	metatiles_bottom offset_gAreaMetatiles_MinishVillage_0, 0x35A8, 1
-	metatiles_top offset_gAreaMetatiles_MinishVillage_1, 0x3228, 1
-	metatile_types_bottom offset_gAreaMetatiles_MinishVillage_2, 0xD6A, 1
-	metatile_types_top offset_gAreaMetatiles_MinishVillage_3, 0xC8A, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishVillage_bottom, 0x35A8, 1
+	metatiles_top offset_gAreaMetaTileset_MinishVillage_top, 0x3228, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishVillage_bottom, 0xD6A, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MinishVillage_top, 0xC8A, 1, 1
 
 gAreaMetatiles_MelarisMine:: @ 08102904
-	metatiles_bottom offset_gAreaMetatiles_MelarisMine_0, 0x27C0, 1
-	metatiles_top offset_gAreaMetatiles_MelarisMine_1, 0x308, 1
-	metatile_types_bottom offset_gAreaMetatiles_MelarisMine_2, 0x9F0, 1
-	metatile_types_top offset_gAreaMetatiles_MelarisMine_3, 0xC2, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MelarisMine_bottom, 0x27C0, 1
+	metatiles_top offset_gAreaMetaTileset_MelarisMine_top, 0x308, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MelarisMine_bottom, 0x9F0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MelarisMine_top, 0xC2, 1, 1
 
 gAreaMetatiles_MnishPaths1:: @ 08102934
-	metatiles_bottom offset_gAreaMetatiles_MnishPaths1_0, 0x1420, 1
-	metatile_types_bottom offset_gAreaMetatiles_MnishPaths1_1, 0x508, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishPaths_bottom, 0x1420, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishPaths_bottom, 0x508, 1, 1
 
 gAreaMetatiles_CrenelMinishPaths:: @ 0810294C
-	metatiles_bottom offset_gAreaMetatiles_CrenelMinishPaths_0, 0x1EB8, 1
-	metatile_types_bottom offset_gAreaMetatiles_CrenelMinishPaths_1, 0x7AE, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CrenelMinishPaths_bottom, 0x1EB8, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CrenelMinishPaths_bottom, 0x7AE, 1, 1
 
 gAreaMetatiles_MinishHouseInteriors:: @ 08102964
-	metatiles_bottom offset_gAreaMetatiles_CrenelCaves_0, 0x3F80, 1
-	metatiles_top offset_gAreaMetatiles_CrenelCaves_1, 0x3F40, 1
-	metatile_types_bottom offset_gAreaMetatiles_CrenelCaves_2, 0xFE0, 1
-	metatile_types_top offset_gAreaMetatiles_CrenelCaves_3, 0xFD0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishHouseInteriors_bottom, 0x3F80, 1
+	metatiles_top offset_gAreaMetaTileset_MinishHouseInteriors_top, 0x3F40, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishHouseInteriors_bottom, 0xFE0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MinishHouseInteriors_top, 0xFD0, 1, 1
 
 gAreaMetatiles_HouseInteriors1:: @ 08102994
-	metatiles_bottom offset_gAreaMetatiles_HouseInteriors1_0, 0x3188, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_HouseInteriors1_2, 0xC62, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HouseInteriors1_bottom, 0x3188, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HouseInteriors1_bottom, 0xC62, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_HouseInteriors2:: @ 081029C4
-	metatiles_bottom offset_gAreaMetatiles_HouseInteriors2_0, 0x33A0, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_HouseInteriors2_2, 0xCE8, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HouseInteriors2_bottom, 0x33A0, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HouseInteriors2_bottom, 0xCE8, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_HouseInteriors4:: @ 081029F4
-	metatiles_bottom offset_gAreaMetatiles_HouseInteriors4_0, 0x33A0, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_HouseInteriors4_2, 0xCE8, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HouseInteriors4_bottom, 0x33A0, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HouseInteriors4_bottom, 0xCE8, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_HouseInteriors3:: @ 08102A24
-	metatiles_bottom offset_gAreaMetatiles_HouseInteriors3_0, 0x2F20, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_HouseInteriors3_2, 0xBC8, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HouseInteriors3_bottom, 0x2F20, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HouseInteriors3_bottom, 0xBC8, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_TreeInteriors:: @ 08102A54
-	metatiles_bottom offset_gAreaMetatiles_TreeInteriors_0, 0x3000, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_TreeInteriors_2, 0xC00, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_TreeInteriors_bottom, 0x3000, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_TreeInteriors_bottom, 0xC00, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_Dojos:: @ 08102A84
-	metatiles_bottom offset_gAreaMetatiles_Dojos_0, 0x33A0, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_Dojos_2, 0xCE8, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_Dojos_bottom, 0x33A0, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_Dojos_bottom, 0xCE8, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_MinishCracks:: @ 08102AB4
-	metatiles_bottom offset_gAreaMetatiles_MinishCracks_0, 0x3180, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_MinishCracks_2, 0xC60, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishCracks_bottom, 0x3180, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishCracks_bottom, 0xC60, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_ArmosInteriors:: @ 08102AE4
-	metatiles_bottom offset_gAreaMetatiles_ArmosInteriors_0, 0xC50, 1
-	metatiles_top offset_gAreaMetatiles_ArmosInteriors_1, 0xC50, 1
-	metatile_types_bottom offset_gAreaMetatiles_ArmosInteriors_2, 0x314, 1
-	metatile_types_top offset_gAreaMetatiles_ArmosInteriors_3, 0x314, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_ArmosInteriors_bottom, 0xC50, 1
+	metatiles_top offset_gAreaMetaTileset_ArmosInteriors_top, 0xC50, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_ArmosInteriors_bottom, 0x314, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_ArmosInteriors_top, 0x314, 1, 1
 
 gAreaMetatiles_MinishRafters:: @ 08102B14
-	metatiles_bottom offset_gAreaMetatiles_MinishRafters_0, 0x1A30, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_MinishRafters_2, 0x68C, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishRafters_bottom, 0x1A30, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishRafters_bottom, 0x68C, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_GoronCave:: @ 08102B44
-	metatiles_bottom offset_gAreaMetatiles_GoronCave_0, 0x3F80, 1
-	metatiles_top offset_gAreaMetatiles_GoronCave_1, 0x3400, 1
-	metatile_types_bottom offset_gAreaMetatiles_GoronCave_2, 0xFE0, 1
-	metatile_types_top offset_gAreaMetatiles_GoronCave_3, 0xD00, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_GoronCave_bottom, 0x3F80, 1
+	metatiles_top offset_gAreaMetaTileset_GoronCave_top, 0x3400, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_GoronCave_bottom, 0xFE0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_GoronCave_top, 0xD00, 1, 1
 
 gAreaMetatiles_WindTribeTower:: @ 08102B74
-	metatiles_bottom offset_gAreaMetatiles_WindTribeTower_0, 0x2EB0, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_WindTribeTower_2, 0xBAC, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_WindTribeTower_bottom, 0x2EB0, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_WindTribeTower_bottom, 0xBAC, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_WindTribeTowerRoof:: @ 08102BA4
-	metatiles_bottom offset_gAreaMetatiles_WindTribeTowerRoof_0, 0xBC0, 1
-	metatiles_top offset_gAreaMetatiles_WindTribeTowerRoof_1, 0xBC0, 1
-	metatile_types_bottom offset_gAreaMetatiles_WindTribeTowerRoof_2, 0x2F0, 1
-	metatile_types_top offset_gAreaMetatiles_WindTribeTowerRoof_3, 0x2F0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_WindTribeTowerRoof_bottom, 0xBC0, 1
+	metatiles_top offset_gAreaMetaTileset_WindTribeTowerRoof_top, 0xBC0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom, 0x2F0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_WindTribeTowerRoof_top, 0x2F0, 1, 1
 
 gAreaMetatiles_MinishCaves:: @ 08102BD4
-	metatiles_bottom offset_gAreaMetatiles_MinishCaves_0, 0x3F80, 1
-	metatiles_top offset_gAreaMetatiles_MinishCaves_1, 0x3F80, 1
-	metatile_types_bottom offset_gAreaMetatiles_MinishCaves_2, 0xFE0, 1
-	metatile_types_top offset_gAreaMetatiles_MinishCaves_3, 0xFE0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_MinishCaves_bottom, 0x3F80, 1
+	metatiles_top offset_gAreaMetaTileset_MinishCaves_top, 0x3F80, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_MinishCaves_bottom, 0xFE0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_MinishCaves_top, 0xFE0, 1, 1
 
 gAreaMetatiles_CastleGardenMinishHoles:: @ 08102C04
-	metatiles_bottom offset_gAreaMetatiles_CastleGardenMinishHoles_0, 0x13A8, 1
-	metatiles_top offset_gAreaMetatiles_CastleGardenMinishHoles_1, 0x1680, 1
-	metatile_types_bottom offset_gAreaMetatiles_CastleGardenMinishHoles_2, 0x4EA, 1
-	metatile_types_top offset_gAreaMetatiles_CastleGardenMinishHoles_3, 0x5A0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CastleGardenMinishHoles_bottom, 0x13A8, 1
+	metatiles_top offset_gAreaMetaTileset_CastleGardenMinishHoles_top, 0x1680, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom, 0x4EA, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CastleGardenMinishHoles_top, 0x5A0, 1, 1
 
 gAreaMetatiles_EzloCutscene:: @ 08102C34
-	metatiles_bottom offset_gAreaMetatiles_EzloCutscene_0, 0x1A20, 1
-	metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_EzloCutscene_2, 0x688, 1
-	metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_EzloCutscene_bottom, 0x1A20, 1
+	metatiles_top offset_gAreaMetaTileset_HouseInteriors1_top, 0x3FF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_EzloCutscene_bottom, 0x688, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HouseInteriors1_top, 0xFFC, 1, 1
 
 gAreaMetatiles_HyruleTownUnderground:: @ 08102C64
-	metatiles_bottom offset_gAreaMetatiles_HyruleTownUnderground_0, 0x3E80, 1
-	metatiles_top offset_gAreaMetatiles_HyruleTownUnderground_1, 0x3610, 1
-	metatile_types_bottom offset_gAreaMetatiles_HyruleTownUnderground_2, 0xFA0, 1
-	metatile_types_top offset_gAreaMetatiles_HyruleTownUnderground_3, 0xD84, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_40_bottom, 0x3E80, 1
+	metatiles_top offset_gAreaMetaTileset_40_top, 0x3610, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_40_bottom, 0xFA0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_40_top, 0xD84, 1, 1
 
 gAreaMetatiles_DeepwoodShrine:: @ 08102C94
-	metatiles_bottom offset_gAreaMetatiles_DeepwoodShrine_0, 0x3B28, 1
-	metatiles_top offset_gAreaMetatiles_DeepwoodShrine_1, 0x3620, 1
-	metatile_types_bottom offset_gAreaMetatiles_DeepwoodShrine_2, 0xECA, 1
-	metatile_types_top offset_gAreaMetatiles_DeepwoodShrine_3, 0xD88, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_DeepwoodShrine_bottom, 0x3B28, 1
+	metatiles_top offset_gAreaMetaTileset_DeepwoodShrine_top, 0x3620, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_DeepwoodShrine_bottom, 0xECA, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_DeepwoodShrine_top, 0xD88, 1, 1
 
 gAreaMetatiles_DeepwoodShrineBoss:: @ 08102CC4
-	metatiles_bottom offset_gAreaMetatiles_DeepwoodShrineBoss_0, 0x3620, 1
-	metatiles_top offset_gAreaMetatiles_DeepwoodShrineBoss_1, 0x11F8, 1
-	metatile_types_bottom offset_gAreaMetatiles_DeepwoodShrineBoss_2, 0xD88, 1
-	metatile_types_top offset_gAreaMetatiles_DeepwoodShrineBoss_3, 0x47E, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_DeepwoodShrineBoss_bottom, 0x3620, 1
+	metatiles_top offset_gAreaMetaTileset_DeepwoodShrineBoss_top, 0x11F8, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom, 0xD88, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_DeepwoodShrineBoss_top, 0x47E, 1, 1
 
 gAreaMetatiles_DeepwoodShrineEntry:: @ 08102CF4
-	metatiles_bottom offset_gAreaMetatiles_DeepwoodShrineEntry_0, 0xD08, 1
-	metatiles_top offset_gAreaMetatiles_DeepwoodShrineEntry_1, 0x9F8, 1
-	metatile_types_bottom offset_gAreaMetatiles_DeepwoodShrineEntry_2, 0x342, 1
-	metatile_types_top offset_gAreaMetatiles_DeepwoodShrineEntry_3, 0x27E, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_DeepwoodShrineEntry_bottom, 0xD08, 1
+	metatiles_top offset_gAreaMetaTileset_DeepwoodShrineEntry_top, 0x9F8, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom, 0x342, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_DeepwoodShrineEntry_top, 0x27E, 1, 1
 
 gAreaMetatiles_CaveOfFlames:: @ 08102D24
-	metatiles_bottom offset_gAreaMetatiles_CaveOfFlames_0, 0x3B08, 1
-	metatiles_top offset_gAreaMetatiles_CaveOfFlames_1, 0x3F28, 1
-	metatile_types_bottom offset_gAreaMetatiles_CaveOfFlames_2, 0xEC2, 1
-	metatile_types_top offset_gAreaMetatiles_CaveOfFlames_3, 0xFCA, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CaveOfFlames_bottom, 0x3B08, 1
+	metatiles_top offset_gAreaMetaTileset_CaveOfFlames_top, 0x3F28, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CaveOfFlames_bottom, 0xEC2, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CaveOfFlames_top, 0xFCA, 1, 1
 
 gAreaMetatiles_CaveOfFlamesBoss:: @ 08102D54
-	metatiles_bottom offset_gAreaMetatiles_CaveOfFlamesBoss_0, 0x3B08, 1
-	metatiles_top offset_gAreaMetatiles_CaveOfFlamesBoss_1, 0x3610, 1
-	metatile_types_bottom offset_gAreaMetatiles_CaveOfFlamesBoss_2, 0xEC2, 1
-	metatile_types_top offset_gAreaMetatiles_CaveOfFlamesBoss_3, 0xD84, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CaveOfFlamesBoss_bottom, 0x3B08, 1
+	metatiles_top offset_gAreaMetaTileset_CaveOfFlamesBoss_top, 0x3610, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom, 0xEC2, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CaveOfFlamesBoss_top, 0xD84, 1, 1
 
 gAreaMetatiles_FortressOfWinds:: @ 08102D84
-	metatiles_bottom offset_gAreaMetatiles_FortressOfWinds_0, 0x3868, 1
-	metatiles_top offset_gAreaMetatiles_FortressOfWinds_1, 0x3850, 1
-	metatile_types_bottom offset_gAreaMetatiles_FortressOfWinds_2, 0xE1A, 1
-	metatile_types_top offset_gAreaMetatiles_FortressOfWinds_3, 0xE14, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_CastorDarknut_bottom, 0x3868, 1
+	metatiles_top offset_gAreaMetaTileset_CastorDarknut_top, 0x3850, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_CastorDarknut_bottom, 0xE1A, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_CastorDarknut_top, 0xE14, 1, 1
 
 gAreaMetatiles_FortressOfWindsTop:: @ 08102DB4
-	metatiles_bottom offset_gAreaMetatiles_FortressOfWindsTop_0, 0x1440, 1
-	metatiles_top offset_gAreaMetatiles_FortressOfWindsTop_1, 0x1368, 1
-	metatile_types_bottom offset_gAreaMetatiles_FortressOfWindsTop_2, 0x510, 1
-	metatile_types_top offset_gAreaMetatiles_FortressOfWindsTop_3, 0x4DA, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_FortressOfWindsTop_bottom, 0x1440, 1
+	metatiles_top offset_gAreaMetaTileset_FortressOfWindsTop_top, 0x1368, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_FortressOfWindsTop_bottom, 0x510, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_FortressOfWindsTop_top, 0x4DA, 1, 1
 
 gAreaMetatiles_InnerMazaal:: @ 08102DE4
-	metatiles_bottom offset_gAreaMetatiles_InnerMazaal_0, 0x3C00, 1
-	metatiles_top offset_gAreaMetatiles_InnerMazaal_1, 0x3E70, 1
-	metatile_types_bottom offset_gAreaMetatiles_InnerMazaal_2, 0xF00, 1
-	metatile_types_top offset_gAreaMetatiles_InnerMazaal_3, 0xF9C, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_InnerMazaal_bottom, 0x3C00, 1
+	metatiles_top offset_gAreaMetaTileset_InnerMazaal_top, 0x3E70, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_InnerMazaal_bottom, 0xF00, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_InnerMazaal_top, 0xF9C, 1, 1
 
 gAreaMetatiles_TempleOfDroplets:: @ 08102E14
-	metatiles_bottom offset_gAreaMetatiles_TempleOfDroplets_0, 0x3D68, 1
-	metatiles_top offset_gAreaMetatiles_TempleOfDroplets_1, 0x4000, 1
-	metatile_types_bottom offset_gAreaMetatiles_TempleOfDroplets_2, 0xF5A, 1
-	metatile_types_top offset_gAreaMetatiles_TempleOfDroplets_3, 0x1000, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_TempleOfDroplets_bottom, 0x3D68, 1
+	metatiles_top offset_gAreaMetaTileset_TempleOfDroplets_top, 0x4000, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_TempleOfDroplets_bottom, 0xF5A, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_TempleOfDroplets_top, 0x1000, 1, 1
 
 gAreaMetatiles_61:: @ 08102E44
-	metatiles_bottom offset_gAreaMetatiles_61_0, 0x600, 1
-	metatiles_top offset_gAreaMetatiles_61_1, 0x398, 1
-	metatile_types_bottom offset_gAreaMetatiles_61_2, 0x180, 1
-	metatile_types_top offset_gAreaMetatiles_61_3, 0xE6, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_Null61_bottom, 0x600, 1
+	metatiles_top offset_gAreaMetaTileset_Null61_top, 0x398, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_Null61_bottom, 0x180, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_Null61_top, 0xE6, 1, 1
 
 gAreaMetatiles_RoyalCrypt:: @ 08102E74
-	metatiles_bottom offset_gAreaMetatiles_RoyalCrypt_0, 0x3610, 1
-	metatiles_top offset_gAreaMetatiles_RoyalCrypt_1, 0x3610, 1
-	metatile_types_bottom offset_gAreaMetatiles_RoyalCrypt_2, 0xD84, 1
-	metatile_types_top offset_gAreaMetatiles_RoyalCrypt_3, 0xD84, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_RoyalCrypt_bottom, 0x3610, 1
+	metatiles_top offset_gAreaMetaTileset_RoyalCrypt_top, 0x3610, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_RoyalCrypt_bottom, 0xD84, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_RoyalCrypt_top, 0xD84, 1, 1
 
 gAreaMetatiles_PalaceOfWinds:: @ 08102EA4
-	metatiles_bottom offset_gAreaMetatiles_PalaceOfWinds_GyorgTornado, 0x3620, 1
-	metatiles_top offset_gAreaMetatiles_PalaceOfWinds_BossKey, 0x3620, 1
-	metatile_types_bottom offset_gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers, 0xD88, 1
-	metatile_types_top offset_gAreaMetatiles_PalaceOfWinds_GyorgBossDoor, 0xD88, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_PalaceOfWinds_bottom, 0x3620, 1
+	metatiles_top offset_gAreaMetaTileset_PalaceOfWinds_top, 0x3620, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_PalaceOfWinds_bottom, 0xD88, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_PalaceOfWinds_top, 0xD88, 1, 1
 
 gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
-	metatiles_top offset_gAreaMetatiles_PalaceOfWindsBoss_0, 0x108, 1
-	metatile_types_top offset_gAreaMetatiles_PalaceOfWindsBoss_1, 0x42, 1, 1
+	metatiles_top offset_gAreaMetaTileset_PalaceOfWindsBoss_top, 0x108, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_PalaceOfWindsBoss_top, 0x42, 1, 1
 
 gAreaMetatiles_Sanctuary:: @ 08102EEC
-	metatiles_bottom offset_gAreaMetatiles_Sanctuary_0, 0x3620, 1
-	metatiles_top offset_gAreaMetatiles_Sanctuary_1, 0x3620, 1
-	metatile_types_bottom offset_gAreaMetatiles_Sanctuary_2, 0xD88, 1
-	metatile_types_top offset_gAreaMetatiles_Sanctuary_3, 0xD88, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_Sanctuary_bottom, 0x3620, 1
+	metatiles_top offset_gAreaMetaTileset_Sanctuary_top, 0x3620, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_Sanctuary_bottom, 0xD88, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_Sanctuary_top, 0xD88, 1, 1
 
 gAreaMetatiles_HyruleCastle:: @ 08102F1C
-	metatiles_bottom offset_gAreaMetatiles_HyruleCastle_0, 0x37C0, 1
-	metatiles_top offset_gAreaMetatiles_HyruleCastle_1, 0x3610, 1
-	metatile_types_bottom offset_gAreaMetatiles_HyruleCastle_2, 0xDF0, 1
-	metatile_types_top offset_gAreaMetatiles_HyruleCastle_3, 0xD84, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_HyruleCastle_bottom, 0x37C0, 1
+	metatiles_top offset_gAreaMetaTileset_HyruleCastle_top, 0x3610, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_HyruleCastle_bottom, 0xDF0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_HyruleCastle_top, 0xD84, 1, 1
 
 gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
-	metatiles_bottom offset_gAreaMetatiles_SanctuaryEntrance_0, 0x1478, 1
-	metatiles_top offset_gAreaMetatiles_SanctuaryEntrance_1, 0xFF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_SanctuaryEntrance_2, 0x51E, 1
-	metatile_types_top offset_gAreaMetatiles_SanctuaryEntrance_3, 0x3FC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_SanctuaryEntrance_bottom, 0x1478, 1
+	metatiles_top offset_gAreaMetaTileset_SanctuaryEntrance_top, 0xFF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_SanctuaryEntrance_bottom, 0x51E, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_SanctuaryEntrance_top, 0x3FC, 1, 1
 
 gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
-	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastle_1FEntrance, 0x3FD8, 1
-	metatiles_top offset_gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower, 0x37C0, 1
-	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastle_3FTopRightTower, 0xFF6, 1
-	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower, 0xDF0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_DarkHyruleCastle_bottom, 0x3FD8, 1
+	metatiles_top offset_gAreaMetaTileset_DarkHyruleCastle_top, 0x37C0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_DarkHyruleCastle_bottom, 0xFF6, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_DarkHyruleCastle_top, 0xDF0, 1, 1
 
 gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
-	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastleOutside_0, 0x3340, 1
-	metatiles_top offset_gAreaMetatiles_DarkHyruleCastleOutside_1, 0x1EF0, 1
-	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastleOutside_2, 0xCD0, 1
-	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastleOutside_3, 0x7BC, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_DarkHyruleCastleOutside_bottom, 0x3340, 1
+	metatiles_top offset_gAreaMetaTileset_DarkHyruleCastleOutside_top, 0x1EF0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom, 0xCD0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top, 0x7BC, 1, 1
 
 gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
-	metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastleBridge_0, 0x3610, 1
-	metatiles_top offset_gAreaMetatiles_DarkHyruleCastleBridge_1, 0x3610, 1
-	metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastleBridge_2, 0xD84, 1
-	metatile_types_top offset_gAreaMetatiles_DarkHyruleCastleBridge_3, 0xD84, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_DarkHyruleCastleBridge_bottom, 0x3610, 1
+	metatiles_top offset_gAreaMetaTileset_DarkHyruleCastleBridge_top, 0x3610, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom, 0xD84, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top, 0xD84, 1, 1
 
 gAreaMetatiles_VaatisArms:: @ 0810300C
-	metatiles_bottom offset_gAreaMetatiles_VaatisArms_0, 0x17C8, 1
-	metatiles_top offset_gAreaMetatiles_VaatisArms_1, 0xBC0, 1
-	metatile_types_bottom offset_gAreaMetatiles_VaatisArms_2, 0x5F2, 1
-	metatile_types_top offset_gAreaMetatiles_VaatisArms_3, 0x2F0, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_VaatisArms_bottom, 0x17C8, 1
+	metatiles_top offset_gAreaMetaTileset_VaatisArms_top, 0xBC0, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_VaatisArms_bottom, 0x5F2, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_VaatisArms_top, 0x2F0, 1, 1
 
 gAreaMetatiles_Vaati3:: @ 0810303C
-	metatiles_bottom offset_gAreaMetatiles_Vaati3_0, 0xE80, 1
-	metatiles_top offset_gAreaMetatiles_Vaati3_1, 0x9B8, 1
-	metatile_types_bottom offset_gAreaMetatiles_Vaati3_2, 0x3A0, 1
-	metatile_types_top offset_gAreaMetatiles_Vaati3_3, 0x26E, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_Vaati3_bottom, 0xE80, 1
+	metatiles_top offset_gAreaMetaTileset_Vaati3_top, 0x9B8, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_Vaati3_bottom, 0x3A0, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_Vaati3_top, 0x26E, 1, 1
 
 gAreaMetatiles_Vaati2:: @ 0810306C
-	metatiles_bottom offset_gAreaMetatiles_Vaati2_0, 0x850, 1
-	metatiles_top offset_gAreaMetatiles_Vaati2_1, 0x298, 1
-	metatile_types_bottom offset_gAreaMetatiles_Vaati2_2, 0x214, 1
-	metatile_types_top offset_gAreaMetatiles_Vaati2_3, 0xA6, 1, 1
+	metatiles_bottom offset_gAreaMetaTileset_Vaati2_bottom, 0x850, 1
+	metatiles_top offset_gAreaMetaTileset_Vaati2_top, 0x298, 1
+	metatile_types_bottom offset_gAreaMetaTilesetTypes_Vaati2_bottom, 0x214, 1
+	metatile_types_top offset_gAreaMetaTilesetTypes_Vaati2_top, 0xA6, 1, 1
 
 
 gAreaMetatiles:: @ 0810309C
diff --git a/data/map/tileset_headers.s b/data/map/tileset_headers.s
index c4d0bf3e..b9b10fc8 100755
--- a/data/map/tileset_headers.s
+++ b/data/map/tileset_headers.s
@@ -22,8 +22,8 @@ gAreaTileset_MinishWoods_0:: @ 08100CF4
 	tileset_palette_set 28, 1
 
 gAreaTileset_MinishWoods_1:: @ 08100D24
-	tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_3, 0x6000000, 0x2000, 1
-	tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_4, 0x6008000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_MinishWoods_1_0, 0x6000000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_MinishWoods_1_1, 0x6008000, 0x2000, 1
 	tileset_palette_set 21, 1
 
 gAreaTilesets_MinishWoods:: @ 08100D48
@@ -31,36 +31,36 @@ gAreaTilesets_MinishWoods:: @ 08100D48
 	.4byte gAreaTileset_MinishWoods_1
 
 gAreaTileset_LakeHylia_0:: @ 08100D50
-	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_LakeHylia_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_LakeHylia_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_LakeHylia_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 39, 1
 
 gAreaTilesets_LakeHylia:: @ 08100D80
 	.4byte gAreaTileset_LakeHylia_0
 
 gAreaTileset_CastorWilds_0:: @ 08100D84
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 19, 1
 
 gAreaTilesets_CastorWilds:: @ 08100DB4
 	.4byte gAreaTileset_CastorWilds_0
 
 gAreaTileset_Ruins_0:: @ 08100DB8
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 29, 1
 
 gAreaTilesets_Ruins:: @ 08100DE8
 	.4byte gAreaTileset_Ruins_0
 
 gAreaTileset_HyruleTown_0:: @ 08100DEC
-	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleTown_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleTown_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleTown_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 27, 1
 
 gAreaTilesets_HyruleTown:: @ 08100E1C
@@ -76,33 +76,33 @@ gAreaTilesets_FestivalTown:: @ 08100E50
 	.4byte gAreaTileset_FestivalTown_0
 
 gAreaTileset_MtCrenel_0:: @ 08100E54
-	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MtCrenel_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MtCrenel_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MtCrenel_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 30, 1
 
 gAreaTilesets_MtCrenel:: @ 08100E84
 	.4byte gAreaTileset_MtCrenel_0
 
 gAreaTileset_HyruleField_0:: @ 08100E88
-	tileset_tiles offset_gAreaTileset_HyruleField_7_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DigCaves1_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_7_1, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_2_3, 0x600F000, 0x800, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_3, 0x600F000, 0x800, 1
 	tileset_palette_set 16, 1
 
 gAreaTileset_HyruleField_1:: @ 08100EC4
-	tileset_tiles offset_gAreaTileset_HyruleField_5_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_1_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HyruleField_1_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_5_1, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_2_3, 0x600F000, 0x800, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_1_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_3, 0x600F000, 0x800, 1
 	tileset_palette_set 67, 1
 
 gAreaTileset_HyruleField_2:: @ 08100F00
-	tileset_tiles offset_gAreaTileset_HyruleField_6_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_2_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HyruleField_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_6_1, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_2_3, 0x600F000, 0x800, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_2_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_3, 0x600F000, 0x800, 1
 	tileset_palette_set 46, 1
 
 gAreaTilesets_HyruleField:: @ 08100F3C
@@ -139,17 +139,17 @@ gAreaTilesets_RoyalValley:: @ 08100FEC
 	.4byte gAreaTileset_RoyalValley_0
 
 gAreaTileset_VeilFalls_0:: @ 08100FF0
-	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 44, 1
 
 gAreaTilesets_VeilFalls:: @ 08101020
 	.4byte gAreaTileset_VeilFalls_0
 
 gAreaTileset_VeilFallsTop_0:: @ 08101024
-	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_1, 0x6004000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 44, 1
 
@@ -167,30 +167,30 @@ gAreaTilesets_Beanstalks:: @ 08101094
 	.4byte gAreaTileset_Beanstalks_0
 
 gAreaTileset_CrenelCaves_0:: @ 08101098
-	tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 62, 1
 
 gAreaTilesets_CrenelCaves:: @ 081010C8
 	.4byte gAreaTileset_CrenelCaves_0
 
 gAreaTileset_GreatFairies_0:: @ 081010CC
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 92, 1
 
 gAreaTileset_GreatFairies_1:: @ 081010FC
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 102, 1
 
 gAreaTileset_GreatFairies_2:: @ 0810112C
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_GreatFairies_2_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_GreatFairies_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 103, 1
 
 gAreaTilesets_GreatFairies:: @ 0810115C
@@ -202,17 +202,17 @@ gAreaTileset_LakeWoodsCave_0:: @ 08101168
 	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_tiles offset_gAreaTileset_MinishWoods_1_0, 0x6001000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_MinishWoods_1_1, 0x6009000, 0x2000, 1
 	tileset_palette_set 21, 1
 
 gAreaTilesets_LakeWoodsCave:: @ 081011B0
 	.4byte gAreaTileset_LakeWoodsCave_0
 
 gAreaTileset_HyruleDigCaves_0:: @ 081011B4
-	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleTown_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleTown_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleTown_0_2, 0x6008000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_3, 0x6001000, 0x2000, 1
 	tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 54, 1
@@ -221,64 +221,64 @@ gAreaTilesets_HyruleDigCaves:: @ 081011FC
 	.4byte gAreaTileset_HyruleDigCaves_0
 
 gAreaTileset_DigCaves1_0:: @ 08101200
-	tileset_tiles offset_gAreaTileset_HyruleField_7_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DigCaves1_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyruleField_7_1, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DigCaves1_0_3, 0x6001000, 0x2000, 1
-	tileset_tiles offset_gAreaTileset_DigCaves1_0_4, 0x6009000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HyruleField_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DigCaves_0_3, 0x6001000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_DigCaves_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 85, 1
 
 gAreaTilesets_DigCaves1:: @ 08101248
 	.4byte gAreaTileset_DigCaves1_0
 
 gAreaTileset_CrenelDigCave_0:: @ 0810124C
-	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_2, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_3, 0x6001000, 0x2000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_4, 0x6009000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_MtCrenel_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MtCrenel_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MtCrenel_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_3, 0x6001000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 33, 1
 
 gAreaTilesets_CrenelDigCave:: @ 08101294
 	.4byte gAreaTileset_CrenelDigCave_0
 
 gAreaTileset_VeilFallsDigCave_0:: @ 08101298
-	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsTop_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_2, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_3, 0x6001000, 0x2000, 1
-	tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_4, 0x6009000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_VeilFalls_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_3, 0x6001000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_CrenelDigCave_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 99, 1
 
 gAreaTilesets_VeilFallsDigCave:: @ 081012E0
 	.4byte gAreaTileset_VeilFallsDigCave_0
 
 gAreaTileset_CastorWildsDigCave_0:: @ 081012E4
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_3, 0x6001000, 0x2000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_4, 0x6009000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWildsDigCave_0_3, 0x6001000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_CastorWildsDigCave_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 100, 1
 
 gAreaTilesets_CastorWildsDigCave:: @ 0810132C
 	.4byte gAreaTileset_CastorWildsDigCave_0
 
 gAreaTileset_OuterFortressOfWinds_0:: @ 08101330
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_3, 0x6001000, 0x2000, 1
-	tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_4, 0x6009000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWilds_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastorWildsDigCave_0_3, 0x6001000, 0x2000, 1
+	tileset_tiles offset_gAreaTileset_CastorWildsDigCave_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 167, 1
 
 gAreaTilesets_OuterFortressOfWinds:: @ 08101378
 	.4byte gAreaTileset_OuterFortressOfWinds_0
 
 gAreaTileset_HyliaDigCaves_0:: @ 0810137C
-	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_LakeHylia_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_LakeHylia_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_LakeHylia_0_2, 0x6008000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_3, 0x6001000, 0x2000, 1
 	tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_4, 0x6009000, 0x2000, 1
 	tileset_palette_set 20, 1
@@ -312,18 +312,18 @@ gAreaTilesets_MelarisMine:: @ 08101460
 	.4byte gAreaTileset_MelarisMine_0
 
 gAreaTileset_MinishPaths_0:: @ 08101464
-	tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_0_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 18, 1
 
 gAreaTileset_MinishPaths_1:: @ 08101488
-	tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_0_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 63, 1
 
 gAreaTileset_MinishPaths_2:: @ 081014AC
-	tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishPaths_0_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 64, 1
 
 gAreaTilesets_MinishPaths:: @ 081014D0
@@ -337,13 +337,13 @@ gAreaTileset_CrenelMinishPaths_0:: @ 081014DC
 	tileset_palette_set 65, 1
 
 gAreaTileset_CrenelMinishPaths_1:: @ 08101500
-	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_1_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_1_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 66, 1
 
 gAreaTileset_CrenelMinishPaths_2:: @ 08101524
-	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_1_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelMinishPaths_1_1, 0x6004000, 0x4000, 1
 	tileset_palette_set 93, 1
 
 gAreaTilesets_CrenelMinishPaths:: @ 08101548
@@ -503,28 +503,28 @@ gAreaTilesets_TownMinishHoles:: @ 0810185C
 gAreaTileset_HouseInteriors1_0:: @ 08101880
 	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 51, 1
 
 gAreaTilesets_HouseInteriors1:: @ 081018B0
 	.4byte gAreaTileset_HouseInteriors1_0
 
 gAreaTileset_HouseInteriors2_0:: @ 081018B4
-	tileset_tiles offset_gAreaTileset_HouseInteriors2_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HouseInteriors2_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors2_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors2_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 52, 1
 
 gAreaTileset_HouseInteriors2_1:: @ 081018E4
-	tileset_tiles offset_gAreaTileset_HouseInteriors2_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HouseInteriors2_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors2_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors2_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 168, 1
 
 gAreaTileset_HouseInteriors2_2:: @ 08101914
-	tileset_tiles offset_gAreaTileset_HouseInteriors2_2_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_HouseInteriors2_2_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors2_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors2_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 157, 1
 
 gAreaTilesets_HouseInteriors2:: @ 08101944
@@ -535,7 +535,7 @@ gAreaTilesets_HouseInteriors2:: @ 08101944
 gAreaTileset_HouseInteriors4_0:: @ 08101950
 	tileset_tiles offset_gAreaTileset_HouseInteriors4_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HouseInteriors4_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 89, 1
 
 gAreaTilesets_HouseInteriors4:: @ 08101980
@@ -544,7 +544,7 @@ gAreaTilesets_HouseInteriors4:: @ 08101980
 gAreaTileset_HouseInteriors3_0:: @ 08101984
 	tileset_tiles offset_gAreaTileset_HouseInteriors3_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_HouseInteriors3_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 53, 1
 
 gAreaTilesets_HouseInteriors3:: @ 081019B4
@@ -553,46 +553,46 @@ gAreaTilesets_HouseInteriors3:: @ 081019B4
 gAreaTileset_TreeInteriors_0:: @ 081019B8
 	tileset_tiles offset_gAreaTileset_TreeInteriors_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_TreeInteriors_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 13, 1
 
 gAreaTilesets_TreeInteriors:: @ 081019E8
 	.4byte gAreaTileset_TreeInteriors_0
 
 gAreaTileset_Dojos_0:: @ 081019EC
-	tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 150, 1
 
 gAreaTileset_Dojos_1:: @ 08101A1C
-	tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 149, 1
 
 gAreaTileset_Dojos_2:: @ 08101A4C
-	tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 148, 1
 
 gAreaTileset_Dojos_3:: @ 08101A7C
-	tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 146, 1
 
 gAreaTileset_Dojos_4:: @ 08101AAC
-	tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 147, 1
 
 gAreaTileset_Dojos_5:: @ 08101ADC
-	tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Dojos_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 45, 1
 
 gAreaTilesets_Dojos:: @ 08101B0C
@@ -604,33 +604,33 @@ gAreaTilesets_Dojos:: @ 08101B0C
 	.4byte gAreaTileset_Dojos_5
 
 gAreaTileset_MinishCracks_0:: @ 08101B24
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 153, 1
 
 gAreaTileset_MinishCracks_1:: @ 08101B54
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 152, 1
 
 gAreaTileset_MinishCracks_2:: @ 08101B84
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 154, 1
 
 gAreaTileset_MinishCracks_3:: @ 08101BB4
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 34, 1
 
 gAreaTileset_MinishCracks_4:: @ 08101BE4
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_MinishCracks_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 151, 1
 
 gAreaTilesets_MinishCracks:: @ 08101C14
@@ -652,7 +652,7 @@ gAreaTilesets_ArmosInteriors:: @ 08101C58
 gAreaTileset_MinishRafters_0:: @ 08101C5C
 	tileset_tiles offset_gAreaTileset_MinishRafters_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_MinishRafters_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 121, 1
 
 gAreaTilesets_MinishRafters:: @ 08101C8C
@@ -670,7 +670,7 @@ gAreaTilesets_GoronCave:: @ 08101CC0
 gAreaTileset_WindTribeTower_0:: @ 08101CC4
 	tileset_tiles offset_gAreaTileset_WindTribeTower_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_WindTribeTower_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 126, 1
 
 gAreaTilesets_WindTribeTower:: @ 08101CF4
@@ -695,18 +695,18 @@ gAreaTilesets_MinishCaves:: @ 08101D5C
 	.4byte gAreaTileset_MinishCaves_0
 
 gAreaTileset_CastleGardenMinishHoles_0:: @ 08101D60
-	tileset_tiles offset_gAreaTileset_37_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_37_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_37_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastleGardenMinishHoles_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastleGardenMinishHoles_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastleGardenMinishHoles_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 159, 1
 
 gAreaTilesets_CastleGardenMinishHoles:: @ 08101D90
 	.4byte gAreaTileset_CastleGardenMinishHoles_0
 
 gAreaTileset_37_0:: @ 08101D94
-	tileset_tiles offset_gAreaTileset_37_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_37_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_37_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastleGardenMinishHoles_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastleGardenMinishHoles_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CastleGardenMinishHoles_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 160, 1
 
 gAreaTilesets_37:: @ 08101DC4
@@ -715,34 +715,34 @@ gAreaTilesets_37:: @ 08101DC4
 gAreaTileset_EzloCutscene_0:: @ 08101DC8
 	tileset_tiles offset_gAreaTileset_EzloCutscene_0_0, 0x6000000, 0x4000, 1
 	tileset_tiles offset_gAreaTileset_EzloCutscene_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_HouseInteriors1_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 161, 1
 
 gAreaTilesets_EzloCutscene:: @ 08101DF8
 	.4byte gAreaTileset_EzloCutscene_0
 
 gAreaTileset_HyruleTownUnderground_0:: @ 08101DFC
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 109, 1
 
 gAreaTilesets_HyruleTownUnderground:: @ 08101E2C
 	.4byte gAreaTileset_HyruleTownUnderground_0
 
 gAreaTileset_SimonsSimulation_0:: @ 08101E30
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 15, 1
 
 gAreaTilesets_SimonsSimulation:: @ 08101E60
 	.4byte gAreaTileset_SimonsSimulation_0
 
 gAreaTileset_40_0:: @ 08101E64
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_SimonsSimulation_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_40_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 15, 1
 
 gAreaTilesets_40:: @ 08101E94
@@ -831,9 +831,9 @@ gAreaTilesets_TempleOfDroplets:: @ 08102074
 	.4byte gAreaTileset_TempleOfDroplets_0
 
 gAreaTileset_61_0:: @ 08102078
-	tileset_tiles offset_gAreaTileset_61_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_61_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_61_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Null61_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Null61_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_Null61_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 104, 1
 
 gAreaTilesets_61:: @ 081020A8
@@ -858,10 +858,10 @@ gAreaTilesets_RoyalCrypt:: @ 08102110
 	.4byte gAreaTileset_RoyalCrypt_0
 
 gAreaTileset_PalaceOfWinds_GyorgTornado:: @ 08102114
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_2, 0x6008000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_3, 0x600F000, 0x800, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_PalaceOfWinds_0_3, 0x600F000, 0x800, 1
 	tileset_palette_set 56, 1
 
 gAreaTilesets_PalaceOfWinds:: @ 08102150
@@ -904,9 +904,9 @@ gAreaTilesets_SanctuaryEntrance:: @ 08102220
 	.4byte gAreaTileset_SanctuaryEntrance_0
 
 gAreaTileset_DarkHyruleCastle_1FEntrance:: @ 08102224
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_DarkHyruleCastle_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 59, 1
 
 gAreaTilesets_DarkHyruleCastle:: @ 08102254
@@ -959,45 +959,45 @@ gAreaTilesets_Vaati2:: @ 08102364
 	.4byte gAreaTileset_Vaati2_0
 
 gAreaTileset_45_0:: @ 08102368
-	tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 35, 1
 
 gAreaTilesets_45:: @ 08102398
 	.4byte gAreaTileset_45_0
 
 gAreaTileset_CastorCaves_0:: @ 0810239C
-	tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 101, 1
 
 gAreaTilesets_CastorCaves:: @ 081023CC
 	.4byte gAreaTileset_CastorCaves_0
 
 gAreaTileset_Caves_0:: @ 081023D0
-	tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 131, 1
 
 gAreaTilesets_Caves:: @ 08102400
 	.4byte gAreaTileset_Caves_0
 
 gAreaTileset_VeilFallsCaves_0:: @ 08102404
-	tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 132, 1
 
 gAreaTilesets_VeilFallsCaves:: @ 08102434
 	.4byte gAreaTileset_VeilFallsCaves_0
 
 gAreaTileset_RoyalValleyGraves_0:: @ 08102438
-	tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1
-	tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_0, 0x6000000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_1, 0x6004000, 0x4000, 1
+	tileset_tiles offset_gAreaTileset_CrenelCaves_0_2, 0x6008000, 0x4000, 1
 	tileset_palette_set 133, 1
 
 gAreaTilesets_RoyalValleyGraves:: @ 08102468