Extract some map data definitions

3 files changed, 70 insertions, 438 deletions

diff --git a/data/const/entity.s b/data/const/entity.s
deleted file mode 100644
index af8d9ff0..00000000
--- a/data/const/entity.s
+++ /dev/null
@@ -1,380 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108E6C:: @ 08108E6C
-	.incbin "data_08108E6C/gUnk_08108E6C.bin"
-
-gUnk_08108E78:: @ 08108E78
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108E78_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108E78_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108E90:: @ 08108E90
-	.4byte gUnk_08108E6C
-	.4byte gUnk_08108E78
-
-gUnk_08108E98:: @ 08108E98
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108E98_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108E98_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108EA4:: @ 08108EA4
-	.incbin "data_08108E6C/gUnk_08108EA4.bin"
-
-gUnk_08108EBC:: @ 08108EBC
-	.4byte gUnk_08108E98
-	.4byte gUnk_08108EA4
-
-gUnk_08108EC4:: @ 08108EC4
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108EC4_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108EC4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108ED0:: @ 08108ED0
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108ED0_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108ED0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108EE8:: @ 08108EE8
-	.4byte gUnk_08108EC4
-	.4byte gUnk_08108ED0
-
-gUnk_08108EF0:: @ 08108EF0
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108EF0_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108EF0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108EFC:: @ 08108EFC
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108EFC_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108EFC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F14:: @ 08108F14
-	.4byte gUnk_08108EF0
-	.4byte gUnk_08108EFC
-
-gUnk_08108F1C:: @ 08108F1C
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108F1C_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F1C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F28:: @ 08108F28
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08108F28_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F28_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F40:: @ 08108F40
-	.4byte gUnk_08108F1C
-	.4byte gUnk_08108F28
-
-gUnk_08108F48:: @ 08108F48
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108F48_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F48_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108F48_2_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F48_3_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F54:: @ 08108F54
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108F54_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F54_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F6C:: @ 08108F6C
-	.4byte gUnk_08108F48
-	.4byte gUnk_08108F54
-
-gUnk_08108F74:: @ 08108F74
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108F74_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F74_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F80:: @ 08108F80
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108F80_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108F80_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108F98:: @ 08108F98
-	.4byte gUnk_08108F74
-	.4byte gUnk_08108F80
-
-gUnk_08108FA0:: @ 08108FA0
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108FA0_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108FA0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108FAC:: @ 08108FAC
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108FAC_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108FAC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108FC4:: @ 08108FC4
-	.4byte gUnk_08108FA0
-	.4byte gUnk_08108FAC
-
-gUnk_08108FCC:: @ 08108FCC
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108FCC_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108FCC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108FD8:: @ 08108FD8
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108FD8_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108FD8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108FF0:: @ 08108FF0
-	.4byte gUnk_08108FCC
-	.4byte gUnk_08108FD8
-
-gUnk_08108FF8:: @ 08108FF8
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08108FF8_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08108FF8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109004:: @ 08109004
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109004_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109004_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109004_2_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109004_3_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109004_4_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109004_5_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0810901C:: @ 0810901C
-	.4byte gUnk_08108FF8
-	.4byte gUnk_08109004
-
-gUnk_08109024:: @ 08109024
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109024_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109024_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109030:: @ 08109030
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109030_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109030_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109030_2_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109030_3_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109048:: @ 08109048
-	.4byte gUnk_08109024
-	.4byte gUnk_08109030
-
-gUnk_08109050:: @ 08109050
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109050_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109050_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0810905C:: @ 0810905C
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_0810905C_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_0810905C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109074:: @ 08109074
-	.4byte gUnk_08109050
-	.4byte gUnk_0810905C
-
-gUnk_0810907C:: @ 0810907C
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_0810907C_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_0810907C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109088:: @ 08109088
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109088_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109088_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081090A0:: @ 081090A0
-	.4byte gUnk_0810907C
-	.4byte gUnk_08109088
-
-gUnk_081090A8:: @ 081090A8
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_081090A8_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_081090A8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081090B4:: @ 081090B4
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_081090B4_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_081090B4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081090CC:: @ 081090CC
-	.4byte gUnk_081090A8
-	.4byte gUnk_081090B4
-
-gUnk_081090D4:: @ 081090D4
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_081090D4_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_081090D4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081090E0:: @ 081090E0
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_081090E0_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_081090E0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081090F8:: @ 081090F8
-	.4byte gUnk_081090D4
-	.4byte gUnk_081090E0
-
-gUnk_08109100:: @ 08109100
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109100_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109100_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0810910C:: @ 0810910C
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_0810910C_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_0810910C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109124:: @ 08109124
-	.4byte gUnk_08109100
-	.4byte gUnk_0810910C
-
-gUnk_0810912C:: @ 0810912C
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_0810912C_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_0810912C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109138:: @ 08109138
-	.4byte gUnk_0810912C
-	.4byte gUnk_081090E0
-
-gUnk_08109140:: @ 08109140
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109140_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109140_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109158:: @ 08109158
-	.4byte gUnk_08109100
-	.4byte gUnk_08109140
-
-gUnk_08109160:: @ 08109160
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_08108E6C/gUnk_08109160_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109160_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08109178:: @ 08109178
-	.4byte gUnk_081090D4
-	.4byte gUnk_08109160
-
-gUnk_08109180:: @ 08109180
-.ifdef EU
-	.incbin "data_08108E6C/gUnk_08109180_EU.bin"
-.else
-	.incbin "data_08108E6C/gUnk_08109180_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0810918C:: @ 0810918C
-	.4byte gUnk_08109180
-	.4byte gUnk_0810910C
-
-@ scroll.c
-gUnk_08109194:: @ 08109194
-	.4byte gUnk_08108E90
-	.4byte gUnk_08108EBC
-	.4byte gUnk_08108EE8
-	.4byte gUnk_08108F14
-	.4byte gUnk_08108F40
-	.4byte gUnk_08108F6C
-	.4byte gUnk_08108F98
-	.4byte gUnk_08108FC4
-	.4byte gUnk_08108FF0
-	.4byte gUnk_0810901C
-	.4byte gUnk_08109048
-	.4byte gUnk_08109074
-	.4byte gUnk_081090A0
-	.4byte gUnk_081090CC
-	.4byte gUnk_081090F8
-	.4byte gUnk_08109124
-	.4byte gUnk_08109138
-	.4byte gUnk_08109158
-	.4byte gUnk_08109178
-	.4byte gUnk_0810918C
diff --git a/data/map/map_data.s b/data/map/map_data.s
index 83e1d78f..17a9bad8 100644
--- a/data/map/map_data.s
+++ b/data/map/map_data.s
@@ -27,8 +27,10 @@ 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"
+gCaveBorder_LakeWoods_outside::
+	.incbin "maps/areas/000_MinishWoods/rooms/00_Main/gCaveBorder_LakeWoods_outside.bin.lz"
+gCaveBorder_LakeWoods_unused::
+	.incbin "maps/areas/000_MinishWoods/rooms/00_Main/gCaveBorder_LakeWoods_unused.bin.lz"
 gAreaTileset_LakeHylia_0_0::
 	.incbin "maps/areas/011_LakeHylia/tilesets/0/gAreaTileset_LakeHylia_0_0.4bpp.lz"
 gAreaTileset_LakeHylia_0_1::
