229 files changed, 917 insertions, 461 deletions

diff --git a/data/maps/attributes/UnusedMap13.asm b/data/maps/attributes/UnusedMap13.asm
deleted file mode 100644
index e178b08..0000000
--- a/data/maps/attributes/UnusedMap13.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "data/maps/attributes/UnusedMap13.asm", ROMX
-	map_attributes UnusedMap13, UNUSED_MAP_13, 0
-
-UnusedMap13_MapEvents::
-UnusedMap13_Blocks:: INCBIN "maps/blk/UnusedMap13.blk"
diff --git a/data/maps/attributes/placeholder/Baadon.asm b/data/maps/objects/Baadon.asm
index c6d8472..f33b6cd 100644
--- a/data/maps/attributes/placeholder/Baadon.asm
+++ b/data/maps/objects/Baadon.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Baadon.asm", ROMX
+SECTION "data/maps/objects/Baadon.asm", ROMX
+
 	map_attributes Baadon, BAADON, NORTH | SOUTH | EAST
 	connection north, FontoRoute4, FONTO_ROUTE_4, 0, 0, 10
 	connection south, BaadonRoute1, BAADON_ROUTE_1, 0, 0, 10
@@ -31,4 +32,5 @@ Baadon_MapEvents::
 	object_event 6, 9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 14, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Baadon_Blocks:: INCBIN "maps/placeholder/blk/Baadon.blk"
+Baadon_Blocks::
+INCBIN "maps/Baadon.blk"
diff --git a/data/maps/attributes/placeholder/BaadonHouse1.asm b/data/maps/objects/BaadonHouse1.asm
index df97af6..a4ecf0b 100644
--- a/data/maps/attributes/placeholder/BaadonHouse1.asm
+++ b/data/maps/objects/BaadonHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonHouse1.asm", ROMX
+SECTION "data/maps/objects/BaadonHouse1.asm", ROMX
+
 	map_attributes BaadonHouse1, BAADON_HOUSE_1, 0
 
 BaadonHouse1_MapEvents::
@@ -15,4 +16,5 @@ BaadonHouse1_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonHouse1_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse1.blk"
+BaadonHouse1_Blocks::
+INCBIN "maps/BaadonHouse1.blk"
diff --git a/data/maps/attributes/placeholder/BaadonHouse2.asm b/data/maps/objects/BaadonHouse2.asm
index 0cd6f84..cac8df5 100644
--- a/data/maps/attributes/placeholder/BaadonHouse2.asm
+++ b/data/maps/objects/BaadonHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonHouse2.asm", ROMX
+SECTION "data/maps/objects/BaadonHouse2.asm", ROMX
+
 	map_attributes BaadonHouse2, BAADON_HOUSE_2, 0
 
 BaadonHouse2_MapEvents::
@@ -15,4 +16,5 @@ BaadonHouse2_MapEvents::
 	db 1 ; person events
 	object_event 7, 5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonHouse2_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse2.blk"
+BaadonHouse2_Blocks::
+INCBIN "maps/BaadonHouse2.blk"
diff --git a/data/maps/attributes/placeholder/BaadonLeague1F.asm b/data/maps/objects/BaadonLeague1F.asm
index cd94f09..828fa54 100644
--- a/data/maps/attributes/placeholder/BaadonLeague1F.asm
+++ b/data/maps/objects/BaadonLeague1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonLeague1F.asm", ROMX
+SECTION "data/maps/objects/BaadonLeague1F.asm", ROMX
+
 	map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0
 
 BaadonLeague1F_MapEvents::
@@ -20,4 +21,5 @@ BaadonLeague1F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague1F.blk"
+BaadonLeague1F_Blocks::
+INCBIN "maps/BaadonLeague1F.blk"
diff --git a/data/maps/attributes/placeholder/BaadonLeague2F.asm b/data/maps/objects/BaadonLeague2F.asm
index 0e49595..7021383 100644
--- a/data/maps/attributes/placeholder/BaadonLeague2F.asm
+++ b/data/maps/objects/BaadonLeague2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonLeague2F.asm", ROMX
+SECTION "data/maps/objects/BaadonLeague2F.asm", ROMX
+
 	map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0
 
 BaadonLeague2F_MapEvents::
@@ -18,4 +19,5 @@ BaadonLeague2F_MapEvents::
 	object_event 9, 9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague2F.blk"
+BaadonLeague2F_Blocks::
+INCBIN "maps/BaadonLeague2F.blk"
diff --git a/data/maps/attributes/placeholder/BaadonMart.asm b/data/maps/objects/BaadonMart.asm
index 2d680c6..2492e69 100644
--- a/data/maps/attributes/placeholder/BaadonMart.asm
+++ b/data/maps/objects/BaadonMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonMart.asm", ROMX
+SECTION "data/maps/objects/BaadonMart.asm", ROMX
+
 	map_attributes BaadonMart, BAADON_MART, 0
 
 BaadonMart_MapEvents::
@@ -17,4 +18,5 @@ BaadonMart_MapEvents::
 	object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonMart_Blocks:: INCBIN "maps/placeholder/blk/BaadonMart.blk"
+BaadonMart_Blocks::
+INCBIN "maps/BaadonMart.blk"
diff --git a/data/maps/attributes/placeholder/BaadonPokecenter1F.asm b/data/maps/objects/BaadonPokecenter1F.asm
index 47bd993..aa9f38d 100644
--- a/data/maps/attributes/placeholder/BaadonPokecenter1F.asm
+++ b/data/maps/objects/BaadonPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/BaadonPokecenter1F.asm", ROMX
+
 	map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0
 
 BaadonPokecenter1F_MapEvents::
@@ -18,4 +19,5 @@ BaadonPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter1F.blk"
+BaadonPokecenter1F_Blocks::
+INCBIN "maps/BaadonPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/BaadonPokecenter2F.asm b/data/maps/objects/BaadonPokecenter2F.asm
index d6fd1a8..4f865a5 100644
--- a/data/maps/attributes/placeholder/BaadonPokecenter2F.asm
+++ b/data/maps/objects/BaadonPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/BaadonPokecenter2F.asm", ROMX
+
 	map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0
 
 BaadonPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ BaadonPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BaadonPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter2F.blk"
+BaadonPokecenter2F_Blocks::
+INCBIN "maps/BaadonPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/BaadonRoute1.asm b/data/maps/objects/BaadonRoute1.asm
index 48c3a54..eddd672 100644
--- a/data/maps/attributes/placeholder/BaadonRoute1.asm
+++ b/data/maps/objects/BaadonRoute1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonRoute1.asm", ROMX
+SECTION "data/maps/objects/BaadonRoute1.asm", ROMX
+
 	map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH
 	connection north, Baadon, BAADON, 0, 0, 10
 	connection south, West, WEST, -3, 2, 16
@@ -16,4 +17,5 @@ BaadonRoute1_MapEvents::
 
 	db 0 ; person events
 
-BaadonRoute1_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute1.blk"
+BaadonRoute1_Blocks::
+INCBIN "maps/BaadonRoute1.blk"
diff --git a/data/maps/attributes/placeholder/BaadonRoute2.asm b/data/maps/objects/BaadonRoute2.asm
index cb5d9bc..93c9a9f 100644
--- a/data/maps/attributes/placeholder/BaadonRoute2.asm
+++ b/data/maps/objects/BaadonRoute2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonRoute2.asm", ROMX
+SECTION "data/maps/objects/BaadonRoute2.asm", ROMX
+
 	map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST
 	connection west, Baadon, BAADON, 0, 0, 9
 	connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12
@@ -14,4 +15,5 @@ BaadonRoute2_MapEvents::
 
 	db 0 ; person events
 
-BaadonRoute2_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute2.blk"
+BaadonRoute2_Blocks::
+INCBIN "maps/BaadonRoute2.blk"
diff --git a/data/maps/attributes/placeholder/BaadonRoute3.asm b/data/maps/objects/BaadonRoute3.asm
index d0e468d..06b491f 100644
--- a/data/maps/attributes/placeholder/BaadonRoute3.asm
+++ b/data/maps/objects/BaadonRoute3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonRoute3.asm", ROMX
+SECTION "data/maps/objects/BaadonRoute3.asm", ROMX
+
 	map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST
 	connection south, Route15, ROUTE_15, 0, 0, 13
 	connection west, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9
@@ -16,4 +17,5 @@ BaadonRoute3_MapEvents::
 
 	db 0 ; person events
 
-BaadonRoute3_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute3.blk"
+BaadonRoute3_Blocks::
+INCBIN "maps/BaadonRoute3.blk"
diff --git a/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm b/data/maps/objects/BaadonRouteGateNewtype.asm
index d144ca5..6fcbe21 100644
--- a/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm
+++ b/data/maps/objects/BaadonRouteGateNewtype.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm", ROMX
+SECTION "data/maps/objects/BaadonRouteGateNewtype.asm", ROMX
+
 	map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0
 
 BaadonRouteGateNewtype_MapEvents::
@@ -16,4 +17,5 @@ BaadonRouteGateNewtype_MapEvents::
 
 	db 0 ; person events
 
-BaadonRouteGateNewtype_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateNewtype.blk"
+BaadonRouteGateNewtype_Blocks::
+INCBIN "maps/BaadonRouteGateNewtype.blk"
diff --git a/data/maps/attributes/placeholder/BaadonRouteGateWest.asm b/data/maps/objects/BaadonRouteGateWest.asm
index 7763028..7eac9a2 100644
--- a/data/maps/attributes/placeholder/BaadonRouteGateWest.asm
+++ b/data/maps/objects/BaadonRouteGateWest.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonRouteGateWest.asm", ROMX
+SECTION "data/maps/objects/BaadonRouteGateWest.asm", ROMX
+
 	map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0
 
 BaadonRouteGateWest_MapEvents::
@@ -16,4 +17,5 @@ BaadonRouteGateWest_MapEvents::
 
 	db 0 ; person events
 
-BaadonRouteGateWest_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateWest.blk"
+BaadonRouteGateWest_Blocks::
+INCBIN "maps/BaadonRouteGateWest.blk"
diff --git a/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm b/data/maps/objects/BaadonWallpaperHouse.asm
index 5a4d361..56e809c 100644
--- a/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm
+++ b/data/maps/objects/BaadonWallpaperHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BaadonWallpaperHouse.asm", ROMX
+SECTION "data/maps/objects/BaadonWallpaperHouse.asm", ROMX
+
 	map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0
 
 BaadonWallpaperHouse_MapEvents::
@@ -14,4 +15,5 @@ BaadonWallpaperHouse_MapEvents::
 
 	db 0 ; person events
 
-BaadonWallpaperHouse_Blocks:: INCBIN "maps/placeholder/blk/BaadonWallpaperHouse.blk"
+BaadonWallpaperHouse_Blocks::
+INCBIN "maps/BaadonWallpaperHouse.blk"
diff --git a/data/maps/attributes/placeholder/BullForest.asm b/data/maps/objects/BullForest.asm
index 9900661..9c7c4f3 100644
--- a/data/maps/attributes/placeholder/BullForest.asm
+++ b/data/maps/objects/BullForest.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullForest.asm", ROMX
+SECTION "data/maps/objects/BullForest.asm", ROMX
+
 	map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST
 	connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5, 0, 10
 	connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5, 0, 10
@@ -31,4 +32,5 @@ BullForest_MapEvents::
 	object_event 20, 19, SPRITE_TEACHER, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 20, 29, SPRITE_BUG_CATCHER_BOY, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullForest_Blocks:: INCBIN "maps/placeholder/blk/BullForest.blk"
+BullForest_Blocks::
+INCBIN "maps/BullForest.blk"
diff --git a/data/maps/attributes/placeholder/BullForestRoute1.asm b/data/maps/objects/BullForestRoute1.asm
index 7df21a6..ad22484 100644
--- a/data/maps/attributes/placeholder/BullForestRoute1.asm
+++ b/data/maps/objects/BullForestRoute1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullForestRoute1.asm", ROMX
+SECTION "data/maps/objects/BullForestRoute1.asm", ROMX
+
 	map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST
 	connection south, Route18, ROUTE_18, 0, 0, 10
 	connection east, BullForest, BULL_FOREST, -3, 6, 12
@@ -17,4 +18,5 @@ BullForestRoute1_MapEvents::
 
 	db 0 ; person events
 
-BullForestRoute1_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1.blk"
+BullForestRoute1_Blocks::
+INCBIN "maps/BullForestRoute1.blk"
diff --git a/data/maps/attributes/placeholder/BullForestRoute1House.asm b/data/maps/objects/BullForestRoute1House.asm
index a6bafc4..e253222 100644
--- a/data/maps/attributes/placeholder/BullForestRoute1House.asm
+++ b/data/maps/objects/BullForestRoute1House.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullForestRoute1House.asm", ROMX
+SECTION "data/maps/objects/BullForestRoute1House.asm", ROMX
+
 	map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0
 
 BullForestRoute1House_MapEvents::
@@ -15,4 +16,5 @@ BullForestRoute1House_MapEvents::
 	db 1 ; person events
 	object_event 1, 5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullForestRoute1House_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1House.blk"
+BullForestRoute1House_Blocks::
+INCBIN "maps/BullForestRoute1House.blk"
diff --git a/data/maps/attributes/placeholder/BullForestRoute2.asm b/data/maps/objects/BullForestRoute2.asm
index cd1fc03..615d539 100644
--- a/data/maps/attributes/placeholder/BullForestRoute2.asm
+++ b/data/maps/objects/BullForestRoute2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullForestRoute2.asm", ROMX
+SECTION "data/maps/objects/BullForestRoute2.asm", ROMX
+
 	map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH
 	connection north, BullForest, BULL_FOREST, -3, 2, 16
 	connection south, Stand, STAND, -3, 7, 13
@@ -16,4 +17,5 @@ BullForestRoute2_MapEvents::
 
 	db 0 ; person events
 
-BullForestRoute2_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute2.blk"
+BullForestRoute2_Blocks::
+INCBIN "maps/BullForestRoute2.blk"
diff --git a/data/maps/attributes/placeholder/BullForestRoute3.asm b/data/maps/objects/BullForestRoute3.asm
index b014dcf..1db4c57 100644
--- a/data/maps/attributes/placeholder/BullForestRoute3.asm
+++ b/data/maps/objects/BullForestRoute3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullForestRoute3.asm", ROMX
+SECTION "data/maps/objects/BullForestRoute3.asm", ROMX
+
 	map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH
 	connection north, North, NORTH, 0, 0, 10
 	connection south, BullForest, BULL_FOREST, -3, 2, 16
@@ -14,4 +15,5 @@ BullForestRoute3_MapEvents::
 
 	db 0 ; person events
 
-BullForestRoute3_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute3.blk"
+BullForestRoute3_Blocks::
+INCBIN "maps/BullForestRoute3.blk"
diff --git a/data/maps/attributes/placeholder/BullForestRouteGateStand.asm b/data/maps/objects/BullForestRouteGateStand.asm
index b7c56a4..ee252b2 100644
--- a/data/maps/attributes/placeholder/BullForestRouteGateStand.asm
+++ b/data/maps/objects/BullForestRouteGateStand.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullForestRouteGateStand.asm", ROMX
+SECTION "data/maps/objects/BullForestRouteGateStand.asm", ROMX
+
 	map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0
 
 BullForestRouteGateStand_MapEvents::
@@ -16,4 +17,5 @@ BullForestRouteGateStand_MapEvents::
 
 	db 0 ; person events
 
-BullForestRouteGateStand_Blocks:: INCBIN "maps/placeholder/blk/BullForestRouteGateStand.blk"
+BullForestRouteGateStand_Blocks::
+INCBIN "maps/BullForestRouteGateStand.blk"
diff --git a/data/maps/attributes/placeholder/BullHouse1.asm b/data/maps/objects/BullHouse1.asm
index 68fbd68..430fea2 100644
--- a/data/maps/attributes/placeholder/BullHouse1.asm
+++ b/data/maps/objects/BullHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullHouse1.asm", ROMX
+SECTION "data/maps/objects/BullHouse1.asm", ROMX
+
 	map_attributes BullHouse1, BULL_HOUSE_1, 0
 
 BullHouse1_MapEvents::
@@ -15,4 +16,5 @@ BullHouse1_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullHouse1_Blocks:: INCBIN "maps/placeholder/blk/BullHouse1.blk"
+BullHouse1_Blocks::
+INCBIN "maps/BullHouse1.blk"
diff --git a/data/maps/attributes/placeholder/BullHouse2.asm b/data/maps/objects/BullHouse2.asm
index 116e167..286b8e8 100644
--- a/data/maps/attributes/placeholder/BullHouse2.asm
+++ b/data/maps/objects/BullHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullHouse2.asm", ROMX
+SECTION "data/maps/objects/BullHouse2.asm", ROMX
+
 	map_attributes BullHouse2, BULL_HOUSE_2, 0
 
 BullHouse2_MapEvents::
@@ -15,4 +16,5 @@ BullHouse2_MapEvents::
 	db 1 ; person events
 	object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullHouse2_Blocks:: INCBIN "maps/placeholder/blk/BullHouse2.blk"
+BullHouse2_Blocks::
+INCBIN "maps/BullHouse2.blk"
diff --git a/data/maps/attributes/placeholder/BullHouse3.asm b/data/maps/objects/BullHouse3.asm
index 95f6f63..6979863 100644
--- a/data/maps/attributes/placeholder/BullHouse3.asm
+++ b/data/maps/objects/BullHouse3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullHouse3.asm", ROMX
+SECTION "data/maps/objects/BullHouse3.asm", ROMX
+
 	map_attributes BullHouse3, BULL_HOUSE_3, 0
 
 BullHouse3_MapEvents::
@@ -15,4 +16,5 @@ BullHouse3_MapEvents::
 	db 1 ; person events
 	object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullHouse3_Blocks:: INCBIN "maps/placeholder/blk/BullHouse3.blk"
+BullHouse3_Blocks::
+INCBIN "maps/BullHouse3.blk"
diff --git a/data/maps/attributes/placeholder/BullHouse4.asm b/data/maps/objects/BullHouse4.asm
index 4f54fd9..9bf3763 100644
--- a/data/maps/attributes/placeholder/BullHouse4.asm
+++ b/data/maps/objects/BullHouse4.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullHouse4.asm", ROMX
+SECTION "data/maps/objects/BullHouse4.asm", ROMX
+
 	map_attributes BullHouse4, BULL_HOUSE_4, 0
 
 BullHouse4_MapEvents::
@@ -14,4 +15,5 @@ BullHouse4_MapEvents::
 
 	db 0 ; person events
 
-BullHouse4_Blocks:: INCBIN "maps/placeholder/blk/BullHouse4.blk"
+BullHouse4_Blocks::
+INCBIN "maps/BullHouse4.blk"
diff --git a/data/maps/attributes/placeholder/BullLeague1F.asm b/data/maps/objects/BullLeague1F.asm
index 49f4480..f7e51d0 100644
--- a/data/maps/attributes/placeholder/BullLeague1F.asm
+++ b/data/maps/objects/BullLeague1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullLeague1F.asm", ROMX
+SECTION "data/maps/objects/BullLeague1F.asm", ROMX
+
 	map_attributes BullLeague1F, BULL_LEAGUE_1F, 0
 
 BullLeague1F_MapEvents::
@@ -20,4 +21,5 @@ BullLeague1F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague1F.blk"
+BullLeague1F_Blocks::
+INCBIN "maps/BullLeague1F.blk"
diff --git a/data/maps/attributes/placeholder/BullLeague2F.asm b/data/maps/objects/BullLeague2F.asm
index 88195ba..cb825a1 100644
--- a/data/maps/attributes/placeholder/BullLeague2F.asm
+++ b/data/maps/objects/BullLeague2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullLeague2F.asm", ROMX
+SECTION "data/maps/objects/BullLeague2F.asm", ROMX
+
 	map_attributes BullLeague2F, BULL_LEAGUE_2F, 0
 
 BullLeague2F_MapEvents::
@@ -18,4 +19,5 @@ BullLeague2F_MapEvents::
 	object_event 2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague2F.blk"
+BullLeague2F_Blocks::
+INCBIN "maps/BullLeague2F.blk"
diff --git a/data/maps/attributes/placeholder/BullMart.asm b/data/maps/objects/BullMart.asm
index ab6406d..14cbb05 100644
--- a/data/maps/attributes/placeholder/BullMart.asm
+++ b/data/maps/objects/BullMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullMart.asm", ROMX
+SECTION "data/maps/objects/BullMart.asm", ROMX
+
 	map_attributes BullMart, BULL_MART, 0
 
 BullMart_MapEvents::
