convert map data to json

Missingmew · May 13, 2019 · 55d66b5 · 55d66b5
1 parent 4b98d7d
commit 55d66b5
Show file tree

Hide file tree

Showing 2,117 changed files with 53,867 additions and 19,940 deletions.
diff --git a/Makefile b/Makefile
@@ -45,6 +45,7 @@ SCANINC := tools/scaninc/scaninc
 PREPROC := tools/preproc/preproc
 RAMSCRGEN := tools/ramscrgen/ramscrgen
 FIX := tools/gbafix/gbafix
+MAPJSON := tools/mapjson/mapjson
 
 # Clear the default suffixes
 .SUFFIXES:
@@ -85,6 +86,9 @@ clean: tidy
 	rm -f sound/direct_sound_samples/*.bin
 	rm -f $(SONG_OBJS)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
+	rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
+	rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
+	find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
 	@$(MAKE) -C berry_fix clean
 
 tidy:
@@ -94,6 +98,7 @@ tidy:
 
 include graphics_file_rules.mk
 include tileset_rules.mk
+include map_data_rules.mk
 
 %.s: ;
 %.png: ;

diff --git a/asm/macros/map.inc b/asm/macros/map.inc
@@ -53,6 +53,10 @@
 	inc _num_signs
 	.endm
 
+	.macro bg_hidden_item_event x, y, height, item, flag, unknown
+	bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown
+	.endm
+
 	.macro map_events npcs, warps, traps, signs
 	.byte _num_npcs, _num_warps, _num_traps, _num_signs
 	.4byte \npcs, \warps, \traps, \signs

diff --git a/build_tools.sh b/build_tools.sh
@@ -7,3 +7,4 @@ make -C tools/preproc CXX=${1:-g++}
 make -C tools/ramscrgen CXX=${1:-g++}
 make -C tools/rsfont CXX=${1:-g++}
 make -C tools/scaninc CXX=${1:-g++}
+make -C tools/mapjson CXX=${1:-g++}
diff --git a/constants/constants.inc b/constants/constants.inc
@@ -2,7 +2,7 @@
 	.include "constants/misc_constants.inc"
 	.include "constants/type_constants.inc"
 	.include "constants/contest_constants.inc"
-	.include "constants/item_data_constants.inc"
+@	.include "constants/item_data_constants.inc"
 	.include "constants/battle_move_constants.inc"
 	.include "constants/trainer_constants.inc"
 	.include "constants/berry_constants.inc"

diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore
@@ -0,0 +1,2 @@
+layouts.inc
+layouts_table.inc
diff --git a/...ts/BirthIsland_Exterior_Layout/border.bin → data/layouts/BirthIsland_Exterior/border.bin b/...ts/BirthIsland_Exterior_Layout/border.bin → data/layouts/BirthIsland_Exterior/border.bin
diff --git a/...youts/BirthIsland_Exterior_Layout/map.bin → data/layouts/BirthIsland_Exterior/map.bin b/...youts/BirthIsland_Exterior_Layout/map.bin → data/layouts/BirthIsland_Exterior/map.bin
diff --git a/data/layouts/CeladonCity_Layout/border.bin → data/layouts/CeladonCity/border.bin b/data/layouts/CeladonCity_Layout/border.bin → data/layouts/CeladonCity/border.bin
diff --git a/data/layouts/CeladonCity_Layout/map.bin → data/layouts/CeladonCity/map.bin b/data/layouts/CeladonCity_Layout/map.bin → data/layouts/CeladonCity/map.bin
diff --git a/...donCity_Condominiums_1F_Layout/border.bin → ...ts/CeladonCity_Condominiums_1F/border.bin b/...donCity_Condominiums_1F_Layout/border.bin → ...ts/CeladonCity_Condominiums_1F/border.bin
diff --git a/...eladonCity_Condominiums_1F_Layout/map.bin → ...youts/CeladonCity_Condominiums_1F/map.bin b/...eladonCity_Condominiums_1F_Layout/map.bin → ...youts/CeladonCity_Condominiums_1F/map.bin
diff --git a/...donCity_Condominiums_2F_Layout/border.bin → ...ts/CeladonCity_Condominiums_2F/border.bin b/...donCity_Condominiums_2F_Layout/border.bin → ...ts/CeladonCity_Condominiums_2F/border.bin
diff --git a/...eladonCity_Condominiums_2F_Layout/map.bin → ...youts/CeladonCity_Condominiums_2F/map.bin b/...eladonCity_Condominiums_2F_Layout/map.bin → ...youts/CeladonCity_Condominiums_2F/map.bin
diff --git a/...donCity_Condominiums_3F_Layout/border.bin → ...ts/CeladonCity_Condominiums_3F/border.bin b/...donCity_Condominiums_3F_Layout/border.bin → ...ts/CeladonCity_Condominiums_3F/border.bin
diff --git a/...eladonCity_Condominiums_3F_Layout/map.bin → ...youts/CeladonCity_Condominiums_3F/map.bin b/...eladonCity_Condominiums_3F_Layout/map.bin → ...youts/CeladonCity_Condominiums_3F/map.bin
diff --git a/...nCity_Condominiums_Roof_Layout/border.bin → .../CeladonCity_Condominiums_Roof/border.bin b/...nCity_Condominiums_Roof_Layout/border.bin → .../CeladonCity_Condominiums_Roof/border.bin
diff --git a/...adonCity_Condominiums_Roof_Layout/map.bin → ...uts/CeladonCity_Condominiums_Roof/map.bin b/...adonCity_Condominiums_Roof_Layout/map.bin → ...uts/CeladonCity_Condominiums_Roof/map.bin
diff --git a/...y_Condominiums_RoofRoom_Layout/border.bin → ...adonCity_Condominiums_RoofRoom/border.bin b/...y_Condominiums_RoofRoom_Layout/border.bin → ...adonCity_Condominiums_RoofRoom/border.bin
diff --git a/...City_Condominiums_RoofRoom_Layout/map.bin → ...CeladonCity_Condominiums_RoofRoom/map.bin b/...City_Condominiums_RoofRoom_Layout/map.bin → ...CeladonCity_Condominiums_RoofRoom/map.bin
diff --git a/...City_DepartmentStore_1F_Layout/border.bin → ...CeladonCity_DepartmentStore_1F/border.bin b/...City_DepartmentStore_1F_Layout/border.bin → ...CeladonCity_DepartmentStore_1F/border.bin
diff --git a/...donCity_DepartmentStore_1F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_1F/map.bin b/...donCity_DepartmentStore_1F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_1F/map.bin
diff --git a/...City_DepartmentStore_2F_Layout/border.bin → ...CeladonCity_DepartmentStore_2F/border.bin b/...City_DepartmentStore_2F_Layout/border.bin → ...CeladonCity_DepartmentStore_2F/border.bin
diff --git a/...donCity_DepartmentStore_2F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_2F/map.bin b/...donCity_DepartmentStore_2F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_2F/map.bin
diff --git a/...City_DepartmentStore_3F_Layout/border.bin → ...CeladonCity_DepartmentStore_3F/border.bin b/...City_DepartmentStore_3F_Layout/border.bin → ...CeladonCity_DepartmentStore_3F/border.bin
diff --git a/...donCity_DepartmentStore_3F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_3F/map.bin b/...donCity_DepartmentStore_3F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_3F/map.bin
diff --git a/...City_DepartmentStore_4F_Layout/border.bin → ...CeladonCity_DepartmentStore_4F/border.bin b/...City_DepartmentStore_4F_Layout/border.bin → ...CeladonCity_DepartmentStore_4F/border.bin
diff --git a/...donCity_DepartmentStore_4F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_4F/map.bin b/...donCity_DepartmentStore_4F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_4F/map.bin
diff --git a/...City_DepartmentStore_5F_Layout/border.bin → ...CeladonCity_DepartmentStore_5F/border.bin b/...City_DepartmentStore_5F_Layout/border.bin → ...CeladonCity_DepartmentStore_5F/border.bin
diff --git a/...donCity_DepartmentStore_5F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_5F/map.bin b/...donCity_DepartmentStore_5F_Layout/map.bin → ...ts/CeladonCity_DepartmentStore_5F/map.bin
diff --git a/...epartmentStore_Elevator_Layout/border.bin → ...nCity_DepartmentStore_Elevator/border.bin b/...epartmentStore_Elevator_Layout/border.bin → ...nCity_DepartmentStore_Elevator/border.bin
diff --git a/...y_DepartmentStore_Elevator_Layout/map.bin → ...adonCity_DepartmentStore_Elevator/map.bin b/...y_DepartmentStore_Elevator_Layout/map.bin → ...adonCity_DepartmentStore_Elevator/map.bin
diff --git a/...ty_DepartmentStore_Roof_Layout/border.bin → ...ladonCity_DepartmentStore_Roof/border.bin b/...ty_DepartmentStore_Roof_Layout/border.bin → ...ladonCity_DepartmentStore_Roof/border.bin
diff --git a/...nCity_DepartmentStore_Roof_Layout/map.bin → .../CeladonCity_DepartmentStore_Roof/map.bin b/...nCity_DepartmentStore_Roof_Layout/map.bin → .../CeladonCity_DepartmentStore_Roof/map.bin
diff --git a/.../CeladonCity_GameCorner_Layout/border.bin → ...layouts/CeladonCity_GameCorner/border.bin b/.../CeladonCity_GameCorner_Layout/border.bin → ...layouts/CeladonCity_GameCorner/border.bin
diff --git a/...uts/CeladonCity_GameCorner_Layout/map.bin → data/layouts/CeladonCity_GameCorner/map.bin b/...uts/CeladonCity_GameCorner_Layout/map.bin → data/layouts/CeladonCity_GameCorner/map.bin
diff --git a/...ty_GameCorner_PrizeRoom_Layout/border.bin → ...ladonCity_GameCorner_PrizeRoom/border.bin b/...ty_GameCorner_PrizeRoom_Layout/border.bin → ...ladonCity_GameCorner_PrizeRoom/border.bin
diff --git a/...nCity_GameCorner_PrizeRoom_Layout/map.bin → .../CeladonCity_GameCorner_PrizeRoom/map.bin b/...nCity_GameCorner_PrizeRoom_Layout/map.bin → .../CeladonCity_GameCorner_PrizeRoom/map.bin
diff --git a/...layouts/CeladonCity_Gym_Layout/border.bin → data/layouts/CeladonCity_Gym/border.bin b/...layouts/CeladonCity_Gym_Layout/border.bin → data/layouts/CeladonCity_Gym/border.bin
diff --git a/data/layouts/CeladonCity_Gym_Layout/map.bin → data/layouts/CeladonCity_Gym/map.bin b/data/layouts/CeladonCity_Gym_Layout/map.bin → data/layouts/CeladonCity_Gym/map.bin
diff --git a/...youts/CeladonCity_Hotel_Layout/border.bin → data/layouts/CeladonCity_Hotel/border.bin b/...youts/CeladonCity_Hotel_Layout/border.bin → data/layouts/CeladonCity_Hotel/border.bin
diff --git a/.../layouts/CeladonCity_Hotel_Layout/map.bin → data/layouts/CeladonCity_Hotel/map.bin b/.../layouts/CeladonCity_Hotel_Layout/map.bin → data/layouts/CeladonCity_Hotel/map.bin
diff --git a/.../CeladonCity_Restaurant_Layout/border.bin → ...layouts/CeladonCity_Restaurant/border.bin b/.../CeladonCity_Restaurant_Layout/border.bin → ...layouts/CeladonCity_Restaurant/border.bin
diff --git a/...uts/CeladonCity_Restaurant_Layout/map.bin → data/layouts/CeladonCity_Restaurant/map.bin b/...uts/CeladonCity_Restaurant_Layout/map.bin → data/layouts/CeladonCity_Restaurant/map.bin
diff --git a/...layouts/CeruleanCave_1F_Layout/border.bin → data/layouts/CeruleanCave_1F/border.bin b/...layouts/CeruleanCave_1F_Layout/border.bin → data/layouts/CeruleanCave_1F/border.bin
diff --git a/data/layouts/CeruleanCave_1F_Layout/map.bin → data/layouts/CeruleanCave_1F/map.bin b/data/layouts/CeruleanCave_1F_Layout/map.bin → data/layouts/CeruleanCave_1F/map.bin
diff --git a/...layouts/CeruleanCave_2F_Layout/border.bin → data/layouts/CeruleanCave_2F/border.bin b/...layouts/CeruleanCave_2F_Layout/border.bin → data/layouts/CeruleanCave_2F/border.bin
diff --git a/data/layouts/CeruleanCave_2F_Layout/map.bin → data/layouts/CeruleanCave_2F/map.bin b/data/layouts/CeruleanCave_2F_Layout/map.bin → data/layouts/CeruleanCave_2F/map.bin
diff --git a/...ayouts/CeruleanCave_B1F_Layout/border.bin → data/layouts/CeruleanCave_B1F/border.bin b/...ayouts/CeruleanCave_B1F_Layout/border.bin → data/layouts/CeruleanCave_B1F/border.bin
diff --git a/data/layouts/CeruleanCave_B1F_Layout/map.bin → data/layouts/CeruleanCave_B1F/map.bin b/data/layouts/CeruleanCave_B1F_Layout/map.bin → data/layouts/CeruleanCave_B1F/map.bin
diff --git a/data/layouts/CeruleanCity_Layout/border.bin → data/layouts/CeruleanCity/border.bin b/data/layouts/CeruleanCity_Layout/border.bin → data/layouts/CeruleanCity/border.bin
diff --git a/data/layouts/CeruleanCity_Layout/map.bin → data/layouts/CeruleanCity/map.bin b/data/layouts/CeruleanCity_Layout/map.bin → data/layouts/CeruleanCity/map.bin
diff --git a/...s/CeruleanCity_BikeShop_Layout/border.bin → .../layouts/CeruleanCity_BikeShop/border.bin b/...s/CeruleanCity_BikeShop_Layout/border.bin → .../layouts/CeruleanCity_BikeShop/border.bin
diff --git a/...outs/CeruleanCity_BikeShop_Layout/map.bin → data/layouts/CeruleanCity_BikeShop/map.bin b/...outs/CeruleanCity_BikeShop_Layout/map.bin → data/layouts/CeruleanCity_BikeShop/map.bin
diff --git a/...ayouts/CeruleanCity_Gym_Layout/border.bin → data/layouts/CeruleanCity_Gym/border.bin b/...ayouts/CeruleanCity_Gym_Layout/border.bin → data/layouts/CeruleanCity_Gym/border.bin
diff --git a/data/layouts/CeruleanCity_Gym_Layout/map.bin → data/layouts/CeruleanCity_Gym/map.bin b/data/layouts/CeruleanCity_Gym_Layout/map.bin → data/layouts/CeruleanCity_Gym/map.bin
diff --git a/...uts/CeruleanCity_House1_Layout/border.bin → data/layouts/CeruleanCity_House1/border.bin b/...uts/CeruleanCity_House1_Layout/border.bin → data/layouts/CeruleanCity_House1/border.bin
diff --git a/...ayouts/CeruleanCity_House1_Layout/map.bin → data/layouts/CeruleanCity_House1/map.bin b/...ayouts/CeruleanCity_House1_Layout/map.bin → data/layouts/CeruleanCity_House1/map.bin
diff --git a/...uts/CeruleanCity_House2_Layout/border.bin → data/layouts/CeruleanCity_House2/border.bin b/...uts/CeruleanCity_House2_Layout/border.bin → data/layouts/CeruleanCity_House2/border.bin
diff --git a/...ayouts/CeruleanCity_House2_Layout/map.bin → data/layouts/CeruleanCity_House2/map.bin b/...ayouts/CeruleanCity_House2_Layout/map.bin → data/layouts/CeruleanCity_House2/map.bin
diff --git a/...uts/CeruleanCity_House5_Layout/border.bin → data/layouts/CeruleanCity_House5/border.bin b/...uts/CeruleanCity_House5_Layout/border.bin → data/layouts/CeruleanCity_House5/border.bin
diff --git a/...ayouts/CeruleanCity_House5_Layout/map.bin → data/layouts/CeruleanCity_House5/map.bin b/...ayouts/CeruleanCity_House5_Layout/map.bin → data/layouts/CeruleanCity_House5/map.bin
diff --git a/.../layouts/CinnabarIsland_Layout/border.bin → data/layouts/CinnabarIsland/border.bin b/.../layouts/CinnabarIsland_Layout/border.bin → data/layouts/CinnabarIsland/border.bin
diff --git a/data/layouts/CinnabarIsland_Layout/map.bin → data/layouts/CinnabarIsland/map.bin b/data/layouts/CinnabarIsland_Layout/map.bin → data/layouts/CinnabarIsland/map.bin
diff --git a/...outs/CinnabarIsland_Gym_Layout/border.bin → data/layouts/CinnabarIsland_Gym/border.bin b/...outs/CinnabarIsland_Gym_Layout/border.bin → data/layouts/CinnabarIsland_Gym/border.bin
diff --git a/...layouts/CinnabarIsland_Gym_Layout/map.bin → data/layouts/CinnabarIsland_Gym/map.bin b/...layouts/CinnabarIsland_Gym_Layout/map.bin → data/layouts/CinnabarIsland_Gym/map.bin
diff --git a/...and_PokemonLab_Entrance_Layout/border.bin → ...abarIsland_PokemonLab_Entrance/border.bin b/...and_PokemonLab_Entrance_Layout/border.bin → ...abarIsland_PokemonLab_Entrance/border.bin
diff --git a/...Island_PokemonLab_Entrance_Layout/map.bin → ...innabarIsland_PokemonLab_Entrance/map.bin b/...Island_PokemonLab_Entrance_Layout/map.bin → ...innabarIsland_PokemonLab_Entrance/map.bin
diff --git a/...kemonLab_ExperimentRoom_Layout/border.bin → ...land_PokemonLab_ExperimentRoom/border.bin b/...kemonLab_ExperimentRoom_Layout/border.bin → ...land_PokemonLab_ExperimentRoom/border.bin
diff --git a/..._PokemonLab_ExperimentRoom_Layout/map.bin → ...rIsland_PokemonLab_ExperimentRoom/map.bin b/..._PokemonLab_ExperimentRoom_Layout/map.bin → ...rIsland_PokemonLab_ExperimentRoom/map.bin
diff --git a/...sland_PokemonLab_Lounge_Layout/border.bin → ...nnabarIsland_PokemonLab_Lounge/border.bin b/...sland_PokemonLab_Lounge_Layout/border.bin → ...nnabarIsland_PokemonLab_Lounge/border.bin
diff --git a/...arIsland_PokemonLab_Lounge_Layout/map.bin → .../CinnabarIsland_PokemonLab_Lounge/map.bin b/...arIsland_PokemonLab_Lounge_Layout/map.bin → .../CinnabarIsland_PokemonLab_Lounge/map.bin
diff --git a/...PokemonLab_ResearchRoom_Layout/border.bin → ...Island_PokemonLab_ResearchRoom/border.bin b/...PokemonLab_ResearchRoom_Layout/border.bin → ...Island_PokemonLab_ResearchRoom/border.bin
diff --git a/...nd_PokemonLab_ResearchRoom_Layout/map.bin → ...barIsland_PokemonLab_ResearchRoom/map.bin b/...nd_PokemonLab_ResearchRoom_Layout/map.bin → ...barIsland_PokemonLab_ResearchRoom/map.bin
diff --git a/...ayouts/DiglettsCave_B1F_Layout/border.bin → data/layouts/DiglettsCave_B1F/border.bin b/...ayouts/DiglettsCave_B1F_Layout/border.bin → data/layouts/DiglettsCave_B1F/border.bin
diff --git a/data/layouts/DiglettsCave_B1F_Layout/map.bin → data/layouts/DiglettsCave_B1F/map.bin b/data/layouts/DiglettsCave_B1F_Layout/map.bin → data/layouts/DiglettsCave_B1F/map.bin
diff --git a/...lettsCave_NorthEntrance_Layout/border.bin → ...uts/DiglettsCave_NorthEntrance/border.bin b/...lettsCave_NorthEntrance_Layout/border.bin → ...uts/DiglettsCave_NorthEntrance/border.bin
diff --git a/...DiglettsCave_NorthEntrance_Layout/map.bin → ...ayouts/DiglettsCave_NorthEntrance/map.bin b/...DiglettsCave_NorthEntrance_Layout/map.bin → ...ayouts/DiglettsCave_NorthEntrance/map.bin
diff --git a/...lettsCave_SouthEntrance_Layout/border.bin → ...uts/DiglettsCave_SouthEntrance/border.bin b/...lettsCave_SouthEntrance_Layout/border.bin → ...uts/DiglettsCave_SouthEntrance/border.bin
diff --git a/...DiglettsCave_SouthEntrance_Layout/map.bin → ...ayouts/DiglettsCave_SouthEntrance/map.bin b/...DiglettsCave_SouthEntrance_Layout/map.bin → ...ayouts/DiglettsCave_SouthEntrance/map.bin
diff --git a/data/layouts/Entrance_1F_Layout/border.bin → data/layouts/Entrance_1F/border.bin b/data/layouts/Entrance_1F_Layout/border.bin → data/layouts/Entrance_1F/border.bin
diff --git a/data/layouts/Entrance_1F_Layout/map.bin → data/layouts/Entrance_1F/map.bin b/data/layouts/Entrance_1F_Layout/map.bin → data/layouts/Entrance_1F/map.bin
diff --git a/data/layouts/Entrance_2F_Layout/border.bin → data/layouts/Entrance_2F/border.bin b/data/layouts/Entrance_2F_Layout/border.bin → data/layouts/Entrance_2F/border.bin
diff --git a/data/layouts/Entrance_2F_Layout/map.bin → data/layouts/Entrance_2F/map.bin b/data/layouts/Entrance_2F_Layout/map.bin → data/layouts/Entrance_2F/map.bin
diff --git a/data/layouts/FiveIsland_Layout/border.bin → data/layouts/FiveIsland/border.bin b/data/layouts/FiveIsland_Layout/border.bin → data/layouts/FiveIsland/border.bin
diff --git a/data/layouts/FiveIsland_Layout/map.bin → data/layouts/FiveIsland/map.bin b/data/layouts/FiveIsland_Layout/map.bin → data/layouts/FiveIsland/map.bin
diff --git a/...sland_LostCave_Entrance_Layout/border.bin → ...s/FiveIsland_LostCave_Entrance/border.bin b/...sland_LostCave_Entrance_Layout/border.bin → ...s/FiveIsland_LostCave_Entrance/border.bin
diff --git a/...veIsland_LostCave_Entrance_Layout/map.bin → ...outs/FiveIsland_LostCave_Entrance/map.bin b/...veIsland_LostCave_Entrance_Layout/map.bin → ...outs/FiveIsland_LostCave_Entrance/map.bin
diff --git a/...eIsland_LostCave_Room10_Layout/border.bin → ...outs/FiveIsland_LostCave_Room1/border.bin b/...eIsland_LostCave_Room10_Layout/border.bin → ...outs/FiveIsland_LostCave_Room1/border.bin
diff --git a/.../FiveIsland_LostCave_Room1_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room1/map.bin b/.../FiveIsland_LostCave_Room1_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room1/map.bin
diff --git a/...eIsland_LostCave_Room11_Layout/border.bin → ...uts/FiveIsland_LostCave_Room10/border.bin b/...eIsland_LostCave_Room11_Layout/border.bin → ...uts/FiveIsland_LostCave_Room10/border.bin
diff --git a/...FiveIsland_LostCave_Room10_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room10/map.bin b/...FiveIsland_LostCave_Room10_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room10/map.bin
diff --git a/...eIsland_LostCave_Room12_Layout/border.bin → ...uts/FiveIsland_LostCave_Room11/border.bin b/...eIsland_LostCave_Room12_Layout/border.bin → ...uts/FiveIsland_LostCave_Room11/border.bin
diff --git a/...FiveIsland_LostCave_Room11_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room11/map.bin b/...FiveIsland_LostCave_Room11_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room11/map.bin
diff --git a/...eIsland_LostCave_Room13_Layout/border.bin → ...uts/FiveIsland_LostCave_Room12/border.bin b/...eIsland_LostCave_Room13_Layout/border.bin → ...uts/FiveIsland_LostCave_Room12/border.bin
diff --git a/...FiveIsland_LostCave_Room12_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room12/map.bin b/...FiveIsland_LostCave_Room12_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room12/map.bin
diff --git a/...eIsland_LostCave_Room14_Layout/border.bin → ...uts/FiveIsland_LostCave_Room13/border.bin b/...eIsland_LostCave_Room14_Layout/border.bin → ...uts/FiveIsland_LostCave_Room13/border.bin
diff --git a/...FiveIsland_LostCave_Room13_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room13/map.bin b/...FiveIsland_LostCave_Room13_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room13/map.bin
diff --git a/...veIsland_LostCave_Room1_Layout/border.bin → ...uts/FiveIsland_LostCave_Room14/border.bin b/...veIsland_LostCave_Room1_Layout/border.bin → ...uts/FiveIsland_LostCave_Room14/border.bin
diff --git a/...FiveIsland_LostCave_Room14_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room14/map.bin b/...FiveIsland_LostCave_Room14_Layout/map.bin → ...ayouts/FiveIsland_LostCave_Room14/map.bin
diff --git a/...veIsland_LostCave_Room2_Layout/border.bin → ...outs/FiveIsland_LostCave_Room2/border.bin b/...veIsland_LostCave_Room2_Layout/border.bin → ...outs/FiveIsland_LostCave_Room2/border.bin
diff --git a/.../FiveIsland_LostCave_Room2_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room2/map.bin b/.../FiveIsland_LostCave_Room2_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room2/map.bin
diff --git a/...veIsland_LostCave_Room3_Layout/border.bin → ...outs/FiveIsland_LostCave_Room3/border.bin b/...veIsland_LostCave_Room3_Layout/border.bin → ...outs/FiveIsland_LostCave_Room3/border.bin
diff --git a/.../FiveIsland_LostCave_Room3_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room3/map.bin b/.../FiveIsland_LostCave_Room3_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room3/map.bin
diff --git a/...veIsland_LostCave_Room4_Layout/border.bin → ...outs/FiveIsland_LostCave_Room4/border.bin b/...veIsland_LostCave_Room4_Layout/border.bin → ...outs/FiveIsland_LostCave_Room4/border.bin
diff --git a/.../FiveIsland_LostCave_Room4_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room4/map.bin b/.../FiveIsland_LostCave_Room4_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room4/map.bin
diff --git a/...veIsland_LostCave_Room5_Layout/border.bin → ...outs/FiveIsland_LostCave_Room5/border.bin b/...veIsland_LostCave_Room5_Layout/border.bin → ...outs/FiveIsland_LostCave_Room5/border.bin
diff --git a/.../FiveIsland_LostCave_Room5_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room5/map.bin b/.../FiveIsland_LostCave_Room5_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room5/map.bin
diff --git a/...veIsland_LostCave_Room6_Layout/border.bin → ...outs/FiveIsland_LostCave_Room6/border.bin b/...veIsland_LostCave_Room6_Layout/border.bin → ...outs/FiveIsland_LostCave_Room6/border.bin
diff --git a/.../FiveIsland_LostCave_Room6_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room6/map.bin b/.../FiveIsland_LostCave_Room6_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room6/map.bin
diff --git a/...veIsland_LostCave_Room7_Layout/border.bin → ...outs/FiveIsland_LostCave_Room7/border.bin b/...veIsland_LostCave_Room7_Layout/border.bin → ...outs/FiveIsland_LostCave_Room7/border.bin
diff --git a/.../FiveIsland_LostCave_Room7_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room7/map.bin b/.../FiveIsland_LostCave_Room7_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room7/map.bin
diff --git a/...veIsland_LostCave_Room8_Layout/border.bin → ...outs/FiveIsland_LostCave_Room8/border.bin b/...veIsland_LostCave_Room8_Layout/border.bin → ...outs/FiveIsland_LostCave_Room8/border.bin
diff --git a/.../FiveIsland_LostCave_Room8_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room8/map.bin b/.../FiveIsland_LostCave_Room8_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room8/map.bin
diff --git a/...veIsland_LostCave_Room9_Layout/border.bin → ...outs/FiveIsland_LostCave_Room9/border.bin b/...veIsland_LostCave_Room9_Layout/border.bin → ...outs/FiveIsland_LostCave_Room9/border.bin
diff --git a/.../FiveIsland_LostCave_Room9_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room9/map.bin b/.../FiveIsland_LostCave_Room9_Layout/map.bin → ...layouts/FiveIsland_LostCave_Room9/map.bin
diff --git a/...youts/FiveIsland_Meadow_Layout/border.bin → data/layouts/FiveIsland_Meadow/border.bin b/...youts/FiveIsland_Meadow_Layout/border.bin → data/layouts/FiveIsland_Meadow/border.bin
diff --git a/.../layouts/FiveIsland_Meadow_Layout/map.bin → data/layouts/FiveIsland_Meadow/map.bin b/.../layouts/FiveIsland_Meadow_Layout/map.bin → data/layouts/FiveIsland_Meadow/map.bin
diff --git a/...veIsland_MemorialPillar_Layout/border.bin → ...outs/FiveIsland_MemorialPillar/border.bin b/...veIsland_MemorialPillar_Layout/border.bin → ...outs/FiveIsland_MemorialPillar/border.bin
diff --git a/.../FiveIsland_MemorialPillar_Layout/map.bin → ...layouts/FiveIsland_MemorialPillar/map.bin b/.../FiveIsland_MemorialPillar_Layout/map.bin → ...layouts/FiveIsland_MemorialPillar/map.bin
diff --git a/...veIsland_ResortGorgeous_Layout/border.bin → ...outs/FiveIsland_ResortGorgeous/border.bin b/...veIsland_ResortGorgeous_Layout/border.bin → ...outs/FiveIsland_ResortGorgeous/border.bin
diff --git a/.../FiveIsland_ResortGorgeous_Layout/map.bin → ...layouts/FiveIsland_ResortGorgeous/map.bin b/.../FiveIsland_ResortGorgeous_Layout/map.bin → ...layouts/FiveIsland_ResortGorgeous/map.bin
diff --git a/...nd_ResortGorgeous_House_Layout/border.bin → ...iveIsland_ResortGorgeous_House/border.bin b/...nd_ResortGorgeous_House_Layout/border.bin → ...iveIsland_ResortGorgeous_House/border.bin
diff --git a/...sland_ResortGorgeous_House_Layout/map.bin → ...s/FiveIsland_ResortGorgeous_House/map.bin b/...sland_ResortGorgeous_House_Layout/map.bin → ...s/FiveIsland_ResortGorgeous_House/map.bin
diff --git a/...ourIsland_LoreleisHouse_Layout/border.bin → ...uts/FiveIsland_RocketWarehouse/border.bin b/...ourIsland_LoreleisHouse_Layout/border.bin → ...uts/FiveIsland_RocketWarehouse/border.bin
diff --git a/...uts/SSAnne_CaptainsOffice4_Layout/map.bin → ...ayouts/FiveIsland_RocketWarehouse/map.bin b/...uts/SSAnne_CaptainsOffice4_Layout/map.bin → ...ayouts/FiveIsland_RocketWarehouse/map.bin
diff --git a/...veIsland_WaterLabyrinth_Layout/border.bin → ...outs/FiveIsland_WaterLabyrinth/border.bin b/...veIsland_WaterLabyrinth_Layout/border.bin → ...outs/FiveIsland_WaterLabyrinth/border.bin
diff --git a/.../FiveIsland_WaterLabyrinth_Layout/map.bin → ...layouts/FiveIsland_WaterLabyrinth/map.bin b/.../FiveIsland_WaterLabyrinth_Layout/map.bin → ...layouts/FiveIsland_WaterLabyrinth/map.bin
diff --git a/data/layouts/FourIsland_Layout/border.bin → data/layouts/FourIsland/border.bin b/data/layouts/FourIsland_Layout/border.bin → data/layouts/FourIsland/border.bin
diff --git a/data/layouts/FourIsland_Layout/map.bin → data/layouts/FourIsland/map.bin b/data/layouts/FourIsland_Layout/map.bin → data/layouts/FourIsland/map.bin
diff --git a/...urIsland_IcefallCave_1F_Layout/border.bin → ...outs/FourIsland_IcefallCave_1F/border.bin b/...urIsland_IcefallCave_1F_Layout/border.bin → ...outs/FourIsland_IcefallCave_1F/border.bin
diff --git a/.../FourIsland_IcefallCave_1F_Layout/map.bin → ...layouts/FourIsland_IcefallCave_1F/map.bin b/.../FourIsland_IcefallCave_1F_Layout/map.bin → ...layouts/FourIsland_IcefallCave_1F/map.bin
diff --git a/...nd_IcefallCave_Entrance_Layout/border.bin → ...uts/FourIsland_IcefallCave_B1F/border.bin b/...nd_IcefallCave_Entrance_Layout/border.bin → ...uts/FourIsland_IcefallCave_B1F/border.bin
diff --git a/...uts/SSAnne_CaptainsOffice2_Layout/map.bin → ...ayouts/FourIsland_IcefallCave_B1F/map.bin b/...uts/SSAnne_CaptainsOffice2_Layout/map.bin → ...ayouts/FourIsland_IcefallCave_B1F/map.bin
diff --git a/...ts/MtEmber_RubyPath_B1F_Layout/border.bin → ...ts/FourIsland_IcefallCave_Back/border.bin b/...ts/MtEmber_RubyPath_B1F_Layout/border.bin → ...ts/FourIsland_IcefallCave_Back/border.bin
diff --git a/...uts/SSAnne_CaptainsOffice3_Layout/map.bin → ...youts/FourIsland_IcefallCave_Back/map.bin b/...uts/SSAnne_CaptainsOffice3_Layout/map.bin → ...youts/FourIsland_IcefallCave_Back/map.bin
diff --git a/...ber_RubyPath_B1F_Stairs_Layout/border.bin → ...ourIsland_IcefallCave_Entrance/border.bin b/...ber_RubyPath_B1F_Stairs_Layout/border.bin → ...ourIsland_IcefallCave_Entrance/border.bin
diff --git a/...sland_IcefallCave_Entrance_Layout/map.bin → ...s/FourIsland_IcefallCave_Entrance/map.bin b/...sland_IcefallCave_Entrance_Layout/map.bin → ...s/FourIsland_IcefallCave_Entrance/map.bin
diff --git a/...urIsland_PokemonDayCare_Layout/border.bin → ...youts/FourIsland_LoreleisHouse/border.bin b/...urIsland_PokemonDayCare_Layout/border.bin → ...youts/FourIsland_LoreleisHouse/border.bin
diff --git a/...s/FourIsland_LoreleisHouse_Layout/map.bin → .../layouts/FourIsland_LoreleisHouse/map.bin b/...s/FourIsland_LoreleisHouse_Layout/map.bin → .../layouts/FourIsland_LoreleisHouse/map.bin
diff --git a/...s/FuchsiaCity_Building1_Layout/border.bin → ...outs/FourIsland_PokemonDayCare/border.bin b/...s/FuchsiaCity_Building1_Layout/border.bin → ...outs/FourIsland_PokemonDayCare/border.bin
diff --git a/.../FourIsland_PokemonDayCare_Layout/map.bin → ...layouts/FourIsland_PokemonDayCare/map.bin b/.../FourIsland_PokemonDayCare_Layout/map.bin → ...layouts/FourIsland_PokemonDayCare/map.bin
diff --git a/data/layouts/FuchsiaCity_Layout/border.bin → data/layouts/FuchsiaCity/border.bin b/data/layouts/FuchsiaCity_Layout/border.bin → data/layouts/FuchsiaCity/border.bin
diff --git a/data/layouts/FuchsiaCity_Layout/map.bin → data/layouts/FuchsiaCity/map.bin b/data/layouts/FuchsiaCity_Layout/map.bin → data/layouts/FuchsiaCity/map.bin
diff --git a/...layouts/FuchsiaCity_Gym_Layout/border.bin → .../layouts/FuchsiaCity_Building1/border.bin b/...layouts/FuchsiaCity_Gym_Layout/border.bin → .../layouts/FuchsiaCity_Building1/border.bin
diff --git a/...outs/FuchsiaCity_Building1_Layout/map.bin → data/layouts/FuchsiaCity_Building1/map.bin b/...outs/FuchsiaCity_Building1_Layout/map.bin → data/layouts/FuchsiaCity_Building1/map.bin
diff --git a/...outs/FuchsiaCity_House2_Layout/border.bin → data/layouts/FuchsiaCity_Gym/border.bin b/...outs/FuchsiaCity_House2_Layout/border.bin → data/layouts/FuchsiaCity_Gym/border.bin
diff --git a/data/layouts/FuchsiaCity_Gym_Layout/map.bin → data/layouts/FuchsiaCity_Gym/map.bin b/data/layouts/FuchsiaCity_Gym_Layout/map.bin → data/layouts/FuchsiaCity_Gym/map.bin
diff --git a/...ity_SafariZone_Entrance_Layout/border.bin → data/layouts/FuchsiaCity_House2/border.bin b/...ity_SafariZone_Entrance_Layout/border.bin → data/layouts/FuchsiaCity_House2/border.bin
diff --git a/...layouts/FuchsiaCity_House2_Layout/map.bin → data/layouts/FuchsiaCity_House2/map.bin b/...layouts/FuchsiaCity_House2_Layout/map.bin → data/layouts/FuchsiaCity_House2/map.bin
diff --git a/...FuchsiaCity_ZooBuilding_Layout/border.bin → ...uchsiaCity_SafariZone_Entrance/border.bin b/...FuchsiaCity_ZooBuilding_Layout/border.bin → ...uchsiaCity_SafariZone_Entrance/border.bin
diff --git a/...iaCity_SafariZone_Entrance_Layout/map.bin → ...s/FuchsiaCity_SafariZone_Entrance/map.bin b/...iaCity_SafariZone_Entrance_Layout/map.bin → ...s/FuchsiaCity_SafariZone_Entrance/map.bin
diff --git a/data/layouts/House1_Layout/border.bin → ...ayouts/FuchsiaCity_ZooBuilding/border.bin b/data/layouts/House1_Layout/border.bin → ...ayouts/FuchsiaCity_ZooBuilding/border.bin
diff --git a/...ts/FuchsiaCity_ZooBuilding_Layout/map.bin → data/layouts/FuchsiaCity_ZooBuilding/map.bin b/...ts/FuchsiaCity_ZooBuilding_Layout/map.bin → data/layouts/FuchsiaCity_ZooBuilding/map.bin
diff --git a/data/layouts/House2_Layout/border.bin → data/layouts/House1/border.bin b/data/layouts/House2_Layout/border.bin → data/layouts/House1/border.bin
diff --git a/data/layouts/House1_Layout/map.bin → data/layouts/House1/map.bin b/data/layouts/House1_Layout/map.bin → data/layouts/House1/map.bin
diff --git a/data/layouts/House3_Layout/border.bin → data/layouts/House2/border.bin b/data/layouts/House3_Layout/border.bin → data/layouts/House2/border.bin
diff --git a/data/layouts/House2_Layout/map.bin → data/layouts/House2/map.bin b/data/layouts/House2_Layout/map.bin → data/layouts/House2/map.bin
diff --git a/data/layouts/House4_Layout/border.bin → data/layouts/House3/border.bin b/data/layouts/House4_Layout/border.bin → data/layouts/House3/border.bin
diff --git a/data/layouts/House3_Layout/map.bin → data/layouts/House3/map.bin b/data/layouts/House3_Layout/map.bin → data/layouts/House3/map.bin
diff --git a/data/layouts/House5_Layout/border.bin → data/layouts/House4/border.bin b/data/layouts/House5_Layout/border.bin → data/layouts/House4/border.bin
diff --git a/data/layouts/House4_Layout/map.bin → data/layouts/House4/map.bin b/data/layouts/House4_Layout/map.bin → data/layouts/House4/map.bin
diff --git a/...lateau_PokemonCenter_1F_Layout/border.bin → data/layouts/House5/border.bin b/...lateau_PokemonCenter_1F_Layout/border.bin → data/layouts/House5/border.bin
diff --git a/data/layouts/House5_Layout/map.bin → data/layouts/House5/map.bin b/data/layouts/House5_Layout/map.bin → data/layouts/House5/map.bin
diff --git a/.../IndigoPlateau_Exterior_Layout/border.bin → ...layouts/IndigoPlateau_Exterior/border.bin b/.../IndigoPlateau_Exterior_Layout/border.bin → ...layouts/IndigoPlateau_Exterior/border.bin
diff --git a/...uts/IndigoPlateau_Exterior_Layout/map.bin → data/layouts/IndigoPlateau_Exterior/map.bin b/...uts/IndigoPlateau_Exterior_Layout/map.bin → data/layouts/IndigoPlateau_Exterior/map.bin
diff --git a/...n_VolunteerPokemonHouse_Layout/border.bin → ...IndigoPlateau_PokemonCenter_1F/border.bin b/...n_VolunteerPokemonHouse_Layout/border.bin → ...IndigoPlateau_PokemonCenter_1F/border.bin
diff --git a/...goPlateau_PokemonCenter_1F_Layout/map.bin → ...ts/IndigoPlateau_PokemonCenter_1F/map.bin b/...goPlateau_PokemonCenter_1F_Layout/map.bin → ...ts/IndigoPlateau_PokemonCenter_1F/map.bin
diff --git a/data/layouts/Island_Harbor_Layout/border.bin → data/layouts/Island_Harbor/border.bin b/data/layouts/Island_Harbor_Layout/border.bin → data/layouts/Island_Harbor/border.bin
diff --git a/data/layouts/Island_Harbor_Layout/map.bin → data/layouts/Island_Harbor/map.bin b/data/layouts/Island_Harbor_Layout/map.bin → data/layouts/Island_Harbor/map.bin
diff --git a/data/layouts/LavenderTown_Layout/border.bin → data/layouts/LavenderTown/border.bin b/data/layouts/LavenderTown_Layout/border.bin → data/layouts/LavenderTown/border.bin
diff --git a/data/layouts/LavenderTown_Layout/map.bin → data/layouts/LavenderTown/map.bin b/data/layouts/LavenderTown_Layout/map.bin → data/layouts/LavenderTown/map.bin
diff --git a/data/layouts/Mart_Layout/border.bin → ...nderTown_VolunteerPokemonHouse/border.bin b/data/layouts/Mart_Layout/border.bin → ...nderTown_VolunteerPokemonHouse/border.bin
diff --git a/...Town_VolunteerPokemonHouse_Layout/map.bin → ...avenderTown_VolunteerPokemonHouse/map.bin b/...Town_VolunteerPokemonHouse_Layout/map.bin → ...avenderTown_VolunteerPokemonHouse/map.bin
diff --git a/...Island_PokemonCenter_1F_Layout/border.bin → data/layouts/Mart/border.bin b/...Island_PokemonCenter_1F_Layout/border.bin → data/layouts/Mart/border.bin
diff --git a/data/layouts/Mart_Layout/map.bin → data/layouts/Mart/map.bin b/data/layouts/Mart_Layout/map.bin → data/layouts/Mart/map.bin
diff --git a/...ayouts/MtEmber_Exterior_Layout/border.bin → data/layouts/MtEmber_Exterior/border.bin b/...ayouts/MtEmber_Exterior_Layout/border.bin → data/layouts/MtEmber_Exterior/border.bin
diff --git a/data/layouts/MtEmber_Exterior_Layout/map.bin → data/layouts/MtEmber_Exterior/map.bin b/data/layouts/MtEmber_Exterior_Layout/map.bin → data/layouts/MtEmber_Exterior/map.bin
diff --git a/...ts/MtEmber_RubyPath_B2F_Layout/border.bin → data/layouts/MtEmber_RubyPath_1F/border.bin b/...ts/MtEmber_RubyPath_B2F_Layout/border.bin → data/layouts/MtEmber_RubyPath_1F/border.bin
diff --git a/data/layouts/SSAnne_Kitchen3_Layout/map.bin → data/layouts/MtEmber_RubyPath_1F/map.bin b/data/layouts/SSAnne_Kitchen3_Layout/map.bin → data/layouts/MtEmber_RubyPath_1F/map.bin
diff --git a/...ber_RubyPath_B2F_Stairs_Layout/border.bin → data/layouts/MtEmber_RubyPath_B1F/border.bin b/...ber_RubyPath_B2F_Stairs_Layout/border.bin → data/layouts/MtEmber_RubyPath_B1F/border.bin
diff --git a/...youts/MtEmber_RubyPath_B1F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B1F/map.bin b/...youts/MtEmber_RubyPath_B1F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B1F/map.bin
diff --git a/...ts/MtEmber_RubyPath_B3F_Layout/border.bin → ...ts/MtEmber_RubyPath_B1F_Stairs/border.bin b/...ts/MtEmber_RubyPath_B3F_Layout/border.bin → ...ts/MtEmber_RubyPath_B1F_Stairs/border.bin
diff --git a/...tEmber_RubyPath_B1F_Stairs_Layout/map.bin → ...youts/MtEmber_RubyPath_B1F_Stairs/map.bin b/...tEmber_RubyPath_B1F_Stairs_Layout/map.bin → ...youts/MtEmber_RubyPath_B1F_Stairs/map.bin
diff --git a/...ts/MtEmber_RubyPath_B4F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B2F/border.bin b/...ts/MtEmber_RubyPath_B4F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B2F/border.bin
diff --git a/...youts/MtEmber_RubyPath_B2F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B2F/map.bin b/...youts/MtEmber_RubyPath_B2F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B2F/map.bin
diff --git a/...ts/MtEmber_RubyPath_B5F_Layout/border.bin → ...ts/MtEmber_RubyPath_B2F_Stairs/border.bin b/...ts/MtEmber_RubyPath_B5F_Layout/border.bin → ...ts/MtEmber_RubyPath_B2F_Stairs/border.bin
diff --git a/...tEmber_RubyPath_B2F_Stairs_Layout/map.bin → ...youts/MtEmber_RubyPath_B2F_Stairs/map.bin b/...tEmber_RubyPath_B2F_Stairs_Layout/map.bin → ...youts/MtEmber_RubyPath_B2F_Stairs/map.bin
diff --git a/...s/MtEmber_SummitPath_1F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B3F/border.bin b/...s/MtEmber_SummitPath_1F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B3F/border.bin
diff --git a/...youts/MtEmber_RubyPath_B3F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B3F/map.bin b/...youts/MtEmber_RubyPath_B3F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B3F/map.bin
diff --git a/...s/MtEmber_SummitPath_2F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B4F/border.bin b/...s/MtEmber_SummitPath_2F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B4F/border.bin
diff --git a/...youts/MtEmber_RubyPath_B4F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B4F/map.bin b/...youts/MtEmber_RubyPath_B4F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B4F/map.bin
diff --git a/...s/MtEmber_SummitPath_3F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B5F/border.bin b/...s/MtEmber_SummitPath_3F_Layout/border.bin → data/layouts/MtEmber_RubyPath_B5F/border.bin
diff --git a/...youts/MtEmber_RubyPath_B5F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B5F/map.bin b/...youts/MtEmber_RubyPath_B5F_Layout/map.bin → data/layouts/MtEmber_RubyPath_B5F/map.bin
diff --git a/.../layouts/MtEmber_Summit_Layout/border.bin → data/layouts/MtEmber_Summit/border.bin b/.../layouts/MtEmber_Summit_Layout/border.bin → data/layouts/MtEmber_Summit/border.bin
diff --git a/data/layouts/MtEmber_Summit_Layout/map.bin → data/layouts/MtEmber_Summit/map.bin b/data/layouts/MtEmber_Summit_Layout/map.bin → data/layouts/MtEmber_Summit/map.bin
diff --git a/data/layouts/MtMoon_1F_Layout/border.bin → .../layouts/MtEmber_SummitPath_1F/border.bin b/data/layouts/MtMoon_1F_Layout/border.bin → .../layouts/MtEmber_SummitPath_1F/border.bin
diff --git a/...outs/MtEmber_SummitPath_1F_Layout/map.bin → data/layouts/MtEmber_SummitPath_1F/map.bin b/...outs/MtEmber_SummitPath_1F_Layout/map.bin → data/layouts/MtEmber_SummitPath_1F/map.bin
diff --git a/data/layouts/NavelRock_1F_Layout/border.bin → .../layouts/MtEmber_SummitPath_2F/border.bin b/data/layouts/NavelRock_1F_Layout/border.bin → .../layouts/MtEmber_SummitPath_2F/border.bin
diff --git a/...outs/MtEmber_SummitPath_2F_Layout/map.bin → data/layouts/MtEmber_SummitPath_2F/map.bin b/...outs/MtEmber_SummitPath_2F_Layout/map.bin → data/layouts/MtEmber_SummitPath_2F/map.bin
diff --git a/data/layouts/NavelRock_B1F_Layout/border.bin → .../layouts/MtEmber_SummitPath_3F/border.bin b/data/layouts/NavelRock_B1F_Layout/border.bin → .../layouts/MtEmber_SummitPath_3F/border.bin
diff --git a/...outs/MtEmber_SummitPath_3F_Layout/map.bin → data/layouts/MtEmber_SummitPath_3F/map.bin b/...outs/MtEmber_SummitPath_3F_Layout/map.bin → data/layouts/MtEmber_SummitPath_3F/map.bin
diff --git a/...NavelRock_BasePath_B10F_Layout/border.bin → data/layouts/MtMoon_1F/border.bin b/...NavelRock_BasePath_B10F_Layout/border.bin → data/layouts/MtMoon_1F/border.bin
diff --git a/data/layouts/MtMoon_1F_Layout/map.bin → data/layouts/MtMoon_1F/map.bin b/data/layouts/MtMoon_1F_Layout/map.bin → data/layouts/MtMoon_1F/map.bin
diff --git a/data/layouts/MtMoon_B1F_Layout/border.bin → data/layouts/MtMoon_B1F/border.bin b/data/layouts/MtMoon_B1F_Layout/border.bin → data/layouts/MtMoon_B1F/border.bin
diff --git a/data/layouts/MtMoon_B1F_Layout/map.bin → data/layouts/MtMoon_B1F/map.bin b/data/layouts/MtMoon_B1F_Layout/map.bin → data/layouts/MtMoon_B1F/map.bin
diff --git a/data/layouts/MtMoon_B2F_Layout/border.bin → data/layouts/MtMoon_B2F/border.bin b/data/layouts/MtMoon_B2F_Layout/border.bin → data/layouts/MtMoon_B2F/border.bin
diff --git a/data/layouts/MtMoon_B2F_Layout/map.bin → data/layouts/MtMoon_B2F/map.bin b/data/layouts/MtMoon_B2F_Layout/map.bin → data/layouts/MtMoon_B2F/map.bin
diff --git a/...NavelRock_BasePath_B11F_Layout/border.bin → data/layouts/NavelRock_1F/border.bin b/...NavelRock_BasePath_B11F_Layout/border.bin → data/layouts/NavelRock_1F/border.bin
diff --git a/data/layouts/NavelRock_1F_Layout/map.bin → data/layouts/NavelRock_1F/map.bin b/data/layouts/NavelRock_1F_Layout/map.bin → data/layouts/NavelRock_1F/map.bin
diff --git a/.../NavelRock_BasePath_B1F_Layout/border.bin → data/layouts/NavelRock_B1F/border.bin b/.../NavelRock_BasePath_B1F_Layout/border.bin → data/layouts/NavelRock_B1F/border.bin
diff --git a/data/layouts/NavelRock_B1F_Layout/map.bin → data/layouts/NavelRock_B1F/map.bin b/data/layouts/NavelRock_B1F_Layout/map.bin → data/layouts/NavelRock_B1F/map.bin
diff --git a/.../NavelRock_BasePath_B2F_Layout/border.bin → data/layouts/NavelRock_Base/border.bin b/.../NavelRock_BasePath_B2F_Layout/border.bin → data/layouts/NavelRock_Base/border.bin
diff --git a/data/layouts/NavelRock_Base_Layout/map.bin → data/layouts/NavelRock_Base/map.bin b/data/layouts/NavelRock_Base_Layout/map.bin → data/layouts/NavelRock_Base/map.bin
diff --git a/.../NavelRock_BasePath_B3F_Layout/border.bin → ...ayouts/NavelRock_BasePath_B10F/border.bin b/.../NavelRock_BasePath_B3F_Layout/border.bin → ...ayouts/NavelRock_BasePath_B10F/border.bin
diff --git a/...ts/NavelRock_BasePath_B10F_Layout/map.bin → data/layouts/NavelRock_BasePath_B10F/map.bin b/...ts/NavelRock_BasePath_B10F_Layout/map.bin → data/layouts/NavelRock_BasePath_B10F/map.bin
diff --git a/.../NavelRock_BasePath_B4F_Layout/border.bin → ...ayouts/NavelRock_BasePath_B11F/border.bin b/.../NavelRock_BasePath_B4F_Layout/border.bin → ...ayouts/NavelRock_BasePath_B11F/border.bin
diff --git a/...ts/NavelRock_BasePath_B11F_Layout/map.bin → data/layouts/NavelRock_BasePath_B11F/map.bin b/...ts/NavelRock_BasePath_B11F_Layout/map.bin → data/layouts/NavelRock_BasePath_B11F/map.bin
diff --git a/.../NavelRock_BasePath_B5F_Layout/border.bin → ...layouts/NavelRock_BasePath_B1F/border.bin b/.../NavelRock_BasePath_B5F_Layout/border.bin → ...layouts/NavelRock_BasePath_B1F/border.bin
diff --git a/...uts/NavelRock_BasePath_B1F_Layout/map.bin → data/layouts/NavelRock_BasePath_B1F/map.bin b/...uts/NavelRock_BasePath_B1F_Layout/map.bin → data/layouts/NavelRock_BasePath_B1F/map.bin
diff --git a/.../NavelRock_BasePath_B6F_Layout/border.bin → ...layouts/NavelRock_BasePath_B2F/border.bin b/.../NavelRock_BasePath_B6F_Layout/border.bin → ...layouts/NavelRock_BasePath_B2F/border.bin
diff --git a/...uts/NavelRock_BasePath_B2F_Layout/map.bin → data/layouts/NavelRock_BasePath_B2F/map.bin b/...uts/NavelRock_BasePath_B2F_Layout/map.bin → data/layouts/NavelRock_BasePath_B2F/map.bin
diff --git a/.../NavelRock_BasePath_B7F_Layout/border.bin → ...layouts/NavelRock_BasePath_B3F/border.bin b/.../NavelRock_BasePath_B7F_Layout/border.bin → ...layouts/NavelRock_BasePath_B3F/border.bin
diff --git a/...uts/NavelRock_BasePath_B3F_Layout/map.bin → data/layouts/NavelRock_BasePath_B3F/map.bin b/...uts/NavelRock_BasePath_B3F_Layout/map.bin → data/layouts/NavelRock_BasePath_B3F/map.bin
diff --git a/.../NavelRock_BasePath_B8F_Layout/border.bin → ...layouts/NavelRock_BasePath_B4F/border.bin b/.../NavelRock_BasePath_B8F_Layout/border.bin → ...layouts/NavelRock_BasePath_B4F/border.bin
diff --git a/...uts/NavelRock_BasePath_B4F_Layout/map.bin → data/layouts/NavelRock_BasePath_B4F/map.bin b/...uts/NavelRock_BasePath_B4F_Layout/map.bin → data/layouts/NavelRock_BasePath_B4F/map.bin
diff --git a/.../NavelRock_BasePath_B9F_Layout/border.bin → ...layouts/NavelRock_BasePath_B5F/border.bin b/.../NavelRock_BasePath_B9F_Layout/border.bin → ...layouts/NavelRock_BasePath_B5F/border.bin
diff --git a/...uts/NavelRock_BasePath_B5F_Layout/map.bin → data/layouts/NavelRock_BasePath_B5F/map.bin b/...uts/NavelRock_BasePath_B5F_Layout/map.bin → data/layouts/NavelRock_BasePath_B5F/map.bin
diff --git a/.../layouts/NavelRock_Base_Layout/border.bin → ...layouts/NavelRock_BasePath_B6F/border.bin b/.../layouts/NavelRock_Base_Layout/border.bin → ...layouts/NavelRock_BasePath_B6F/border.bin
diff --git a/...uts/NavelRock_BasePath_B6F_Layout/map.bin → data/layouts/NavelRock_BasePath_B6F/map.bin b/...uts/NavelRock_BasePath_B6F_Layout/map.bin → data/layouts/NavelRock_BasePath_B6F/map.bin
diff --git a/.../layouts/NavelRock_Fork_Layout/border.bin → ...layouts/NavelRock_BasePath_B7F/border.bin b/.../layouts/NavelRock_Fork_Layout/border.bin → ...layouts/NavelRock_BasePath_B7F/border.bin
diff --git a/...uts/NavelRock_BasePath_B7F_Layout/map.bin → data/layouts/NavelRock_BasePath_B7F/map.bin b/...uts/NavelRock_BasePath_B7F_Layout/map.bin → data/layouts/NavelRock_BasePath_B7F/map.bin
diff --git a/...NavelRock_SummitPath_2F_Layout/border.bin → ...layouts/NavelRock_BasePath_B8F/border.bin b/...NavelRock_SummitPath_2F_Layout/border.bin → ...layouts/NavelRock_BasePath_B8F/border.bin
diff --git a/...uts/NavelRock_BasePath_B8F_Layout/map.bin → data/layouts/NavelRock_BasePath_B8F/map.bin b/...uts/NavelRock_BasePath_B8F_Layout/map.bin → data/layouts/NavelRock_BasePath_B8F/map.bin
diff --git a/...NavelRock_SummitPath_3F_Layout/border.bin → ...layouts/NavelRock_BasePath_B9F/border.bin b/...NavelRock_SummitPath_3F_Layout/border.bin → ...layouts/NavelRock_BasePath_B9F/border.bin
diff --git a/...uts/NavelRock_BasePath_B9F_Layout/map.bin → data/layouts/NavelRock_BasePath_B9F/map.bin b/...uts/NavelRock_BasePath_B9F_Layout/map.bin → data/layouts/NavelRock_BasePath_B9F/map.bin
diff --git a/...outs/NavelRock_Exterior_Layout/border.bin → data/layouts/NavelRock_Exterior/border.bin b/...outs/NavelRock_Exterior_Layout/border.bin → data/layouts/NavelRock_Exterior/border.bin
diff --git a/...layouts/NavelRock_Exterior_Layout/map.bin → data/layouts/NavelRock_Exterior/map.bin b/...layouts/NavelRock_Exterior_Layout/map.bin → data/layouts/NavelRock_Exterior/map.bin
diff --git a/...NavelRock_SummitPath_4F_Layout/border.bin → data/layouts/NavelRock_Fork/border.bin b/...NavelRock_SummitPath_4F_Layout/border.bin → data/layouts/NavelRock_Fork/border.bin
diff --git a/data/layouts/NavelRock_Fork_Layout/map.bin → data/layouts/NavelRock_Fork/map.bin b/data/layouts/NavelRock_Fork_Layout/map.bin → data/layouts/NavelRock_Fork/map.bin
diff --git a/...ayouts/NavelRock_Summit_Layout/border.bin → data/layouts/NavelRock_Summit/border.bin b/...ayouts/NavelRock_Summit_Layout/border.bin → data/layouts/NavelRock_Summit/border.bin
diff --git a/data/layouts/NavelRock_Summit_Layout/map.bin → data/layouts/NavelRock_Summit/map.bin b/data/layouts/NavelRock_Summit_Layout/map.bin → data/layouts/NavelRock_Summit/map.bin
diff --git a/...NavelRock_SummitPath_5F_Layout/border.bin → ...ayouts/NavelRock_SummitPath_2F/border.bin b/...NavelRock_SummitPath_5F_Layout/border.bin → ...ayouts/NavelRock_SummitPath_2F/border.bin
diff --git a/...ts/NavelRock_SummitPath_2F_Layout/map.bin → data/layouts/NavelRock_SummitPath_2F/map.bin b/...ts/NavelRock_SummitPath_2F_Layout/map.bin → data/layouts/NavelRock_SummitPath_2F/map.bin
diff --git a/...and_KindleRoad_EmberSpa_Layout/border.bin → ...ayouts/NavelRock_SummitPath_3F/border.bin b/...and_KindleRoad_EmberSpa_Layout/border.bin → ...ayouts/NavelRock_SummitPath_3F/border.bin
diff --git a/...ts/NavelRock_SummitPath_3F_Layout/map.bin → data/layouts/NavelRock_SummitPath_3F/map.bin b/...ts/NavelRock_SummitPath_3F_Layout/map.bin → data/layouts/NavelRock_SummitPath_3F/map.bin
diff --git a/data/layouts/RockTunnel_1F_Layout/border.bin → ...ayouts/NavelRock_SummitPath_4F/border.bin b/data/layouts/RockTunnel_1F_Layout/border.bin → ...ayouts/NavelRock_SummitPath_4F/border.bin
diff --git a/...ts/NavelRock_SummitPath_4F_Layout/map.bin → data/layouts/NavelRock_SummitPath_4F/map.bin b/...ts/NavelRock_SummitPath_4F_Layout/map.bin → data/layouts/NavelRock_SummitPath_4F/map.bin
diff --git a/.../layouts/RockTunnel_B1F_Layout/border.bin → ...ayouts/NavelRock_SummitPath_5F/border.bin b/.../layouts/RockTunnel_B1F_Layout/border.bin → ...ayouts/NavelRock_SummitPath_5F/border.bin
diff --git a/...ts/NavelRock_SummitPath_5F_Layout/map.bin → data/layouts/NavelRock_SummitPath_5F/map.bin b/...ts/NavelRock_SummitPath_5F_Layout/map.bin → data/layouts/NavelRock_SummitPath_5F/map.bin
diff --git a/...ts/OneIsland_KindleRoad_Layout/border.bin → data/layouts/OneIsland/border.bin b/...ts/OneIsland_KindleRoad_Layout/border.bin → data/layouts/OneIsland/border.bin
diff --git a/data/layouts/OneIsland_Layout/map.bin → data/layouts/OneIsland/map.bin b/data/layouts/OneIsland_Layout/map.bin → data/layouts/OneIsland/map.bin
diff --git a/data/layouts/OneIsland_Layout/border.bin → data/layouts/OneIsland_KindleRoad/border.bin b/data/layouts/OneIsland_Layout/border.bin → data/layouts/OneIsland_KindleRoad/border.bin
diff --git a/...youts/OneIsland_KindleRoad_Layout/map.bin → data/layouts/OneIsland_KindleRoad/map.bin b/...youts/OneIsland_KindleRoad_Layout/map.bin → data/layouts/OneIsland_KindleRoad/map.bin
diff --git a/...ayouts/SSAnne_1F_Room12_Layout/border.bin → .../OneIsland_KindleRoad_EmberSpa/border.bin b/...ayouts/SSAnne_1F_Room12_Layout/border.bin → .../OneIsland_KindleRoad_EmberSpa/border.bin
diff --git a/...Island_KindleRoad_EmberSpa_Layout/map.bin → ...uts/OneIsland_KindleRoad_EmberSpa/map.bin b/...Island_KindleRoad_EmberSpa_Layout/map.bin → ...uts/OneIsland_KindleRoad_EmberSpa/map.bin
diff --git a/...Island_PokemonCenter_2F_Layout/border.bin → ...uts/OneIsland_PokemonCenter_1F/border.bin b/...Island_PokemonCenter_2F_Layout/border.bin → ...uts/OneIsland_PokemonCenter_1F/border.bin
diff --git a/...OneIsland_PokemonCenter_1F_Layout/map.bin → ...ayouts/OneIsland_PokemonCenter_1F/map.bin b/...OneIsland_PokemonCenter_1F_Layout/map.bin → ...ayouts/OneIsland_PokemonCenter_1F/map.bin
diff --git a/...s/PalletTown_GarysHouse_Layout/border.bin → ...uts/OneIsland_PokemonCenter_2F/border.bin b/...s/PalletTown_GarysHouse_Layout/border.bin → ...uts/OneIsland_PokemonCenter_2F/border.bin
diff --git a/...OneIsland_PokemonCenter_2F_Layout/map.bin → ...ayouts/OneIsland_PokemonCenter_2F/map.bin b/...OneIsland_PokemonCenter_2F_Layout/map.bin → ...ayouts/OneIsland_PokemonCenter_2F/map.bin
diff --git a/...OneIsland_TreasureBeach_Layout/border.bin → ...ayouts/OneIsland_TreasureBeach/border.bin b/...OneIsland_TreasureBeach_Layout/border.bin → ...ayouts/OneIsland_TreasureBeach/border.bin
diff --git a/...ts/OneIsland_TreasureBeach_Layout/map.bin → data/layouts/OneIsland_TreasureBeach/map.bin b/...ts/OneIsland_TreasureBeach_Layout/map.bin → data/layouts/OneIsland_TreasureBeach/map.bin
diff --git a/data/layouts/PalletTown_Layout/border.bin → data/layouts/PalletTown/border.bin b/data/layouts/PalletTown_Layout/border.bin → data/layouts/PalletTown/border.bin
diff --git a/data/layouts/PalletTown_Layout/map.bin → data/layouts/PalletTown/map.bin b/data/layouts/PalletTown_Layout/map.bin → data/layouts/PalletTown/map.bin
diff --git a/...letTown_PlayersHouse_1F_Layout/border.bin → .../layouts/PalletTown_GarysHouse/border.bin b/...letTown_PlayersHouse_1F_Layout/border.bin → .../layouts/PalletTown_GarysHouse/border.bin
diff --git a/...outs/PalletTown_GarysHouse_Layout/map.bin → data/layouts/PalletTown_GarysHouse/map.bin b/...outs/PalletTown_GarysHouse_Layout/map.bin → data/layouts/PalletTown_GarysHouse/map.bin
diff --git a/...letTown_PlayersHouse_2F_Layout/border.bin → ...uts/PalletTown_PlayersHouse_1F/border.bin b/...letTown_PlayersHouse_2F_Layout/border.bin → ...uts/PalletTown_PlayersHouse_1F/border.bin
diff --git a/...PalletTown_PlayersHouse_1F_Layout/map.bin → ...ayouts/PalletTown_PlayersHouse_1F/map.bin b/...PalletTown_PlayersHouse_1F_Layout/map.bin → ...ayouts/PalletTown_PlayersHouse_1F/map.bin
diff --git a/...etTown_ProfessorOaksLab_Layout/border.bin → ...uts/PalletTown_PlayersHouse_2F/border.bin b/...etTown_ProfessorOaksLab_Layout/border.bin → ...uts/PalletTown_PlayersHouse_2F/border.bin
diff --git a/...PalletTown_PlayersHouse_2F_Layout/map.bin → ...ayouts/PalletTown_PlayersHouse_2F/map.bin b/...PalletTown_PlayersHouse_2F_Layout/map.bin → ...ayouts/PalletTown_PlayersHouse_2F/map.bin
diff --git a/.../layouts/PewterCity_Gym_Layout/border.bin → ...ts/PalletTown_ProfessorOaksLab/border.bin b/.../layouts/PewterCity_Gym_Layout/border.bin → ...ts/PalletTown_ProfessorOaksLab/border.bin
diff --git a/...alletTown_ProfessorOaksLab_Layout/map.bin → ...youts/PalletTown_ProfessorOaksLab/map.bin b/...alletTown_ProfessorOaksLab_Layout/map.bin → ...youts/PalletTown_ProfessorOaksLab/map.bin
diff --git a/data/layouts/PewterCity_Layout/border.bin → data/layouts/PewterCity/border.bin b/data/layouts/PewterCity_Layout/border.bin → data/layouts/PewterCity/border.bin
diff --git a/data/layouts/PewterCity_Layout/map.bin → data/layouts/PewterCity/map.bin b/data/layouts/PewterCity_Layout/map.bin → data/layouts/PewterCity/map.bin
diff --git a/...ts/PewterCity_Museum_1F_Layout/border.bin → data/layouts/PewterCity_Gym/border.bin b/...ts/PewterCity_Museum_1F_Layout/border.bin → data/layouts/PewterCity_Gym/border.bin
diff --git a/data/layouts/PewterCity_Gym_Layout/map.bin → data/layouts/PewterCity_Gym/map.bin b/data/layouts/PewterCity_Gym_Layout/map.bin → data/layouts/PewterCity_Gym/map.bin
diff --git a/...ts/PewterCity_Museum_2F_Layout/border.bin → data/layouts/PewterCity_Museum_1F/border.bin b/...ts/PewterCity_Museum_2F_Layout/border.bin → data/layouts/PewterCity_Museum_1F/border.bin
diff --git a/...youts/PewterCity_Museum_1F_Layout/map.bin → data/layouts/PewterCity_Museum_1F/map.bin b/...youts/PewterCity_Museum_1F_Layout/map.bin → data/layouts/PewterCity_Museum_1F/map.bin
diff --git a/...ayouts/PokemonCenter_1F_Layout/border.bin → data/layouts/PewterCity_Museum_2F/border.bin b/...ayouts/PokemonCenter_1F_Layout/border.bin → data/layouts/PewterCity_Museum_2F/border.bin
diff --git a/...youts/PewterCity_Museum_2F_Layout/map.bin → data/layouts/PewterCity_Museum_2F/map.bin b/...youts/PewterCity_Museum_2F_Layout/map.bin → data/layouts/PewterCity_Museum_2F/map.bin
diff --git a/...ayouts/PokemonCenter_2F_Layout/border.bin → data/layouts/PokemonCenter_1F/border.bin b/...ayouts/PokemonCenter_2F_Layout/border.bin → data/layouts/PokemonCenter_1F/border.bin
diff --git a/data/layouts/PokemonCenter_1F_Layout/map.bin → data/layouts/PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F_Layout/map.bin → data/layouts/PokemonCenter_1F/map.bin
diff --git a/...kemonLeague_AgathasRoom_Layout/border.bin → data/layouts/PokemonCenter_2F/border.bin b/...kemonLeague_AgathasRoom_Layout/border.bin → data/layouts/PokemonCenter_2F/border.bin
diff --git a/data/layouts/PokemonCenter_2F_Layout/map.bin → data/layouts/PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F_Layout/map.bin → data/layouts/PokemonCenter_2F/map.bin
diff --git a/...okemonLeague_BrunosRoom_Layout/border.bin → ...outs/PokemonLeague_AgathasRoom/border.bin b/...okemonLeague_BrunosRoom_Layout/border.bin → ...outs/PokemonLeague_AgathasRoom/border.bin
diff --git a/.../PokemonLeague_AgathasRoom_Layout/map.bin → ...layouts/PokemonLeague_AgathasRoom/map.bin b/.../PokemonLeague_AgathasRoom_Layout/map.bin → ...layouts/PokemonLeague_AgathasRoom/map.bin
diff --git a/...monLeague_ChampionsRoom_Layout/border.bin → ...youts/PokemonLeague_BrunosRoom/border.bin b/...monLeague_ChampionsRoom_Layout/border.bin → ...youts/PokemonLeague_BrunosRoom/border.bin
diff --git a/...s/PokemonLeague_BrunosRoom_Layout/map.bin → .../layouts/PokemonLeague_BrunosRoom/map.bin b/...s/PokemonLeague_BrunosRoom_Layout/map.bin → .../layouts/PokemonLeague_BrunosRoom/map.bin
diff --git a/...okemonLeague_HallOfFame_Layout/border.bin → ...ts/PokemonLeague_ChampionsRoom/border.bin b/...okemonLeague_HallOfFame_Layout/border.bin → ...ts/PokemonLeague_ChampionsRoom/border.bin
diff --git a/...okemonLeague_ChampionsRoom_Layout/map.bin → ...youts/PokemonLeague_ChampionsRoom/map.bin b/...okemonLeague_ChampionsRoom_Layout/map.bin → ...youts/PokemonLeague_ChampionsRoom/map.bin
diff --git a/...okemonLeague_LancesRoom_Layout/border.bin → ...youts/PokemonLeague_HallOfFame/border.bin b/...okemonLeague_LancesRoom_Layout/border.bin → ...youts/PokemonLeague_HallOfFame/border.bin
diff --git a/...s/PokemonLeague_HallOfFame_Layout/map.bin → .../layouts/PokemonLeague_HallOfFame/map.bin b/...s/PokemonLeague_HallOfFame_Layout/map.bin → .../layouts/PokemonLeague_HallOfFame/map.bin
diff --git a/...emonLeague_LoreleisRoom_Layout/border.bin → ...youts/PokemonLeague_LancesRoom/border.bin b/...emonLeague_LoreleisRoom_Layout/border.bin → ...youts/PokemonLeague_LancesRoom/border.bin
diff --git a/...s/PokemonLeague_LancesRoom_Layout/map.bin → .../layouts/PokemonLeague_LancesRoom/map.bin b/...s/PokemonLeague_LancesRoom_Layout/map.bin → .../layouts/PokemonLeague_LancesRoom/map.bin
diff --git a/...youts/PokemonMansion_1F_Layout/border.bin → ...uts/PokemonLeague_LoreleisRoom/border.bin b/...youts/PokemonMansion_1F_Layout/border.bin → ...uts/PokemonLeague_LoreleisRoom/border.bin
diff --git a/...PokemonLeague_LoreleisRoom_Layout/map.bin → ...ayouts/PokemonLeague_LoreleisRoom/map.bin b/...PokemonLeague_LoreleisRoom_Layout/map.bin → ...ayouts/PokemonLeague_LoreleisRoom/map.bin
diff --git a/...youts/PokemonMansion_2F_Layout/border.bin → data/layouts/PokemonMansion_1F/border.bin b/...youts/PokemonMansion_2F_Layout/border.bin → data/layouts/PokemonMansion_1F/border.bin
diff --git a/.../layouts/PokemonMansion_1F_Layout/map.bin → data/layouts/PokemonMansion_1F/map.bin b/.../layouts/PokemonMansion_1F_Layout/map.bin → data/layouts/PokemonMansion_1F/map.bin
diff --git a/...youts/PokemonMansion_3F_Layout/border.bin → data/layouts/PokemonMansion_2F/border.bin b/...youts/PokemonMansion_3F_Layout/border.bin → data/layouts/PokemonMansion_2F/border.bin
diff --git a/.../layouts/PokemonMansion_2F_Layout/map.bin → data/layouts/PokemonMansion_2F/map.bin b/.../layouts/PokemonMansion_2F_Layout/map.bin → data/layouts/PokemonMansion_2F/map.bin
diff --git a/...outs/PokemonMansion_B1F_Layout/border.bin → data/layouts/PokemonMansion_3F/border.bin b/...outs/PokemonMansion_B1F_Layout/border.bin → data/layouts/PokemonMansion_3F/border.bin