@@ -47,8 +49,8 @@ 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"
+gCaveBorder_LakeHyliaNorth_outside::
+	.incbin "maps/areas/011_LakeHylia/rooms/00_Main/gCaveBorder_LakeHyliaNorth_outside.bin.lz"
 gAreaRoomMap_LakeHylia_Beanstalk_bottom::
 	.incbin "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_bottom.bin.lz"
 gAreaRoomMap_LakeHylia_Beanstalk_top::
@@ -71,8 +73,8 @@ 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"
+gCaveBorder_CastorWilds_outside::
+	.incbin "maps/areas/004_CastorWilds/rooms/00_Main/gCaveBorder_CastorWilds_outside.bin.lz"
 gAreaRoomMap_Ruins_Entrance_bottom::
 	.incbin "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_bottom.bin.lz"
 gAreaRoomMap_Ruins_Entrance_top::
@@ -123,8 +125,8 @@ 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"
+gCaveBorder_HyruleTown_outside::
+	.incbin "maps/areas/002_HyruleTown/rooms/00_Main/gCaveBorder_HyruleTown_outside.bin.lz"
 gAreaRoomMap_FestivalTown_Main_bottom::
 	.incbin "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_bottom.bin.lz"
 gAreaRoomMap_FestivalTown_Main_top::