@@ -17,4 +18,5 @@ BullMart_MapEvents::
 	object_event 10, 5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullMart_Blocks:: INCBIN "maps/placeholder/blk/BullMart.blk"
+BullMart_Blocks::
+INCBIN "maps/BullMart.blk"
diff --git a/data/maps/attributes/placeholder/BullPokecenter1F.asm b/data/maps/objects/BullPokecenter1F.asm
index 8b1d201..ca32a16 100644
--- a/data/maps/attributes/placeholder/BullPokecenter1F.asm
+++ b/data/maps/objects/BullPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/BullPokecenter1F.asm", ROMX
+
 	map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0
 
 BullPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ BullPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter1F.blk"
+BullPokecenter1F_Blocks::
+INCBIN "maps/BullPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/BullPokecenter2F.asm b/data/maps/objects/BullPokecenter2F.asm
index 7a3960e..0fc3b4b 100644
--- a/data/maps/attributes/placeholder/BullPokecenter2F.asm
+++ b/data/maps/objects/BullPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/BullPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/BullPokecenter2F.asm", ROMX
+
 	map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0
 
 BullPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ BullPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-BullPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter2F.blk"
+BullPokecenter2F_Blocks::
+INCBIN "maps/BullPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts1.asm b/data/maps/objects/CaveMinecarts1.asm
index 5671702..922c9f2 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts1.asm
+++ b/data/maps/objects/CaveMinecarts1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts1.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts1.asm", ROMX
+
 	map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0
 
 CaveMinecarts1_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts1_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts1_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts1.blk"
+CaveMinecarts1_Blocks::
+INCBIN "maps/CaveMinecarts1.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts2.asm b/data/maps/objects/CaveMinecarts2.asm
index fd6af2e..b878892 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts2.asm
+++ b/data/maps/objects/CaveMinecarts2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts2.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts2.asm", ROMX
+
 	map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0
 
 CaveMinecarts2_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts2_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts2_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts2.blk"
+CaveMinecarts2_Blocks::
+INCBIN "maps/CaveMinecarts2.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts3.asm b/data/maps/objects/CaveMinecarts3.asm
index 4cca968..bae9ae6 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts3.asm
+++ b/data/maps/objects/CaveMinecarts3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts3.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts3.asm", ROMX
+
 	map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0
 
 CaveMinecarts3_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts3_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts3_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts3.blk"
+CaveMinecarts3_Blocks::
+INCBIN "maps/CaveMinecarts3.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts4.asm b/data/maps/objects/CaveMinecarts4.asm
index 315527b..955d7a3 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts4.asm
+++ b/data/maps/objects/CaveMinecarts4.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts4.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts4.asm", ROMX
+
 	map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0
 
 CaveMinecarts4_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts4_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts4_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts4.blk"
+CaveMinecarts4_Blocks::
+INCBIN "maps/CaveMinecarts4.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts5.asm b/data/maps/objects/CaveMinecarts5.asm
index ba07065..5e64a3d 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts5.asm
+++ b/data/maps/objects/CaveMinecarts5.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts5.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts5.asm", ROMX
+
 	map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0
 
 CaveMinecarts5_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts5_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts5_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts5.blk"
+CaveMinecarts5_Blocks::
+INCBIN "maps/CaveMinecarts5.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts6.asm b/data/maps/objects/CaveMinecarts6.asm
index c4d435d..ca84386 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts6.asm
+++ b/data/maps/objects/CaveMinecarts6.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts6.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts6.asm", ROMX
+
 	map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0
 
 CaveMinecarts6_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts6_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts6_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts6.blk"
+CaveMinecarts6_Blocks::
+INCBIN "maps/CaveMinecarts6.blk"
diff --git a/data/maps/attributes/placeholder/CaveMinecarts7.asm b/data/maps/objects/CaveMinecarts7.asm
index c411e1b..222f0c2 100644
--- a/data/maps/attributes/placeholder/CaveMinecarts7.asm
+++ b/data/maps/objects/CaveMinecarts7.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/CaveMinecarts7.asm", ROMX
+SECTION "data/maps/objects/CaveMinecarts7.asm", ROMX
+
 	map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0
 
 CaveMinecarts7_MapEvents::
@@ -12,4 +13,5 @@ CaveMinecarts7_MapEvents::
 
 	db 0 ; person events
 
-CaveMinecarts7_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts7.blk"
+CaveMinecarts7_Blocks::
+INCBIN "maps/CaveMinecarts7.blk"
diff --git a/data/maps/attributes/placeholder/Fonto.asm b/data/maps/objects/Fonto.asm
index 278eba1..4e9da3c 100644
--- a/data/maps/attributes/placeholder/Fonto.asm
+++ b/data/maps/objects/Fonto.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Fonto.asm", ROMX
+SECTION "data/maps/objects/Fonto.asm", ROMX
+
 	map_attributes Fonto, FONTO, NORTH | WEST | EAST
 	connection north, FontoRoute2, FONTO_ROUTE_2, 0, 0, 10
 	connection west, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9
@@ -29,4 +30,5 @@ Fonto_MapEvents::
 	object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-Fonto_Blocks:: INCBIN "maps/placeholder/blk/Fonto.blk"
+Fonto_Blocks::
+INCBIN "maps/Fonto.blk"
diff --git a/data/maps/attributes/placeholder/FontoHouse.asm b/data/maps/objects/FontoHouse.asm
index 6a3bcf8..05c8a5e 100644
--- a/data/maps/attributes/placeholder/FontoHouse.asm
+++ b/data/maps/objects/FontoHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoHouse.asm", ROMX
+SECTION "data/maps/objects/FontoHouse.asm", ROMX
+
 	map_attributes FontoHouse, FONTO_HOUSE, 0
 
 FontoHouse_MapEvents::
@@ -15,4 +16,5 @@ FontoHouse_MapEvents::
 	db 1 ; person events
 	object_event 8, 4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoHouse.blk"
+FontoHouse_Blocks::
+INCBIN "maps/FontoHouse.blk"
diff --git a/data/maps/attributes/placeholder/FontoLab.asm b/data/maps/objects/FontoLab.asm
index ae79e99..59fa933 100644
--- a/data/maps/attributes/placeholder/FontoLab.asm
+++ b/data/maps/objects/FontoLab.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoLab.asm", ROMX
+SECTION "data/maps/objects/FontoLab.asm", ROMX
+
 	map_attributes FontoLab, FONTO_LAB, 0
 
 FontoLab_MapEvents::
@@ -16,4 +17,5 @@ FontoLab_MapEvents::
 	object_event 2, 2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 8, 5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoLab_Blocks:: INCBIN "maps/placeholder/blk/FontoLab.blk"
+FontoLab_Blocks::
+INCBIN "maps/FontoLab.blk"
diff --git a/data/maps/attributes/placeholder/FontoMart.asm b/data/maps/objects/FontoMart.asm
index 76572c3..3241f57 100644
--- a/data/maps/attributes/placeholder/FontoMart.asm
+++ b/data/maps/objects/FontoMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoMart.asm", ROMX
+SECTION "data/maps/objects/FontoMart.asm", ROMX
+
 	map_attributes FontoMart, FONTO_MART, 0
 
 FontoMart_MapEvents::
@@ -17,4 +18,5 @@ FontoMart_MapEvents::
 	object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoMart_Blocks:: INCBIN "maps/placeholder/blk/FontoMart.blk"
+FontoMart_Blocks::
+INCBIN "maps/FontoMart.blk"
diff --git a/data/maps/attributes/placeholder/FontoPokecenter1F.asm b/data/maps/objects/FontoPokecenter1F.asm
index 10a0302..aefac44 100644
--- a/data/maps/attributes/placeholder/FontoPokecenter1F.asm
+++ b/data/maps/objects/FontoPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/FontoPokecenter1F.asm", ROMX
+
 	map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0
 
 FontoPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ FontoPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter1F.blk"
+FontoPokecenter1F_Blocks::
+INCBIN "maps/FontoPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/FontoPokecenter2F.asm b/data/maps/objects/FontoPokecenter2F.asm
index 6d6ff94..025df9f 100644
--- a/data/maps/attributes/placeholder/FontoPokecenter2F.asm
+++ b/data/maps/objects/FontoPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/FontoPokecenter2F.asm", ROMX
+
 	map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0
 
 FontoPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ FontoPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter2F.blk"
+FontoPokecenter2F_Blocks::
+INCBIN "maps/FontoPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/FontoRocketHouse.asm b/data/maps/objects/FontoRocketHouse.asm
index a291669..b97cb16 100644
--- a/data/maps/attributes/placeholder/FontoRocketHouse.asm
+++ b/data/maps/objects/FontoRocketHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRocketHouse.asm", ROMX
+SECTION "data/maps/objects/FontoRocketHouse.asm", ROMX
+
 	map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0
 
 FontoRocketHouse_MapEvents::
@@ -18,4 +19,5 @@ FontoRocketHouse_MapEvents::
 	object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-FontoRocketHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoRocketHouse.blk"
+FontoRocketHouse_Blocks::
+INCBIN "maps/FontoRocketHouse.blk"
diff --git a/data/maps/attributes/placeholder/FontoRoute1.asm b/data/maps/objects/FontoRoute1.asm
index 7d7831a..6218d81 100644
--- a/data/maps/attributes/placeholder/FontoRoute1.asm
+++ b/data/maps/objects/FontoRoute1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRoute1.asm", ROMX
+SECTION "data/maps/objects/FontoRoute1.asm", ROMX
+
 	map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST
 	connection west, South, SOUTH, 0, 0, 12
 	connection east, Fonto, FONTO, 0, 0, 9
@@ -15,4 +16,5 @@ FontoRoute1_MapEvents::
 
 	db 0 ; person events
 
-FontoRoute1_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute1.blk"
+FontoRoute1_Blocks::
+INCBIN "maps/FontoRoute1.blk"
diff --git a/data/maps/attributes/placeholder/FontoRoute2.asm b/data/maps/objects/FontoRoute2.asm
index 10957aa..1c79180 100644
--- a/data/maps/attributes/placeholder/FontoRoute2.asm
+++ b/data/maps/objects/FontoRoute2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRoute2.asm", ROMX
+SECTION "data/maps/objects/FontoRoute2.asm", ROMX
+
 	map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST
 	connection south, Fonto, FONTO, 0, 0, 10
 	connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9
@@ -14,4 +15,5 @@ FontoRoute2_MapEvents::
 
 	db 0 ; person events
 
-FontoRoute2_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute2.blk"
+FontoRoute2_Blocks::
+INCBIN "maps/FontoRoute2.blk"
diff --git a/data/maps/attributes/placeholder/FontoRoute3.asm b/data/maps/objects/FontoRoute3.asm
index a288f0b..36dc909 100644
--- a/data/maps/attributes/placeholder/FontoRoute3.asm
+++ b/data/maps/objects/FontoRoute3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRoute3.asm", ROMX
+SECTION "data/maps/objects/FontoRoute3.asm", ROMX
+
 	map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST
 	connection west, Fonto, FONTO, 0, 0, 9
 	connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12
@@ -14,4 +15,5 @@ FontoRoute3_MapEvents::
 
 	db 0 ; person events
 
-FontoRoute3_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute3.blk"
+FontoRoute3_Blocks::
+INCBIN "maps/FontoRoute3.blk"
diff --git a/data/maps/attributes/placeholder/FontoRoute4.asm b/data/maps/objects/FontoRoute4.asm
index 496c613..bed27cb 100644
--- a/data/maps/attributes/placeholder/FontoRoute4.asm
+++ b/data/maps/objects/FontoRoute4.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRoute4.asm", ROMX
+SECTION "data/maps/objects/FontoRoute4.asm", ROMX
+
 	map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST
 	connection south, Baadon, BAADON, 0, 0, 10
 	connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9
@@ -16,4 +17,5 @@ FontoRoute4_MapEvents::
 
 	db 0 ; person events
 
-FontoRoute4_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute4.blk"
+FontoRoute4_Blocks::
+INCBIN "maps/FontoRoute4.blk"
diff --git a/data/maps/attributes/placeholder/FontoRoute5.asm b/data/maps/objects/FontoRoute5.asm
index 85bb2f8..441a773 100644
--- a/data/maps/attributes/placeholder/FontoRoute5.asm
+++ b/data/maps/objects/FontoRoute5.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRoute5.asm", ROMX
+SECTION "data/maps/objects/FontoRoute5.asm", ROMX
+
 	map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST
 	connection south, South, SOUTH, -3, 7, 13
 	connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9
@@ -16,4 +17,5 @@ FontoRoute5_MapEvents::
 
 	db 0 ; person events
 
-FontoRoute5_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute5.blk"
+FontoRoute5_Blocks::
+INCBIN "maps/FontoRoute5.blk"
diff --git a/data/maps/attributes/placeholder/FontoRoute6.asm b/data/maps/objects/FontoRoute6.asm
index 523f6d2..c3320e7 100644
--- a/data/maps/attributes/placeholder/FontoRoute6.asm
+++ b/data/maps/objects/FontoRoute6.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRoute6.asm", ROMX
+SECTION "data/maps/objects/FontoRoute6.asm", ROMX
+
 	map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST
 	connection west, FontoRoute5, FONTO_ROUTE_5, 0, 0, 12
 	connection east, FontoRoute2, FONTO_ROUTE_2, 0, 0, 12
@@ -14,4 +15,5 @@ FontoRoute6_MapEvents::
 
 	db 0 ; person events
 
-FontoRoute6_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute6.blk"
+FontoRoute6_Blocks::
+INCBIN "maps/FontoRoute6.blk"
diff --git a/data/maps/attributes/placeholder/FontoRouteGate1.asm b/data/maps/objects/FontoRouteGate1.asm
index 7276e60..2ef0c71 100644
--- a/data/maps/attributes/placeholder/FontoRouteGate1.asm
+++ b/data/maps/objects/FontoRouteGate1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRouteGate1.asm", ROMX
+SECTION "data/maps/objects/FontoRouteGate1.asm", ROMX
+
 	map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0
 
 FontoRouteGate1_MapEvents::
@@ -16,4 +17,5 @@ FontoRouteGate1_MapEvents::
 
 	db 0 ; person events
 
-FontoRouteGate1_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate1.blk"
+FontoRouteGate1_Blocks::
+INCBIN "maps/FontoRouteGate1.blk"
diff --git a/data/maps/attributes/placeholder/FontoRouteGate2.asm b/data/maps/objects/FontoRouteGate2.asm
index 6180a67..bf69bf8 100644
--- a/data/maps/attributes/placeholder/FontoRouteGate2.asm
+++ b/data/maps/objects/FontoRouteGate2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRouteGate2.asm", ROMX
+SECTION "data/maps/objects/FontoRouteGate2.asm", ROMX
+
 	map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0
 
 FontoRouteGate2_MapEvents::
@@ -16,4 +17,5 @@ FontoRouteGate2_MapEvents::
 
 	db 0 ; person events
 
-FontoRouteGate2_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate2.blk"
+FontoRouteGate2_Blocks::
+INCBIN "maps/FontoRouteGate2.blk"
diff --git a/data/maps/attributes/placeholder/FontoRouteGate3.asm b/data/maps/objects/FontoRouteGate3.asm
index ff3341d..18af188 100644
--- a/data/maps/attributes/placeholder/FontoRouteGate3.asm
+++ b/data/maps/objects/FontoRouteGate3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/FontoRouteGate3.asm", ROMX
+SECTION "data/maps/objects/FontoRouteGate3.asm", ROMX
+
 	map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0
 
 FontoRouteGate3_MapEvents::
@@ -16,4 +17,5 @@ FontoRouteGate3_MapEvents::
 
 	db 0 ; person events
 
-FontoRouteGate3_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate3.blk"
+FontoRouteGate3_Blocks::
+INCBIN "maps/FontoRouteGate3.blk"
diff --git a/data/maps/attributes/placeholder/Haiteku.asm b/data/maps/objects/Haiteku.asm
index 211fccb..2205ced 100644
--- a/data/maps/attributes/placeholder/Haiteku.asm
+++ b/data/maps/objects/Haiteku.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Haiteku.asm", ROMX
+SECTION "data/maps/objects/Haiteku.asm", ROMX
+
 	map_attributes Haiteku, HAITEKU, WEST
 	connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9
 
@@ -35,4 +36,5 @@ Haiteku_MapEvents::
 	object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Haiteku_Blocks:: INCBIN "maps/placeholder/blk/Haiteku.blk"
+Haiteku_Blocks::
+INCBIN "maps/Haiteku.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuAquarium1F.asm b/data/maps/objects/HaitekuAquarium1F.asm
index 9eddea5..5b7a1de 100644
--- a/data/maps/attributes/placeholder/HaitekuAquarium1F.asm
+++ b/data/maps/objects/HaitekuAquarium1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuAquarium1F.asm", ROMX
+SECTION "data/maps/objects/HaitekuAquarium1F.asm", ROMX
+
 	map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0
 
 HaitekuAquarium1F_MapEvents::
@@ -18,4 +19,5 @@ HaitekuAquarium1F_MapEvents::
 	object_event 12, 2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuAquarium1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium1F.blk"
+HaitekuAquarium1F_Blocks::
+INCBIN "maps/HaitekuAquarium1F.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuAquarium2F.asm b/data/maps/objects/HaitekuAquarium2F.asm
index 1b675f2..61a377d 100644
--- a/data/maps/attributes/placeholder/HaitekuAquarium2F.asm
+++ b/data/maps/objects/HaitekuAquarium2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuAquarium2F.asm", ROMX
+SECTION "data/maps/objects/HaitekuAquarium2F.asm", ROMX
+
 	map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0
 
 HaitekuAquarium2F_MapEvents::
@@ -15,4 +16,5 @@ HaitekuAquarium2F_MapEvents::
 	object_event 7, 6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuAquarium2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium2F.blk"
+HaitekuAquarium2F_Blocks::
+INCBIN "maps/HaitekuAquarium2F.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuHouse1.asm b/data/maps/objects/HaitekuHouse1.asm
index 11c2bc0..d359c1c 100644
--- a/data/maps/attributes/placeholder/HaitekuHouse1.asm
+++ b/data/maps/objects/HaitekuHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuHouse1.asm", ROMX
+SECTION "data/maps/objects/HaitekuHouse1.asm", ROMX
+
 	map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0
 
 HaitekuHouse1_MapEvents::
@@ -15,4 +16,5 @@ HaitekuHouse1_MapEvents::
 	db 1 ; person events
 	object_event 7, 3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuHouse1_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse1.blk"
+HaitekuHouse1_Blocks::
+INCBIN "maps/HaitekuHouse1.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuHouse2.asm b/data/maps/objects/HaitekuHouse2.asm
index d254e09..e0df087 100644
--- a/data/maps/attributes/placeholder/HaitekuHouse2.asm
+++ b/data/maps/objects/HaitekuHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuHouse2.asm", ROMX
+SECTION "data/maps/objects/HaitekuHouse2.asm", ROMX
+
 	map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0
 
 HaitekuHouse2_MapEvents::
@@ -15,4 +16,5 @@ HaitekuHouse2_MapEvents::
 	db 1 ; person events
 	object_event 7, 3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuHouse2_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse2.blk"
+HaitekuHouse2_Blocks::
+INCBIN "maps/HaitekuHouse2.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm b/data/maps/objects/HaitekuImposterOakHouse.asm
index 68c7eaf..87ce9b3 100644
--- a/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm
+++ b/data/maps/objects/HaitekuImposterOakHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm", ROMX
+SECTION "data/maps/objects/HaitekuImposterOakHouse.asm", ROMX
+
 	map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0
 
 HaitekuImposterOakHouse_MapEvents::
@@ -16,4 +17,5 @@ HaitekuImposterOakHouse_MapEvents::
 	object_event 7, 3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuImposterOakHouse_Blocks:: INCBIN "maps/placeholder/blk/HaitekuImposterOakHouse.blk"
+HaitekuImposterOakHouse_Blocks::
+INCBIN "maps/HaitekuImposterOakHouse.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuLeague1F.asm b/data/maps/objects/HaitekuLeague1F.asm
index c45aba7..c00342d 100644
--- a/data/maps/attributes/placeholder/HaitekuLeague1F.asm
+++ b/data/maps/objects/HaitekuLeague1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuLeague1F.asm", ROMX
+SECTION "data/maps/objects/HaitekuLeague1F.asm", ROMX
+
 	map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0
 
 HaitekuLeague1F_MapEvents::
