move blockdata into maps.asm

3 files changed, 21 insertions, 14 deletions

diff --git a/contents.asm b/contents.asm
index 25afc4779..62756c88d 100644
--- a/contents.asm
+++ b/contents.asm
@@ -74,6 +74,10 @@ PICS_19                   EQU $5A
 
 MAP_HEADERS               EQU $25
 
+MAPS_1                    EQU $2A
+MAPS_2                    EQU $2B
+MAPS_3                    EQU $2C
+
 MAP_SCRIPTS_1             EQU $15
 MAP_SCRIPTS_2             EQU $16
 MAP_SCRIPTS_3             EQU $17
diff --git a/main.asm b/main.asm
index e80a8fb5f..055aa07be 100644
--- a/main.asm
+++ b/main.asm
@@ -71853,20 +71853,6 @@ SECTION "bank29", ROMX, BANK[$29]
 INCLUDE "text/phone/extra2.asm"
 
 
-SECTION "bank2A", ROMX, BANK[$2A]
-
-INCLUDE "maps/blockdata_1.asm"
-
-
-SECTION "bank2B", ROMX, BANK[$2B]
-
-INCLUDE "maps/blockdata_2.asm"
-
-
-SECTION "bank2C", ROMX, BANK[$2C]
-
-INCLUDE "maps/blockdata_3.asm"
-
 
 SECTION "Tileset Data 5", ROMX, BANK[TILESETS_5]
 
diff --git a/maps.asm b/maps.asm
index 51e5c00cd..9db2c7361 100644
--- a/maps.asm
+++ b/maps.asm
@@ -5,6 +5,23 @@ INCLUDE "maps/map_headers.asm"
 INCLUDE "maps/second_map_headers.asm"
 
 
+
+SECTION "Map Blockdata 1", ROMX, BANK[MAPS_1]
+
+INCLUDE "maps/blockdata_1.asm"
+
+
+SECTION "Map Blockdata 2", ROMX, BANK[MAPS_2]
+
+INCLUDE "maps/blockdata_2.asm"
+
+
+SECTION "Map Blockdata 3", ROMX, BANK[MAPS_3]
+
+INCLUDE "maps/blockdata_3.asm"
+
+
+
 SECTION "Map Scripts 1", ROMX, BANK[MAP_SCRIPTS_1]
 
 INCLUDE "maps/GoldenrodGym.asm"