@@ -151,8 +153,8 @@ 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"
+gCaveBorder_Crenel_outside::
+	.incbin "maps/areas/006_MtCrenel/rooms/01_WallClimb/gCaveBorder_Crenel_outside.bin.lz"
 gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom::
 	.incbin "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom.bin.lz"
 gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top::
@@ -201,26 +203,26 @@ 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_EasternHillsSouth_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/02_EasternHillsSouth/gAreaRoomMap_HyruleField_EasternHillsSouth_bottom.bin.lz"
+gAreaRoomMap_HyruleField_EasternHillsSouth_top::
+	.incbin "maps/areas/003_HyruleField/rooms/02_EasternHillsSouth/gAreaRoomMap_HyruleField_EasternHillsSouth_top.bin.lz"
+gAreaRoomMap_HyruleField_EasternHillsCenter_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/03_EasternHillsCenter/gAreaRoomMap_HyruleField_EasternHillsCenter_bottom.bin.lz"
+gAreaRoomMap_HyruleField_EasternHillsCenter_top::
+	.incbin "maps/areas/003_HyruleField/rooms/03_EasternHillsCenter/gAreaRoomMap_HyruleField_EasternHillsCenter_top.bin.lz"
+gAreaRoomMap_HyruleField_EasternHillsNorth_bottom::
+	.incbin "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gAreaRoomMap_HyruleField_EasternHillsNorth_bottom.bin.lz"
+gAreaRoomMap_HyruleField_EasternHillsNorth_top::
+	.incbin "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gAreaRoomMap_HyruleField_EasternHillsNorth_top.bin.lz"
+gCaveBorder_EasternHills_outside::
+	.incbin "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gCaveBorder_EasternHills_outside.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"
+gCaveBorder_LonLonRanch_outside::
+	.incbin "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gCaveBorder_LonLonRanch_outside.bin.lz"
 gAreaRoomMap_HyruleField_NorthHyruleField_bottom::
 	.incbin "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_bottom.bin.lz"
 gAreaRoomMap_HyruleField_NorthHyruleField_top::
@@ -229,8 +231,8 @@ 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"
+gCaveBorder_TrilbyHighlands_outside::
+	.incbin "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gCaveBorder_TrilbyHighlands_outside.bin.lz"
 gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom::
 	.incbin "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom.bin.lz"
 gAreaRoomMap_HyruleField_WesternWoodsNorth_top::
@@ -319,8 +321,8 @@ 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"
+gCaveBorder_VeilFalls_outside::
+	.incbin "maps/areas/010_VeilFalls/rooms/00_Main/gCaveBorder_VeilFalls_outside.bin.lz"
 gAreaTileset_VeilFallsTop_0_2::
 	.incbin "maps/areas/026_VeilFallsTop/tilesets/0/gAreaTileset_VeilFallsTop_0_2.4bpp.lz"
 gAreaRoomMap_VeilFallsTop_0_bottom::
@@ -827,56 +829,56 @@ gAreaTileset_HyliaDigCaves_0_4::
 	.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"
+gCaveBorder_LakeWoods_inside::
+	.incbin "maps/areas/012_LakeWoodsCave/rooms/00_Main/gCaveBorder_LakeWoods_inside.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"
+gCaveBorder_LakeHyliaCenter_inside::
+	.incbin "maps/areas/025_HyliaDigCaves/rooms/00_0/gCaveBorder_LakeHyliaCenter_inside.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"
+gCaveBorder_LakeHyliaNorth_inside::
+	.incbin "maps/areas/025_HyliaDigCaves/rooms/01_1/gCaveBorder_LakeHyliaNorth_inside.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"
+gCaveBorder_CastorWilds_inside::
+	.incbin "maps/areas/023_CastorWildsDigCave/rooms/00_0/gCaveBorder_CastorWilds_inside.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"
+gCaveBorder_HyruleTown_inside::
+	.incbin "maps/areas/015_HyruleDigCaves/rooms/00_Town/gCaveBorder_HyruleTown_inside.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"
+gCaveBorder_Crenel_inside::
+	.incbin "maps/areas/020_CrenelDigCave/rooms/00_0/gCaveBorder_Crenel_inside.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"
+gCaveBorder_EasternHills_inside::
+	.incbin "maps/areas/019_DigCaves/rooms/00_EasternHills/gCaveBorder_EasternHills_inside.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"
+gCaveBorder_TrilbyHighlands_inside::
+	.incbin "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gCaveBorder_TrilbyHighlands_inside.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"
+gCaveBorder_VeilFalls_inside::
+	.incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gCaveBorder_VeilFalls_inside.bin.lz"
 gAreaRoomMap_VeilFallsDigCave_0_top::
 	.incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_top.bin.lz"
 gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom::