@@ -20,4 +21,5 @@ HaitekuLeague1F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuLeague1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague1F.blk"
+HaitekuLeague1F_Blocks::
+INCBIN "maps/HaitekuLeague1F.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuLeague2F.asm b/data/maps/objects/HaitekuLeague2F.asm
index c868dd5..5eadc64 100644
--- a/data/maps/attributes/placeholder/HaitekuLeague2F.asm
+++ b/data/maps/objects/HaitekuLeague2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuLeague2F.asm", ROMX
+SECTION "data/maps/objects/HaitekuLeague2F.asm", ROMX
+
 	map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0
 
 HaitekuLeague2F_MapEvents::
@@ -18,4 +19,5 @@ HaitekuLeague2F_MapEvents::
 	object_event 2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuLeague2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague2F.blk"
+HaitekuLeague2F_Blocks::
+INCBIN "maps/HaitekuLeague2F.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuMart.asm b/data/maps/objects/HaitekuMart.asm
index 53cd2dd..5570978 100644
--- a/data/maps/attributes/placeholder/HaitekuMart.asm
+++ b/data/maps/objects/HaitekuMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuMart.asm", ROMX
+SECTION "data/maps/objects/HaitekuMart.asm", ROMX
+
 	map_attributes HaitekuMart, HAITEKU_MART, 0
 
 HaitekuMart_MapEvents::
@@ -17,4 +18,5 @@ HaitekuMart_MapEvents::
 	object_event 10, 5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuMart_Blocks:: INCBIN "maps/placeholder/blk/HaitekuMart.blk"
+HaitekuMart_Blocks::
+INCBIN "maps/HaitekuMart.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm b/data/maps/objects/HaitekuPokecenter1F.asm
index a015908..e17a4aa 100644
--- a/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm
+++ b/data/maps/objects/HaitekuPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/HaitekuPokecenter1F.asm", ROMX
+
 	map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0
 
 HaitekuPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ HaitekuPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter1F.blk"
+HaitekuPokecenter1F_Blocks::
+INCBIN "maps/HaitekuPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm b/data/maps/objects/HaitekuPokecenter2F.asm
index 0b88113..ef3abc9 100644
--- a/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm
+++ b/data/maps/objects/HaitekuPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/HaitekuPokecenter2F.asm", ROMX
+
 	map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0
 
 HaitekuPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ HaitekuPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-HaitekuPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter2F.blk"
+HaitekuPokecenter2F_Blocks::
+INCBIN "maps/HaitekuPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuWestRoute.asm b/data/maps/objects/HaitekuWestRoute.asm
index 8806407..6facf73 100644
--- a/data/maps/attributes/placeholder/HaitekuWestRoute.asm
+++ b/data/maps/objects/HaitekuWestRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuWestRoute.asm", ROMX
+SECTION "data/maps/objects/HaitekuWestRoute.asm", ROMX
+
 	map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST
 	connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -3, 15, 12
 	connection east, Haiteku, HAITEKU, 0, 0, 12
@@ -14,4 +15,5 @@ HaitekuWestRoute_MapEvents::
 
 	db 0 ; person events
 
-HaitekuWestRoute_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRoute.blk"
+HaitekuWestRoute_Blocks::
+INCBIN "maps/HaitekuWestRoute.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm b/data/maps/objects/HaitekuWestRouteGate.asm
index 4a41b3b..77774c2 100644
--- a/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm
+++ b/data/maps/objects/HaitekuWestRouteGate.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuWestRouteGate.asm", ROMX
+SECTION "data/maps/objects/HaitekuWestRouteGate.asm", ROMX
+
 	map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0
 
 HaitekuWestRouteGate_MapEvents::
@@ -16,4 +17,5 @@ HaitekuWestRouteGate_MapEvents::
 
 	db 0 ; person events
 
-HaitekuWestRouteGate_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteGate.blk"
+HaitekuWestRouteGate_Blocks::
+INCBIN "maps/HaitekuWestRouteGate.blk"
diff --git a/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm b/data/maps/objects/HaitekuWestRouteOcean.asm
index 931bef6..9a4ab79 100644
--- a/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm
+++ b/data/maps/objects/HaitekuWestRouteOcean.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm", ROMX
+SECTION "data/maps/objects/HaitekuWestRouteOcean.asm", ROMX
+
 	map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST
 	connection north, South, SOUTH, -3, 7, 13
 	connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18, 0, 9
@@ -16,4 +17,5 @@ HaitekuWestRouteOcean_MapEvents::
 
 	db 0 ; person events
 
-HaitekuWestRouteOcean_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteOcean.blk"
+HaitekuWestRouteOcean_Blocks::
+INCBIN "maps/HaitekuWestRouteOcean.blk"
diff --git a/data/maps/attributes/placeholder/Kanto.asm b/data/maps/objects/Kanto.asm
index 657a2f6..60ddd71 100644
--- a/data/maps/attributes/placeholder/Kanto.asm
+++ b/data/maps/objects/Kanto.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Kanto.asm", ROMX
+SECTION "data/maps/objects/Kanto.asm", ROMX
+
 	map_attributes Kanto, KANTO, WEST | EAST
 	connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9
 	connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9
@@ -56,4 +57,5 @@ Kanto_MapEvents::
 
 	db 0 ; person events
 
-Kanto_Blocks:: INCBIN "maps/placeholder/blk/Kanto.blk"
+Kanto_Blocks::
+INCBIN "maps/Kanto.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeladonElevator.asm b/data/maps/objects/KantoCeladonElevator.asm
index b08d35d..391ba9e 100644
--- a/data/maps/attributes/placeholder/KantoCeladonElevator.asm
+++ b/data/maps/objects/KantoCeladonElevator.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeladonElevator.asm", ROMX
+SECTION "data/maps/objects/KantoCeladonElevator.asm", ROMX
+
 	map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0
 
 KantoCeladonElevator_MapEvents::
@@ -14,4 +15,5 @@ KantoCeladonElevator_MapEvents::
 
 	db 0 ; person events
 
-KantoCeladonElevator_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonElevator.blk"
+KantoCeladonElevator_Blocks::
+INCBIN "maps/KantoCeladonElevator.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeladonMart1F.asm b/data/maps/objects/KantoCeladonMart1F.asm
index 540b834..e97c1a2 100644
--- a/data/maps/attributes/placeholder/KantoCeladonMart1F.asm
+++ b/data/maps/objects/KantoCeladonMart1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeladonMart1F.asm", ROMX
+SECTION "data/maps/objects/KantoCeladonMart1F.asm", ROMX
+
 	map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0
 
 KantoCeladonMart1F_MapEvents::
@@ -17,4 +18,5 @@ KantoCeladonMart1F_MapEvents::
 	db 1 ; person events
 	object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoCeladonMart1F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart1F.blk"
+KantoCeladonMart1F_Blocks::
+INCBIN "maps/KantoCeladonMart1F.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeladonMart2F.asm b/data/maps/objects/KantoCeladonMart2F.asm
index e682e50..306e463 100644
--- a/data/maps/attributes/placeholder/KantoCeladonMart2F.asm
+++ b/data/maps/objects/KantoCeladonMart2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeladonMart2F.asm", ROMX
+SECTION "data/maps/objects/KantoCeladonMart2F.asm", ROMX
+
 	map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0
 
 KantoCeladonMart2F_MapEvents::
@@ -17,4 +18,5 @@ KantoCeladonMart2F_MapEvents::
 	object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoCeladonMart2F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart2F.blk"
+KantoCeladonMart2F_Blocks::
+INCBIN "maps/KantoCeladonMart2F.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeladonMart3F.asm b/data/maps/objects/KantoCeladonMart3F.asm
index 1c0bf1c..86ed78e 100644
--- a/data/maps/attributes/placeholder/KantoCeladonMart3F.asm
+++ b/data/maps/objects/KantoCeladonMart3F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeladonMart3F.asm", ROMX
+SECTION "data/maps/objects/KantoCeladonMart3F.asm", ROMX
+
 	map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0
 
 KantoCeladonMart3F_MapEvents::
@@ -17,4 +18,5 @@ KantoCeladonMart3F_MapEvents::
 	object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 3, 5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoCeladonMart3F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart3F.blk"
+KantoCeladonMart3F_Blocks::
+INCBIN "maps/KantoCeladonMart3F.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeladonMart4F.asm b/data/maps/objects/KantoCeladonMart4F.asm
index 0cc7099..db1c820 100644
--- a/data/maps/attributes/placeholder/KantoCeladonMart4F.asm
+++ b/data/maps/objects/KantoCeladonMart4F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeladonMart4F.asm", ROMX
+SECTION "data/maps/objects/KantoCeladonMart4F.asm", ROMX
+
 	map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0
 
 KantoCeladonMart4F_MapEvents::
@@ -18,4 +19,5 @@ KantoCeladonMart4F_MapEvents::
 	object_event 8, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoCeladonMart4F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart4F.blk"
+KantoCeladonMart4F_Blocks::
+INCBIN "maps/KantoCeladonMart4F.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeladonMart5F.asm b/data/maps/objects/KantoCeladonMart5F.asm
index 6727d30..b783876 100644
--- a/data/maps/attributes/placeholder/KantoCeladonMart5F.asm
+++ b/data/maps/objects/KantoCeladonMart5F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeladonMart5F.asm", ROMX
+SECTION "data/maps/objects/KantoCeladonMart5F.asm", ROMX
+
 	map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0
 
 KantoCeladonMart5F_MapEvents::
@@ -17,4 +18,5 @@ KantoCeladonMart5F_MapEvents::
 	object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoCeladonMart5F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart5F.blk"
+KantoCeladonMart5F_Blocks::
+INCBIN "maps/KantoCeladonMart5F.blk"
diff --git a/data/maps/attributes/placeholder/KantoCeruleanHouse.asm b/data/maps/objects/KantoCeruleanHouse.asm
index 7570123..93d6c59 100644
--- a/data/maps/attributes/placeholder/KantoCeruleanHouse.asm
+++ b/data/maps/objects/KantoCeruleanHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoCeruleanHouse.asm", ROMX
+SECTION "data/maps/objects/KantoCeruleanHouse.asm", ROMX
+
 	map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0
 
 KantoCeruleanHouse_MapEvents::
@@ -15,4 +16,5 @@ KantoCeruleanHouse_MapEvents::
 	db 1 ; person events
 	object_event 3, 3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoCeruleanHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoCeruleanHouse.blk"
+KantoCeruleanHouse_Blocks::
+INCBIN "maps/KantoCeruleanHouse.blk"
diff --git a/data/maps/attributes/placeholder/KantoDiner.asm b/data/maps/objects/KantoDiner.asm
index 9906d4b..b161d29 100644
--- a/data/maps/attributes/placeholder/KantoDiner.asm
+++ b/data/maps/objects/KantoDiner.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoDiner.asm", ROMX
+SECTION "data/maps/objects/KantoDiner.asm", ROMX
+
 	map_attributes KantoDiner, KANTO_DINER, 0
 
 KantoDiner_MapEvents::
@@ -14,4 +15,5 @@ KantoDiner_MapEvents::
 
 	db 0 ; person events
 
-KantoDiner_Blocks:: INCBIN "maps/placeholder/blk/KantoDiner.blk"
+KantoDiner_Blocks::
+INCBIN "maps/KantoDiner.blk"
diff --git a/data/maps/attributes/placeholder/KantoEastRoute.asm b/data/maps/objects/KantoEastRoute.asm
index f338935..00bf8f2 100644
--- a/data/maps/attributes/placeholder/KantoEastRoute.asm
+++ b/data/maps/objects/KantoEastRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoEastRoute.asm", ROMX
+SECTION "data/maps/objects/KantoEastRoute.asm", ROMX
+
 	map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST
 	connection north, StandRoute, STAND_ROUTE, 10, 0, 10
 	connection west, Kanto, KANTO, -3, 6, 15
@@ -16,4 +17,5 @@ KantoEastRoute_MapEvents::
 
 	db 0 ; person events
 
-KantoEastRoute_Blocks:: INCBIN "maps/placeholder/blk/KantoEastRoute.blk"
+KantoEastRoute_Blocks::
+INCBIN "maps/KantoEastRoute.blk"
diff --git a/data/maps/attributes/placeholder/KantoEldersHouse.asm b/data/maps/objects/KantoEldersHouse.asm
index 9587fd0..7ea0b94 100644
--- a/data/maps/attributes/placeholder/KantoEldersHouse.asm
+++ b/data/maps/objects/KantoEldersHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoEldersHouse.asm", ROMX
+SECTION "data/maps/objects/KantoEldersHouse.asm", ROMX
+
 	map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0
 
 KantoEldersHouse_MapEvents::
@@ -16,4 +17,5 @@ KantoEldersHouse_MapEvents::
 	object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoEldersHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoEldersHouse.blk"
+KantoEldersHouse_Blocks::
+INCBIN "maps/KantoEldersHouse.blk"
diff --git a/data/maps/attributes/placeholder/KantoFishingGuru.asm b/data/maps/objects/KantoFishingGuru.asm
index dd71611..a5a2312 100644
--- a/data/maps/attributes/placeholder/KantoFishingGuru.asm
+++ b/data/maps/objects/KantoFishingGuru.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoFishingGuru.asm", ROMX
+SECTION "data/maps/objects/KantoFishingGuru.asm", ROMX
+
 	map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0
 
 KantoFishingGuru_MapEvents::
@@ -15,4 +16,5 @@ KantoFishingGuru_MapEvents::
 	db 1 ; person events
 	object_event 4, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoFishingGuru_Blocks:: INCBIN "maps/placeholder/blk/KantoFishingGuru.blk"
+KantoFishingGuru_Blocks::
+INCBIN "maps/KantoFishingGuru.blk"
diff --git a/data/maps/attributes/placeholder/KantoGameCorner.asm b/data/maps/objects/KantoGameCorner.asm
index 61c4092..424a77a 100644
--- a/data/maps/attributes/placeholder/KantoGameCorner.asm
+++ b/data/maps/objects/KantoGameCorner.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGameCorner.asm", ROMX
+SECTION "data/maps/objects/KantoGameCorner.asm", ROMX
+
 	map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0
 
 KantoGameCorner_MapEvents::
@@ -26,4 +27,5 @@ KantoGameCorner_MapEvents::
 	object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoGameCorner_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCorner.blk"
+KantoGameCorner_Blocks::
+INCBIN "maps/KantoGameCorner.blk"
diff --git a/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm b/data/maps/objects/KantoGameCornerPrizes.asm
index 62a312e..b21ca78 100644
--- a/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm
+++ b/data/maps/objects/KantoGameCornerPrizes.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGameCornerPrizes.asm", ROMX
+SECTION "data/maps/objects/KantoGameCornerPrizes.asm", ROMX
+
 	map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0
 
 KantoGameCornerPrizes_MapEvents::
@@ -17,4 +18,5 @@ KantoGameCornerPrizes_MapEvents::
 	object_event 4, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoGameCornerPrizes_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCornerPrizes.blk"
+KantoGameCornerPrizes_Blocks::
+INCBIN "maps/KantoGameCornerPrizes.blk"
diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm b/data/maps/objects/KantoGamefreakHQ1.asm
index 91158b4..2964f40 100644
--- a/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm
+++ b/data/maps/objects/KantoGamefreakHQ1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ1.asm", ROMX
+SECTION "data/maps/objects/KantoGamefreakHQ1.asm", ROMX
+
 	map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0
 
 KantoGamefreakHQ1_MapEvents::
@@ -21,4 +22,5 @@ KantoGamefreakHQ1_MapEvents::
 	object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoGamefreakHQ1_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ1.blk"
+KantoGamefreakHQ1_Blocks::
+INCBIN "maps/KantoGamefreakHQ1.blk"
diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm b/data/maps/objects/KantoGamefreakHQ2.asm
index da4f3bc..f419688 100644
--- a/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm
+++ b/data/maps/objects/KantoGamefreakHQ2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ2.asm", ROMX
+SECTION "data/maps/objects/KantoGamefreakHQ2.asm", ROMX
+
 	map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0
 
 KantoGamefreakHQ2_MapEvents::
@@ -17,4 +18,5 @@ KantoGamefreakHQ2_MapEvents::
 	db 1 ; person events
 	object_event 2, 4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoGamefreakHQ2_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ2.blk"
+KantoGamefreakHQ2_Blocks::
+INCBIN "maps/KantoGamefreakHQ2.blk"
diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm b/data/maps/objects/KantoGamefreakHQ3.asm
index 8844533..4e36ec7 100644
--- a/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm
+++ b/data/maps/objects/KantoGamefreakHQ3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ3.asm", ROMX
+SECTION "data/maps/objects/KantoGamefreakHQ3.asm", ROMX
+
 	map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0
 
 KantoGamefreakHQ3_MapEvents::
@@ -19,4 +20,5 @@ KantoGamefreakHQ3_MapEvents::
 	object_event 0, 7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoGamefreakHQ3_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ3.blk"
+KantoGamefreakHQ3_Blocks::
+INCBIN "maps/KantoGamefreakHQ3.blk"
diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm b/data/maps/objects/KantoGamefreakHQ4.asm
index 8004d0d..fc1ee0f 100644
--- a/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm
+++ b/data/maps/objects/KantoGamefreakHQ4.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ4.asm", ROMX
+SECTION "data/maps/objects/KantoGamefreakHQ4.asm", ROMX
+
 	map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0
 
 KantoGamefreakHQ4_MapEvents::
@@ -15,4 +16,5 @@ KantoGamefreakHQ4_MapEvents::
 
 	db 0 ; person events
 
-KantoGamefreakHQ4_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ4.blk"
+KantoGamefreakHQ4_Blocks::
+INCBIN "maps/KantoGamefreakHQ4.blk"
diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm b/data/maps/objects/KantoGamefreakHQ5.asm
index 4f9765b..96d02ca 100644
--- a/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm
+++ b/data/maps/objects/KantoGamefreakHQ5.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGamefreakHQ5.asm", ROMX
+SECTION "data/maps/objects/KantoGamefreakHQ5.asm", ROMX
+
 	map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0
 
 KantoGamefreakHQ5_MapEvents::
@@ -14,4 +15,5 @@ KantoGamefreakHQ5_MapEvents::
 
 	db 0 ; person events
 
-KantoGamefreakHQ5_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ5.blk"
+KantoGamefreakHQ5_Blocks::
+INCBIN "maps/KantoGamefreakHQ5.blk"
diff --git a/data/maps/attributes/placeholder/KantoGreensHouse1F.asm b/data/maps/objects/KantoGreensHouse1F.asm
index 728448f..d6600b1 100644
--- a/data/maps/attributes/placeholder/KantoGreensHouse1F.asm
+++ b/data/maps/objects/KantoGreensHouse1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGreensHouse1F.asm", ROMX
+SECTION "data/maps/objects/KantoGreensHouse1F.asm", ROMX
+
 	map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0
 
 KantoGreensHouse1F_MapEvents::
@@ -16,4 +17,5 @@ KantoGreensHouse1F_MapEvents::
 	db 1 ; person events
 	object_event 5, 3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoGreensHouse1F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse1F.blk"
+KantoGreensHouse1F_Blocks::
+INCBIN "maps/KantoGreensHouse1F.blk"
diff --git a/data/maps/attributes/placeholder/KantoGreensHouse2F.asm b/data/maps/objects/KantoGreensHouse2F.asm
index b01b313..a534362 100644
--- a/data/maps/attributes/placeholder/KantoGreensHouse2F.asm
+++ b/data/maps/objects/KantoGreensHouse2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoGreensHouse2F.asm", ROMX
+SECTION "data/maps/objects/KantoGreensHouse2F.asm", ROMX
+
 	map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0
 
 KantoGreensHouse2F_MapEvents::
@@ -13,4 +14,5 @@ KantoGreensHouse2F_MapEvents::
 
 	db 0 ; person events
 
-KantoGreensHouse2F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse2F.blk"
+KantoGreensHouse2F_Blocks::
+INCBIN "maps/KantoGreensHouse2F.blk"
diff --git a/data/maps/attributes/placeholder/KantoHospital.asm b/data/maps/objects/KantoHospital.asm
index 9840695..252b56b 100644
--- a/data/maps/attributes/placeholder/KantoHospital.asm
+++ b/data/maps/objects/KantoHospital.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoHospital.asm", ROMX
+SECTION "data/maps/objects/KantoHospital.asm", ROMX
+
 	map_attributes KantoHospital, KANTO_HOSPITAL, 0
 
 KantoHospital_MapEvents::
@@ -17,4 +18,5 @@ KantoHospital_MapEvents::
 	object_event 10, 6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 12, 6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoHospital_Blocks:: INCBIN "maps/placeholder/blk/KantoHospital.blk"
+KantoHospital_Blocks::
+INCBIN "maps/KantoHospital.blk"
diff --git a/data/maps/attributes/placeholder/KantoLavenderHouse.asm b/data/maps/objects/KantoLavenderHouse.asm
index 3e8109d..e74f072 100644
--- a/data/maps/attributes/placeholder/KantoLavenderHouse.asm
+++ b/data/maps/objects/KantoLavenderHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoLavenderHouse.asm", ROMX
+SECTION "data/maps/objects/KantoLavenderHouse.asm", ROMX
+
 	map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0
 
 KantoLavenderHouse_MapEvents::
@@ -16,4 +17,5 @@ KantoLavenderHouse_MapEvents::
 	object_event 7, 3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoLavenderHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoLavenderHouse.blk"
+KantoLavenderHouse_Blocks::
+INCBIN "maps/KantoLavenderHouse.blk"
diff --git a/data/maps/attributes/placeholder/KantoLeague1F.asm b/data/maps/objects/KantoLeague1F.asm
index 5790403..ea51b73 100644
--- a/data/maps/attributes/placeholder/KantoLeague1F.asm
+++ b/data/maps/objects/KantoLeague1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoLeague1F.asm", ROMX
+SECTION "data/maps/objects/KantoLeague1F.asm", ROMX
+
 	map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0
 
 KantoLeague1F_MapEvents::
@@ -20,4 +21,5 @@ KantoLeague1F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoLeague1F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague1F.blk"
+KantoLeague1F_Blocks::
+INCBIN "maps/KantoLeague1F.blk"
diff --git a/data/maps/attributes/placeholder/KantoLeague21F.asm b/data/maps/objects/KantoLeague21F.asm
index b09f1bd..a773116 100644
--- a/data/maps/attributes/placeholder/KantoLeague21F.asm
+++ b/data/maps/objects/KantoLeague21F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoLeague21F.asm", ROMX
+SECTION "data/maps/objects/KantoLeague21F.asm", ROMX
+
 	map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0
 
 KantoLeague21F_MapEvents::
@@ -20,4 +21,5 @@ KantoLeague21F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoLeague21F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague21F.blk"
+KantoLeague21F_Blocks::
+INCBIN "maps/KantoLeague21F.blk"
diff --git a/data/maps/attributes/placeholder/KantoLeague22F.asm b/data/maps/objects/KantoLeague22F.asm
index f7c0061..a45069b 100644
--- a/data/maps/attributes/placeholder/KantoLeague22F.asm
+++ b/data/maps/objects/KantoLeague22F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoLeague22F.asm", ROMX
+SECTION "data/maps/objects/KantoLeague22F.asm", ROMX
+
 	map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0
 
 KantoLeague22F_MapEvents::
@@ -18,4 +19,5 @@ KantoLeague22F_MapEvents::
 	object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoLeague22F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague22F.blk"
+KantoLeague22F_Blocks::
+INCBIN "maps/KantoLeague22F.blk"
diff --git a/data/maps/attributes/placeholder/KantoLeague2F.asm b/data/maps/objects/KantoLeague2F.asm
index d3c8b48..d6e38f4 100644
--- a/data/maps/attributes/placeholder/KantoLeague2F.asm
+++ b/data/maps/objects/KantoLeague2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoLeague2F.asm", ROMX
+SECTION "data/maps/objects/KantoLeague2F.asm", ROMX
+
 	map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0
 
 KantoLeague2F_MapEvents::
@@ -18,4 +19,5 @@ KantoLeague2F_MapEvents::
 	object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoLeague2F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague2F.blk"
+KantoLeague2F_Blocks::
+INCBIN "maps/KantoLeague2F.blk"
diff --git a/data/maps/attributes/placeholder/KantoMart.asm b/data/maps/objects/KantoMart.asm
index a45bb75..0ad9314 100644
--- a/data/maps/attributes/placeholder/KantoMart.asm
+++ b/data/maps/objects/KantoMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoMart.asm", ROMX
+SECTION "data/maps/objects/KantoMart.asm", ROMX
+
 	map_attributes KantoMart, KANTO_MART, 0
 
 KantoMart_MapEvents::
@@ -17,4 +18,5 @@ KantoMart_MapEvents::
 	object_event 10, 5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoMart_Blocks:: INCBIN "maps/placeholder/blk/KantoMart.blk"
+KantoMart_Blocks::
+INCBIN "maps/KantoMart.blk"
diff --git a/data/maps/attributes/placeholder/KantoOaksLab.asm b/data/maps/objects/KantoOaksLab.asm
index 534f8a4..2760121 100644
--- a/data/maps/attributes/placeholder/KantoOaksLab.asm
+++ b/data/maps/objects/KantoOaksLab.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoOaksLab.asm", ROMX
+SECTION "data/maps/objects/KantoOaksLab.asm", ROMX
+
 	map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0
 
 KantoOaksLab_MapEvents::
@@ -15,4 +16,5 @@ KantoOaksLab_MapEvents::
 	db 1 ; person events
 	object_event 3, 2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoOaksLab_Blocks:: INCBIN "maps/placeholder/blk/KantoOaksLab.blk"
+KantoOaksLab_Blocks::
+INCBIN "maps/KantoOaksLab.blk"
diff --git a/data/maps/attributes/placeholder/KantoPokecenter1F.asm b/data/maps/objects/KantoPokecenter1F.asm
index 03fccc3..1ee32fd 100644
--- a/data/maps/attributes/placeholder/KantoPokecenter1F.asm
+++ b/data/maps/objects/KantoPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/KantoPokecenter1F.asm", ROMX
+
 	map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0
 
 KantoPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ KantoPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter1F.blk"
+KantoPokecenter1F_Blocks::
+INCBIN "maps/KantoPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/KantoPokecenter21F.asm b/data/maps/objects/KantoPokecenter21F.asm
index 9226222..2e7a2ac 100644
--- a/data/maps/attributes/placeholder/KantoPokecenter21F.asm
+++ b/data/maps/objects/KantoPokecenter21F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoPokecenter21F.asm", ROMX
+SECTION "data/maps/objects/KantoPokecenter21F.asm", ROMX
+
 	map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0
 
 KantoPokecenter21F_MapEvents::
@@ -19,4 +20,5 @@ KantoPokecenter21F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoPokecenter21F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter21F.blk"
+KantoPokecenter21F_Blocks::
+INCBIN "maps/KantoPokecenter21F.blk"
diff --git a/data/maps/attributes/placeholder/KantoPokecenter22F.asm b/data/maps/objects/KantoPokecenter22F.asm
index 3e56c12..1e46fe2 100644
--- a/data/maps/attributes/placeholder/KantoPokecenter22F.asm
+++ b/data/maps/objects/KantoPokecenter22F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoPokecenter22F.asm", ROMX
+SECTION "data/maps/objects/KantoPokecenter22F.asm", ROMX
+
 	map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0
 
 KantoPokecenter22F_MapEvents::
@@ -16,4 +17,5 @@ KantoPokecenter22F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoPokecenter22F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter22F.blk"
+KantoPokecenter22F_Blocks::
+INCBIN "maps/KantoPokecenter22F.blk"
diff --git a/data/maps/attributes/placeholder/KantoPokecenter2F.asm b/data/maps/objects/KantoPokecenter2F.asm
index c684143..43a9070 100644
--- a/data/maps/attributes/placeholder/KantoPokecenter2F.asm
+++ b/data/maps/objects/KantoPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/KantoPokecenter2F.asm", ROMX
+
 	map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0
 
 KantoPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ KantoPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter2F.blk"
+KantoPokecenter2F_Blocks::
+INCBIN "maps/KantoPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/KantoRedsHouse.asm b/data/maps/objects/KantoRedsHouse.asm
index dc9748c..7043e27 100644
--- a/data/maps/attributes/placeholder/KantoRedsHouse.asm
+++ b/data/maps/objects/KantoRedsHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoRedsHouse.asm", ROMX
+SECTION "data/maps/objects/KantoRedsHouse.asm", ROMX
+
 	map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0
 
 KantoRedsHouse_MapEvents::
@@ -16,4 +17,5 @@ KantoRedsHouse_MapEvents::
 	object_event 7, 3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoRedsHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoRedsHouse.blk"
+KantoRedsHouse_Blocks::
+INCBIN "maps/KantoRedsHouse.blk"
diff --git a/data/maps/attributes/placeholder/KantoSchool.asm b/data/maps/objects/KantoSchool.asm
index eb49456..dcba623 100644
--- a/data/maps/attributes/placeholder/KantoSchool.asm
+++ b/data/maps/objects/KantoSchool.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoSchool.asm", ROMX
+SECTION "data/maps/objects/KantoSchool.asm", ROMX
+
 	map_attributes KantoSchool, KANTO_SCHOOL, 0
 
 KantoSchool_MapEvents::
@@ -19,4 +20,5 @@ KantoSchool_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoSchool_Blocks:: INCBIN "maps/placeholder/blk/KantoSchool.blk"
+KantoSchool_Blocks::
+INCBIN "maps/KantoSchool.blk"
diff --git a/data/maps/attributes/placeholder/KantoSilphCo.asm b/data/maps/objects/KantoSilphCo.asm
index 29926be..38bd8ab 100644
--- a/data/maps/attributes/placeholder/KantoSilphCo.asm
+++ b/data/maps/objects/KantoSilphCo.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoSilphCo.asm", ROMX
+SECTION "data/maps/objects/KantoSilphCo.asm", ROMX
+
 	map_attributes KantoSilphCo, KANTO_SILPH_CO, 0
 
 KantoSilphCo_MapEvents::
@@ -16,4 +17,5 @@ KantoSilphCo_MapEvents::
 	object_event 2, 2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 22, 1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoSilphCo_Blocks:: INCBIN "maps/placeholder/blk/KantoSilphCo.blk"
+KantoSilphCo_Blocks::
+INCBIN "maps/KantoSilphCo.blk"
diff --git a/data/maps/attributes/placeholder/KantoUnusedArea.asm b/data/maps/objects/KantoUnusedArea.asm
index cb8686e..7429d38 100644
--- a/data/maps/attributes/placeholder/KantoUnusedArea.asm
+++ b/data/maps/objects/KantoUnusedArea.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoUnusedArea.asm", ROMX
+SECTION "data/maps/objects/KantoUnusedArea.asm", ROMX
+
 	map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0
 
 KantoUnusedArea_MapEvents::
@@ -12,4 +13,5 @@ KantoUnusedArea_MapEvents::
 
 	db 0 ; person events
 
-KantoUnusedArea_Blocks:: INCBIN "maps/placeholder/blk/KantoUnusedArea.blk"
+KantoUnusedArea_Blocks::
+INCBIN "maps/KantoUnusedArea.blk"
diff --git a/data/maps/attributes/placeholder/KantoViridianHouse.asm b/data/maps/objects/KantoViridianHouse.asm
index 1699edc..29bc41f 100644
--- a/data/maps/attributes/placeholder/KantoViridianHouse.asm
+++ b/data/maps/objects/KantoViridianHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/KantoViridianHouse.asm", ROMX
+SECTION "data/maps/objects/KantoViridianHouse.asm", ROMX
+
 	map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0
 
 KantoViridianHouse_MapEvents::
@@ -16,4 +17,5 @@ KantoViridianHouse_MapEvents::
 	object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-KantoViridianHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoViridianHouse.blk"
+KantoViridianHouse_Blocks::
+INCBIN "maps/KantoViridianHouse.blk"
diff --git a/data/maps/attributes/placeholder/MtFuji.asm b/data/maps/objects/MtFuji.asm
index 8d31fa7..ddae1d3 100644
--- a/data/maps/attributes/placeholder/MtFuji.asm
+++ b/data/maps/objects/MtFuji.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/MtFuji.asm", ROMX
+SECTION "data/maps/objects/MtFuji.asm", ROMX
+
 	map_attributes MtFuji, MT_FUJI, SOUTH
 	connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10
 
@@ -13,4 +14,5 @@ MtFuji_MapEvents::
 
 	db 0 ; person events
 
-MtFuji_Blocks:: INCBIN "maps/placeholder/blk/MtFuji.blk"
+MtFuji_Blocks::
+INCBIN "maps/MtFuji.blk"
diff --git a/data/maps/attributes/placeholder/MtFujiRoute.asm b/data/maps/objects/MtFujiRoute.asm
index c4a2f08..e530dcc 100644
--- a/data/maps/attributes/placeholder/MtFujiRoute.asm
+++ b/data/maps/objects/MtFujiRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/MtFujiRoute.asm", ROMX
+SECTION "data/maps/objects/MtFujiRoute.asm", ROMX
+
 	map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH
 	connection north, MtFuji, MT_FUJI, 0, 0, 10
 	connection south, Prince, PRINCE, 0, 0, 10
@@ -14,4 +15,5 @@ MtFujiRoute_MapEvents::
 
 	db 0 ; person events
 
-MtFujiRoute_Blocks:: INCBIN "maps/placeholder/blk/MtFujiRoute.blk"
+MtFujiRoute_Blocks::
+INCBIN "maps/MtFujiRoute.blk"
diff --git a/data/maps/attributes/placeholder/Newtype.asm b/data/maps/objects/Newtype.asm
index 32297bd..a0179d9 100644
--- a/data/maps/attributes/placeholder/Newtype.asm
+++ b/data/maps/objects/Newtype.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Newtype.asm", ROMX
+SECTION "data/maps/objects/Newtype.asm", ROMX
+
 	map_attributes Newtype, NEWTYPE, NORTH | WEST | EAST
 	connection north, SugarRoute, SUGAR_ROUTE, 5, 0, 10
 	connection west, Route15, ROUTE_15, 0, 0, 9
@@ -37,4 +38,5 @@ Newtype_MapEvents::
 	object_event 24, 9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Newtype_Blocks:: INCBIN "maps/placeholder/blk/Newtype.blk"
+Newtype_Blocks::
+INCBIN "maps/Newtype.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeDiner.asm b/data/maps/objects/NewtypeDiner.asm
index 968b478..fafd30a 100644
--- a/data/maps/attributes/placeholder/NewtypeDiner.asm
+++ b/data/maps/objects/NewtypeDiner.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeDiner.asm", ROMX
+SECTION "data/maps/objects/NewtypeDiner.asm", ROMX
+
 	map_attributes NewtypeDiner, NEWTYPE_DINER, 0
 
 NewtypeDiner_MapEvents::
@@ -18,4 +19,5 @@ NewtypeDiner_MapEvents::
 	object_event 5, 3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeDiner_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDiner.blk"
+NewtypeDiner_Blocks::
+INCBIN "maps/NewtypeDiner.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeDojo.asm b/data/maps/objects/NewtypeDojo.asm
index 7a0457b..444a861 100644
--- a/data/maps/attributes/placeholder/NewtypeDojo.asm
+++ b/data/maps/objects/NewtypeDojo.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeDojo.asm", ROMX
+SECTION "data/maps/objects/NewtypeDojo.asm", ROMX
+
 	map_attributes NewtypeDojo, NEWTYPE_DOJO, 0
 
 NewtypeDojo_MapEvents::
@@ -19,4 +20,5 @@ NewtypeDojo_MapEvents::
 	object_event 3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeDojo_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDojo.blk"
+NewtypeDojo_Blocks::
+INCBIN "maps/NewtypeDojo.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeHouse1.asm b/data/maps/objects/NewtypeHouse1.asm
index 9b613ad..30de46a 100644
--- a/data/maps/attributes/placeholder/NewtypeHouse1.asm
+++ b/data/maps/objects/NewtypeHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeHouse1.asm", ROMX
+SECTION "data/maps/objects/NewtypeHouse1.asm", ROMX
+
 	map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0
 
 NewtypeHouse1_MapEvents::
@@ -15,4 +16,5 @@ NewtypeHouse1_MapEvents::
 	db 1 ; person events
 	object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeHouse1_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse1.blk"
+NewtypeHouse1_Blocks::
+INCBIN "maps/NewtypeHouse1.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeHouse2.asm b/data/maps/objects/NewtypeHouse2.asm
index ef7e650..d0153d0 100644
--- a/data/maps/attributes/placeholder/NewtypeHouse2.asm
+++ b/data/maps/objects/NewtypeHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeHouse2.asm", ROMX
+SECTION "data/maps/objects/NewtypeHouse2.asm", ROMX
+
 	map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0
 
 NewtypeHouse2_MapEvents::
@@ -15,4 +16,5 @@ NewtypeHouse2_MapEvents::
 	db 1 ; person events
 	object_event 4, 3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeHouse2_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse2.blk"
+NewtypeHouse2_Blocks::
+INCBIN "maps/NewtypeHouse2.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeHouse3.asm b/data/maps/objects/NewtypeHouse3.asm
index fbe78a1..bf7bcfb 100644
--- a/data/maps/attributes/placeholder/NewtypeHouse3.asm
+++ b/data/maps/objects/NewtypeHouse3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeHouse3.asm", ROMX
+SECTION "data/maps/objects/NewtypeHouse3.asm", ROMX
+
 	map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0
 
 NewtypeHouse3_MapEvents::
@@ -15,4 +16,5 @@ NewtypeHouse3_MapEvents::
 	db 1 ; person events
 	object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeHouse3_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse3.blk"
+NewtypeHouse3_Blocks::
+INCBIN "maps/NewtypeHouse3.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeLeague1F.asm b/data/maps/objects/NewtypeLeague1F.asm
index 227c641..cd9ea41 100644
--- a/data/maps/attributes/placeholder/NewtypeLeague1F.asm
+++ b/data/maps/objects/NewtypeLeague1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeLeague1F.asm", ROMX
+SECTION "data/maps/objects/NewtypeLeague1F.asm", ROMX
+
 	map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0
 
 NewtypeLeague1F_MapEvents::
@@ -20,4 +21,5 @@ NewtypeLeague1F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeLeague1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague1F.blk"
+NewtypeLeague1F_Blocks::
+INCBIN "maps/NewtypeLeague1F.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeLeague2F.asm b/data/maps/objects/NewtypeLeague2F.asm
index 3ee52b4..19cae51 100644
--- a/data/maps/attributes/placeholder/NewtypeLeague2F.asm
+++ b/data/maps/objects/NewtypeLeague2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeLeague2F.asm", ROMX
+SECTION "data/maps/objects/NewtypeLeague2F.asm", ROMX
+
 	map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0
 
 NewtypeLeague2F_MapEvents::
@@ -18,4 +19,5 @@ NewtypeLeague2F_MapEvents::
 	object_event 0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeLeague2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague2F.blk"
+NewtypeLeague2F_Blocks::
+INCBIN "maps/NewtypeLeague2F.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeMart.asm b/data/maps/objects/NewtypeMart.asm
index a180396..2ada20c 100644
--- a/data/maps/attributes/placeholder/NewtypeMart.asm
+++ b/data/maps/objects/NewtypeMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeMart.asm", ROMX
+SECTION "data/maps/objects/NewtypeMart.asm", ROMX
+
 	map_attributes NewtypeMart, NEWTYPE_MART, 0
 
 NewtypeMart_MapEvents::
@@ -17,4 +18,5 @@ NewtypeMart_MapEvents::
 	object_event 10, 5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeMart_Blocks:: INCBIN "maps/placeholder/blk/NewtypeMart.blk"
+NewtypeMart_Blocks::
+INCBIN "maps/NewtypeMart.blk"
diff --git a/data/maps/attributes/placeholder/NewtypePokecenter1F.asm b/data/maps/objects/NewtypePokecenter1F.asm
index 196e153..9122876 100644
--- a/data/maps/attributes/placeholder/NewtypePokecenter1F.asm
+++ b/data/maps/objects/NewtypePokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypePokecenter1F.asm", ROMX
+SECTION "data/maps/objects/NewtypePokecenter1F.asm", ROMX
+
 	map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0
 
 NewtypePokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ NewtypePokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypePokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter1F.blk"
+NewtypePokecenter1F_Blocks::
+INCBIN "maps/NewtypePokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/NewtypePokecenter2F.asm b/data/maps/objects/NewtypePokecenter2F.asm
index 89a35fa..50a988e 100644
--- a/data/maps/attributes/placeholder/NewtypePokecenter2F.asm
+++ b/data/maps/objects/NewtypePokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypePokecenter2F.asm", ROMX
+SECTION "data/maps/objects/NewtypePokecenter2F.asm", ROMX
+
 	map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0
 
 NewtypePokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ NewtypePokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypePokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter2F.blk"