@@ -2685,8 +2687,14 @@ gAreaMetaTileset_PalaceOfWindsBoss_top::
 	.incbin "maps/areas/113_PalaceOfWindsBoss/metatileset/gAreaMetaTileset_PalaceOfWindsBoss_top.bin.lz"
 gAreaMetaTilesetTypes_PalaceOfWindsBoss_top::
 	.incbin "maps/areas/113_PalaceOfWindsBoss/metatileset/gAreaMetaTilesetTypes_PalaceOfWindsBoss_top.bin.lz"
-unknown_134::
-	.incbin "assets/unknown_134.bin"
+gyorgMapping_2_bottom::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_2_bottom.bin.lz"
+gyorgMapping_3_bottom::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_3_bottom.bin.lz"
+gyorgMapping_1_bottom::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_1_bottom.bin.lz"
+gyorgMapping_0_bottom::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_0_bottom.bin.lz"
 gAreaTileset_PalaceOfWindsBoss_0_2::
 	.incbin "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_2.4bpp.lz"
 gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom::
@@ -2997,8 +3005,12 @@ gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top::
 	.incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/dungeon_map.bin"
 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"
+gyorgRoomMap_1_top::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_1_top.bin.lz"
+gyorgRoomMap_2_top::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_2_top.bin.lz"
+gyorgRoomMap_3_top::
+	.incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_3_top.bin.lz"
 gAreaTileset_Sanctuary_0_0::
 	.incbin "maps/areas/120_Sanctuary/tilesets/0/gAreaTileset_Sanctuary_0_0.4bpp.lz"
 gAreaTileset_Sanctuary_0_1::
diff --git a/data/map/map_headers.s b/data/map/map_headers.s
index f1c8118c..bbe7f997 100755
--- a/data/map/map_headers.s
+++ b/data/map/map_headers.s
@@ -117,22 +117,22 @@ gAreaRoomMap_HyruleField_1:: @ 081034D0
 	map_top offset_gAreaRoomMap_HyruleField_SouthHyruleField_top, 0x152A, 1, 1
 
 gAreaRoomMap_HyruleField_2:: @ 0810350C
-	map_bottom offset_gAreaRoomMap_HyruleField_EasternHilllsSouth_bottom, 0x30C, 1
-	map_top offset_gAreaRoomMap_HyruleField_EasternHilllsSouth_top, 0x30C, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_EasternHillsSouth_bottom, 0x30C, 1
+	map_top offset_gAreaRoomMap_HyruleField_EasternHillsSouth_top, 0x30C, 1, 1
 
 gAreaRoomMap_HyruleField_3:: @ 08103524
 	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_EasternHilllsCenter_bottom, 0x3C0, 1
-	map_top offset_gAreaRoomMap_HyruleField_EasternHilllsCenter_top, 0x3C0, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_EasternHillsCenter_bottom, 0x3C0, 1
+	map_top offset_gAreaRoomMap_HyruleField_EasternHillsCenter_top, 0x3C0, 1, 1
 
 gAreaRoomMap_HyruleField_4:: @ 08103560
 	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_EasternHilllsNorth_bottom, 0x7F8, 1
-	map_top offset_gAreaRoomMap_HyruleField_EasternHilllsNorth_top, 0x7F8, 1, 1
+	map_bottom offset_gAreaRoomMap_HyruleField_EasternHillsNorth_bottom, 0x7F8, 1
+	map_top offset_gAreaRoomMap_HyruleField_EasternHillsNorth_top, 0x7F8, 1, 1
 
 gAreaRoomMap_HyruleField_5:: @ 0810359C
 	tileset_tiles offset_gAreaTileset_HyruleField_1_0, 0x6000000, 0x4000, 1