+NewtypePokecenter2F_Blocks::
+INCBIN "maps/NewtypePokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeRoute.asm b/data/maps/objects/NewtypeRoute.asm
index ae23280..eceaf4c 100644
--- a/data/maps/attributes/placeholder/NewtypeRoute.asm
+++ b/data/maps/objects/NewtypeRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeRoute.asm", ROMX
+SECTION "data/maps/objects/NewtypeRoute.asm", ROMX
+
 	map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST
 	connection west, Newtype, NEWTYPE, -3, 6, 12
 	connection east, Route18, ROUTE_18, -3, 33, 12
@@ -14,4 +15,5 @@ NewtypeRoute_MapEvents::
 
 	db 0 ; person events
 
-NewtypeRoute_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRoute.blk"
+NewtypeRoute_Blocks::
+INCBIN "maps/NewtypeRoute.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeRouteGate.asm b/data/maps/objects/NewtypeRouteGate.asm
index b3546a6..382549b 100644
--- a/data/maps/attributes/placeholder/NewtypeRouteGate.asm
+++ b/data/maps/objects/NewtypeRouteGate.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeRouteGate.asm", ROMX
+SECTION "data/maps/objects/NewtypeRouteGate.asm", ROMX
+
 	map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0
 
 NewtypeRouteGate_MapEvents::
@@ -16,4 +17,5 @@ NewtypeRouteGate_MapEvents::
 
 	db 0 ; person events
 
-NewtypeRouteGate_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRouteGate.blk"
+NewtypeRouteGate_Blocks::
+INCBIN "maps/NewtypeRouteGate.blk"
diff --git a/data/maps/attributes/placeholder/NewtypeSailorHouse.asm b/data/maps/objects/NewtypeSailorHouse.asm
index ea7cb6b..234929c 100644
--- a/data/maps/attributes/placeholder/NewtypeSailorHouse.asm
+++ b/data/maps/objects/NewtypeSailorHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NewtypeSailorHouse.asm", ROMX
+SECTION "data/maps/objects/NewtypeSailorHouse.asm", ROMX
+
 	map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0
 
 NewtypeSailorHouse_MapEvents::
@@ -15,4 +16,5 @@ NewtypeSailorHouse_MapEvents::
 	db 1 ; person events
 	object_event 6, 3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NewtypeSailorHouse_Blocks:: INCBIN "maps/placeholder/blk/NewtypeSailorHouse.blk"
+NewtypeSailorHouse_Blocks::
+INCBIN "maps/NewtypeSailorHouse.blk"
diff --git a/data/maps/attributes/placeholder/North.asm b/data/maps/objects/North.asm
index fec500b..4675b13 100644
--- a/data/maps/attributes/placeholder/North.asm
+++ b/data/maps/objects/North.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/North.asm", ROMX
+SECTION "data/maps/objects/North.asm", ROMX
+
 	map_attributes North, NORTH, SOUTH
 	connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10
 
@@ -24,4 +25,5 @@ North_MapEvents::
 	object_event 10, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 9, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-North_Blocks:: INCBIN "maps/placeholder/blk/North.blk"
+North_Blocks::
+INCBIN "maps/North.blk"
diff --git a/data/maps/attributes/placeholder/NorthHouse1.asm b/data/maps/objects/NorthHouse1.asm
index 55ea98b..a60ac00 100644
--- a/data/maps/attributes/placeholder/NorthHouse1.asm
+++ b/data/maps/objects/NorthHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NorthHouse1.asm", ROMX
+SECTION "data/maps/objects/NorthHouse1.asm", ROMX
+
 	map_attributes NorthHouse1, NORTH_HOUSE_1, 0
 
 NorthHouse1_MapEvents::
@@ -15,4 +16,5 @@ NorthHouse1_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NorthHouse1_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse1.blk"
+NorthHouse1_Blocks::
+INCBIN "maps/NorthHouse1.blk"
diff --git a/data/maps/attributes/placeholder/NorthHouse2.asm b/data/maps/objects/NorthHouse2.asm
index 42178a7..f8fce5f 100644
--- a/data/maps/attributes/placeholder/NorthHouse2.asm
+++ b/data/maps/objects/NorthHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NorthHouse2.asm", ROMX
+SECTION "data/maps/objects/NorthHouse2.asm", ROMX
+
 	map_attributes NorthHouse2, NORTH_HOUSE_2, 0
 
 NorthHouse2_MapEvents::
@@ -15,4 +16,5 @@ NorthHouse2_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NorthHouse2_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse2.blk"
+NorthHouse2_Blocks::
+INCBIN "maps/NorthHouse2.blk"
diff --git a/data/maps/attributes/placeholder/NorthMart.asm b/data/maps/objects/NorthMart.asm
index f916cf1..3af319f 100644
--- a/data/maps/attributes/placeholder/NorthMart.asm
+++ b/data/maps/objects/NorthMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NorthMart.asm", ROMX
+SECTION "data/maps/objects/NorthMart.asm", ROMX
+
 	map_attributes NorthMart, NORTH_MART, 0
 
 NorthMart_MapEvents::
@@ -17,4 +18,5 @@ NorthMart_MapEvents::
 	object_event 10, 5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NorthMart_Blocks:: INCBIN "maps/placeholder/blk/NorthMart.blk"
+NorthMart_Blocks::
+INCBIN "maps/NorthMart.blk"
diff --git a/data/maps/attributes/placeholder/NorthPokecenter1F.asm b/data/maps/objects/NorthPokecenter1F.asm
index 3b84a12..29fc812 100644
--- a/data/maps/attributes/placeholder/NorthPokecenter1F.asm
+++ b/data/maps/objects/NorthPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NorthPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/NorthPokecenter1F.asm", ROMX
+
 	map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0
 
 NorthPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ NorthPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NorthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter1F.blk"
+NorthPokecenter1F_Blocks::
+INCBIN "maps/NorthPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/NorthPokecenter2F.asm b/data/maps/objects/NorthPokecenter2F.asm
index 6d678c3..e092e41 100644
--- a/data/maps/attributes/placeholder/NorthPokecenter2F.asm
+++ b/data/maps/objects/NorthPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/NorthPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/NorthPokecenter2F.asm", ROMX
+
 	map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0
 
 NorthPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ NorthPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-NorthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter2F.blk"
+NorthPokecenter2F_Blocks::
+INCBIN "maps/NorthPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/Office1.asm b/data/maps/objects/Office1.asm
index 661e688..ae45362 100644
--- a/data/maps/attributes/placeholder/Office1.asm
+++ b/data/maps/objects/Office1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Office1.asm", ROMX
+SECTION "data/maps/objects/Office1.asm", ROMX
+
 	map_attributes Office1, OFFICE_1, 0
 
 Office1_MapEvents::
@@ -12,4 +13,5 @@ Office1_MapEvents::
 
 	db 0 ; person events
 
-Office1_Blocks:: INCBIN "maps/placeholder/blk/Office1.blk"
+Office1_Blocks::
+INCBIN "maps/Office1.blk"
diff --git a/data/maps/attributes/placeholder/Office2.asm b/data/maps/objects/Office2.asm
index 7190b43..24ef079 100644
--- a/data/maps/attributes/placeholder/Office2.asm
+++ b/data/maps/objects/Office2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Office2.asm", ROMX
+SECTION "data/maps/objects/Office2.asm", ROMX
+
 	map_attributes Office2, OFFICE_2, 0
 
 Office2_MapEvents::
@@ -12,4 +13,5 @@ Office2_MapEvents::
 
 	db 0 ; person events
 
-Office2_Blocks:: INCBIN "maps/placeholder/blk/Office2.blk"
+Office2_Blocks::
+INCBIN "maps/Office2.blk"
diff --git a/data/maps/attributes/placeholder/Office3.asm b/data/maps/objects/Office3.asm
index 752a0b4..7a70ad1 100644
--- a/data/maps/attributes/placeholder/Office3.asm
+++ b/data/maps/objects/Office3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Office3.asm", ROMX
+SECTION "data/maps/objects/Office3.asm", ROMX
+
 	map_attributes Office3, OFFICE_3, 0
 
 Office3_MapEvents::
@@ -12,4 +13,5 @@ Office3_MapEvents::
 
 	db 0 ; person events
 
-Office3_Blocks:: INCBIN "maps/placeholder/blk/Office3.blk"
+Office3_Blocks::
+INCBIN "maps/Office3.blk"
diff --git a/data/maps/attributes/placeholder/OldCity.asm b/data/maps/objects/OldCity.asm
index f1ffc71..00280e1 100644
--- a/data/maps/attributes/placeholder/OldCity.asm
+++ b/data/maps/objects/OldCity.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCity.asm", ROMX
+SECTION "data/maps/objects/OldCity.asm", ROMX
+
 	map_attributes OldCity, OLD_CITY, SOUTH | WEST
 	connection south, Route1P2, ROUTE_1_P2, 5, 0, 10
 	connection west, Route2, ROUTE_2, 5, 0, 9
@@ -45,4 +46,5 @@ OldCity_MapEvents::
 	object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 17, 19, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCity_Blocks:: INCBIN "maps/placeholder/blk/OldCity.blk"
+OldCity_Blocks::
+INCBIN "maps/OldCity.blk"
diff --git a/data/maps/attributes/placeholder/OldCityBillsHouse.asm b/data/maps/objects/OldCityBillsHouse.asm
index e64ded4..0e79b5c 100644
--- a/data/maps/attributes/placeholder/OldCityBillsHouse.asm
+++ b/data/maps/objects/OldCityBillsHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityBillsHouse.asm", ROMX
+SECTION "data/maps/objects/OldCityBillsHouse.asm", ROMX
+
 	map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0
 
 OldCityBillsHouse_MapEvents::
@@ -21,4 +22,5 @@ OldCityBillsHouse_MapEvents::
 	db 1 ; person events
 	object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityBillsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityBillsHouse.blk"
+OldCityBillsHouse_Blocks::
+INCBIN "maps/OldCityBillsHouse.blk"
diff --git a/data/maps/attributes/placeholder/OldCityGym.asm b/data/maps/objects/OldCityGym.asm
index d83f856..3405b04 100644
--- a/data/maps/attributes/placeholder/OldCityGym.asm
+++ b/data/maps/objects/OldCityGym.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityGym.asm", ROMX
+SECTION "data/maps/objects/OldCityGym.asm", ROMX
+
 	map_attributes OldCityGym, OLD_CITY_GYM, 0
 
 OldCityGym_MapEvents::
@@ -22,4 +23,5 @@ OldCityGym_MapEvents::
 	object_event 1, 9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
 	object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0
 
-OldCityGym_Blocks:: INCBIN "maps/placeholder/blk/OldCityGym.blk"
+OldCityGym_Blocks::
+INCBIN "maps/OldCityGym.blk"
diff --git a/data/maps/attributes/placeholder/OldCityHouse.asm b/data/maps/objects/OldCityHouse.asm
index 085ed83..dd140a4 100644
--- a/data/maps/attributes/placeholder/OldCityHouse.asm
+++ b/data/maps/objects/OldCityHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityHouse.asm", ROMX
+SECTION "data/maps/objects/OldCityHouse.asm", ROMX
+
 	map_attributes OldCityHouse, OLD_CITY_HOUSE, 0
 
 OldCityHouse_MapEvents::
@@ -21,4 +22,5 @@ OldCityHouse_MapEvents::
 	object_event 0, 6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityHouse.blk"
+OldCityHouse_Blocks::
+INCBIN "maps/OldCityHouse.blk"
diff --git a/data/maps/attributes/placeholder/OldCityKurtsHouse.asm b/data/maps/objects/OldCityKurtsHouse.asm
index 0e343fd..178b8a4 100644
--- a/data/maps/attributes/placeholder/OldCityKurtsHouse.asm
+++ b/data/maps/objects/OldCityKurtsHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityKurtsHouse.asm", ROMX
+SECTION "data/maps/objects/OldCityKurtsHouse.asm", ROMX
+
 	map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0
 
 OldCityKurtsHouse_MapEvents::
@@ -20,4 +21,5 @@ OldCityKurtsHouse_MapEvents::
 	db 1 ; person events
 	object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityKurtsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityKurtsHouse.blk"
+OldCityKurtsHouse_Blocks::
+INCBIN "maps/OldCityKurtsHouse.blk"
diff --git a/data/maps/attributes/placeholder/OldCityMart.asm b/data/maps/objects/OldCityMart.asm
index 125dfa7..bbcafd0 100644
--- a/data/maps/attributes/placeholder/OldCityMart.asm
+++ b/data/maps/objects/OldCityMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityMart.asm", ROMX
+SECTION "data/maps/objects/OldCityMart.asm", ROMX
+
 	map_attributes OldCityMart, OLD_CITY_MART, 0
 
 OldCityMart_MapEvents::
@@ -18,4 +19,5 @@ OldCityMart_MapEvents::
 	object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityMart_Blocks:: INCBIN "maps/placeholder/blk/OldCityMart.blk"
+OldCityMart_Blocks::
+INCBIN "maps/OldCityMart.blk"
diff --git a/data/maps/attributes/placeholder/OldCityMuseum.asm b/data/maps/objects/OldCityMuseum.asm
index 28f3351..60f2505 100644
--- a/data/maps/attributes/placeholder/OldCityMuseum.asm
+++ b/data/maps/objects/OldCityMuseum.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityMuseum.asm", ROMX
+SECTION "data/maps/objects/OldCityMuseum.asm", ROMX
+
 	map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0
 
 OldCityMuseum_MapEvents::
@@ -20,4 +21,5 @@ OldCityMuseum_MapEvents::
 	object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13, 4, SPRITE_EGG, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityMuseum_Blocks:: INCBIN "maps/placeholder/blk/OldCityMuseum.blk"
+OldCityMuseum_Blocks::
+INCBIN "maps/OldCityMuseum.blk"
diff --git a/data/maps/attributes/placeholder/OldCityPokecenter1F.asm b/data/maps/objects/OldCityPokecenter1F.asm
index 1b27e00..28fa3bb 100644
--- a/data/maps/attributes/placeholder/OldCityPokecenter1F.asm
+++ b/data/maps/objects/OldCityPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/OldCityPokecenter1F.asm", ROMX
+
 	map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0
 
 OldCityPokecenter1F_MapEvents::
@@ -20,4 +21,5 @@ OldCityPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_35, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityPokecenter1F.blk"
+OldCityPokecenter1F_Blocks::
+INCBIN "maps/OldCityPokecenter1F.blk"
diff --git a/data/maps/attributes/OldCityPokecenter2F.asm b/data/maps/objects/OldCityPokecenter2F.asm
index 2f6ab03..b6354c3 100644
--- a/data/maps/attributes/OldCityPokecenter2F.asm
+++ b/data/maps/objects/OldCityPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/OldCityPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/OldCityPokecenter2F.asm", ROMX
+
 	map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0
 
 OldCityPokecenter2F_MapEvents::
@@ -21,4 +22,5 @@ OldCityPokecenter2F_MapEvents::
 	object_event 2, 3, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityPokecenter2F_Blocks:: INCBIN "maps/blk/OldCityPokecenter2F.blk"
+OldCityPokecenter2F_Blocks::
+INCBIN "maps/OldCityPokecenter2F.blk"
diff --git a/data/maps/attributes/OldCityPokecenterBattle.asm b/data/maps/objects/OldCityPokecenterBattle.asm
index daae3ac..d9e3704 100644
--- a/data/maps/attributes/OldCityPokecenterBattle.asm
+++ b/data/maps/objects/OldCityPokecenterBattle.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/OldCityPokecenterBattle.asm", ROMX
+SECTION "data/maps/objects/OldCityPokecenterBattle.asm", ROMX
+
 	map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0
 
 OldCityPokecenterBattle_MapEvents::
@@ -15,4 +16,5 @@ OldCityPokecenterBattle_MapEvents::
 	db 1 ; person events
 	object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityPokecenterBattle_Blocks:: INCBIN "maps/blk/OldCityPokecenterBattle.blk"
+OldCityPokecenterBattle_Blocks::
+INCBIN "maps/OldCityPokecenterBattle.blk"
diff --git a/data/maps/attributes/OldCityPokecenterTimeMachine.asm b/data/maps/objects/OldCityPokecenterTimeMachine.asm
index 312e633..d4a91fb 100644
--- a/data/maps/attributes/OldCityPokecenterTimeMachine.asm
+++ b/data/maps/objects/OldCityPokecenterTimeMachine.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/OldCityPokecenterTimeMachine.asm", ROMX
+SECTION "data/maps/objects/OldCityPokecenterTimeMachine.asm", ROMX
+
 	map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0
 
 OldCityPokecenterTimeMachine_MapEvents::
@@ -16,4 +17,5 @@ OldCityPokecenterTimeMachine_MapEvents::
 	db 1 ; person events
 	object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityPokecenterTimeMachine_Blocks:: INCBIN "maps/blk/OldCityPokecenterTimeMachine.blk"
+OldCityPokecenterTimeMachine_Blocks::
+INCBIN "maps/OldCityPokecenterTimeMachine.blk"
diff --git a/data/maps/attributes/OldCityPokecenterTrade.asm b/data/maps/objects/OldCityPokecenterTrade.asm
index 7c3abe7..178cbea 100644
--- a/data/maps/attributes/OldCityPokecenterTrade.asm
+++ b/data/maps/objects/OldCityPokecenterTrade.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/OldCityPokecenterTrade.asm", ROMX
+SECTION "data/maps/objects/OldCityPokecenterTrade.asm", ROMX
+
 	map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0
 
 OldCityPokecenterTrade_MapEvents::
@@ -15,4 +16,5 @@ OldCityPokecenterTrade_MapEvents::
 	db 1 ; person events
 	object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityPokecenterTrade_Blocks:: INCBIN "maps/blk/OldCityPokecenterTrade.blk"
+OldCityPokecenterTrade_Blocks::
+INCBIN "maps/OldCityPokecenterTrade.blk"
diff --git a/data/maps/attributes/placeholder/OldCitySchool.asm b/data/maps/objects/OldCitySchool.asm
index b6640a5..db27565 100644
--- a/data/maps/attributes/placeholder/OldCitySchool.asm
+++ b/data/maps/objects/OldCitySchool.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCitySchool.asm", ROMX
+SECTION "data/maps/objects/OldCitySchool.asm", ROMX
+
 	map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0
 
 OldCitySchool_MapEvents::
@@ -24,4 +25,5 @@ OldCitySchool_MapEvents::
 	object_event 6, 6, SPRITE_TEACHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCitySchool_Blocks:: INCBIN "maps/placeholder/blk/OldCitySchool.blk"
+OldCitySchool_Blocks::
+INCBIN "maps/OldCitySchool.blk"
diff --git a/data/maps/attributes/placeholder/OldCityTower1F.asm b/data/maps/objects/OldCityTower1F.asm
index 39f8d17..64ddb60 100644
--- a/data/maps/attributes/placeholder/OldCityTower1F.asm
+++ b/data/maps/objects/OldCityTower1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityTower1F.asm", ROMX
+SECTION "data/maps/objects/OldCityTower1F.asm", ROMX
+
 	map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0
 
 OldCityTower1F_MapEvents::
@@ -22,4 +23,5 @@ OldCityTower1F_MapEvents::
 	object_event 5, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0
 	object_event 6, 4, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0
 
-OldCityTower1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower1F.blk"
+OldCityTower1F_Blocks::
+INCBIN "maps/OldCityTower1F.blk"
diff --git a/data/maps/attributes/placeholder/OldCityTower2F.asm b/data/maps/objects/OldCityTower2F.asm
index 2231f4d..078661f 100644
--- a/data/maps/attributes/placeholder/OldCityTower2F.asm
+++ b/data/maps/objects/OldCityTower2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityTower2F.asm", ROMX
+SECTION "data/maps/objects/OldCityTower2F.asm", ROMX
+
 	map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0
 
 OldCityTower2F_MapEvents::
@@ -20,4 +21,5 @@ OldCityTower2F_MapEvents::
 	object_event 2, 6, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0
 	object_event 5, 6, SPRITE_MEDIUM, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0
 
-OldCityTower2F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower2F.blk"
+OldCityTower2F_Blocks::
+INCBIN "maps/OldCityTower2F.blk"
diff --git a/data/maps/attributes/placeholder/OldCityTower3F.asm b/data/maps/objects/OldCityTower3F.asm
index d887263..fae518e 100644
--- a/data/maps/attributes/placeholder/OldCityTower3F.asm
+++ b/data/maps/objects/OldCityTower3F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityTower3F.asm", ROMX
+SECTION "data/maps/objects/OldCityTower3F.asm", ROMX
+
 	map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0
 
 OldCityTower3F_MapEvents::
@@ -20,4 +21,5 @@ OldCityTower3F_MapEvents::
 	object_event 4, 4, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0
 	object_event 5, 5, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0
 
-OldCityTower3F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower3F.blk"
+OldCityTower3F_Blocks::
+INCBIN "maps/OldCityTower3F.blk"
diff --git a/data/maps/attributes/placeholder/OldCityTower4F.asm b/data/maps/objects/OldCityTower4F.asm
index 7a0902c..a3bae56 100644
--- a/data/maps/attributes/placeholder/OldCityTower4F.asm
+++ b/data/maps/objects/OldCityTower4F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityTower4F.asm", ROMX
+SECTION "data/maps/objects/OldCityTower4F.asm", ROMX
+
 	map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0
 
 OldCityTower4F_MapEvents::
@@ -20,4 +21,5 @@ OldCityTower4F_MapEvents::
 	object_event 6, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0
 	object_event 7, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0
 
-OldCityTower4F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower4F.blk"
+OldCityTower4F_Blocks::
+INCBIN "maps/OldCityTower4F.blk"
diff --git a/data/maps/attributes/placeholder/OldCityTower5F.asm b/data/maps/objects/OldCityTower5F.asm
index 9056341..590aad9 100644
--- a/data/maps/attributes/placeholder/OldCityTower5F.asm
+++ b/data/maps/objects/OldCityTower5F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/OldCityTower5F.asm", ROMX
+SECTION "data/maps/objects/OldCityTower5F.asm", ROMX
+
 	map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0
 
 OldCityTower5F_MapEvents::
@@ -17,4 +18,5 @@ OldCityTower5F_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-OldCityTower5F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower5F.blk"
+OldCityTower5F_Blocks::
+INCBIN "maps/OldCityTower5F.blk"
diff --git a/data/maps/attributes/PlayerHouse1F.asm b/data/maps/objects/PlayerHouse1F.asm
index a97559d..4721993 100644
--- a/data/maps/attributes/PlayerHouse1F.asm
+++ b/data/maps/objects/PlayerHouse1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/PlayerHouse1F.asm", ROMX
+SECTION "data/maps/objects/PlayerHouse1F.asm", ROMX
+
 	map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0
 
 PlayerHouse1F_MapEvents::
@@ -21,4 +22,5 @@ PlayerHouse1F_MapEvents::
 	db 1 ; person events
 	object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-PlayerHouse1F_Blocks:: INCBIN "maps/blk/PlayerHouse1F.blk"
+PlayerHouse1F_Blocks::
+INCBIN "maps/PlayerHouse1F.blk"
diff --git a/data/maps/attributes/PlayerHouse2F.asm b/data/maps/objects/PlayerHouse2F.asm
index 66be90b..6e6fc68 100644
--- a/data/maps/attributes/PlayerHouse2F.asm
+++ b/data/maps/objects/PlayerHouse2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/PlayerHouse2F.asm", ROMX
+SECTION "data/maps/objects/PlayerHouse2F.asm", ROMX
+
 	map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0
 
 PlayerHouse2F_MapEvents::
@@ -20,4 +21,5 @@ PlayerHouse2F_MapEvents::
 	object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-PlayerHouse2F_Blocks:: INCBIN "maps/blk/PlayerHouse2F.blk"
+PlayerHouse2F_Blocks::
+INCBIN "maps/PlayerHouse2F.blk"
diff --git a/data/maps/attributes/placeholder/PowerPlant1.asm b/data/maps/objects/PowerPlant1.asm
index e06ccd2..9a8f33e 100644
--- a/data/maps/attributes/placeholder/PowerPlant1.asm
+++ b/data/maps/objects/PowerPlant1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/PowerPlant1.asm", ROMX
+SECTION "data/maps/objects/PowerPlant1.asm", ROMX
+
 	map_attributes PowerPlant1, POWER_PLANT_1, 0
 
 PowerPlant1_MapEvents::
@@ -12,4 +13,5 @@ PowerPlant1_MapEvents::
 
 	db 0 ; person events
 
-PowerPlant1_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant1.blk"
+PowerPlant1_Blocks::
+INCBIN "maps/PowerPlant1.blk"
diff --git a/data/maps/attributes/placeholder/PowerPlant2.asm b/data/maps/objects/PowerPlant2.asm
index e14cdd9..9f68bb5 100644
--- a/data/maps/attributes/placeholder/PowerPlant2.asm
+++ b/data/maps/objects/PowerPlant2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/PowerPlant2.asm", ROMX
+SECTION "data/maps/objects/PowerPlant2.asm", ROMX
+
 	map_attributes PowerPlant2, POWER_PLANT_2, 0
 
 PowerPlant2_MapEvents::
@@ -12,4 +13,5 @@ PowerPlant2_MapEvents::
 
 	db 0 ; person events
 
-PowerPlant2_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant2.blk"
+PowerPlant2_Blocks::
+INCBIN "maps/PowerPlant2.blk"
diff --git a/data/maps/attributes/placeholder/PowerPlant3.asm b/data/maps/objects/PowerPlant3.asm
index 8a3797d..46bdc0f 100644
--- a/data/maps/attributes/placeholder/PowerPlant3.asm
+++ b/data/maps/objects/PowerPlant3.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/PowerPlant3.asm", ROMX
+SECTION "data/maps/objects/PowerPlant3.asm", ROMX
+
 	map_attributes PowerPlant3, POWER_PLANT_3, 0
 
 PowerPlant3_MapEvents::
@@ -12,4 +13,5 @@ PowerPlant3_MapEvents::
 
 	db 0 ; person events
 
-PowerPlant3_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant3.blk"
+PowerPlant3_Blocks::
+INCBIN "maps/PowerPlant3.blk"
diff --git a/data/maps/attributes/placeholder/PowerPlant4.asm b/data/maps/objects/PowerPlant4.asm
index bdb33ba..9c5ee38 100644
--- a/data/maps/attributes/placeholder/PowerPlant4.asm
+++ b/data/maps/objects/PowerPlant4.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/PowerPlant4.asm", ROMX
+SECTION "data/maps/objects/PowerPlant4.asm", ROMX
+
 	map_attributes PowerPlant4, POWER_PLANT_4, 0
 
 PowerPlant4_MapEvents::
@@ -12,4 +13,5 @@ PowerPlant4_MapEvents::
 
 	db 0 ; person events
 
-PowerPlant4_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant4.blk"
+PowerPlant4_Blocks::
+INCBIN "maps/PowerPlant4.blk"
diff --git a/data/maps/attributes/placeholder/Prince.asm b/data/maps/objects/Prince.asm
index 597d5eb..8923d37 100644
--- a/data/maps/attributes/placeholder/Prince.asm
+++ b/data/maps/objects/Prince.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Prince.asm", ROMX
+SECTION "data/maps/objects/Prince.asm", ROMX
+
 	map_attributes Prince, PRINCE, NORTH | SOUTH
 	connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10
 	connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10
@@ -14,4 +15,5 @@ Prince_MapEvents::
 
 	db 0 ; person events
 
-Prince_Blocks:: INCBIN "maps/placeholder/blk/Prince.blk"
+Prince_Blocks::
+INCBIN "maps/Prince.blk"
diff --git a/data/maps/attributes/placeholder/PrinceRoute.asm b/data/maps/objects/PrinceRoute.asm
index 28af3d3..40ebef3 100644
--- a/data/maps/attributes/placeholder/PrinceRoute.asm
+++ b/data/maps/objects/PrinceRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/PrinceRoute.asm", ROMX
+SECTION "data/maps/objects/PrinceRoute.asm", ROMX
+
 	map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH
 	connection north, Prince, PRINCE, 0, 0, 10
 	connection south, SilentHill, SILENT_HILL, 0, 0, 10
@@ -14,4 +15,5 @@ PrinceRoute_MapEvents::
 
 	db 0 ; person events
 
-PrinceRoute_Blocks:: INCBIN "maps/placeholder/blk/PrinceRoute.blk"
+PrinceRoute_Blocks::
+INCBIN "maps/PrinceRoute.blk"
diff --git a/data/maps/attributes/placeholder/Route15.asm b/data/maps/objects/Route15.asm
index 08f1564..7f3329e 100644
--- a/data/maps/attributes/placeholder/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route15.asm", ROMX
+SECTION "data/maps/objects/Route15.asm", ROMX
+
 	map_attributes Route15, ROUTE_15, NORTH | EAST
 	connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10
 	connection east, Newtype, NEWTYPE, 0, 0, 12
@@ -21,4 +22,5 @@ Route15_MapEvents::
 
 	db 0 ; person events
 
-Route15_Blocks:: INCBIN "maps/placeholder/blk/Route15.blk"
+Route15_Blocks::
+INCBIN "maps/Route15.blk"
diff --git a/data/maps/attributes/placeholder/Route15Pokecenter1F.asm b/data/maps/objects/Route15Pokecenter1F.asm
index 52e9fc8..a4dd565 100644
--- a/data/maps/attributes/placeholder/Route15Pokecenter1F.asm
+++ b/data/maps/objects/Route15Pokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route15Pokecenter1F.asm", ROMX
+SECTION "data/maps/objects/Route15Pokecenter1F.asm", ROMX
+
 	map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0
 
 Route15Pokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ Route15Pokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route15Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter1F.blk"
+Route15Pokecenter1F_Blocks::
+INCBIN "maps/Route15Pokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/Route15Pokecenter2F.asm b/data/maps/objects/Route15Pokecenter2F.asm
index 758212d..9ac2787 100644
--- a/data/maps/attributes/placeholder/Route15Pokecenter2F.asm
+++ b/data/maps/objects/Route15Pokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route15Pokecenter2F.asm", ROMX
+SECTION "data/maps/objects/Route15Pokecenter2F.asm", ROMX
+
 	map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0
 
 Route15Pokecenter2F_MapEvents::
@@ -13,4 +14,5 @@ Route15Pokecenter2F_MapEvents::
 
 	db 0 ; person events
 
-Route15Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter2F.blk"
+Route15Pokecenter2F_Blocks::
+INCBIN "maps/Route15Pokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/Route18.asm b/data/maps/objects/Route18.asm
index 8c7809a..95d85f5 100644
--- a/data/maps/attributes/placeholder/Route18.asm
+++ b/data/maps/objects/Route18.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route18.asm", ROMX
+SECTION "data/maps/objects/Route18.asm", ROMX
+
 	map_attributes Route18, ROUTE_18, NORTH | WEST
 	connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0, 0, 13
 	connection west, NewtypeRoute, NEWTYPE_ROUTE, 36, 0, 9
@@ -17,4 +18,5 @@ Route18_MapEvents::
 
 	db 0 ; person events
 
-Route18_Blocks:: INCBIN "maps/placeholder/blk/Route18.blk"
+Route18_Blocks::
+INCBIN "maps/Route18.blk"
diff --git a/data/maps/attributes/placeholder/Route18Pokecenter1F.asm b/data/maps/objects/Route18Pokecenter1F.asm
index ba29f0d..9018bcf 100644
--- a/data/maps/attributes/placeholder/Route18Pokecenter1F.asm
+++ b/data/maps/objects/Route18Pokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route18Pokecenter1F.asm", ROMX
+SECTION "data/maps/objects/Route18Pokecenter1F.asm", ROMX
+
 	map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0
 
 Route18Pokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ Route18Pokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route18Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter1F.blk"
+Route18Pokecenter1F_Blocks::
+INCBIN "maps/Route18Pokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/Route18Pokecenter2F.asm b/data/maps/objects/Route18Pokecenter2F.asm
index 3c0502f..6c95739 100644
--- a/data/maps/attributes/placeholder/Route18Pokecenter2F.asm
+++ b/data/maps/objects/Route18Pokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route18Pokecenter2F.asm", ROMX
+SECTION "data/maps/objects/Route18Pokecenter2F.asm", ROMX
+
 	map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0
 
 Route18Pokecenter2F_MapEvents::
@@ -13,4 +14,5 @@ Route18Pokecenter2F_MapEvents::
 
 	db 0 ; person events
 
-Route18Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter2F.blk"
+Route18Pokecenter2F_Blocks::
+INCBIN "maps/Route18Pokecenter2F.blk"
diff --git a/data/maps/attributes/Route1Gate1F.asm b/data/maps/objects/Route1Gate1F.asm
index 0329f21..fcbd314 100644
--- a/data/maps/attributes/Route1Gate1F.asm
+++ b/data/maps/objects/Route1Gate1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/Route1Gate1F.asm", ROMX
+SECTION "data/maps/objects/Route1Gate1F.asm", ROMX
+
 	map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0
 
 Route1Gate1F_MapEvents::
@@ -19,4 +20,5 @@ Route1Gate1F_MapEvents::
 	object_event 6, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route1Gate1F_Blocks:: INCBIN "maps/blk/Route1Gate1F.blk"
+Route1Gate1F_Blocks::
+INCBIN "maps/Route1Gate1F.blk"
diff --git a/data/maps/attributes/Route1Gate2F.asm b/data/maps/objects/Route1Gate2F.asm
index dcfa07a..18fe387 100644
--- a/data/maps/attributes/Route1Gate2F.asm
+++ b/data/maps/objects/Route1Gate2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/Route1Gate2F.asm", ROMX
+SECTION "data/maps/objects/Route1Gate2F.asm", ROMX
+
 	map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0
 
 Route1Gate2F_MapEvents::
@@ -17,4 +18,5 @@ Route1Gate2F_MapEvents::
 	object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 4, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route1Gate2F_Blocks:: INCBIN "maps/blk/Route1Gate2F.blk"
+Route1Gate2F_Blocks::
+INCBIN "maps/Route1Gate2F.blk"
diff --git a/data/maps/attributes/Route1P1.asm b/data/maps/objects/Route1P1.asm
index 8332b67..f779b26 100644
--- a/data/maps/attributes/Route1P1.asm
+++ b/data/maps/objects/Route1P1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/Route1P1.asm", ROMX
+SECTION "data/maps/objects/Route1P1.asm", ROMX
+
 	map_attributes Route1P1, ROUTE_1_P1, WEST | EAST
 	connection west, Route1P2, ROUTE_1_P2, -3, 6, 12
 	connection east, SilentHill, SILENT_HILL, 0, 0, 9
@@ -20,4 +21,5 @@ Route1P1_MapEvents::
 	object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 18, 12, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route1P1_Blocks:: INCBIN "maps/blk/Route1P1.blk"
+Route1P1_Blocks::
+INCBIN "maps/Route1P1.blk"
diff --git a/data/maps/attributes/Route1P2.asm b/data/maps/objects/Route1P2.asm
index 881d80e..96b2d46 100644
--- a/data/maps/attributes/Route1P2.asm
+++ b/data/maps/objects/Route1P2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/Route1P2.asm", ROMX
+SECTION "data/maps/objects/Route1P2.asm", ROMX
+
 	map_attributes Route1P2, ROUTE_1_P2, NORTH | EAST
 	connection north, OldCity, OLD_CITY, -3, 2, 16
 	connection east, Route1P1, ROUTE_1_P1, 9, 0, 9
@@ -21,4 +22,5 @@ Route1P2_MapEvents::
 	object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
 
-Route1P2_Blocks:: INCBIN "maps/blk/Route1P2.blk"
+Route1P2_Blocks::
+INCBIN "maps/Route1P2.blk"
diff --git a/data/maps/attributes/placeholder/Route2.asm b/data/maps/objects/Route2.asm
index f3d876f..f17db86 100644
--- a/data/maps/attributes/placeholder/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route2.asm", ROMX
+SECTION "data/maps/objects/Route2.asm", ROMX
+
 	map_attributes Route2, ROUTE_2, WEST | EAST
 	connection west, West, WEST, -3, 2, 15
 	connection east, OldCity, OLD_CITY, -3, 2, 15
@@ -22,4 +23,5 @@ Route2_MapEvents::
 	object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
 
-Route2_Blocks:: INCBIN "maps/placeholder/blk/Route2.blk"
+Route2_Blocks::
+INCBIN "maps/Route2.blk"
diff --git a/data/maps/attributes/placeholder/Route2Gate1F.asm b/data/maps/objects/Route2Gate1F.asm
index bb112f9..a9639b0 100644
--- a/data/maps/attributes/placeholder/Route2Gate1F.asm
+++ b/data/maps/objects/Route2Gate1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route2Gate1F.asm", ROMX
+SECTION "data/maps/objects/Route2Gate1F.asm", ROMX
+
 	map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0
 
 Route2Gate1F_MapEvents::
@@ -19,4 +20,5 @@ Route2Gate1F_MapEvents::
 	object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route2Gate1F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate1F.blk"
+Route2Gate1F_Blocks::
+INCBIN "maps/Route2Gate1F.blk"
diff --git a/data/maps/attributes/placeholder/Route2Gate2F.asm b/data/maps/objects/Route2Gate2F.asm
index c9d2d82..1fc7984 100644
--- a/data/maps/attributes/placeholder/Route2Gate2F.asm
+++ b/data/maps/objects/Route2Gate2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route2Gate2F.asm", ROMX
+SECTION "data/maps/objects/Route2Gate2F.asm", ROMX
+
 	map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0
 
 Route2Gate2F_MapEvents::
@@ -17,4 +18,5 @@ Route2Gate2F_MapEvents::
 	object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 4, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route2Gate2F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate2F.blk"
+Route2Gate2F_Blocks::
+INCBIN "maps/Route2Gate2F.blk"
diff --git a/data/maps/attributes/placeholder/Route2House.asm b/data/maps/objects/Route2House.asm
index 3600ea1..2088ef6 100644
--- a/data/maps/attributes/placeholder/Route2House.asm
+++ b/data/maps/objects/Route2House.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Route2House.asm", ROMX
+SECTION "data/maps/objects/Route2House.asm", ROMX
+
 	map_attributes Route2House, ROUTE_2_HOUSE, 0
 
 Route2House_MapEvents::
@@ -21,4 +22,5 @@ Route2House_MapEvents::
 	db 1 ; person events
 	object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Route2House_Blocks:: INCBIN "maps/placeholder/blk/Route2House.blk"
+Route2House_Blocks::
+INCBIN "maps/Route2House.blk"
diff --git a/data/maps/attributes/placeholder/RouteSilentEast.asm b/data/maps/objects/RouteSilentEast.asm
index 661a9a7..825ee45 100644
--- a/data/maps/attributes/placeholder/RouteSilentEast.asm
+++ b/data/maps/objects/RouteSilentEast.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/RouteSilentEast.asm", ROMX
+SECTION "data/maps/objects/RouteSilentEast.asm", ROMX
+
 	map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST
 	connection west, SilentHill, SILENT_HILL, 0, 0, 9
 	connection east, Kanto, KANTO, -3, 6, 15
@@ -15,4 +16,5 @@ RouteSilentEast_MapEvents::
 
 	db 0 ; person events
 
-RouteSilentEast_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEast.blk"
+RouteSilentEast_Blocks::
+INCBIN "maps/RouteSilentEast.blk"
diff --git a/data/maps/attributes/placeholder/RouteSilentEastGate.asm b/data/maps/objects/RouteSilentEastGate.asm
index 9de74e1..e292b83 100644
--- a/data/maps/attributes/placeholder/RouteSilentEastGate.asm
+++ b/data/maps/objects/RouteSilentEastGate.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/RouteSilentEastGate.asm", ROMX
+SECTION "data/maps/objects/RouteSilentEastGate.asm", ROMX
+
 	map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0
 
 RouteSilentEastGate_MapEvents::
@@ -16,4 +17,5 @@ RouteSilentEastGate_MapEvents::
 
 	db 0 ; person events
 
-RouteSilentEastGate_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEastGate.blk"
+RouteSilentEastGate_Blocks::
+INCBIN "maps/RouteSilentEastGate.blk"
diff --git a/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm b/data/maps/objects/RuinsOfAlphEntrance.asm
index 6394343..e0e5d1f 100644
--- a/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm
+++ b/data/maps/objects/RuinsOfAlphEntrance.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm", ROMX
+SECTION "data/maps/objects/RuinsOfAlphEntrance.asm", ROMX
+
 	map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0
 
 RuinsOfAlphEntrance_MapEvents::
@@ -12,4 +13,5 @@ RuinsOfAlphEntrance_MapEvents::
 
 	db 0 ; person events
 
-RuinsOfAlphEntrance_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphEntrance.blk"
+RuinsOfAlphEntrance_Blocks::
+INCBIN "maps/RuinsOfAlphEntrance.blk"
diff --git a/data/maps/attributes/placeholder/RuinsOfAlphMain.asm b/data/maps/objects/RuinsOfAlphMain.asm
index bf6e073..decc978 100644
--- a/data/maps/attributes/placeholder/RuinsOfAlphMain.asm
+++ b/data/maps/objects/RuinsOfAlphMain.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/RuinsOfAlphMain.asm", ROMX
+SECTION "data/maps/objects/RuinsOfAlphMain.asm", ROMX
+
 	map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0
 
 RuinsOfAlphMain_MapEvents::
@@ -12,4 +13,5 @@ RuinsOfAlphMain_MapEvents::
 
 	db 0 ; person events
 
-RuinsOfAlphMain_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphMain.blk"
+RuinsOfAlphMain_Blocks::
+INCBIN "maps/RuinsOfAlphMain.blk"
diff --git a/data/maps/attributes/ShizukanaOka.asm b/data/maps/objects/ShizukanaOka.asm
index 09978c1..e4c1e51 100644
--- a/data/maps/attributes/ShizukanaOka.asm
+++ b/data/maps/objects/ShizukanaOka.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/ShizukanaOka.asm", ROMX
+SECTION "data/maps/objects/ShizukanaOka.asm", ROMX
+
 	map_attributes ShizukanaOka, SHIZUKANA_OKA, 0
 
 ShizukanaOka_MapEvents::
@@ -30,4 +31,5 @@ ShizukanaOka_MapEvents::
 	object_event 36, 16, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0
 	object_event 9, 25, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0
 
-ShizukanaOka_Blocks:: INCBIN "maps/blk/ShizukanaOka.blk"
+ShizukanaOka_Blocks::
+INCBIN "maps/ShizukanaOka.blk"
diff --git a/data/maps/attributes/SilentHill.asm b/data/maps/objects/SilentHill.asm
index b791c37..1e3d49f 100644
--- a/data/maps/attributes/SilentHill.asm
+++ b/data/maps/objects/SilentHill.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/SilentHill.asm", ROMX
+SECTION "data/maps/objects/SilentHill.asm", ROMX
+
 	map_attributes SilentHill, SILENT_HILL, NORTH | WEST | EAST
 	connection north, PrinceRoute, PRINCE_ROUTE, 0, 0, 10
 	connection west, Route1P1, ROUTE_1_P1, 0, 0, 9
@@ -29,4 +30,5 @@ SilentHill_MapEvents::
 	object_event 8, 6, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 13, SPRITE_SUPER_NERD, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SilentHill_Blocks:: INCBIN "maps/blk/SilentHill.blk"
+SilentHill_Blocks::
+INCBIN "maps/SilentHill.blk"
diff --git a/data/maps/attributes/SilentHillHouse.asm b/data/maps/objects/SilentHillHouse.asm
index 7aa6d92..eb2fb03 100644
--- a/data/maps/attributes/SilentHillHouse.asm
+++ b/data/maps/objects/SilentHillHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/SilentHillHouse.asm", ROMX
+SECTION "data/maps/objects/SilentHillHouse.asm", ROMX
+
 	map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0
 
 SilentHillHouse_MapEvents::
@@ -22,4 +23,5 @@ SilentHillHouse_MapEvents::
 	object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SilentHillHouse_Blocks:: INCBIN "maps/blk/SilentHillHouse.blk"
+SilentHillHouse_Blocks::
+INCBIN "maps/SilentHillHouse.blk"
diff --git a/data/maps/attributes/SilentHillLabBack.asm b/data/maps/objects/SilentHillLabBack.asm
index fc069c4..ed60cec 100644
--- a/data/maps/attributes/SilentHillLabBack.asm
+++ b/data/maps/objects/SilentHillLabBack.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/SilentHillLabBack.asm", ROMX
+SECTION "data/maps/objects/SilentHillLabBack.asm", ROMX
+
 	map_attributes SilentHillLabBack, SILENT_HILL_LAB_BACK, 0
 
 SilentHillLabBack_MapEvents::
@@ -24,4 +25,5 @@ SilentHillLabBack_MapEvents::
 	object_event 6, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SilentHillLabBack_Blocks:: INCBIN "maps/blk/SilentHillLabBack.blk"
+SilentHillLabBack_Blocks::
+INCBIN "maps/SilentHillLabBack.blk"
diff --git a/data/maps/attributes/SilentHillLabFront.asm b/data/maps/objects/SilentHillLabFront.asm
index fbae2f8..66cb05a 100644
--- a/data/maps/attributes/SilentHillLabFront.asm
+++ b/data/maps/objects/SilentHillLabFront.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/SilentHillLabFront.asm", ROMX
+SECTION "data/maps/objects/SilentHillLabFront.asm", ROMX
+
 	map_attributes SilentHillLabFront, SILENT_HILL_LAB_FRONT, 0
 
 SilentHillLabFront_MapEvents::
@@ -41,4 +42,5 @@ SilentHillLabFront_MapEvents::
 	object_event 0, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SilentHillLabFront_Blocks:: INCBIN "maps/blk/SilentHillLabFront.blk"
+SilentHillLabFront_Blocks::
+INCBIN "maps/SilentHillLabFront.blk"
diff --git a/data/maps/attributes/SilentHillPokecenter.asm b/data/maps/objects/SilentHillPokecenter.asm
index 1f1bad8..cd68ffc 100644
--- a/data/maps/attributes/SilentHillPokecenter.asm
+++ b/data/maps/objects/SilentHillPokecenter.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/SilentHillPokecenter.asm", ROMX
+SECTION "data/maps/objects/SilentHillPokecenter.asm", ROMX
+
 	map_attributes SilentHillPokecenter, SILENT_HILL_POKECENTER, 0
 
 SilentHillPokecenter_MapEvents::
@@ -20,4 +21,5 @@ SilentHillPokecenter_MapEvents::
 	object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SilentHillPokecenter_Blocks:: INCBIN "maps/blk/SilentHillPokecenter.blk"
+SilentHillPokecenter_Blocks::
+INCBIN "maps/SilentHillPokecenter.blk"
diff --git a/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm b/data/maps/objects/SlowpokeWellEntrance.asm
index 7e9a91e..3c7ede6 100644
--- a/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm
+++ b/data/maps/objects/SlowpokeWellEntrance.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SlowpokeWellEntrance.asm", ROMX
+SECTION "data/maps/objects/SlowpokeWellEntrance.asm", ROMX
+
 	map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0
 
 SlowpokeWellEntrance_MapEvents::
@@ -12,4 +13,5 @@ SlowpokeWellEntrance_MapEvents::
 
 	db 0 ; person events
 
-SlowpokeWellEntrance_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellEntrance.blk"
+SlowpokeWellEntrance_Blocks::
+INCBIN "maps/SlowpokeWellEntrance.blk"
diff --git a/data/maps/attributes/placeholder/SlowpokeWellMain.asm b/data/maps/objects/SlowpokeWellMain.asm
index 5293965..0a20a6f 100644
--- a/data/maps/attributes/placeholder/SlowpokeWellMain.asm
+++ b/data/maps/objects/SlowpokeWellMain.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SlowpokeWellMain.asm", ROMX
+SECTION "data/maps/objects/SlowpokeWellMain.asm", ROMX
+
 	map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0
 
 SlowpokeWellMain_MapEvents::
@@ -12,4 +13,5 @@ SlowpokeWellMain_MapEvents::
 
 	db 0 ; person events
 
-SlowpokeWellMain_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellMain.blk"
+SlowpokeWellMain_Blocks::
+INCBIN "maps/SlowpokeWellMain.blk"
diff --git a/data/maps/attributes/placeholder/South.asm b/data/maps/objects/South.asm
index 682b5dc..8c7dd82 100644
--- a/data/maps/attributes/placeholder/South.asm
+++ b/data/maps/objects/South.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/South.asm", ROMX
+SECTION "data/maps/objects/South.asm", ROMX
+
 	map_attributes South, SOUTH, NORTH | SOUTH | EAST
 	connection north, FontoRoute5, FONTO_ROUTE_5, 10, 0, 10
 	connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10, 0, 10
@@ -33,4 +34,5 @@ South_MapEvents::
 	object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 30, 11, SPRITE_FISHING_GURU, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-South_Blocks:: INCBIN "maps/placeholder/blk/South.blk"
+South_Blocks::
+INCBIN "maps/South.blk"
diff --git a/data/maps/attributes/placeholder/SouthHouse1.asm b/data/maps/objects/SouthHouse1.asm
index 70c2f79..07db5fa 100644
--- a/data/maps/attributes/placeholder/SouthHouse1.asm
+++ b/data/maps/objects/SouthHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SouthHouse1.asm", ROMX
+SECTION "data/maps/objects/SouthHouse1.asm", ROMX
+
 	map_attributes SouthHouse1, SOUTH_HOUSE_1, 0
 
 SouthHouse1_MapEvents::
@@ -15,4 +16,5 @@ SouthHouse1_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SouthHouse1_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse1.blk"
+SouthHouse1_Blocks::
+INCBIN "maps/SouthHouse1.blk"
diff --git a/data/maps/attributes/placeholder/SouthHouse2.asm b/data/maps/objects/SouthHouse2.asm
index 556c132..2474d72 100644
--- a/data/maps/attributes/placeholder/SouthHouse2.asm
+++ b/data/maps/objects/SouthHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SouthHouse2.asm", ROMX
+SECTION "data/maps/objects/SouthHouse2.asm", ROMX
+
 	map_attributes SouthHouse2, SOUTH_HOUSE_2, 0
 
 SouthHouse2_MapEvents::
@@ -15,4 +16,5 @@ SouthHouse2_MapEvents::
 	db 1 ; person events
 	object_event 1, 2, SPRITE_FISHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SouthHouse2_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse2.blk"
+SouthHouse2_Blocks::
+INCBIN "maps/SouthHouse2.blk"
diff --git a/data/maps/attributes/placeholder/SouthMart.asm b/data/maps/objects/SouthMart.asm
index 89ed8a6..a173179 100644
--- a/data/maps/attributes/placeholder/SouthMart.asm
+++ b/data/maps/objects/SouthMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SouthMart.asm", ROMX
+SECTION "data/maps/objects/SouthMart.asm", ROMX
+
 	map_attributes SouthMart, SOUTH_MART, 0
 
 SouthMart_MapEvents::
@@ -17,4 +18,5 @@ SouthMart_MapEvents::
 	object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SouthMart_Blocks:: INCBIN "maps/placeholder/blk/SouthMart.blk"
+SouthMart_Blocks::
+INCBIN "maps/SouthMart.blk"
diff --git a/data/maps/attributes/placeholder/SouthPokecenter1F.asm b/data/maps/objects/SouthPokecenter1F.asm
index 635a8e4..3cfe73c 100644
--- a/data/maps/attributes/placeholder/SouthPokecenter1F.asm
+++ b/data/maps/objects/SouthPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SouthPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/SouthPokecenter1F.asm", ROMX
+
 	map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0
 
 SouthPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ SouthPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SouthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter1F.blk"
+SouthPokecenter1F_Blocks::
+INCBIN "maps/SouthPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/SouthPokecenter2F.asm b/data/maps/objects/SouthPokecenter2F.asm
index 27c0b2e..5674b0e 100644
--- a/data/maps/attributes/placeholder/SouthPokecenter2F.asm
+++ b/data/maps/objects/SouthPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SouthPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/SouthPokecenter2F.asm", ROMX
+
 	map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0
 
 SouthPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ SouthPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SouthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter2F.blk"
+SouthPokecenter2F_Blocks::
+INCBIN "maps/SouthPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/Stand.asm b/data/maps/objects/Stand.asm
index b5289c9..730f369 100644
--- a/data/maps/attributes/placeholder/Stand.asm
+++ b/data/maps/objects/Stand.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Stand.asm", ROMX
+SECTION "data/maps/objects/Stand.asm", ROMX
+
 	map_attributes Stand, STAND, NORTH | SOUTH
 	connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10
 	connection south, StandRoute, STAND_ROUTE, 10, 0, 10
@@ -43,4 +44,5 @@ Stand_MapEvents::
 	object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-Stand_Blocks:: INCBIN "maps/placeholder/blk/Stand.blk"
+Stand_Blocks::
+INCBIN "maps/Stand.blk"
diff --git a/data/maps/attributes/placeholder/StandHouse.asm b/data/maps/objects/StandHouse.asm
index 8560cec..75655c0 100644
--- a/data/maps/attributes/placeholder/StandHouse.asm
+++ b/data/maps/objects/StandHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandHouse.asm", ROMX
+SECTION "data/maps/objects/StandHouse.asm", ROMX
+
 	map_attributes StandHouse, STAND_HOUSE, 0
 
 StandHouse_MapEvents::
@@ -15,4 +16,5 @@ StandHouse_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_SUPER_NERD, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandHouse_Blocks:: INCBIN "maps/placeholder/blk/StandHouse.blk"
+StandHouse_Blocks::
+INCBIN "maps/StandHouse.blk"
diff --git a/data/maps/attributes/placeholder/StandLab.asm b/data/maps/objects/StandLab.asm
index cfaeb45..eabce9c 100644
--- a/data/maps/attributes/placeholder/StandLab.asm
+++ b/data/maps/objects/StandLab.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandLab.asm", ROMX
+SECTION "data/maps/objects/StandLab.asm", ROMX
+
 	map_attributes StandLab, STAND_LAB, 0
 
 StandLab_MapEvents::
@@ -15,4 +16,5 @@ StandLab_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandLab_Blocks:: INCBIN "maps/placeholder/blk/StandLab.blk"
+StandLab_Blocks::
+INCBIN "maps/StandLab.blk"
diff --git a/data/maps/attributes/placeholder/StandLeague1F.asm b/data/maps/objects/StandLeague1F.asm
index a762b75..00d550c 100644
--- a/data/maps/attributes/placeholder/StandLeague1F.asm
+++ b/data/maps/objects/StandLeague1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandLeague1F.asm", ROMX
+SECTION "data/maps/objects/StandLeague1F.asm", ROMX
+
 	map_attributes StandLeague1F, STAND_LEAGUE_1F, 0
 
 StandLeague1F_MapEvents::
@@ -20,4 +21,5 @@ StandLeague1F_MapEvents::
 	object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandLeague1F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague1F.blk"
+StandLeague1F_Blocks::
+INCBIN "maps/StandLeague1F.blk"
diff --git a/data/maps/attributes/placeholder/StandLeague2F.asm b/data/maps/objects/StandLeague2F.asm
index e88767b..9b80537 100644
--- a/data/maps/attributes/placeholder/StandLeague2F.asm
+++ b/data/maps/objects/StandLeague2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandLeague2F.asm", ROMX
+SECTION "data/maps/objects/StandLeague2F.asm", ROMX
+
 	map_attributes StandLeague2F, STAND_LEAGUE_2F, 0
 
 StandLeague2F_MapEvents::
@@ -18,4 +19,5 @@ StandLeague2F_MapEvents::
 	object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandLeague2F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague2F.blk"
+StandLeague2F_Blocks::
+INCBIN "maps/StandLeague2F.blk"
diff --git a/data/maps/attributes/placeholder/StandMart.asm b/data/maps/objects/StandMart.asm
index 56b2581..f05bc5b 100644
--- a/data/maps/attributes/placeholder/StandMart.asm
+++ b/data/maps/objects/StandMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandMart.asm", ROMX
+SECTION "data/maps/objects/StandMart.asm", ROMX
+
 	map_attributes StandMart, STAND_MART, 0
 
 StandMart_MapEvents::
@@ -17,4 +18,5 @@ StandMart_MapEvents::
 	object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandMart_Blocks:: INCBIN "maps/placeholder/blk/StandMart.blk"
+StandMart_Blocks::
+INCBIN "maps/StandMart.blk"
diff --git a/data/maps/attributes/placeholder/StandOffice.asm b/data/maps/objects/StandOffice.asm
index 7faa973..a85dbeb 100644
--- a/data/maps/attributes/placeholder/StandOffice.asm
+++ b/data/maps/objects/StandOffice.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandOffice.asm", ROMX
+SECTION "data/maps/objects/StandOffice.asm", ROMX
+
 	map_attributes StandOffice, STAND_OFFICE, 0
 
 StandOffice_MapEvents::
@@ -17,4 +18,5 @@ StandOffice_MapEvents::
 	object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandOffice_Blocks:: INCBIN "maps/placeholder/blk/StandOffice.blk"
+StandOffice_Blocks::
+INCBIN "maps/StandOffice.blk"
diff --git a/data/maps/attributes/placeholder/StandPokecenter1F.asm b/data/maps/objects/StandPokecenter1F.asm
index 36fe312..76bfa3f 100644
--- a/data/maps/attributes/placeholder/StandPokecenter1F.asm
+++ b/data/maps/objects/StandPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/StandPokecenter1F.asm", ROMX
+
 	map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0
 
 StandPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ StandPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter1F.blk"
+StandPokecenter1F_Blocks::
+INCBIN "maps/StandPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/StandPokecenter2F.asm b/data/maps/objects/StandPokecenter2F.asm
index 27cceef..ced417c 100644
--- a/data/maps/attributes/placeholder/StandPokecenter2F.asm
+++ b/data/maps/objects/StandPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/StandPokecenter2F.asm", ROMX
+
 	map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0
 
 StandPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ StandPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter2F.blk"
+StandPokecenter2F_Blocks::
+INCBIN "maps/StandPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/StandRocketHouse1F.asm b/data/maps/objects/StandRocketHouse1F.asm
index e5c9553..6bda8de 100644
--- a/data/maps/attributes/placeholder/StandRocketHouse1F.asm
+++ b/data/maps/objects/StandRocketHouse1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandRocketHouse1F.asm", ROMX
+SECTION "data/maps/objects/StandRocketHouse1F.asm", ROMX
+
 	map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0
 
 StandRocketHouse1F_MapEvents::
@@ -16,4 +17,5 @@ StandRocketHouse1F_MapEvents::
 	db 1 ; person events
 	object_event 11, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandRocketHouse1F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse1F.blk"
+StandRocketHouse1F_Blocks::
+INCBIN "maps/StandRocketHouse1F.blk"
diff --git a/data/maps/attributes/placeholder/StandRocketHouse2F.asm b/data/maps/objects/StandRocketHouse2F.asm
index 6f7828d..5ed8d35 100644
--- a/data/maps/attributes/placeholder/StandRocketHouse2F.asm
+++ b/data/maps/objects/StandRocketHouse2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandRocketHouse2F.asm", ROMX
+SECTION "data/maps/objects/StandRocketHouse2F.asm", ROMX
+
 	map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0
 
 StandRocketHouse2F_MapEvents::
@@ -14,4 +15,5 @@ StandRocketHouse2F_MapEvents::
 	db 1 ; person events
 	object_event 5, 4, SPRITE_ROCKET_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-StandRocketHouse2F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse2F.blk"
+StandRocketHouse2F_Blocks::
+INCBIN "maps/StandRocketHouse2F.blk"
diff --git a/data/maps/attributes/placeholder/StandRoute.asm b/data/maps/objects/StandRoute.asm
index 30186ce..fabb1ae 100644
--- a/data/maps/attributes/placeholder/StandRoute.asm
+++ b/data/maps/objects/StandRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandRoute.asm", ROMX
+SECTION "data/maps/objects/StandRoute.asm", ROMX
+
 	map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH
 	connection north, Stand, STAND, -3, 7, 13
 	connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13
@@ -16,4 +17,5 @@ StandRoute_MapEvents::
 
 	db 0 ; person events
 
-StandRoute_Blocks:: INCBIN "maps/placeholder/blk/StandRoute.blk"
+StandRoute_Blocks::
+INCBIN "maps/StandRoute.blk"
diff --git a/data/maps/attributes/placeholder/StandRouteGateKanto.asm b/data/maps/objects/StandRouteGateKanto.asm
index 2981852..a80039f 100644
--- a/data/maps/attributes/placeholder/StandRouteGateKanto.asm
+++ b/data/maps/objects/StandRouteGateKanto.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/StandRouteGateKanto.asm", ROMX
+SECTION "data/maps/objects/StandRouteGateKanto.asm", ROMX
+
 	map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0
 
 StandRouteGateKanto_MapEvents::
@@ -16,4 +17,5 @@ StandRouteGateKanto_MapEvents::
 
 	db 0 ; person events
 
-StandRouteGateKanto_Blocks:: INCBIN "maps/placeholder/blk/StandRouteGateKanto.blk"
+StandRouteGateKanto_Blocks::
+INCBIN "maps/StandRouteGateKanto.blk"
diff --git a/data/maps/attributes/placeholder/Sugar.asm b/data/maps/objects/Sugar.asm
index 6c5d6b4..43fd16e 100644
--- a/data/maps/attributes/placeholder/Sugar.asm
+++ b/data/maps/objects/Sugar.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/Sugar.asm", ROMX
+SECTION "data/maps/objects/Sugar.asm", ROMX
+
 	map_attributes Sugar, SUGAR, SOUTH
 	connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10
 
@@ -24,4 +25,5 @@ Sugar_MapEvents::
 	object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13, 11, SPRITE_GRAMPS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 
-Sugar_Blocks:: INCBIN "maps/placeholder/blk/Sugar.blk"
+Sugar_Blocks::
+INCBIN "maps/Sugar.blk"
diff --git a/data/maps/attributes/placeholder/SugarHouse.asm b/data/maps/objects/SugarHouse.asm
index eef5c56..9e1f697 100644
--- a/data/maps/attributes/placeholder/SugarHouse.asm
+++ b/data/maps/objects/SugarHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarHouse.asm", ROMX
+SECTION "data/maps/objects/SugarHouse.asm", ROMX
+
 	map_attributes SugarHouse, SUGAR_HOUSE, 0
 
 SugarHouse_MapEvents::
@@ -17,4 +18,5 @@ SugarHouse_MapEvents::
 	object_event 4, 5, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 3, 1, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SugarHouse_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse.blk"
+SugarHouse_Blocks::
+INCBIN "maps/SugarHouse.blk"
diff --git a/data/maps/attributes/placeholder/SugarHouse2.asm b/data/maps/objects/SugarHouse2.asm
index 9d86644..4d74ca0 100644
--- a/data/maps/attributes/placeholder/SugarHouse2.asm
+++ b/data/maps/objects/SugarHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarHouse2.asm", ROMX
+SECTION "data/maps/objects/SugarHouse2.asm", ROMX
+
 	map_attributes SugarHouse2, SUGAR_HOUSE_2, 0
 
 SugarHouse2_MapEvents::
@@ -15,4 +16,5 @@ SugarHouse2_MapEvents::
 	db 1 ; person events
 	object_event 2, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SugarHouse2_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse2.blk"
+SugarHouse2_Blocks::
+INCBIN "maps/SugarHouse2.blk"
diff --git a/data/maps/attributes/placeholder/SugarMart.asm b/data/maps/objects/SugarMart.asm
index 2da0c08..8bae8e3 100644
--- a/data/maps/attributes/placeholder/SugarMart.asm
+++ b/data/maps/objects/SugarMart.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarMart.asm", ROMX
+SECTION "data/maps/objects/SugarMart.asm", ROMX
+
 	map_attributes SugarMart, SUGAR_MART, 0
 
 SugarMart_MapEvents::
@@ -17,4 +18,5 @@ SugarMart_MapEvents::
 	object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SugarMart_Blocks:: INCBIN "maps/placeholder/blk/SugarMart.blk"
+SugarMart_Blocks::
+INCBIN "maps/SugarMart.blk"
diff --git a/data/maps/attributes/placeholder/SugarPokecenter1F.asm b/data/maps/objects/SugarPokecenter1F.asm
index 944c776..f43eae9 100644
--- a/data/maps/attributes/placeholder/SugarPokecenter1F.asm
+++ b/data/maps/objects/SugarPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/SugarPokecenter1F.asm", ROMX
+
 	map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0
 
 SugarPokecenter1F_MapEvents::
@@ -19,4 +20,5 @@ SugarPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SugarPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter1F.blk"
+SugarPokecenter1F_Blocks::
+INCBIN "maps/SugarPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/SugarPokecenter2F.asm b/data/maps/objects/SugarPokecenter2F.asm
index 8141093..903a0b3 100644
--- a/data/maps/attributes/placeholder/SugarPokecenter2F.asm
+++ b/data/maps/objects/SugarPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/SugarPokecenter2F.asm", ROMX
+
 	map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0
 
 SugarPokecenter2F_MapEvents::
@@ -16,4 +17,5 @@ SugarPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-SugarPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter2F.blk"
+SugarPokecenter2F_Blocks::
+INCBIN "maps/SugarPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/SugarRoute.asm b/data/maps/objects/SugarRoute.asm
index 20647d8..9f8469a 100644
--- a/data/maps/attributes/placeholder/SugarRoute.asm
+++ b/data/maps/objects/SugarRoute.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarRoute.asm", ROMX
+SECTION "data/maps/objects/SugarRoute.asm", ROMX
+
 	map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH
 	connection north, Sugar, SUGAR, 0, 0, 10
 	connection south, Newtype, NEWTYPE, -3, 2, 16
@@ -16,4 +17,5 @@ SugarRoute_MapEvents::
 
 	db 0 ; person events
 
-SugarRoute_Blocks:: INCBIN "maps/placeholder/blk/SugarRoute.blk"
+SugarRoute_Blocks::
+INCBIN "maps/SugarRoute.blk"
diff --git a/data/maps/attributes/placeholder/SugarRouteGate.asm b/data/maps/objects/SugarRouteGate.asm
index 95acf84..2ebce43 100644
--- a/data/maps/attributes/placeholder/SugarRouteGate.asm
+++ b/data/maps/objects/SugarRouteGate.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/SugarRouteGate.asm", ROMX
+SECTION "data/maps/objects/SugarRouteGate.asm", ROMX
+
 	map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0
 
 SugarRouteGate_MapEvents::
@@ -16,4 +17,5 @@ SugarRouteGate_MapEvents::
 
 	db 0 ; person events
 
-SugarRouteGate_Blocks:: INCBIN "maps/placeholder/blk/SugarRouteGate.blk"
+SugarRouteGate_Blocks::
+INCBIN "maps/SugarRouteGate.blk"
diff --git a/data/maps/objects/UnusedMap13.asm b/data/maps/objects/UnusedMap13.asm
new file mode 100644
index 0000000..f5564e3
--- /dev/null
+++ b/data/maps/objects/UnusedMap13.asm
@@ -0,0 +1,9 @@
+INCLUDE "constants.asm"
+
+SECTION "data/maps/objects/UnusedMap13.asm", ROMX
+
+	map_attributes UnusedMap13, UNUSED_MAP_13, 0
+
+UnusedMap13_MapEvents::
+UnusedMap13_Blocks::
+INCBIN "maps/UnusedMap13.blk"
diff --git a/data/maps/attributes/placeholder/West.asm b/data/maps/objects/West.asm
index 04d1e8d..3884b21 100644
--- a/data/maps/attributes/placeholder/West.asm
+++ b/data/maps/objects/West.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/West.asm", ROMX
+SECTION "data/maps/objects/West.asm", ROMX
+
 	map_attributes West, WEST, NORTH | EAST
 	connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10
 	connection east, Route2, ROUTE_2, 5, 0, 9
@@ -40,4 +41,5 @@ West_MapEvents::
 	object_event 22, 19, SPRITE_COOLTRAINER_F, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 18, 13, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-West_Blocks:: INCBIN "maps/placeholder/blk/West.blk"
+West_Blocks::
+INCBIN "maps/West.blk"
diff --git a/data/maps/attributes/placeholder/WestGym.asm b/data/maps/objects/WestGym.asm
index f1bc752..de11175 100644
--- a/data/maps/attributes/placeholder/WestGym.asm
+++ b/data/maps/objects/WestGym.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestGym.asm", ROMX
+SECTION "data/maps/objects/WestGym.asm", ROMX
+
 	map_attributes WestGym, WEST_GYM, 0
 
 WestGym_MapEvents::
@@ -22,4 +23,5 @@ WestGym_MapEvents::
 	object_event 4, 6, SPRITE_TWIN, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0
 	object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestGym_Blocks:: INCBIN "maps/placeholder/blk/WestGym.blk"
+WestGym_Blocks::
+INCBIN "maps/WestGym.blk"
diff --git a/data/maps/attributes/placeholder/WestHouse1.asm b/data/maps/objects/WestHouse1.asm
index 6b9fb0c..5796355 100644
--- a/data/maps/attributes/placeholder/WestHouse1.asm
+++ b/data/maps/objects/WestHouse1.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestHouse1.asm", ROMX
+SECTION "data/maps/objects/WestHouse1.asm", ROMX
+
 	map_attributes WestHouse1, WEST_HOUSE_1, 0
 
 WestHouse1_MapEvents::
@@ -21,4 +22,5 @@ WestHouse1_MapEvents::
 	object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestHouse1_Blocks:: INCBIN "maps/placeholder/blk/WestHouse1.blk"
+WestHouse1_Blocks::
+INCBIN "maps/WestHouse1.blk"
diff --git a/data/maps/attributes/placeholder/WestHouse2.asm b/data/maps/objects/WestHouse2.asm
index 2e10b62..be8ea8f 100644
--- a/data/maps/attributes/placeholder/WestHouse2.asm
+++ b/data/maps/objects/WestHouse2.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestHouse2.asm", ROMX
+SECTION "data/maps/objects/WestHouse2.asm", ROMX
+
 	map_attributes WestHouse2, WEST_HOUSE_2, 0
 
 WestHouse2_MapEvents::
@@ -21,4 +22,5 @@ WestHouse2_MapEvents::
 	object_event 8, 6, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 5, SPRITE_BUG_CATCHER_BOY, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestHouse2_Blocks:: INCBIN "maps/placeholder/blk/WestHouse2.blk"
+WestHouse2_Blocks::
+INCBIN "maps/WestHouse2.blk"
diff --git a/data/maps/attributes/placeholder/WestMart1F.asm b/data/maps/objects/WestMart1F.asm
index 8a9cdff..f3a0415 100644
--- a/data/maps/attributes/placeholder/WestMart1F.asm
+++ b/data/maps/objects/WestMart1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMart1F.asm", ROMX
+SECTION "data/maps/objects/WestMart1F.asm", ROMX
+
 	map_attributes WestMart1F, WEST_MART_1F, 0
 
 WestMart1F_MapEvents::
@@ -19,4 +20,5 @@ WestMart1F_MapEvents::
 	db 1 ; person events
 	object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestMart1F_Blocks:: INCBIN "maps/placeholder/blk/WestMart1F.blk"
+WestMart1F_Blocks::
+INCBIN "maps/WestMart1F.blk"
diff --git a/data/maps/attributes/placeholder/WestMart2F.asm b/data/maps/objects/WestMart2F.asm
index 97d1893..853fe93 100644
--- a/data/maps/attributes/placeholder/WestMart2F.asm
+++ b/data/maps/objects/WestMart2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMart2F.asm", ROMX
+SECTION "data/maps/objects/WestMart2F.asm", ROMX
+
 	map_attributes WestMart2F, WEST_MART_2F, 0
 
 WestMart2F_MapEvents::
@@ -35,4 +36,5 @@ WestMart2F_MapEvents::
 	object_event 1, 5, SPRITE_BURGLAR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 9, 2, SPRITE_ROCKET_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestMart2F_Blocks:: INCBIN "maps/placeholder/blk/WestMart2F.blk"
+WestMart2F_Blocks::
+INCBIN "maps/WestMart2F.blk"
diff --git a/data/maps/attributes/placeholder/WestMart3F.asm b/data/maps/objects/WestMart3F.asm
index fe53d36..3665b94 100644
--- a/data/maps/attributes/placeholder/WestMart3F.asm
+++ b/data/maps/objects/WestMart3F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMart3F.asm", ROMX
+SECTION "data/maps/objects/WestMart3F.asm", ROMX
+
 	map_attributes WestMart3F, WEST_MART_3F, 0
 
 WestMart3F_MapEvents::
@@ -32,4 +33,5 @@ WestMart3F_MapEvents::
 	object_event 13, 4, SPRITE_GENTLEMAN, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 3, 5, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestMart3F_Blocks:: INCBIN "maps/placeholder/blk/WestMart3F.blk"
+WestMart3F_Blocks::
+INCBIN "maps/WestMart3F.blk"
diff --git a/data/maps/attributes/placeholder/WestMart4F.asm b/data/maps/objects/WestMart4F.asm
index f63a9b4..0b1f857 100644
--- a/data/maps/attributes/placeholder/WestMart4F.asm
+++ b/data/maps/objects/WestMart4F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMart4F.asm", ROMX
+SECTION "data/maps/objects/WestMart4F.asm", ROMX
+
 	map_attributes WestMart4F, WEST_MART_4F, 0
 
 WestMart4F_MapEvents::
@@ -32,4 +33,5 @@ WestMart4F_MapEvents::
 	object_event 8, 6, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestMart4F_Blocks:: INCBIN "maps/placeholder/blk/WestMart4F.blk"
+WestMart4F_Blocks::
+INCBIN "maps/WestMart4F.blk"
diff --git a/data/maps/attributes/placeholder/WestMart5F.asm b/data/maps/objects/WestMart5F.asm
index c3bf314..bf963f0 100644
--- a/data/maps/attributes/placeholder/WestMart5F.asm
+++ b/data/maps/objects/WestMart5F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMart5F.asm", ROMX
+SECTION "data/maps/objects/WestMart5F.asm", ROMX
+
 	map_attributes WestMart5F, WEST_MART_5F, 0
 
 WestMart5F_MapEvents::
@@ -20,4 +21,5 @@ WestMart5F_MapEvents::
 	object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestMart5F_Blocks:: INCBIN "maps/placeholder/blk/WestMart5F.blk"
+WestMart5F_Blocks::
+INCBIN "maps/WestMart5F.blk"
diff --git a/data/maps/attributes/placeholder/WestMart6F.asm b/data/maps/objects/WestMart6F.asm
index 1d2f81c..8228270 100644
--- a/data/maps/attributes/placeholder/WestMart6F.asm
+++ b/data/maps/objects/WestMart6F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMart6F.asm", ROMX
+SECTION "data/maps/objects/WestMart6F.asm", ROMX
+
 	map_attributes WestMart6F, WEST_MART_6F, 0
 
 WestMart6F_MapEvents::
@@ -21,4 +22,5 @@ WestMart6F_MapEvents::
 	object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestMart6F_Blocks:: INCBIN "maps/placeholder/blk/WestMart6F.blk"
+WestMart6F_Blocks::
+INCBIN "maps/WestMart6F.blk"
diff --git a/data/maps/attributes/placeholder/WestMartElevator.asm b/data/maps/objects/WestMartElevator.asm
index 1e7c99a..18861c9 100644
--- a/data/maps/attributes/placeholder/WestMartElevator.asm
+++ b/data/maps/objects/WestMartElevator.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestMartElevator.asm", ROMX
+SECTION "data/maps/objects/WestMartElevator.asm", ROMX
+
 	map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0
 
 WestMartElevator_MapEvents::
@@ -14,4 +15,5 @@ WestMartElevator_MapEvents::
 
 	db 0 ; person events
 
-WestMartElevator_Blocks:: INCBIN "maps/placeholder/blk/WestMartElevator.blk"
+WestMartElevator_Blocks::
+INCBIN "maps/WestMartElevator.blk"
diff --git a/data/maps/attributes/placeholder/WestPokecenter1F.asm b/data/maps/objects/WestPokecenter1F.asm
index 3135a9e..27a39e2 100644
--- a/data/maps/attributes/placeholder/WestPokecenter1F.asm
+++ b/data/maps/objects/WestPokecenter1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestPokecenter1F.asm", ROMX
+SECTION "data/maps/objects/WestPokecenter1F.asm", ROMX
+
 	map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0
 
 WestPokecenter1F_MapEvents::
@@ -20,4 +21,5 @@ WestPokecenter1F_MapEvents::
 	object_event 2, 5, SPRITE_LASS, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 10, 1, SPRITE_ROCKET_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter1F.blk"
+WestPokecenter1F_Blocks::
+INCBIN "maps/WestPokecenter1F.blk"
diff --git a/data/maps/attributes/placeholder/WestPokecenter2F.asm b/data/maps/objects/WestPokecenter2F.asm
index f67f47e..7e2c0e3 100644
--- a/data/maps/attributes/placeholder/WestPokecenter2F.asm
+++ b/data/maps/objects/WestPokecenter2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestPokecenter2F.asm", ROMX
+SECTION "data/maps/objects/WestPokecenter2F.asm", ROMX
+
 	map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0
 
 WestPokecenter2F_MapEvents::
@@ -17,4 +18,5 @@ WestPokecenter2F_MapEvents::
 	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter2F.blk"
+WestPokecenter2F_Blocks::
+INCBIN "maps/WestPokecenter2F.blk"
diff --git a/data/maps/attributes/placeholder/WestRadioTower1F.asm b/data/maps/objects/WestRadioTower1F.asm
index 8a7f33a..baa2d7f 100644
--- a/data/maps/attributes/placeholder/WestRadioTower1F.asm
+++ b/data/maps/objects/WestRadioTower1F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestRadioTower1F.asm", ROMX
+SECTION "data/maps/objects/WestRadioTower1F.asm", ROMX
+
 	map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0
 
 WestRadioTower1F_MapEvents::
@@ -20,4 +21,5 @@ WestRadioTower1F_MapEvents::
 	object_event 2, 3, SPRITE_SUPER_NERD, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestRadioTower1F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower1F.blk"
+WestRadioTower1F_Blocks::
+INCBIN "maps/WestRadioTower1F.blk"
diff --git a/data/maps/attributes/placeholder/WestRadioTower2F.asm b/data/maps/objects/WestRadioTower2F.asm
index c42b729..5efdd72 100644
--- a/data/maps/attributes/placeholder/WestRadioTower2F.asm
+++ b/data/maps/objects/WestRadioTower2F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestRadioTower2F.asm", ROMX
+SECTION "data/maps/objects/WestRadioTower2F.asm", ROMX
+
 	map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0
 
 WestRadioTower2F_MapEvents::
@@ -22,4 +23,5 @@ WestRadioTower2F_MapEvents::
 	object_event 6, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 2, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestRadioTower2F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower2F.blk"
+WestRadioTower2F_Blocks::
+INCBIN "maps/WestRadioTower2F.blk"
diff --git a/data/maps/attributes/placeholder/WestRadioTower3F.asm b/data/maps/objects/WestRadioTower3F.asm
index 87e3b7c..db9f966 100644
--- a/data/maps/attributes/placeholder/WestRadioTower3F.asm
+++ b/data/maps/objects/WestRadioTower3F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestRadioTower3F.asm", ROMX
+SECTION "data/maps/objects/WestRadioTower3F.asm", ROMX
+
 	map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0
 
 WestRadioTower3F_MapEvents::
@@ -23,4 +24,5 @@ WestRadioTower3F_MapEvents::
 	object_event 1, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestRadioTower3F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower3F.blk"
+WestRadioTower3F_Blocks::
+INCBIN "maps/WestRadioTower3F.blk"
diff --git a/data/maps/attributes/placeholder/WestRadioTower4F.asm b/data/maps/objects/WestRadioTower4F.asm
index 3f16e4f..c3a5175 100644
--- a/data/maps/attributes/placeholder/WestRadioTower4F.asm
+++ b/data/maps/objects/WestRadioTower4F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestRadioTower4F.asm", ROMX
+SECTION "data/maps/objects/WestRadioTower4F.asm", ROMX
+
 	map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0
 
 WestRadioTower4F_MapEvents::
@@ -24,4 +25,5 @@ WestRadioTower4F_MapEvents::
 	object_event 5, 1, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 1, 2, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestRadioTower4F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower4F.blk"
+WestRadioTower4F_Blocks::
+INCBIN "maps/WestRadioTower4F.blk"
diff --git a/data/maps/attributes/placeholder/WestRadioTower5F.asm b/data/maps/objects/WestRadioTower5F.asm
index da37bb0..9cbd21a 100644
--- a/data/maps/attributes/placeholder/WestRadioTower5F.asm
+++ b/data/maps/objects/WestRadioTower5F.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestRadioTower5F.asm", ROMX
+SECTION "data/maps/objects/WestRadioTower5F.asm", ROMX
+
 	map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0
 
 WestRadioTower5F_MapEvents::
@@ -24,4 +25,5 @@ WestRadioTower5F_MapEvents::
 	object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 6, 7, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestRadioTower5F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower5F.blk"
+WestRadioTower5F_Blocks::
+INCBIN "maps/WestRadioTower5F.blk"
diff --git a/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm b/data/maps/objects/WestRocketRaidedHouse.asm
index c3ea07d..5ae6133 100644
--- a/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm
+++ b/data/maps/objects/WestRocketRaidedHouse.asm
@@ -1,6 +1,7 @@
 INCLUDE "constants.asm"
 
-SECTION "data/maps/attributes/placeholder/WestRocketRaidedHouse.asm", ROMX
+SECTION "data/maps/objects/WestRocketRaidedHouse.asm", ROMX
+
 	map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0
 
 WestRocketRaidedHouse_MapEvents::
@@ -26,4 +27,5 @@ WestRocketRaidedHouse_MapEvents::
 	object_event 1, 3, SPRITE_POKEFAN_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 	object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
 
-WestRocketRaidedHouse_Blocks:: INCBIN "maps/placeholder/blk/WestRocketRaidedHouse.blk"
+WestRocketRaidedHouse_Blocks::
+INCBIN "maps/WestRocketRaidedHouse.blk"