Merge branch 'mid-kid-master'

11 files changed, 2321 insertions, 730 deletions

diff --git a/Makefile b/Makefile
index 69f9dde..dd6c27a 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ $(CORRECTEDROM): %-correctheader.gb: %.gb
 $(ROM): poke%-spaceworld.gb: $(OBJS) | $(BASEROM)
 	$(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^
 	$(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2$(shell echo $* | cut -d _ -f 1 | tr '[:lower:]' '[:upper:]')" $@
-#	$(sort_sym) $(@:.gb=.sym)
+	$(sort_sym) $(@:.gb=.sym)
 
 $(BASEROM):
 	@echo "Please obtain a copy of Gold_debug.sgb and put it in this directory as $@"
diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm
index b7a7542..56a7b02 100644
--- a/constants/landmark_constants.asm
+++ b/constants/landmark_constants.asm
@@ -1,47 +1,45 @@
 	const_def
-	const LANDMARK_NONE               ; 00
-	const LANDMARK_SILENT             ; 01
-	const LANDMARK_OLD                ; 02
-	const LANDMARK_WEST               ; 03
-	const LANDMARK_HIGH_TECH          ; 04
-	const LANDMARK_FOUNT              ; 05
-	const LANDMARK_BIRDON             ; 06
-	const LANDMARK_NEW_TYPE           ; 07
-	const LANDMARK_SUGAR              ; 08
-	const LANDMARK_BLUE_FOREST        ; 09
-	const LANDMARK_STAND              ; 0a
-	const LANDMARK_KANTO              ; 0b
-	const LANDMARK_PRINCE             ; 0c
-	const LANDMARK_MT_FUJI            ; 0d
-	const LANDMARK_SOUTH              ; 0e
-	const LANDMARK_NORTH              ; 0f
-	const LANDMARK_ROUTE_15           ; 10
-	const LANDMARK_ROUTE_18           ; 11
-	const LANDMARK_POWER_PLANT_1      ; 12
-	const LANDMARK_POWER_PLANT_2      ; 13
-	const LANDMARK_POWER_PLANT_3      ; 14
-	const LANDMARK_POWER_PLANT_4      ; 15
-	const LANDMARK_RUINS_1            ; 16
-	const LANDMARK_RUINS_2            ; 17
-	const LANDMARK_MINES_1            ; 18
-	const LANDMARK_MINES_2            ; 19
-	const LANDMARK_MINES_3            ; 1a
-	const LANDMARK_MINES_4            ; 1b
-	const LANDMARK_MINES_5            ; 1c
-	const LANDMARK_MINES_6            ; 1d
-	const LANDMARK_MINES_7            ; 1e
-	const LANDMARK_HIDEOUT_1          ; 1f
-	const LANDMARK_HIDEOUT_2          ; 20
-	const LANDMARK_HIDEOUT_3          ; 21
-	const LANDMARK_SLOWPOKE_WELL_1    ; 22
-	const LANDMARK_SLOWPOKE_WELL_2    ; 23
-	const LANDMARK_POKEMON_LEAGUE_1   ; 24
-	const LANDMARK_POKEMON_LEAGUE_1_2 ; 25
-	const LANDMARK_POKEMON_LEAGUE_2   ; 26
-	const LANDMARK_POKEMON_LEAGUE_3   ; 27
-	const LANDMARK_POKEMON_LEAGUE_4   ; 28
-	const LANDMARK_POKEMON_LEAGUE_5   ; 29
-	const LANDMARK_POKEMON_LEAGUE_6   ; 2a
-	const LANDMARK_POKEMON_LEAGUE_7   ; 2b
-	const LANDMARK_POKEMON_LEAGUE_7_2 ; 2c
-	const LANDMARK_SILENT_HILL        ; 2d
+	const LANDMARK_NONE                     ; 00
+	const LANDMARK_NORTH                    ; 01
+	const LANDMARK_BULL_FOREST_ROUTE_3      ; 02
+	const LANDMARK_BULL_FOREST              ; 03
+	const LANDMARK_BULL_FOREST_ROUTE_2      ; 04
+	const LANDMARK_STAND                    ; 05
+	const LANDMARK_STAND_ROUTE              ; 06
+	const LANDMARK_KANTO_EAST_ROUTE         ; 07
+	const LANDMARK_KANTO                    ; 08
+	const LANDMARK_ROUTE_SILENT_EAST        ; 09
+	const LANDMARK_SILENT_HILL              ; 0a
+	const LANDMARK_PRINCE                   ; 0b
+	const LANDMARK_MT_FUJI                  ; 0c
+	const LANDMARK_ROUTE_1_P1               ; 0d
+	const LANDMARK_ROUTE_1_P2               ; 0e
+	const LANDMARK_OLD_CITY                 ; 0f
+	const LANDMARK_ROUTE_2                  ; 10
+	const LANDMARK_WEST                     ; 11
+	const LANDMARK_BAADON_ROUTE_1           ; 12
+	const LANDMARK_BAADON                   ; 13
+	const LANDMARK_BAADON_ROUTE_2           ; 14
+	const LANDMARK_BAADON_ROUTE_3           ; 15
+	const LANDMARK_ROUTE_15                 ; 16
+	const LANDMARK_NEWTYPE                  ; 17
+	const LANDMARK_SUGAR_ROUTE              ; 18
+	const LANDMARK_SUGAR                    ; 19
+	const LANDMARK_NEWTYPE_ROUTE            ; 1a
+	const LANDMARK_ROUTE_18                 ; 1b
+	const LANDMARK_BULL_FOREST_ROUTE_1      ; 1c
+	const LANDMARK_1C                       ; 1d
+	const LANDMARK_1D                       ; 1e
+	const LANDMARK_FONTO_ROUTE_3            ; 1f
+	const LANDMARK_FONTO                    ; 20
+	const LANDMARK_FONTO_ROUTE_2            ; 21
+	const LANDMARK_FONTO_ROUTE_6            ; 22
+	const LANDMARK_FONTO_ROUTE_5            ; 23
+	const LANDMARK_SOUTH                    ; 24
+	const LANDMARK_FONTO_ROUTE_1            ; 25
+	const LANDMARK_HAITEKU_WEST_ROUTE_OCEAN ; 26
+	const LANDMARK_HAITEKU_WEST_ROUTE       ; 27
+	const LANDMARK_HAITEKU                  ; 28
+	const LANDMARK_WASTE_BRIDGE             ; 29
+	const LANDMARK_FONTO_ROUTE_4            ; 2a
+	const LANDMARK_FONTO_BRIDGE             ; 2b
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index d5e130e..828b01a 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1,231 +1,293 @@
-; Map IDs
+newgroup: MACRO
+const_value = const_value + 1
+	enum_start 1
+ENDM
+
+map_const: MACRO
+;\1: map id
+;\2: width: in blocks
+;\3: height: in blocks
+GROUP_\1 EQU const_value
+	enum MAP_\1
+\1_WIDTH EQU \2
+\1_HEIGHT EQU \3
+ENDM
 
+; Map IDs
 	const_def
-	const ROUTE_1_P1
-	const ROUTE_1_P2
-	const ROUTE_SILENT_EAST
-	const SILENT_HILL
-	const ROUTE_1_GATE_1F
-	const ROUTE_1_GATE_2F
-	const ROUTE_SILENT_EAST_GATE
-	const PLAYER_HOUSE_1F
-	const PLAYER_HOUSE_2F
-	const SILENT_POKECENTER
-	const SILENT_HILL_HOUSE
-	const SILENT_HILL_LAB
-	const SILENT_HILL_LAB_2
-	const UNUSED_13
-	const SHIZUKANA_OKA
-	const ROUTE_2
-	const OLD_CITY
-	const ROUTE_2_GATE_1F
-	const ROUTE_2_GATE_2F
-	const ROUTE_2_HOUSE
-	const OLD_CITY_MUSEUM
-	const OLD_CITY_GYM
-	const OLD_CITY_TOWER_1F
-	const OLD_CITY_TOWER_2F
-	const OLD_CITY_TOWER_3F
-	const OLD_CITY_TOWER_4F
-	const OLD_CITY_TOWER_5F
-	const OLD_CITY_BILLS_HOUSE
-	const OLD_CITY_MART
-	const OLD_CITY_HOUSE
-	const OLD_CITY_POKECENTER_1F
-	const OLD_CITY_POKECENTER_2F
-	const OLD_CITY_POKECENTER_TRADE
-	const OLD_CITY_POKECENTER_BATTLE
-	const OLD_CITY_POKECENTER_TIME_MACHINE
-	const OLD_CITY_KURTS_HOUSE
-	const OLD_CITY_SCHOOL
-	const WEST
-	const WEST_MART_1F
-	const WEST_MART_2F
-	const WEST_MART_3F
-	const WEST_MART_4F
-	const WEST_MART_5F
-	const WEST_MART_6F
-	const WEST_MART_ELEVATOR
-	const WEST_RADIO_TOWER_1F
-	const WEST_RADIO_TOWER_2F
-	const WEST_RADIO_TOWER_3F
-	const WEST_RADIO_TOWER_4F
-	const WEST_RADIO_TOWER_5F
-	const WEST_ROCKET_RAIDED_HOUSE
-	const WEST_POKECENTER_1F
-	const WEST_POKECENTER_2F
-	const WEST_GYM
-	const WEST_HOUSE_1
-	const WEST_HOUSE_2
-	const HAITEKU_WEST_ROUTE
-	const HAITEKU_WEST_ROUTE_OCEAN
-	const HAITEKU
-	const HAITEKU_WEST_ROUTE_GATE
-	const HAITEKU_POKECENTER_1F
-	const HAITEKU_POKECENTER_2F
-	const HAITEKU_LEAGUE_1F
-	const HAITEKU_LEAGUE_2F
-	const HAITEKU_MART
-	const HAITEKU_HOUSE_1
-	const HAITEKU_HOUSE_2
-	const HAITEKU_IMPOSTER_OAK_HOUSE
-	const HAITEKU_AQUARIUM_1F
-	const HAITEKU_AQUARIUM_2F
-	const FONTO_ROUTE_1
-	const FONTO_ROUTE_2
-	const FONTO_ROUTE_3
-	const FONTO_ROUTE_4
-	const FONTO_ROUTE_5
-	const FONTO_ROUTE_6
-	const FONTO
-	const FONTO_ROUTE_GATE_1
-	const FONTO_ROUTE_GATE_2
-	const FONTO_ROUTE_GATE_3
-	const FONTO_ROCKET_HOUSE
-	const FONTO_MART
-	const FONTO_HOUSE
-	const FONTO_POKECENTER_1F
-	const FONTO_POKECENTER_2F
-	const FONTO_LAB
-	const BAADON_ROUTE_1
-	const BAADON_ROUTE_2
-	const BAADON_ROUTE_3
-	const BAADON
-	const BAADON_ROUTE_GATE_WEST
-	const BAADON_ROUTE_GATE_NEWTYPE
-	const BAADON_MART
-	const BAADON_POKECENTER_1F
-	const BAADON_POKECENTER_2F
-	const BAADON_HOUSE_1
-	const BAADON_WALLPAPER_HOUSE
-	const BAADON_HOUSE_2
-	const BAADON_LEAGUE_1F
-	const BAADON_LEAGUE_2F
-	const ROUTE_15
-	const NEWTYPE_ROUTE
-	const ROUTE_18
-	const NEWTYPE
-	const ROUTE_15_POKECENTER_1F
-	const ROUTE_15_POKECENTER_2F
-	const NEWTYPE_ROUTE_GATE
-	const ROUTE_18_POKECENTER_1F
-	const ROUTE_18_POKECENTER_2F
-	const NEWTYPE_POKECENTER_1F
-	const NEWTYPE_POKECENTER_2F
-	const NEWTYPE_LEAGUE_1F
-	const NEWTYPE_LEAGUE_2F
-	const NEWTYPE_SAILOR_HOUSE
-	const NEWTYPE_MART
-	const NEWTYPE_DOJO
-	const NEWTYPE_HOUSE_1
-	const NEWTYPE_DINER
-	const NEWTYPE_HOUSE_2
-	const NEWTYPE_HOUSE_3
-	const SUGAR_ROUTE
-	const SUGAR
-	const SUGAR_ROUTE_GATE
-	const SUGAR_HOUSE
-	const SUGAR_HOUSE_2
-	const SUGAR_MART
-	const SUGAR_POKECENTER_1F
-	const SUGAR_POKECENTER_2F
-	const BULL_FOREST_ROUTE_1
-	const BULL_FOREST_ROUTE_2
-	const BULL_FOREST_ROUTE_3
-	const BULL_FOREST
-	const BULL_FOREST_ROUTE_1_HOUSE
-	const BULL_FOREST_ROUTE_GATE_STAND
-	const BULL_MART
-	const BULL_HOUSE_1
-	const BULL_HOUSE_2
-	const BULL_HOUSE_3
-	const BULL_POKECENTER_1F
-	const BULL_POKECENTER_2F
-	const BULL_LEAGUE_1F
-	const BULL_LEAGUE_2F
-	const BULL_HOUSE_4
-	const STAND_ROUTE
-	const STAND
-	const STAND_ROUTE_GATE_KANTO
-	const STAND_LAB
-	const STAND_POKECENTER_1F
-	const STAND_POKECENTER_2F
-	const STAND_OFFICE
-	const STAND_MART
-	const STAND_HOUSE
-	const STAND_ROCKET_HOUSE_1F
-	const STAND_ROCKET_HOUSE_2F
-	const STAND_LEAGUE_1F
-	const STAND_LEAGUE_2F
-	const KANTO_EAST_ROUTE
-	const KANTO
-	const KANTO_CERULEAN_HOUSE
-	const KANTO_POKECENTER_1F
-	const KANTO_POKECENTER_2F
-	const KANTO_LEAGUE_1F
-	const KANTO_LEAGUE_2F
-	const KANTO_LAVENDER_HOUSE
-	const KANTO_CELADON_MART_1F
-	const KANTO_CELADON_MART_2F
-	const KANTO_CELADON_MART_3F
-	const KANTO_CELADON_MART_4F
-	const KANTO_CELADON_MART_5F
-	const KANTO_CELADON_ELEVATOR
-	const KANTO_MART
-	const KANTO_GAMEFREAK_HQ_1
-	const KANTO_GAMEFREAK_HQ_2
-	const KANTO_GAMEFREAK_HQ_3
-	const KANTO_GAMEFREAK_HQ_4
-	const KANTO_GAMEFREAK_HQ_5
-	const KANTO_SILPH_CO
-	const KANTO_VIRIDIAN_HOUSE
-	const KANTO_GAME_CORNER
-	const KANTO_UNUSED_AREA
-	const KANTO_GAME_CORNER_PRIZES
-	const KANTO_DINER
-	const KANTO_SCHOOL
-	const KANTO_HOSPITAL
-	const KANTO_POKECENTER_2_1F
-	const KANTO_POKECENTER_2_2F
-	const KANTO_REDS_HOUSE
-	const KANTO_GREENS_HOUSE_1F
-	const KANTO_GREENS_HOUSE_2F
-	const KANTO_ELDERS_HOUSE
-	const KANTO_OAKS_LAB
-	const KANTO_LEAGUE_2_1F
-	const KANTO_LEAGUE_2_2F
-	const KANTO_FISHING_GURU
-	const PRINCE_ROUTE
-	const PRINCE
-	const MT_FUJI_ROUTE
-	const MT_FUJI
-	const SOUTH
-	const SOUTH_HOUSE_1
-	const SOUTH_POKECENTER_1F
-	const SOUTH_POKECENTER_2F
-	const SOUTH_MART
-	const SOUTH_HOUSE_2
-	const NORTH
-	const NORTH_HOUSE_1
-	const NORTH_MART
-	const NORTH_HOUSE_2
-	const NORTH_POKECENTER_1F
-	const NORTH_POKECENTER_2F
-	const POWER_PLANT_1
-	const POWER_PLANT_2
-	const POWER_PLANT_3
-	const POWER_PLANT_4
-	const RUINS_OF_ALPH_ENTRANCE
-	const RUINS_OF_ALPH_MAIN
-	const CAVE_MINECARTS_1
-	const CAVE_MINECARTS_2
-	const CAVE_MINECARTS_3
-	const CAVE_MINECARTS_4
-	const CAVE_MINECARTS_5
-	const CAVE_MINECARTS_6
-	const CAVE_MINECARTS_7
-	const OFFICE_1
-	const OFFICE_2
-	const OFFICE_3
-	const SLOWPOKE_WELL_ENTRANCE
-	const SLOWPOKE_WELL_MAIN
+
+	newgroup                                           ;  1
+
+	map_const ROUTE_1_P1,                       15,  9 ;  1
+	map_const ROUTE_1_P2,                       10, 18 ;  2
+	map_const ROUTE_SILENT_EAST,                30,  9 ;  3
+	map_const SILENT_HILL,                      10,  9 ;  4
+	map_const ROUTE_1_GATE_1F,                   5,  4 ;  5
+	map_const ROUTE_1_GATE_2F,                   4,  3 ;  6
+	map_const ROUTE_SILENT_EAST_GATE,            5,  4 ;  7
+	map_const PLAYER_HOUSE_1F,                   5,  4 ;  8
+	map_const PLAYER_HOUSE_2F,                   5,  4 ;  9
+	map_const SILENT_POKECENTER,                 8,  4 ; 10
+	map_const SILENT_HILL_HOUSE,                 5,  4 ; 11
+	map_const SILENT_HILL_LAB,                   4,  8 ; 12
+	map_const SILENT_HILL_LAB_2,                 4,  4 ; 13
+	map_const UNUSED_13,                         4,  4 ; 14
+	map_const SHIZUKANA_OKA,                    25, 18 ; 15
+
+	newgroup                                           ;  2
+
+	map_const ROUTE_2,                          15,  9 ;  1
+	map_const OLD_CITY,                         20, 18 ;  2
+	map_const ROUTE_2_GATE_1F,                   5,  4 ;  3
+	map_const ROUTE_2_GATE_2F,                   4,  3 ;  4
+	map_const ROUTE_2_HOUSE,                     4,  4 ;  5
+	map_const OLD_CITY_MUSEUM,                   8,  4 ;  6
+	map_const OLD_CITY_GYM,                      5,  9 ;  7
+	map_const OLD_CITY_TOWER_1F,                 4,  4 ;  8
+	map_const OLD_CITY_TOWER_2F,                 4,  4 ;  9
+	map_const OLD_CITY_TOWER_3F,                 4,  4 ; 10
+	map_const OLD_CITY_TOWER_4F,                 4,  4 ; 11
+	map_const OLD_CITY_TOWER_5F,                 3,  3 ; 12
+	map_const OLD_CITY_BILLS_HOUSE,              4,  4 ; 13
+	map_const OLD_CITY_MART,                     6,  4 ; 14
+	map_const OLD_CITY_HOUSE,                    4,  4 ; 15
+	map_const OLD_CITY_POKECENTER_1F,            8,  4 ; 16
+	map_const OLD_CITY_POKECENTER_2F,            8,  4 ; 17
+	map_const OLD_CITY_POKECENTER_TRADE,         5,  4 ; 18
+	map_const OLD_CITY_POKECENTER_BATTLE,        5,  4 ; 19
+	map_const OLD_CITY_POKECENTER_TIME_MACHINE,  8,  4 ; 20
+	map_const OLD_CITY_KURTS_HOUSE,              8,  4 ; 21
+	map_const OLD_CITY_SCHOOL,                   4,  8 ; 22
+
+	newgroup                                           ;  3
+
+	map_const WEST,                             20, 18 ;  1
+	map_const WEST_MART_1F,                      8,  4 ;  2
+	map_const WEST_MART_2F,                      8,  4 ;  3
+	map_const WEST_MART_3F,                      8,  4 ;  4
+	map_const WEST_MART_4F,                      8,  4 ;  5
+	map_const WEST_MART_5F,                      8,  4 ;  6
+	map_const WEST_MART_6F,                      8,  4 ;  7
+	map_const WEST_MART_ELEVATOR,                2,  2 ;  8
+	map_const WEST_RADIO_TOWER_1F,               4,  4 ;  9
+	map_const WEST_RADIO_TOWER_2F,               4,  4 ; 10
+	map_const WEST_RADIO_TOWER_3F,               4,  4 ; 11
+	map_const WEST_RADIO_TOWER_4F,               4,  4 ; 12
+	map_const WEST_RADIO_TOWER_5F,               4,  4 ; 13
+	map_const WEST_ROCKET_RAIDED_HOUSE,          5,  4 ; 14
+	map_const WEST_POKECENTER_1F,                8,  4 ; 15
+	map_const WEST_POKECENTER_2F,                8,  4 ; 16
+	map_const WEST_GYM,                          5,  9 ; 17
+	map_const WEST_HOUSE_1,                      5,  4 ; 18
+	map_const WEST_HOUSE_2,                      5,  4 ; 19
+
+	newgroup                                           ;  4
+
+	map_const HAITEKU_WEST_ROUTE,               25,  9 ;  1
+	map_const HAITEKU_WEST_ROUTE_OCEAN,         10, 27 ;  2
+	map_const HAITEKU,                          20, 18 ;  3
+	map_const HAITEKU_WEST_ROUTE_GATE,           5,  4 ;  4
+	map_const HAITEKU_POKECENTER_1F,             8,  4 ;  5
+	map_const HAITEKU_POKECENTER_2F,             8,  4 ;  6
+	map_const HAITEKU_LEAGUE_1F,                 4,  8 ;  7
+	map_const HAITEKU_LEAGUE_2F,                 5,  9 ;  8
+	map_const HAITEKU_MART,                      6,  4 ;  9
+	map_const HAITEKU_HOUSE_1,                   5,  4 ; 10
+	map_const HAITEKU_HOUSE_2,                   5,  4 ; 11
+	map_const HAITEKU_IMPOSTER_OAK_HOUSE,        5,  4 ; 12
+	map_const HAITEKU_AQUARIUM_1F,               8,  4 ; 13
+	map_const HAITEKU_AQUARIUM_2F,               8,  4 ; 14
+
+	newgroup
+
+	map_const FONTO_ROUTE_1,                    35,  9
+	map_const FONTO_ROUTE_2,                    10, 18
+	map_const FONTO_ROUTE_3,                    25,  9
+	map_const FONTO_ROUTE_4,                    10, 18
+	map_const FONTO_ROUTE_5,                    10, 18
+	map_const FONTO_ROUTE_6,                    35,  9
+	map_const FONTO,                            10,  9
+	map_const FONTO_ROUTE_GATE_1,                5,  4
+	map_const FONTO_ROUTE_GATE_2,                5,  4
+	map_const FONTO_ROUTE_GATE_3,                5,  4
+	map_const FONTO_ROCKET_HOUSE,                8,  4
+	map_const FONTO_MART,                        8,  4
+	map_const FONTO_HOUSE,                       5,  4
+	map_const FONTO_POKECENTER_1F,               8,  4
+	map_const FONTO_POKECENTER_2F,               8,  4
+	map_const FONTO_LAB,                         5,  4
+
+	newgroup
+
+	map_const BAADON_ROUTE_1,                   10, 27
+	map_const BAADON_ROUTE_2,                   50,  9
+	map_const BAADON_ROUTE_3,                   10, 18
+	map_const BAADON,                           10,  9
+	map_const BAADON_ROUTE_GATE_WEST,            5,  4
+	map_const BAADON_ROUTE_GATE_NEWTYPE,         5,  4
+	map_const BAADON_MART,                       8,  4
+	map_const BAADON_POKECENTER_1F,              8,  4
+	map_const BAADON_POKECENTER_2F,              8,  4
+	map_const BAADON_HOUSE_1,                    4,  4
+	map_const BAADON_WALLPAPER_HOUSE,            4,  4
+	map_const BAADON_HOUSE_2,                    5,  4
+	map_const BAADON_LEAGUE_1F,                  4,  8
+	map_const BAADON_LEAGUE_2F,                  5,  9
+
+	newgroup
+
+	map_const ROUTE_15,                         15,  9
+	map_const NEWTYPE_ROUTE,                    15,  9
+	map_const ROUTE_18,                         10, 45
+	map_const NEWTYPE,                          20, 18
+	map_const ROUTE_15_POKECENTER_1F,            8,  4
+	map_const ROUTE_15_POKECENTER_2F,            8,  4
+	map_const NEWTYPE_ROUTE_GATE,                5,  4
+	map_const ROUTE_18_POKECENTER_1F,            8,  4
+	map_const ROUTE_18_POKECENTER_2F,            8,  4
+	map_const NEWTYPE_POKECENTER_1F,             8,  4
+	map_const NEWTYPE_POKECENTER_2F,             8,  4
+	map_const NEWTYPE_LEAGUE_1F,                 4,  8
+	map_const NEWTYPE_LEAGUE_2F,                 5,  9
+	map_const NEWTYPE_SAILOR_HOUSE,              5,  4
+	map_const NEWTYPE_MART,                      8,  4
+	map_const NEWTYPE_DOJO,                      4,  8
+	map_const NEWTYPE_HOUSE_1,                   5,  4
+	map_const NEWTYPE_DINER,                     4,  4
+	map_const NEWTYPE_HOUSE_2,                   5,  4
+	map_const NEWTYPE_HOUSE_3,                   5,  4
+
+	newgroup
+
+	map_const SUGAR_ROUTE,                      10, 27
+	map_const SUGAR,                            10,  9
+	map_const SUGAR_ROUTE_GATE,                  5,  4
+	map_const SUGAR_HOUSE,                       4,  8
+	map_const SUGAR_HOUSE_2,                     4,  4
+	map_const SUGAR_MART,                        8,  4
+	map_const SUGAR_POKECENTER_1F,               8,  4
+	map_const SUGAR_POKECENTER_2F,               8,  4
+
+	newgroup
+
+	map_const BULL_FOREST_ROUTE_1,              25,  9
+	map_const BULL_FOREST_ROUTE_2,              10, 27
+	map_const BULL_FOREST_ROUTE_3,              10, 27
+	map_const BULL_FOREST,                      20, 18
+	map_const BULL_FOREST_ROUTE_1_HOUSE,         5,  4
+	map_const BULL_FOREST_ROUTE_GATE_STAND,      5,  4
+	map_const BULL_MART,                         8,  4
+	map_const BULL_HOUSE_1,                      4,  4
+	map_const BULL_HOUSE_2,                      5,  4
+	map_const BULL_HOUSE_3,                      5,  4
+	map_const BULL_POKECENTER_1F,                8,  4
+	map_const BULL_POKECENTER_2F,                8,  4
+	map_const BULL_LEAGUE_1F,                    4,  8
+	map_const BULL_LEAGUE_2F,                    5,  9
+	map_const BULL_HOUSE_4,                      5,  4
+
+	newgroup
+
+	map_const STAND_ROUTE,                      10, 27
+	map_const STAND,                            20, 18
+	map_const STAND_ROUTE_GATE_KANTO,            5,  4
+	map_const STAND_LAB,                         4,  4
+	map_const STAND_POKECENTER_1F,               8,  4
+	map_const STAND_POKECENTER_2F,               8,  4
+	map_const STAND_OFFICE,                      8,  4
+	map_const STAND_MART,                        8,  4
+	map_const STAND_HOUSE,                       5,  4
+	map_const STAND_ROCKET_HOUSE_1F,             8,  4
+	map_const STAND_ROCKET_HOUSE_2F,             8,  4
+	map_const STAND_LEAGUE_1F,                   4,  8
+	map_const STAND_LEAGUE_2F,                   5,  9
+
+	newgroup
+
+	map_const KANTO_EAST_ROUTE,                 20,  9
+	map_const KANTO,                            30, 27
+	map_const KANTO_CERULEAN_HOUSE,              5,  4
+	map_const KANTO_POKECENTER_1F,               8,  4
+	map_const KANTO_POKECENTER_2F,               8,  4
+	map_const KANTO_LEAGUE_1F,                   4,  8
+	map_const KANTO_LEAGUE_2F,                   5,  9
+	map_const KANTO_LAVENDER_HOUSE,              5,  4
+	map_const KANTO_CELADON_MART_1F,             8,  4
+	map_const KANTO_CELADON_MART_2F,             8,  4
+	map_const KANTO_CELADON_MART_3F,             8,  4
+	map_const KANTO_CELADON_MART_4F,             8,  4
+	map_const KANTO_CELADON_MART_5F,             8,  4
+	map_const KANTO_CELADON_ELEVATOR,            2,  2
+	map_const KANTO_MART,                        8,  4
+	map_const KANTO_GAMEFREAK_HQ_1,              4,  6
+	map_const KANTO_GAMEFREAK_HQ_2,              4,  6
+	map_const KANTO_GAMEFREAK_HQ_3,              4,  6
+	map_const KANTO_GAMEFREAK_HQ_4,              4,  6
+	map_const KANTO_GAMEFREAK_HQ_5,              4,  4
+	map_const KANTO_SILPH_CO,                   12,  8
+	map_const KANTO_VIRIDIAN_HOUSE,              5,  4
+	map_const KANTO_GAME_CORNER,                10,  7
+	map_const KANTO_UNUSED_AREA,                 4,  4
+	map_const KANTO_GAME_CORNER_PRIZES,          5,  4
+	map_const KANTO_DINER,                       5,  4
+	map_const KANTO_SCHOOL,                      4,  8
+	map_const KANTO_HOSPITAL,                    8,  4
+	map_const KANTO_POKECENTER_2_1F,             8,  4
+	map_const KANTO_POKECENTER_2_2F,             8,  4
+	map_const KANTO_REDS_HOUSE,                  5,  4
+	map_const KANTO_GREENS_HOUSE_1F,             4,  4
+	map_const KANTO_GREENS_HOUSE_2F,             4,  4
+	map_const KANTO_ELDERS_HOUSE,                5,  4
+	map_const KANTO_OAKS_LAB,                    4,  4
+	map_const KANTO_LEAGUE_2_1F,                 4,  8
+	map_const KANTO_LEAGUE_2_2F,                 5,  9
+	map_const KANTO_FISHING_GURU,                5,  4
+
+	newgroup
+
+	map_const PRINCE_ROUTE,                     10,  5
+	map_const PRINCE,                           10,  9
+
+	newgroup
+
+	map_const MT_FUJI_ROUTE,                    10,  5
+	map_const MT_FUJI,                          10,  9
+
+	newgroup
+
+	map_const SOUTH,                            20, 18
+	map_const SOUTH_HOUSE_1,                     5,  4
+	map_const SOUTH_POKECENTER_1F,               8,  4
+	map_const SOUTH_POKECENTER_2F,               8,  4
+	map_const SOUTH_MART,                        8,  4
+	map_const SOUTH_HOUSE_2,                     5,  4
+
+	newgroup
+
+	map_const NORTH,                            10,  9
+	map_const NORTH_HOUSE_1,                     5,  4
+	map_const NORTH_MART,                        6,  4
+	map_const NORTH_HOUSE_2,                     5,  4
+	map_const NORTH_POKECENTER_1F,               8,  4
+	map_const NORTH_POKECENTER_2F,               8,  4
+
+	newgroup
+
+	map_const POWER_PLANT_1,                    10,  9
+	map_const POWER_PLANT_2,                    10,  9
+	map_const POWER_PLANT_3,                    15, 18
+	map_const POWER_PLANT_4,                    15, 18
+	map_const RUINS_OF_ALPH_ENTRANCE,           10,  9
+	map_const RUINS_OF_ALPH_MAIN,               25, 27
+	map_const CAVE_MINECARTS_1,                 20, 18
+	map_const CAVE_MINECARTS_2,                 20, 18
+	map_const CAVE_MINECARTS_3,                 20, 18
+	map_const CAVE_MINECARTS_4,                 20, 18
+	map_const CAVE_MINECARTS_5,                 20, 18
+	map_const CAVE_MINECARTS_6,                 10, 18
+	map_const CAVE_MINECARTS_7,                 10, 18
+	map_const OFFICE_1,                         10,  9
+	map_const OFFICE_2,                         15, 18
+	map_const OFFICE_3,                         10, 18
+	map_const SLOWPOKE_WELL_ENTRANCE,           10,  9
+	map_const SLOWPOKE_WELL_MAIN,               10, 18
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index e711e1d..8a60442 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -8,11 +8,25 @@
 	const GATE
 	const DUNGEON
 
+; connection directions (see data/maps/data.asm)
+	const_def
+	const EAST_F
+	const WEST_F
+	const SOUTH_F
+	const NORTH_F
+
+; wMapConnections
+	const_def
+	shift_const EAST
+	shift_const WEST
+	shift_const SOUTH
+	shift_const NORTH
+
 ; SpawnPoints indexes (see data/maps/spawn_points.asm)
 const_value = -1
 	const SPAWN_N_A
-	
+
 NUM_SPAWNS EQU 18
-	
+
 ; size of each spawn point data
-SPAWN_POINT_SIZE EQU 4
\ No newline at end of file
+SPAWN_POINT_SIZE EQU 4
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
new file mode 100644
index 0000000..4ff1d0e
--- /dev/null
+++ b/data/maps/attributes.asm
@@ -0,0 +1,836 @@
+INCLUDE "constants.asm"
+
+map_id: MACRO
+;\1: map id
+	db GROUP_\1, MAP_\1
+ENDM
+
+map_attributes: MACRO
+;\1: map name
+;\2: map id
+;\3: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
+CURRENT_MAP_WIDTH = \2_WIDTH
+CURRENT_MAP_HEIGHT = \2_HEIGHT
+\1_MapAttributes::
+	db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH
+	dw \1_Blocks
+	dw \1_Unk
+	dw \1_MapScripts
+	dw \1_MapEvents
+	db \3
+ENDM
+
+; Connections go in order: north, south, west, east
+connection: MACRO
+;\1: direction
+;\2: map name
+;\3: map id
+;\4: final y offset for east/west, x offset for north/south
+;\5: map data y offset for east/west, x offset for north/south
+;\6: strip length
+if "\1" == "north"
+	map_id \3
+	dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
+	dw wOverworldMapBlocks + \4 + 3
+	db \6
+	db \3_WIDTH
+	db \3_HEIGHT * 2 - 1
+	db (\4 - \5) * -2
+	dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1
+elif "\1" == "south"
+	map_id \3
+	dw \2_Blocks + \5
+	dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
+	db \6
+	db \3_WIDTH
+	db 0
+	db (\4 - \5) * -2
+	dw wOverworldMapBlocks + \3_WIDTH + 7
+elif "\1" == "west"
+	map_id \3
+	dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
+	dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
+	db \6
+	db \3_WIDTH
+	db (\4 - \5) * -2
+	db \3_WIDTH * 2 - 1
+	dw wOverworldMapBlocks + \3_WIDTH * 2 + 6
+elif "\1" == "east"
+	map_id \3
+	dw \2_Blocks + (\3_WIDTH * \5)
+	dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
+	db \6
+	db \3_WIDTH
+	db (\4 - \5) * -2
+	db 0
+	dw wOverworldMapBlocks + \3_WIDTH + 7
+endc
+ENDM
+
+SECTION "Route2Gate1F", ROMX[$4000], BANK[$25]
+	map_attributes Route2Gate1F, ROUTE_2_GATE_1F, 0
+
+SECTION "Route2Gate2F", ROMX[$407C], BANK[$25]
+	map_attributes Route2Gate2F, ROUTE_2_GATE_2F, 0
+
+SECTION "Route2House", ROMX[$40DC], BANK[$25]
+	map_attributes Route2House, ROUTE_2_HOUSE, 0
+
+SECTION "OldCityMuseum", ROMX[$414A], BANK[$25]
+	map_attributes OldCityMuseum, OLD_CITY_MUSEUM, 0
+
+SECTION "OldCityGym", ROMX[$41CD], BANK[$25]
+	map_attributes OldCityGym, OLD_CITY_GYM, 0
+
+SECTION "OldCityTower1F", ROMX[$4289], BANK[$25]
+	map_attributes OldCityTower1F, OLD_CITY_TOWER_1F, 0
+
+SECTION "OldCityTower2F", ROMX[$4319], BANK[$25]
+	map_attributes OldCityTower2F, OLD_CITY_TOWER_2F, 0
+
+SECTION "OldCityTower3F", ROMX[$439E], BANK[$25]
+	map_attributes OldCityTower3F, OLD_CITY_TOWER_3F, 0
+
+SECTION "OldCityTower4F", ROMX[$4423], BANK[$25]
+	map_attributes OldCityTower4F, OLD_CITY_TOWER_4F, 0
+
+SECTION "OldCityTower5F", ROMX[$44A8], BANK[$25]
+	map_attributes OldCityTower5F, OLD_CITY_TOWER_5F, 0
+
+SECTION "OldCityBillsHouse", ROMX[$44FC], BANK[$25]
+	map_attributes OldCityBillsHouse, OLD_CITY_BILLS_HOUSE, 0
+
+SECTION "OldCityMart", ROMX[$456A], BANK[$25]
+	map_attributes OldCityMart, OLD_CITY_MART, 0
+
+SECTION "OldCityHouse", ROMX[$45EE], BANK[$25]
+	map_attributes OldCityHouse, OLD_CITY_HOUSE, 0
+
+SECTION "OldCityPokecenter1F", ROMX[$466E], BANK[$25]
+	map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, 0
+
+SECTION "OldCityPokecenter2F", ROMX[$46FE], BANK[$25]
+	map_attributes OldCityPokecenter2F, OLD_CITY_POKECENTER_2F, 0
+
+SECTION "OldCityPokecenterTrade", ROMX[$4826], BANK[$25]
+	map_attributes OldCityPokecenterTrade, OLD_CITY_POKECENTER_TRADE, 0
+
+SECTION "OldCityPokecenterBattle", ROMX[$48AC], BANK[$25]
+	map_attributes OldCityPokecenterBattle, OLD_CITY_POKECENTER_BATTLE, 0
+
+SECTION "OldCityPokecenterTimeMachine", ROMX[$492F], BANK[$25]
+	map_attributes OldCityPokecenterTimeMachine, OLD_CITY_POKECENTER_TIME_MACHINE, 0
+
+SECTION "OldCityKurtsHouse", ROMX[$49AC], BANK[$25]
+	map_attributes OldCityKurtsHouse, OLD_CITY_KURTS_HOUSE, 0
+
+SECTION "OldCitySchool", ROMX[$4A26], BANK[$25]
+	map_attributes OldCitySchool, OLD_CITY_SCHOOL, 0
+
+SECTION "Route1Gate1F", ROMX[$4000], BANK[$26]
+	map_attributes Route1Gate1F, ROUTE_1_GATE_1F, 0
+
+SECTION "Route1Gate2F", ROMX[$40DA], BANK[$26]
+	map_attributes Route1Gate2F, ROUTE_1_GATE_2F, 0
+
+SECTION "WestMart1F", ROMX[$4224], BANK[$26]
+	map_attributes WestMart1F, WEST_MART_1F, 0
+
+SECTION "WestMart2F", ROMX[$42A0], BANK[$26]
+	map_attributes WestMart2F, WEST_MART_2F, 0
+
+SECTION "WestMart3F", ROMX[$4374], BANK[$26]
+	map_attributes WestMart3F, WEST_MART_3F, 0
+
+SECTION "WestMart4F", ROMX[$4433], BANK[$26]
+	map_attributes WestMart4F, WEST_MART_4F, 0
+
+SECTION "WestMart5F", ROMX[$44F2], BANK[$26]
+	map_attributes WestMart5F, WEST_MART_5F, 0
+
+SECTION "WestMart6F", ROMX[$4581], BANK[$26]
+	map_attributes WestMart6F, WEST_MART_6F, 0
+
+SECTION "WestMartElevator", ROMX[$460E], BANK[$26]
+	map_attributes WestMartElevator, WEST_MART_ELEVATOR, 0
+
+SECTION "WestRadioTower1F", ROMX[$464B], BANK[$26]
+	map_attributes WestRadioTower1F, WEST_RADIO_TOWER_1F, 0
+
+SECTION "WestRadioTower2F", ROMX[$46CA], BANK[$26]
+	map_attributes WestRadioTower2F, WEST_RADIO_TOWER_2F, 0
+
+SECTION "WestRadioTower3F", ROMX[$4772], BANK[$26]
+	map_attributes WestRadioTower3F, WEST_RADIO_TOWER_3F, 0
+
+SECTION "WestRadioTower4F", ROMX[$4827], BANK[$26]
+	map_attributes WestRadioTower4F, WEST_RADIO_TOWER_4F, 0
+
+SECTION "WestRadioTower5F", ROMX[$48E9], BANK[$26]
+	map_attributes WestRadioTower5F, WEST_RADIO_TOWER_5F, 0
+
+SECTION "WestRocketRaidedHouse", ROMX[$499F], BANK[$26]
+	map_attributes WestRocketRaidedHouse, WEST_ROCKET_RAIDED_HOUSE, 0
+
+SECTION "WestPokecenter1F", ROMX[$4A49], BANK[$26]
+	map_attributes WestPokecenter1F, WEST_POKECENTER_1F, 0
+
+SECTION "WestPokecenter2F", ROMX[$4AE1], BANK[$26]
+	map_attributes WestPokecenter2F, WEST_POKECENTER_2F, 0
+
+SECTION "WestGym", ROMX[$4B5E], BANK[$26]
+	map_attributes WestGym, WEST_GYM, 0
+
+SECTION "WestHouse1", ROMX[$4C1A], BANK[$26]
+	map_attributes WestHouse1, WEST_HOUSE_1, 0
+
+SECTION "WestHouse2", ROMX[$4C9E], BANK[$26]
+	map_attributes WestHouse2, WEST_HOUSE_2, 0
+
+SECTION "HaitekuWestRouteGate", ROMX[$4000], BANK[$27]
+	map_attributes HaitekuWestRouteGate, HAITEKU_WEST_ROUTE_GATE, 0
+
+SECTION "HaitekuPokecenter1F", ROMX[$405B], BANK[$27]
+	map_attributes HaitekuPokecenter1F, HAITEKU_POKECENTER_1F, 0
+
+SECTION "HaitekuPokecenter2F", ROMX[$40EF], BANK[$27]
+	map_attributes HaitekuPokecenter2F, HAITEKU_POKECENTER_2F, 0
+
+SECTION "HaitekuLeague1F", ROMX[$4168], BANK[$27]
+	map_attributes HaitekuLeague1F, HAITEKU_LEAGUE_1F, 0
+
+SECTION "HaitekuLeague2F", ROMX[$4209], BANK[$27]
+	map_attributes HaitekuLeague2F, HAITEKU_LEAGUE_2F, 0
+
+SECTION "HaitekuMart", ROMX[$42A9], BANK[$27]
+	map_attributes HaitekuMart, HAITEKU_MART, 0
+
+SECTION "HaitekuHouse1", ROMX[$4329], BANK[$27]
+	map_attributes HaitekuHouse1, HAITEKU_HOUSE_1, 0
+
+SECTION "HaitekuHouse2", ROMX[$4383], BANK[$27]
+	map_attributes HaitekuHouse2, HAITEKU_HOUSE_2, 0
+
+SECTION "HaitekuImposterOakHouse", ROMX[$43DD], BANK[$27]
+	map_attributes HaitekuImposterOakHouse, HAITEKU_IMPOSTER_OAK_HOUSE, 0
+
+SECTION "HaitekuAquarium1F", ROMX[$4444], BANK[$27]
+	map_attributes HaitekuAquarium1F, HAITEKU_AQUARIUM_1F, 0
+
+SECTION "HaitekuAquarium2F", ROMX[$44CB], BANK[$27]
+	map_attributes HaitekuAquarium2F, HAITEKU_AQUARIUM_2F, 0
+
+SECTION "FontoRouteGate1", ROMX[$4537], BANK[$27]
+	map_attributes FontoRouteGate1, FONTO_ROUTE_GATE_1, 0
+
+SECTION "FontoRouteGate2", ROMX[$4592], BANK[$27]
+	map_attributes FontoRouteGate2, FONTO_ROUTE_GATE_2, 0
+
+SECTION "FontoRouteGate3", ROMX[$45ED], BANK[$27]
+	map_attributes FontoRouteGate3, FONTO_ROUTE_GATE_3, 0
+
+SECTION "FontoRocketHouse", ROMX[$4648], BANK[$27]
+	map_attributes FontoRocketHouse, FONTO_ROCKET_HOUSE, 0
+
+SECTION "FontoMart", ROMX[$46D5], BANK[$27]
+	map_attributes FontoMart, FONTO_MART, 0
+
+SECTION "FontoHouse", ROMX[$4755], BANK[$27]
+	map_attributes FontoHouse, FONTO_HOUSE, 0
+
+SECTION "FontoPokecenter1F", ROMX[$47AF], BANK[$27]
+	map_attributes FontoPokecenter1F, FONTO_POKECENTER_1F, 0
+
+SECTION "FontoPokecenter2F", ROMX[$4843], BANK[$27]
+	map_attributes FontoPokecenter2F, FONTO_POKECENTER_2F, 0
+
+SECTION "FontoLab", ROMX[$48BC], BANK[$27]
+	map_attributes FontoLab, FONTO_LAB, 0
+
+SECTION "BaadonMart", ROMX[$4923], BANK[$27]
+	map_attributes BaadonMart, BAADON_MART, 0
+
+SECTION "BaadonPokecenter1F", ROMX[$49A3], BANK[$27]
+	map_attributes BaadonPokecenter1F, BAADON_POKECENTER_1F, 0
+
+SECTION "BaadonPokecenter2F", ROMX[$4A2A], BANK[$27]
+	map_attributes BaadonPokecenter2F, BAADON_POKECENTER_2F, 0
+
+SECTION "BaadonHouse1", ROMX[$4AA3], BANK[$27]
+	map_attributes BaadonHouse1, BAADON_HOUSE_1, 0
+
+SECTION "BaadonWallpaperHouse", ROMX[$4AF9], BANK[$27]
+	map_attributes BaadonWallpaperHouse, BAADON_WALLPAPER_HOUSE, 0
+
+SECTION "BaadonHouse2", ROMX[$4B42], BANK[$27]
+	map_attributes BaadonHouse2, BAADON_HOUSE_2, 0
+
+SECTION "BaadonLeague1F", ROMX[$4B9C], BANK[$27]
+	map_attributes BaadonLeague1F, BAADON_LEAGUE_1F, 0
+
+SECTION "BaadonLeague2F", ROMX[$4C3D], BANK[$27]
+	map_attributes BaadonLeague2F, BAADON_LEAGUE_2F, 0
+
+SECTION "BaadonRouteGateWest", ROMX[$4CDD], BANK[$27]
+	map_attributes BaadonRouteGateWest, BAADON_ROUTE_GATE_WEST, 0
+
+SECTION "BaadonRouteGateNewtype", ROMX[$4D38], BANK[$27]
+	map_attributes BaadonRouteGateNewtype, BAADON_ROUTE_GATE_NEWTYPE, 0
+
+SECTION "NewtypePokecenter1F", ROMX[$4D93], BANK[$27]
+	map_attributes NewtypePokecenter1F, NEWTYPE_POKECENTER_1F, 0
+
+SECTION "NewtypePokecenter2F", ROMX[$4E27], BANK[$27]
+	map_attributes NewtypePokecenter2F, NEWTYPE_POKECENTER_2F, 0
+
+SECTION "NewtypeLeague1F", ROMX[$4EA0], BANK[$27]
+	map_attributes NewtypeLeague1F, NEWTYPE_LEAGUE_1F, 0
+
+SECTION "NewtypeLeague2F", ROMX[$4F41], BANK[$27]
+	map_attributes NewtypeLeague2F, NEWTYPE_LEAGUE_2F, 0
+
+SECTION "NewtypeSailorHouse", ROMX[$4FE1], BANK[$27]
+	map_attributes NewtypeSailorHouse, NEWTYPE_SAILOR_HOUSE, 0
+
+SECTION "NewtypeMart", ROMX[$503B], BANK[$27]
+	map_attributes NewtypeMart, NEWTYPE_MART, 0
+
+SECTION "NewtypeDojo", ROMX[$50BB], BANK[$27]
+	map_attributes NewtypeDojo, NEWTYPE_DOJO, 0
+
+SECTION "NewtypeHouse1", ROMX[$5155], BANK[$27]
+	map_attributes NewtypeHouse1, NEWTYPE_HOUSE_1, 0
+
+SECTION "NewtypeDiner", ROMX[$51AF], BANK[$27]
+	map_attributes NewtypeDiner, NEWTYPE_DINER, 0
+
+SECTION "NewtypeHouse2", ROMX[$522C], BANK[$27]
+	map_attributes NewtypeHouse2, NEWTYPE_HOUSE_2, 0
+
+SECTION "NewtypeHouse3", ROMX[$5286], BANK[$27]
+	map_attributes NewtypeHouse3, NEWTYPE_HOUSE_3, 0
+
+SECTION "Route15Pokecenter1F", ROMX[$52E0], BANK[$27]
+	map_attributes Route15Pokecenter1F, ROUTE_15_POKECENTER_1F, 0
+
+SECTION "Route15Pokecenter2F", ROMX[$5374], BANK[$27]
+	map_attributes Route15Pokecenter2F, ROUTE_15_POKECENTER_2F, 0
+
+SECTION "NewtypeRouteGate", ROMX[$53C6], BANK[$27]
+	map_attributes NewtypeRouteGate, NEWTYPE_ROUTE_GATE, 0
+
+SECTION "Route18Pokecenter1F", ROMX[$5421], BANK[$27]
+	map_attributes Route18Pokecenter1F, ROUTE_18_POKECENTER_1F, 0
+
+SECTION "Route18Pokecenter2F", ROMX[$54B5], BANK[$27]
+	map_attributes Route18Pokecenter2F, ROUTE_18_POKECENTER_2F, 0
+
+SECTION "SugarRouteGate", ROMX[$5507], BANK[$27]
+	map_attributes SugarRouteGate, SUGAR_ROUTE_GATE, 0
+
+SECTION "SugarHouse", ROMX[$5562], BANK[$27]
+	map_attributes SugarHouse, SUGAR_HOUSE, 0
+
+SECTION "SugarHouse2", ROMX[$55E2], BANK[$27]
+	map_attributes SugarHouse2, SUGAR_HOUSE_2, 0
+
+SECTION "SugarMart", ROMX[$5638], BANK[$27]
+	map_attributes SugarMart, SUGAR_MART, 0
+
+SECTION "SugarPokecenter1F", ROMX[$56B8], BANK[$27]
+	map_attributes SugarPokecenter1F, SUGAR_POKECENTER_1F, 0
+
+SECTION "SugarPokecenter2F", ROMX[$574C], BANK[$27]
+	map_attributes SugarPokecenter2F, SUGAR_POKECENTER_2F, 0
+
+SECTION "BullForestRoute1House", ROMX[$57C5], BANK[$27]
+	map_attributes BullForestRoute1House, BULL_FOREST_ROUTE_1_HOUSE, 0
+
+SECTION "BullForestRouteGateStand", ROMX[$581F], BANK[$27]
+	map_attributes BullForestRouteGateStand, BULL_FOREST_ROUTE_GATE_STAND, 0
+
+SECTION "BullMart", ROMX[$587A], BANK[$27]
+	map_attributes BullMart, BULL_MART, 0
+
+SECTION "BullHouse1", ROMX[$58FA], BANK[$27]
+	map_attributes BullHouse1, BULL_HOUSE_1, 0
+
+SECTION "BullHouse2", ROMX[$5950], BANK[$27]
+	map_attributes BullHouse2, BULL_HOUSE_2, 0
+
+SECTION "BullHouse3", ROMX[$59AA], BANK[$27]
+	map_attributes BullHouse3, BULL_HOUSE_3, 0
+
+SECTION "BullPokecenter1F", ROMX[$5A04], BANK[$27]
+	map_attributes BullPokecenter1F, BULL_POKECENTER_1F, 0
+
+SECTION "BullPokecenter2F", ROMX[$5A98], BANK[$27]
+	map_attributes BullPokecenter2F, BULL_POKECENTER_2F, 0
+
+SECTION "BullLeague1F", ROMX[$5B11], BANK[$27]
+	map_attributes BullLeague1F, BULL_LEAGUE_1F, 0
+
+SECTION "BullLeague2F", ROMX[$5BB2], BANK[$27]
+	map_attributes BullLeague2F, BULL_LEAGUE_2F, 0
+
+SECTION "BullHouse4", ROMX[$5C52], BANK[$27]
+	map_attributes BullHouse4, BULL_HOUSE_4, 0
+
+SECTION "StandRouteGateKanto", ROMX[$5C9F], BANK[$27]
+	map_attributes StandRouteGateKanto, STAND_ROUTE_GATE_KANTO, 0
+
+SECTION "StandLab", ROMX[$5CFA], BANK[$27]
+	map_attributes StandLab, STAND_LAB, 0
+
+SECTION "StandPokecenter1F", ROMX[$5D50], BANK[$27]
+	map_attributes StandPokecenter1F, STAND_POKECENTER_1F, 0
+
+SECTION "StandPokecenter2F", ROMX[$5DE4], BANK[$27]
+	map_attributes StandPokecenter2F, STAND_POKECENTER_2F, 0
+
+SECTION "StandOffice", ROMX[$5E5D], BANK[$27]
+	map_attributes StandOffice, STAND_OFFICE, 0
+
+SECTION "StandMart", ROMX[$5EDD], BANK[$27]
+	map_attributes StandMart, STAND_MART, 0
+
+SECTION "StandHouse", ROMX[$5F5D], BANK[$27]
+	map_attributes StandHouse, STAND_HOUSE, 0
+
+SECTION "StandRocketHouse1F", ROMX[$5FB7], BANK[$27]
+	map_attributes StandRocketHouse1F, STAND_ROCKET_HOUSE_1F, 0
+
+SECTION "StandRocketHouse2F", ROMX[$6024], BANK[$27]
+	map_attributes StandRocketHouse2F, STAND_ROCKET_HOUSE_2F, 0
+
+SECTION "StandLeague1F", ROMX[$6083], BANK[$27]
+	map_attributes StandLeague1F, STAND_LEAGUE_1F, 0
+
+SECTION "StandLeague2F", ROMX[$6124], BANK[$27]
+	map_attributes StandLeague2F, STAND_LEAGUE_2F, 0
+
+SECTION "KantoCeruleanHouse", ROMX[$61C4], BANK[$27]
+	map_attributes KantoCeruleanHouse, KANTO_CERULEAN_HOUSE, 0
+
+SECTION "KantoPokecenter1F", ROMX[$621E], BANK[$27]
+	map_attributes KantoPokecenter1F, KANTO_POKECENTER_1F, 0
+
+SECTION "KantoPokecenter2F", ROMX[$62B2], BANK[$27]
+	map_attributes KantoPokecenter2F, KANTO_POKECENTER_2F, 0
+
+SECTION "KantoLeague1F", ROMX[$632B], BANK[$27]
+	map_attributes KantoLeague1F, KANTO_LEAGUE_1F, 0
+
+SECTION "KantoLeague2F", ROMX[$63CC], BANK[$27]
+	map_attributes KantoLeague2F, KANTO_LEAGUE_2F, 0
+
+SECTION "KantoLavenderHouse", ROMX[$646C], BANK[$27]
+	map_attributes KantoLavenderHouse, KANTO_LAVENDER_HOUSE, 0
+
+SECTION "KantoCeladonMart1F", ROMX[$64D3], BANK[$27]
+	map_attributes KantoCeladonMart1F, KANTO_CELADON_MART_1F, 0
+
+SECTION "KantoCeladonMart2F", ROMX[$6547], BANK[$27]
+	map_attributes KantoCeladonMart2F, KANTO_CELADON_MART_2F, 0
+
+SECTION "KantoCeladonMart3F", ROMX[$65C1], BANK[$27]
+	map_attributes KantoCeladonMart3F, KANTO_CELADON_MART_3F, 0
+
+SECTION "KantoCeladonMart4F", ROMX[$663B], BANK[$27]
+	map_attributes KantoCeladonMart4F, KANTO_CELADON_MART_4F, 0
+
+SECTION "KantoCeladonMart5F", ROMX[$66C2], BANK[$27]
+	map_attributes KantoCeladonMart5F, KANTO_CELADON_MART_5F, 0
+
+SECTION "KantoCeladonElevator", ROMX[$6742], BANK[$27]
+	map_attributes KantoCeladonElevator, KANTO_CELADON_ELEVATOR, 0
+
+SECTION "KantoMart", ROMX[$677F], BANK[$27]
+	map_attributes KantoMart, KANTO_MART, 0
+
+SECTION "KantoGamefreakHQ1", ROMX[$67FF], BANK[$27]
+	map_attributes KantoGamefreakHQ1, KANTO_GAMEFREAK_HQ_1, 0
+
+SECTION "KantoGamefreakHQ2", ROMX[$6899], BANK[$27]
+	map_attributes KantoGamefreakHQ2, KANTO_GAMEFREAK_HQ_2, 0
+
+SECTION "KantoGamefreakHQ3", ROMX[$6905], BANK[$27]
+	map_attributes KantoGamefreakHQ3, KANTO_GAMEFREAK_HQ_3, 0
+
+SECTION "KantoGamefreakHQ4", ROMX[$698B], BANK[$27]
+	map_attributes KantoGamefreakHQ4, KANTO_GAMEFREAK_HQ_4, 0
+
+SECTION "KantoGamefreakHQ5", ROMX[$69E3], BANK[$27]
+	map_attributes KantoGamefreakHQ5, KANTO_GAMEFREAK_HQ_5, 0
+
+SECTION "KantoSilphCo", ROMX[$6A2C], BANK[$27]
+	map_attributes KantoSilphCo, KANTO_SILPH_CO, 0
+
+SECTION "KantoViridianHouse", ROMX[$6ADF], BANK[$27]
+	map_attributes KantoViridianHouse, KANTO_VIRIDIAN_HOUSE, 0
+
+SECTION "KantoGameCorner", ROMX[$6B46], BANK[$27]
+	map_attributes KantoGameCorner, KANTO_GAME_CORNER, 0
+
+SECTION "KantoUnusedArea", ROMX[$6C55], BANK[$27]
+	map_attributes KantoUnusedArea, KANTO_UNUSED_AREA, 0
+
+SECTION "KantoGameCornerPrizes", ROMX[$6C90], BANK[$27]
+	map_attributes KantoGameCornerPrizes, KANTO_GAME_CORNER_PRIZES, 0
+
+SECTION "KantoDiner", ROMX[$6D04], BANK[$27]
+	map_attributes KantoDiner, KANTO_DINER, 0
+
+SECTION "KantoSchool", ROMX[$6D51], BANK[$27]
+	map_attributes KantoSchool, KANTO_SCHOOL, 0
+
+SECTION "KantoHospital", ROMX[$6DEB], BANK[$27]
+	map_attributes KantoHospital, KANTO_HOSPITAL, 0
+
+SECTION "KantoPokecenter21F", ROMX[$6E6B], BANK[$27]
+	map_attributes KantoPokecenter21F, KANTO_POKECENTER_2_1F, 0
+
+SECTION "KantoPokecenter22F", ROMX[$6EFF], BANK[$27]
+	map_attributes KantoPokecenter22F, KANTO_POKECENTER_2_2F, 0
+
+SECTION "KantoRedsHouse", ROMX[$6F78], BANK[$27]
+	map_attributes KantoRedsHouse, KANTO_REDS_HOUSE, 0
+
+SECTION "KantoGreensHouse1F", ROMX[$6FDF], BANK[$27]
+	map_attributes KantoGreensHouse1F, KANTO_GREENS_HOUSE_1F, 0
+
+SECTION "KantoGreensHouse2F", ROMX[$703C], BANK[$27]
+	map_attributes KantoGreensHouse2F, KANTO_GREENS_HOUSE_2F, 0
+
+SECTION "KantoEldersHouse", ROMX[$707E], BANK[$27]
+	map_attributes KantoEldersHouse, KANTO_ELDERS_HOUSE, 0
+
+SECTION "KantoOaksLab", ROMX[$70E5], BANK[$27]
+	map_attributes KantoOaksLab, KANTO_OAKS_LAB, 0
+
+SECTION "KantoLeague21F", ROMX[$713B], BANK[$27]
+	map_attributes KantoLeague21F, KANTO_LEAGUE_2_1F, 0
+
+SECTION "KantoLeague22F", ROMX[$71DC], BANK[$27]
+	map_attributes KantoLeague22F, KANTO_LEAGUE_2_2F, 0
+
+SECTION "KantoFishingGuru", ROMX[$727C], BANK[$27]
+	map_attributes KantoFishingGuru, KANTO_FISHING_GURU, 0
+
+SECTION "SouthHouse1", ROMX[$72D6], BANK[$27]
+	map_attributes SouthHouse1, SOUTH_HOUSE_1, 0
+
+SECTION "SouthPokecenter1F", ROMX[$7330], BANK[$27]
+	map_attributes SouthPokecenter1F, SOUTH_POKECENTER_1F, 0
+
+SECTION "SouthPokecenter2F", ROMX[$73C4], BANK[$27]
+	map_attributes SouthPokecenter2F, SOUTH_POKECENTER_2F, 0
+
+SECTION "SouthMart", ROMX[$743D], BANK[$27]
+	map_attributes SouthMart, SOUTH_MART, 0
+
+SECTION "SouthHouse2", ROMX[$74BD], BANK[$27]
+	map_attributes SouthHouse2, SOUTH_HOUSE_2, 0
+
+SECTION "NorthHouse1", ROMX[$7517], BANK[$27]
+	map_attributes NorthHouse1, NORTH_HOUSE_1, 0
+
+SECTION "NorthMart", ROMX[$7571], BANK[$27]
+	map_attributes NorthMart, NORTH_MART, 0
+
+SECTION "NorthHouse2", ROMX[$75F1], BANK[$27]
+	map_attributes NorthHouse2, NORTH_HOUSE_2, 0
+
+SECTION "NorthPokecenter1F", ROMX[$764B], BANK[$27]
+	map_attributes NorthPokecenter1F, NORTH_POKECENTER_1F, 0
+
+SECTION "NorthPokecenter2F", ROMX[$76DF], BANK[$27]
+	map_attributes NorthPokecenter2F, NORTH_POKECENTER_2F, 0
+
+SECTION "PowerPlant1", ROMX[$4000], BANK[$2F]
+	map_attributes PowerPlant1, POWER_PLANT_1, 0
+
+SECTION "PowerPlant2", ROMX[$407D], BANK[$2F]
+	map_attributes PowerPlant2, POWER_PLANT_2, 0
+
+SECTION "PowerPlant3", ROMX[$40FA], BANK[$2F]
+	map_attributes PowerPlant3, POWER_PLANT_3, 0
+
+SECTION "PowerPlant4", ROMX[$422B], BANK[$2F]
+	map_attributes PowerPlant4, POWER_PLANT_4, 0
+
+SECTION "RuinsOfAlphEntrance", ROMX[$435C], BANK[$2F]
+	map_attributes RuinsOfAlphEntrance, RUINS_OF_ALPH_ENTRANCE, 0
+
+SECTION "RuinsOfAlphMain", ROMX[$43D9], BANK[$2F]
+	map_attributes RuinsOfAlphMain, RUINS_OF_ALPH_MAIN, 0
+
+SECTION "CaveMinecarts1", ROMX[$469F], BANK[$2F]
+	map_attributes CaveMinecarts1, CAVE_MINECARTS_1, 0
+
+SECTION "CaveMinecarts2", ROMX[$482A], BANK[$2F]
+	map_attributes CaveMinecarts2, CAVE_MINECARTS_2, 0
+
+SECTION "CaveMinecarts3", ROMX[$49B5], BANK[$2F]
+	map_attributes CaveMinecarts3, CAVE_MINECARTS_3, 0
+
+SECTION "CaveMinecarts4", ROMX[$4B40], BANK[$2F]
+	map_attributes CaveMinecarts4, CAVE_MINECARTS_4, 0
+
+SECTION "CaveMinecarts5", ROMX[$4CCB], BANK[$2F]
+	map_attributes CaveMinecarts5, CAVE_MINECARTS_5, 0
+
+SECTION "CaveMinecarts6", ROMX[$4E56], BANK[$2F]
+	map_attributes CaveMinecarts6, CAVE_MINECARTS_6, 0
+
+SECTION "CaveMinecarts7", ROMX[$4F2D], BANK[$2F]
+	map_attributes CaveMinecarts7, CAVE_MINECARTS_7, 0
+
+SECTION "Office1", ROMX[$5004], BANK[$2F]
+	map_attributes Office1, OFFICE_1, 0
+
+SECTION "Office2", ROMX[$5081], BANK[$2F]
+	map_attributes Office2, OFFICE_2, 0
+
+SECTION "Office3", ROMX[$51B2], BANK[$2F]
+	map_attributes Office3, OFFICE_3, 0
+
+SECTION "SlowpokeWellEntrance", ROMX[$5289], BANK[$2F]
+	map_attributes SlowpokeWellEntrance, SLOWPOKE_WELL_ENTRANCE, 0
+
+SECTION "SlowpokeWellMain", ROMX[$5306], BANK[$2F]
+	map_attributes SlowpokeWellMain, SLOWPOKE_WELL_MAIN, 0
+
+SECTION "ShizukanaOka", ROMX[$53DD], BANK[$2F]
+	map_attributes ShizukanaOka, SHIZUKANA_OKA, 0
+
+SECTION "RouteSilentEastGate", ROMX[$4000], BANK[$34]
+	map_attributes RouteSilentEastGate, ROUTE_SILENT_EAST_GATE, 0
+
+SECTION "PlayerHouse1F", ROMX[$4042], BANK[$34]
+	map_attributes PlayerHouse1F, PLAYER_HOUSE_1F, 0
+
+SECTION "PlayerHouse2F", ROMX[$4132], BANK[$34]
+	map_attributes PlayerHouse2F, PLAYER_HOUSE_2F, 0
+
+SECTION "SilentPokecenter", ROMX[$45FF], BANK[$34]
+	map_attributes SilentPokecenter, SILENT_POKECENTER, 0
+
+SECTION "SilentHillHouse", ROMX[$47D5], BANK[$34]
+	map_attributes SilentHillHouse, SILENT_HILL_HOUSE, 0
+
+SECTION "SilentHillLab", ROMX[$4AAC], BANK[$34]
+	map_attributes SilentHillLab, SILENT_HILL_LAB, 0
+
+SECTION "SilentHillLab2", ROMX[$5BE6], BANK[$34]
+	map_attributes SilentHillLab2, SILENT_HILL_LAB_2, 0
+
+SECTION "Unused13", ROMX[$605D], BANK[$34]
+	map_attributes Unused13, UNUSED_13, 0
+
+SECTION "SilentHill", ROMX[$4014], BANK[$36]
+	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
+	connection east, RouteSilentEast, ROUTE_SILENT_EAST, 0, 0, 9
+
+SECTION "OldCity", ROMX[$410D], BANK[$36]
+	map_attributes OldCity, OLD_CITY, SOUTH | WEST
+	connection south, Route1P2, ROUTE_1_P2, 5, 0, 10
+	connection west, Route2, ROUTE_2, 5, 0, 9
+
+SECTION "West", ROMX[$4372], BANK[$36]
+	map_attributes West, WEST, NORTH | EAST
+	connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10
+	connection east, Route2, ROUTE_2, 5, 0, 9
+
+SECTION "Haiteku", ROMX[$45D2], BANK[$36]
+	map_attributes Haiteku, HAITEKU, WEST
+	connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9
+
+SECTION "Fonto", ROMX[$47F8], BANK[$36]
+	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
+	connection east, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9
+
+SECTION "Baadon", ROMX[$48F3], BANK[$36]
+	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
+	connection east, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9
+
+SECTION "Newtype", ROMX[$49F9], BANK[$36]
+	map_attributes Newtype, NEWTYPE, NORTH | WEST | EAST
+	connection north, SugarRoute, SUGAR_ROUTE, 5, 0, 10
+	connection west, Route15, ROUTE_15, 0, 0, 9
+	connection east, NewtypeRoute, NEWTYPE_ROUTE, 9, 0, 9
+
+SECTION "Sugar", ROMX[$4C3A], BANK[$36]
+	map_attributes Sugar, SUGAR, SOUTH
+	connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10
+
+SECTION "BullForest", ROMX[$4D05], BANK[$36]
+	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
+	connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9, 0, 9
+
+SECTION "Stand", ROMX[$4F28], BANK[$36]
+	map_attributes Stand, STAND, NORTH | SOUTH
+	connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10
+	connection south, StandRoute, STAND_ROUTE, 10, 0, 10
+
+SECTION "Kanto", ROMX[$519D], BANK[$36]
+	map_attributes Kanto, KANTO, WEST | EAST
+	connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9
+	connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9
+
+SECTION "Prince", ROMX[$55F3], BANK[$36]
+	map_attributes Prince, PRINCE, NORTH | SOUTH
+	connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10
+	connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10
+
+SECTION "MtFuji", ROMX[$5677], BANK[$36]
+	map_attributes MtFuji, MT_FUJI, SOUTH
+	connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10
+
+SECTION "South", ROMX[$56EF], BANK[$36]
+	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
+	connection east, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9
+
+SECTION "North", ROMX[$5914], BANK[$36]
+	map_attributes North, NORTH, SOUTH
+	connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10
+
+SECTION "Route1P1", ROMX[$59DF], BANK[$36]
+	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
+
+SECTION "Route1P2", ROMX[$5ABE], BANK[$36]
+	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
+
+SECTION "Route2", ROMX[$5BD4], BANK[$36]
+	map_attributes Route2, ROUTE_2, WEST | EAST
+	connection west, West, WEST, -3, 2, 15
+	connection east, OldCity, OLD_CITY, -3, 2, 15
+
+SECTION "HaitekuWestRoute", ROMX[$5CC6], BANK[$36]
+	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
+
+SECTION "HaitekuWestRouteOcean", ROMX[$5DD1], BANK[$36]
+	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
+
+SECTION "FontoRoute1", ROMX[$5F17], BANK[$36]
+	map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST
+	connection west, South, SOUTH, 0, 0, 12
+	connection east, Fonto, FONTO, 0, 0, 9
+
+SECTION "FontoRoute6", ROMX[$6083], BANK[$36]
+	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
+
+SECTION "FontoRoute2", ROMX[$61E8], BANK[$36]
+	map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST
+	connection south, Fonto, FONTO, 0, 0, 10
+	connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9
+
+SECTION "FontoRoute4", ROMX[$62C6], BANK[$36]
+	map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST
+	connection south, Baadon, BAADON, 0, 0, 10
+	connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9
+
+SECTION "FontoRoute3", ROMX[$63B2], BANK[$36]
+	map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST
+	connection west, Fonto, FONTO, 0, 0, 9
+	connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12
+
+SECTION "BaadonRoute1", ROMX[$64BD], BANK[$36]
+	map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH
+	connection north, Baadon, BAADON, 0, 0, 10
+	connection south, West, WEST, -3, 2, 16
+
+SECTION "BaadonRoute2", ROMX[$6603], BANK[$36]
+	map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST
+	connection west, Baadon, BAADON, 0, 0, 9
+	connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12
+
+SECTION "BaadonRoute3", ROMX[$67EF], BANK[$36]
+	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
+
+SECTION "Route15", ROMX[$68DB], BANK[$36]
+	map_attributes Route15, ROUTE_15, NORTH | EAST
+	connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10
+	connection east, Newtype, NEWTYPE, 0, 0, 12
+
+SECTION "NewtypeRoute", ROMX[$69BD], BANK[$36]
+	map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST
+	connection west, Newtype, NEWTYPE, -3, 6, 12
+	connection east, Route18, ROUTE_18, -3, 33, 12
+
+SECTION "Route18", ROMX[$6A6E], BANK[$36]
+	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
+
+SECTION "BullForestRoute1", ROMX[$6C6F], BANK[$36]
+	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
+
+SECTION "SugarRoute", ROMX[$6D8F], BANK[$36]
+	map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH
+	connection north, Sugar, SUGAR, 0, 0, 10
+	connection south, Newtype, NEWTYPE, -3, 2, 16
+
+SECTION "BullForestRoute2", ROMX[$6ED5], BANK[$36]
+	map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH
+	connection north, BullForest, BULL_FOREST, -3, 2, 16
+	connection south, Stand, STAND, -3, 7, 13
+
+SECTION "StandRoute", ROMX[$701B], BANK[$36]
+	map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH
+	connection north, Stand, STAND, -3, 7, 13
+	connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13
+
+SECTION "KantoEastRoute", ROMX[$7161], BANK[$36]
+	map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST
+	connection north, StandRoute, STAND_ROUTE, 10, 0, 10
+	connection west, Kanto, KANTO, -3, 6, 15
+
+SECTION "RouteSilentEast", ROMX[$724D], BANK[$36]
+	map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST
+	connection west, SilentHill, SILENT_HILL, 0, 0, 9
+	connection east, Kanto, KANTO, -3, 6, 15
+
+SECTION "PrinceRoute", ROMX[$738C], BANK[$36]
+	map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH
+	connection north, Prince, PRINCE, 0, 0, 10
+	connection south, SilentHill, SILENT_HILL, 0, 0, 10
+
+SECTION "MtFujiRoute", ROMX[$73E8], BANK[$36]
+	map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH
+	connection north, MtFuji, MT_FUJI, 0, 0, 10
+	connection south, Prince, PRINCE, 0, 0, 10
+
+SECTION "FontoRoute5", ROMX[$7444], BANK[$36]
+	map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST
+	connection south, South, SOUTH, -3, 7, 13
+	connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9
+
+SECTION "BullForestRoute3", ROMX[$7530], BANK[$36]
+	map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH
+	connection north, North, NORTH, 0, 0, 10
+	connection south, BullForest, BULL_FOREST, -3, 2, 16
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 28ba8f4..1332a0e 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -35,244 +35,244 @@ MapGroupPointers:
 	dw MapGroup_Empty
 
 MapGroup_SilentHill:
-	map Route1P1, TILESET_SILENT_HILL, ROUTE, LANDMARK_MT_FUJI
-	map Route1P2, TILESET_SILENT_HILL, ROUTE, LANDMARK_SOUTH
-	map RouteSilentEast, TILESET_SILENT_HILL, ROUTE, LANDMARK_BLUE_FOREST
-	map SilentHill, TILESET_SILENT_HILL, TOWN, LANDMARK_STAND
-	map Route1Gate1F, TILESET_ROUTE_GATE, GATE, LANDMARK_SOUTH
-	map Route1Gate2F, TILESET_ROUTE_GATE, GATE, LANDMARK_SOUTH
-	map RouteSilentEastGate, TILESET_ROUTE_GATE, GATE, LANDMARK_BLUE_FOREST
-	map PlayerHouse1F, TILESET_HOUSE, INDOOR, LANDMARK_STAND
-	map PlayerHouse2F, TILESET_HOUSE, INDOOR, LANDMARK_STAND
-	map SilentPokecenter, TILESET_POKECENTER, INDOOR, LANDMARK_STAND
-	map SilentHillHouse, TILESET_HOUSE, INDOOR, LANDMARK_STAND
-	map SilentHillLab, TILESET_LAB, INDOOR, LANDMARK_STAND
-	map SilentHillLab2, TILESET_LAB, INDOOR, LANDMARK_STAND
-	map Unused13, TILESET_LAB, INDOOR, LANDMARK_STAND
+	map Route1P1, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_1_P1
+	map Route1P2, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_1_P2
+	map RouteSilentEast, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_SILENT_EAST
+	map SilentHill, TILESET_SILENT_HILL, TOWN, LANDMARK_SILENT_HILL
+	map Route1Gate1F, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_1_P2
+	map Route1Gate2F, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_1_P2
+	map RouteSilentEastGate, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_SILENT_EAST
+	map PlayerHouse1F, TILESET_HOUSE, INDOOR, LANDMARK_SILENT_HILL
+	map PlayerHouse2F, TILESET_HOUSE, INDOOR, LANDMARK_SILENT_HILL
+	map SilentPokecenter, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILL
+	map SilentHillHouse, TILESET_HOUSE, INDOOR, LANDMARK_SILENT_HILL
+	map SilentHillLab, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL
+	map SilentHillLab2, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL
+	map Unused13, TILESET_LAB, INDOOR, LANDMARK_SILENT_HILL
 	map ShizukanaOka, TILESET_FOREST, CAVE, LANDMARK_NONE
 
 MapGroup_OldCity:
-	map Route2, TILESET_OLD_CITY, ROUTE, LANDMARK_ROUTE_15
-	map OldCity, TILESET_OLD_CITY, TOWN, LANDMARK_NORTH
-	map Route2Gate1F, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_15
-	map Route2Gate2F, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_15
-	map Route2House, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_15
-	map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_NORTH
-	map OldCityGym, TILESET_GYM, INDOOR, LANDMARK_NORTH
-	map OldCityTower1F, TILESET_TOWER, INDOOR, LANDMARK_NORTH
-	map OldCityTower2F, TILESET_TOWER, INDOOR, LANDMARK_NORTH
-	map OldCityTower3F, TILESET_TOWER, INDOOR, LANDMARK_NORTH
-	map OldCityTower4F, TILESET_TOWER, INDOOR, LANDMARK_NORTH
-	map OldCityTower5F, TILESET_TOWER, INDOOR, LANDMARK_NORTH
-	map OldCityBillsHouse, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_NORTH
-	map OldCityMart, TILESET_MART, INDOOR, LANDMARK_NORTH
-	map OldCityHouse, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_NORTH
-	map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_NORTH
-	map OldCityPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_NORTH
-	map OldCityPokecenterTrade, TILESET_ROUTE_GATE, GATE, LANDMARK_NORTH
-	map OldCityPokecenterBattle, TILESET_ROUTE_GATE, GATE, LANDMARK_NORTH
-	map OldCityPokecenterTimeMachine, TILESET_POKECENTER, INDOOR, LANDMARK_NORTH
-	map OldCityKurtsHouse, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_NORTH
-	map OldCitySchool, TILESET_TOWER, INDOOR, LANDMARK_NORTH
+	map Route2, TILESET_OLD_CITY, ROUTE, LANDMARK_ROUTE_2
+	map OldCity, TILESET_OLD_CITY, TOWN, LANDMARK_OLD_CITY
+	map Route2Gate1F, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_2
+	map Route2Gate2F, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_2
+	map Route2House, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2
+	map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityGym, TILESET_GYM, INDOOR, LANDMARK_OLD_CITY
+	map OldCityTower1F, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityTower2F, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityTower3F, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityTower4F, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityTower5F, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityBillsHouse, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_OLD_CITY
+	map OldCityMart, TILESET_MART, INDOOR, LANDMARK_OLD_CITY
+	map OldCityHouse, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_OLD_CITY
+	map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityPokecenterTrade, TILESET_ROUTE_GATE, GATE, LANDMARK_OLD_CITY
+	map OldCityPokecenterBattle, TILESET_ROUTE_GATE, GATE, LANDMARK_OLD_CITY
+	map OldCityPokecenterTimeMachine, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY
+	map OldCityKurtsHouse, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_OLD_CITY
+	map OldCitySchool, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY
 
 MapGroup_West:
-	map West, TILESET_WEST, TOWN, LANDMARK_ROUTE_18
-	map WestMart1F, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestMart2F, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestMart3F, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestMart4F, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestMart5F, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestMart6F, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestMartElevator, TILESET_BIG_MART, INDOOR, LANDMARK_ROUTE_18
-	map WestRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_ROUTE_18
-	map WestRadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_ROUTE_18
-	map WestRadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_ROUTE_18
-	map WestRadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_ROUTE_18
-	map WestRadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_ROUTE_18
-	map WestRocketRaidedHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_18
-	map WestPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_18
-	map WestPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_18
-	map WestGym, TILESET_GYM, INDOOR, LANDMARK_ROUTE_18
-	map WestHouse1, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_18
-	map WestHouse2, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_18
+	map West, TILESET_WEST, TOWN, LANDMARK_WEST
+	map WestMart1F, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestMart2F, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestMart3F, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestMart4F, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestMart5F, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestMart6F, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestMartElevator, TILESET_BIG_MART, INDOOR, LANDMARK_WEST
+	map WestRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_WEST
+	map WestRadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_WEST
+	map WestRadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_WEST
+	map WestRadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_WEST
+	map WestRadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_WEST
+	map WestRocketRaidedHouse, TILESET_HOUSE, INDOOR, LANDMARK_WEST
+	map WestPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_WEST
+	map WestPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_WEST
+	map WestGym, TILESET_GYM, INDOOR, LANDMARK_WEST
+	map WestHouse1, TILESET_HOUSE, INDOOR, LANDMARK_WEST
+	map WestHouse2, TILESET_HOUSE, INDOOR, LANDMARK_WEST
 
 MapGroup_Haiteku:
-	map HaitekuWestRoute, TILESET_HAITEKU, ROUTE, LANDMARK_POKEMON_LEAGUE_3
-	map HaitekuWestRouteOcean, TILESET_HAITEKU, ROUTE, LANDMARK_POKEMON_LEAGUE_2
-	map Haiteku, TILESET_HAITEKU, TOWN, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuWestRouteGate, TILESET_ROUTE_GATE, GATE, LANDMARK_POKEMON_LEAGUE_2
-	map HaitekuPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuLeague1F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuLeague2F, TILESET_GYM, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuMart, TILESET_MART, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuHouse1, TILESET_HOUSE, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuHouse2, TILESET_HOUSE, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuImposterOakHouse, TILESET_HOUSE, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuAquarium1F, TILESET_AQUARIUM, INDOOR, LANDMARK_POKEMON_LEAGUE_4
-	map HaitekuAquarium2F, TILESET_AQUARIUM, INDOOR, LANDMARK_POKEMON_LEAGUE_4
+	map HaitekuWestRoute, TILESET_HAITEKU, ROUTE, LANDMARK_HAITEKU_WEST_ROUTE
+	map HaitekuWestRouteOcean, TILESET_HAITEKU, ROUTE, LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
+	map Haiteku, TILESET_HAITEKU, TOWN, LANDMARK_HAITEKU
+	map HaitekuWestRouteGate, TILESET_ROUTE_GATE, GATE, LANDMARK_HAITEKU_WEST_ROUTE_OCEAN
+	map HaitekuPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_HAITEKU
+	map HaitekuPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_HAITEKU
+	map HaitekuLeague1F, TILESET_TOWER, INDOOR, LANDMARK_HAITEKU
+	map HaitekuLeague2F, TILESET_GYM, INDOOR, LANDMARK_HAITEKU
+	map HaitekuMart, TILESET_MART, INDOOR, LANDMARK_HAITEKU
+	map HaitekuHouse1, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU
+	map HaitekuHouse2, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU
+	map HaitekuImposterOakHouse, TILESET_HOUSE, INDOOR, LANDMARK_HAITEKU
+	map HaitekuAquarium1F, TILESET_AQUARIUM, INDOOR, LANDMARK_HAITEKU
+	map HaitekuAquarium2F, TILESET_AQUARIUM, INDOOR, LANDMARK_HAITEKU
 
 MapGroup_Fonto:
-	map FontoRoute1, TILESET_FONTO, ROUTE, LANDMARK_POKEMON_LEAGUE_1_2
-	map FontoRoute2, TILESET_FONTO, ROUTE, LANDMARK_HIDEOUT_3
-	map FontoRoute3, TILESET_FONTO, ROUTE, LANDMARK_HIDEOUT_1
-	map FontoRoute4, TILESET_FONTO, ROUTE, LANDMARK_POKEMON_LEAGUE_6
-	map FontoRoute5, TILESET_FONTO, ROUTE, LANDMARK_SLOWPOKE_WELL_2
-	map FontoRoute6, TILESET_FONTO, ROUTE, LANDMARK_SLOWPOKE_WELL_1
-	map Fonto, TILESET_FONTO, TOWN, LANDMARK_HIDEOUT_2
-	map FontoRouteGate1, TILESET_ROUTE_GATE, GATE, LANDMARK_POKEMON_LEAGUE_1_2
-	map FontoRouteGate2, TILESET_ROUTE_GATE, GATE, LANDMARK_POKEMON_LEAGUE_6
-	map FontoRouteGate3, TILESET_ROUTE_GATE, GATE, LANDMARK_SLOWPOKE_WELL_2
-	map FontoRocketHouse, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_HIDEOUT_2
-	map FontoMart, TILESET_MART, INDOOR, LANDMARK_HIDEOUT_2
-	map FontoHouse, TILESET_HOUSE, INDOOR, LANDMARK_HIDEOUT_2
-	map FontoPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_HIDEOUT_2
-	map FontoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_HIDEOUT_2
-	map FontoLab, TILESET_LAB, INDOOR, LANDMARK_HIDEOUT_2
+	map FontoRoute1, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_1
+	map FontoRoute2, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_2
+	map FontoRoute3, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_3
+	map FontoRoute4, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_4
+	map FontoRoute5, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_5
+	map FontoRoute6, TILESET_FONTO, ROUTE, LANDMARK_FONTO_ROUTE_6
+	map Fonto, TILESET_FONTO, TOWN, LANDMARK_FONTO
+	map FontoRouteGate1, TILESET_ROUTE_GATE, GATE, LANDMARK_FONTO_ROUTE_1
+	map FontoRouteGate2, TILESET_ROUTE_GATE, GATE, LANDMARK_FONTO_ROUTE_4
+	map FontoRouteGate3, TILESET_ROUTE_GATE, GATE, LANDMARK_FONTO_ROUTE_5
+	map FontoRocketHouse, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FONTO
+	map FontoMart, TILESET_MART, INDOOR, LANDMARK_FONTO
+	map FontoHouse, TILESET_HOUSE, INDOOR, LANDMARK_FONTO
+	map FontoPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FONTO
+	map FontoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_FONTO
+	map FontoLab, TILESET_LAB, INDOOR, LANDMARK_FONTO
 
 MapGroup_Baadon:
-	map BaadonRoute1, TILESET_BAADON, ROUTE, LANDMARK_POWER_PLANT_1
-	map BaadonRoute2, TILESET_BAADON, ROUTE, LANDMARK_POWER_PLANT_3
-	map BaadonRoute3, TILESET_BAADON, ROUTE, LANDMARK_POWER_PLANT_4
-	map Baadon, TILESET_BAADON, TOWN, LANDMARK_POWER_PLANT_2
-	map BaadonRouteGateWest, TILESET_ROUTE_GATE, GATE, LANDMARK_POWER_PLANT_1
-	map BaadonRouteGateNewtype, TILESET_ROUTE_GATE, GATE, LANDMARK_POWER_PLANT_4
-	map BaadonMart, TILESET_MART, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonHouse1, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonWallpaperHouse, TILESET_AQUARIUM, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonHouse2, TILESET_HOUSE, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonLeague1F, TILESET_TOWER, INDOOR, LANDMARK_POWER_PLANT_2
-	map BaadonLeague2F, TILESET_GYM, INDOOR, LANDMARK_POWER_PLANT_2
+	map BaadonRoute1, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_1
+	map BaadonRoute2, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_2
+	map BaadonRoute3, TILESET_BAADON, ROUTE, LANDMARK_BAADON_ROUTE_3
+	map Baadon, TILESET_BAADON, TOWN, LANDMARK_BAADON
+	map BaadonRouteGateWest, TILESET_ROUTE_GATE, GATE, LANDMARK_BAADON_ROUTE_1
+	map BaadonRouteGateNewtype, TILESET_ROUTE_GATE, GATE, LANDMARK_BAADON_ROUTE_3
+	map BaadonMart, TILESET_MART, INDOOR, LANDMARK_BAADON
+	map BaadonPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BAADON
+	map BaadonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BAADON
+	map BaadonHouse1, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_BAADON
+	map BaadonWallpaperHouse, TILESET_AQUARIUM, INDOOR, LANDMARK_BAADON
+	map BaadonHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BAADON
+	map BaadonLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BAADON
+	map BaadonLeague2F, TILESET_GYM, INDOOR, LANDMARK_BAADON
 
 MapGroup_Newtype:
-	map Route15, TILESET_SILENT_HILL, ROUTE, LANDMARK_RUINS_1
-	map NewtypeRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_MINES_3
-	map Route18, TILESET_SILENT_HILL, ROUTE, LANDMARK_MINES_4
-	map Newtype, TILESET_SILENT_HILL, TOWN, LANDMARK_RUINS_2
-	map Route15Pokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_RUINS_1
-	map Route15Pokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_RUINS_1
-	map NewtypeRouteGate, TILESET_ROUTE_GATE, GATE, LANDMARK_MINES_4
-	map Route18Pokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MINES_4
-	map Route18Pokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_MINES_4
-	map NewtypePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_RUINS_2
-	map NewtypePokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_RUINS_2
-	map NewtypeLeague1F, TILESET_TOWER, INDOOR, LANDMARK_RUINS_2
-	map NewtypeLeague2F, TILESET_GYM, INDOOR, LANDMARK_RUINS_2
-	map NewtypeSailorHouse, TILESET_HOUSE, INDOOR, LANDMARK_RUINS_2
-	map NewtypeMart, TILESET_MART, INDOOR, LANDMARK_RUINS_2
-	map NewtypeDojo, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_RUINS_2
-	map NewtypeHouse1, TILESET_HOUSE, INDOOR, LANDMARK_RUINS_2
-	map NewtypeDiner, TILESET_AQUARIUM, INDOOR, LANDMARK_RUINS_2
-	map NewtypeHouse2, TILESET_HOUSE, INDOOR, LANDMARK_RUINS_2
-	map NewtypeHouse3, TILESET_HOUSE, INDOOR, LANDMARK_RUINS_2
+	map Route15, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_15
+	map NewtypeRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_NEWTYPE_ROUTE
+	map Route18, TILESET_SILENT_HILL, ROUTE, LANDMARK_ROUTE_18
+	map Newtype, TILESET_SILENT_HILL, TOWN, LANDMARK_NEWTYPE
+	map Route15Pokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_15
+	map Route15Pokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_15
+	map NewtypeRouteGate, TILESET_ROUTE_GATE, GATE, LANDMARK_ROUTE_18
+	map Route18Pokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_18
+	map Route18Pokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_18
+	map NewtypePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_NEWTYPE
+	map NewtypePokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeLeague1F, TILESET_TOWER, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeLeague2F, TILESET_GYM, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeSailorHouse, TILESET_HOUSE, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeMart, TILESET_MART, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeDojo, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeHouse1, TILESET_HOUSE, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeDiner, TILESET_AQUARIUM, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeHouse2, TILESET_HOUSE, INDOOR, LANDMARK_NEWTYPE
+	map NewtypeHouse3, TILESET_HOUSE, INDOOR, LANDMARK_NEWTYPE
 
 MapGroup_Sugar:
-	map SugarRoute, TILESET_HAITEKU, ROUTE, LANDMARK_MINES_1
-	map Sugar, TILESET_HAITEKU, TOWN, LANDMARK_MINES_2
-	map SugarRouteGate, TILESET_ROUTE_GATE, GATE, LANDMARK_MINES_1
-	map SugarHouse, TILESET_GYM, INDOOR, LANDMARK_MINES_2
-	map SugarHouse2, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_MINES_2
-	map SugarMart, TILESET_MART, INDOOR, LANDMARK_MINES_2
-	map SugarPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MINES_2
-	map SugarPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_MINES_2
+	map SugarRoute, TILESET_HAITEKU, ROUTE, LANDMARK_SUGAR_ROUTE
+	map Sugar, TILESET_HAITEKU, TOWN, LANDMARK_SUGAR
+	map SugarRouteGate, TILESET_ROUTE_GATE, GATE, LANDMARK_SUGAR_ROUTE
+	map SugarHouse, TILESET_GYM, INDOOR, LANDMARK_SUGAR
+	map SugarHouse2, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_SUGAR
+	map SugarMart, TILESET_MART, INDOOR, LANDMARK_SUGAR
+	map SugarPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
+	map SugarPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
 
 MapGroup_Bull:
-	map BullForestRoute1, TILESET_BULL_FOREST, ROUTE, LANDMARK_MINES_5
-	map BullForestRoute2, TILESET_BULL_FOREST, ROUTE, LANDMARK_HIGH_TECH
-	map BullForestRoute3, TILESET_BULL_FOREST, ROUTE, LANDMARK_OLD
-	map BullForest, TILESET_BULL_FOREST, TOWN, LANDMARK_WEST
-	map BullForestRoute1House, TILESET_HOUSE, INDOOR, LANDMARK_MINES_5
-	map BullForestRouteGateStand, TILESET_ROUTE_GATE, GATE, LANDMARK_HIGH_TECH
-	map BullMart, TILESET_MART, INDOOR, LANDMARK_WEST
-	map BullHouse1, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_WEST
-	map BullHouse2, TILESET_HOUSE, INDOOR, LANDMARK_WEST
-	map BullHouse3, TILESET_HOUSE, INDOOR, LANDMARK_WEST
-	map BullPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_WEST
-	map BullPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_WEST
-	map BullLeague1F, TILESET_TOWER, INDOOR, LANDMARK_WEST
-	map BullLeague2F, TILESET_GYM, INDOOR, LANDMARK_WEST
-	map BullHouse4, TILESET_HOUSE, INDOOR, LANDMARK_WEST
+	map BullForestRoute1, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_1
+	map BullForestRoute2, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_2
+	map BullForestRoute3, TILESET_BULL_FOREST, ROUTE, LANDMARK_BULL_FOREST_ROUTE_3
+	map BullForest, TILESET_BULL_FOREST, TOWN, LANDMARK_BULL_FOREST
+	map BullForestRoute1House, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST_ROUTE_1
+	map BullForestRouteGateStand, TILESET_ROUTE_GATE, GATE, LANDMARK_BULL_FOREST_ROUTE_2
+	map BullMart, TILESET_MART, INDOOR, LANDMARK_BULL_FOREST
+	map BullHouse1, TILESET_JAPANESE_HOUSE, INDOOR, LANDMARK_BULL_FOREST
+	map BullHouse2, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST
+	map BullHouse3, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST
+	map BullPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BULL_FOREST
+	map BullPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_BULL_FOREST
+	map BullLeague1F, TILESET_TOWER, INDOOR, LANDMARK_BULL_FOREST
+	map BullLeague2F, TILESET_GYM, INDOOR, LANDMARK_BULL_FOREST
+	map BullHouse4, TILESET_HOUSE, INDOOR, LANDMARK_BULL_FOREST
 
 MapGroup_Stand:
-	map StandRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_BIRDON
-	map Stand, TILESET_SILENT_HILL, TOWN, LANDMARK_FOUNT
-	map StandRouteGateKanto, TILESET_ROUTE_GATE, GATE, LANDMARK_BIRDON
-	map StandLab, TILESET_POKECENTER, INDOOR, LANDMARK_FOUNT
-	map StandPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FOUNT
-	map StandPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_FOUNT
-	map StandOffice, TILESET_RADIO_TOWER, INDOOR, LANDMARK_FOUNT
-	map StandMart, TILESET_MART, INDOOR, LANDMARK_FOUNT
-	map StandHouse, TILESET_HOUSE, INDOOR, LANDMARK_FOUNT
-	map StandRocketHouse1F, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FOUNT
-	map StandRocketHouse2F, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_FOUNT
-	map StandLeague1F, TILESET_TOWER, INDOOR, LANDMARK_FOUNT
-	map StandLeague2F, TILESET_GYM, INDOOR, LANDMARK_FOUNT
+	map StandRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_STAND_ROUTE
+	map Stand, TILESET_SILENT_HILL, TOWN, LANDMARK_STAND
+	map StandRouteGateKanto, TILESET_ROUTE_GATE, GATE, LANDMARK_STAND_ROUTE
+	map StandLab, TILESET_POKECENTER, INDOOR, LANDMARK_STAND
+	map StandPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_STAND
+	map StandPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_STAND
+	map StandOffice, TILESET_RADIO_TOWER, INDOOR, LANDMARK_STAND
+	map StandMart, TILESET_MART, INDOOR, LANDMARK_STAND
+	map StandHouse, TILESET_HOUSE, INDOOR, LANDMARK_STAND
+	map StandRocketHouse1F, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_STAND
+	map StandRocketHouse2F, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_STAND
+	map StandLeague1F, TILESET_TOWER, INDOOR, LANDMARK_STAND
+	map StandLeague2F, TILESET_GYM, INDOOR, LANDMARK_STAND
 
 MapGroup_Kanto:
-	map KantoEastRoute, TILESET_KANTO, ROUTE, LANDMARK_NEW_TYPE
-	map Kanto, TILESET_KANTO, TOWN, LANDMARK_SUGAR
-	map KantoCeruleanHouse, TILESET_ROUTE_GATE, GATE, LANDMARK_SUGAR
-	map KantoPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
-	map KantoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
-	map KantoLeague1F, TILESET_TOWER, INDOOR, LANDMARK_SUGAR
-	map KantoLeague2F, TILESET_GYM, INDOOR, LANDMARK_SUGAR
-	map KantoLavenderHouse, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoCeladonMart1F, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoCeladonMart2F, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoCeladonMart3F, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoCeladonMart4F, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoCeladonMart5F, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoCeladonElevator, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoMart, TILESET_MART, INDOOR, LANDMARK_SUGAR
-	map KantoGamefreakHQ1, TILESET_LAB, INDOOR, LANDMARK_SUGAR
-	map KantoGamefreakHQ2, TILESET_LAB, INDOOR, LANDMARK_SUGAR
-	map KantoGamefreakHQ3, TILESET_LAB, INDOOR, LANDMARK_SUGAR
-	map KantoGamefreakHQ4, TILESET_MART, INDOOR, LANDMARK_SUGAR
-	map KantoGamefreakHQ5, TILESET_LAB, INDOOR, LANDMARK_SUGAR
-	map KantoSilphCo, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoViridianHouse, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoGameCorner, TILESET_AQUARIUM, INDOOR, LANDMARK_SUGAR
-	map KantoUnusedArea, TILESET_ROUTE_GATE, INDOOR, LANDMARK_SUGAR
-	map KantoGameCornerPrizes, TILESET_AQUARIUM, INDOOR, LANDMARK_SUGAR
-	map KantoDiner, TILESET_AQUARIUM, INDOOR, LANDMARK_SUGAR
-	map KantoSchool, TILESET_TOWER, INDOOR, LANDMARK_SUGAR
-	map KantoHospital, TILESET_BIG_MART, INDOOR, LANDMARK_SUGAR
-	map KantoPokecenter21F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
-	map KantoPokecenter22F, TILESET_POKECENTER, INDOOR, LANDMARK_SUGAR
-	map KantoRedsHouse, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoGreensHouse1F, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoGreensHouse2F, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoEldersHouse, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
-	map KantoOaksLab, TILESET_LAB, INDOOR, LANDMARK_SUGAR
-	map KantoLeague21F, TILESET_TOWER, INDOOR, LANDMARK_SUGAR
-	map KantoLeague22F, TILESET_GYM, INDOOR, LANDMARK_SUGAR
-	map KantoFishingGuru, TILESET_HOUSE, INDOOR, LANDMARK_SUGAR
+	map KantoEastRoute, TILESET_KANTO, ROUTE, LANDMARK_KANTO_EAST_ROUTE
+	map Kanto, TILESET_KANTO, TOWN, LANDMARK_KANTO
+	map KantoCeruleanHouse, TILESET_ROUTE_GATE, GATE, LANDMARK_KANTO
+	map KantoPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_KANTO
+	map KantoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_KANTO
+	map KantoLeague1F, TILESET_TOWER, INDOOR, LANDMARK_KANTO
+	map KantoLeague2F, TILESET_GYM, INDOOR, LANDMARK_KANTO
+	map KantoLavenderHouse, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoCeladonMart1F, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoCeladonMart2F, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoCeladonMart3F, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoCeladonMart4F, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoCeladonMart5F, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoCeladonElevator, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoMart, TILESET_MART, INDOOR, LANDMARK_KANTO
+	map KantoGamefreakHQ1, TILESET_LAB, INDOOR, LANDMARK_KANTO
+	map KantoGamefreakHQ2, TILESET_LAB, INDOOR, LANDMARK_KANTO
+	map KantoGamefreakHQ3, TILESET_LAB, INDOOR, LANDMARK_KANTO
+	map KantoGamefreakHQ4, TILESET_MART, INDOOR, LANDMARK_KANTO
+	map KantoGamefreakHQ5, TILESET_LAB, INDOOR, LANDMARK_KANTO
+	map KantoSilphCo, TILESET_ROCKET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoViridianHouse, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoGameCorner, TILESET_AQUARIUM, INDOOR, LANDMARK_KANTO
+	map KantoUnusedArea, TILESET_ROUTE_GATE, INDOOR, LANDMARK_KANTO
+	map KantoGameCornerPrizes, TILESET_AQUARIUM, INDOOR, LANDMARK_KANTO
+	map KantoDiner, TILESET_AQUARIUM, INDOOR, LANDMARK_KANTO
+	map KantoSchool, TILESET_TOWER, INDOOR, LANDMARK_KANTO
+	map KantoHospital, TILESET_BIG_MART, INDOOR, LANDMARK_KANTO
+	map KantoPokecenter21F, TILESET_POKECENTER, INDOOR, LANDMARK_KANTO
+	map KantoPokecenter22F, TILESET_POKECENTER, INDOOR, LANDMARK_KANTO
+	map KantoRedsHouse, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoGreensHouse1F, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoGreensHouse2F, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoEldersHouse, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
+	map KantoOaksLab, TILESET_LAB, INDOOR, LANDMARK_KANTO
+	map KantoLeague21F, TILESET_TOWER, INDOOR, LANDMARK_KANTO
+	map KantoLeague22F, TILESET_GYM, INDOOR, LANDMARK_KANTO
+	map KantoFishingGuru, TILESET_HOUSE, INDOOR, LANDMARK_KANTO
 
 MapGroup_Prince:
-	map PrinceRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_KANTO
-	map Prince, TILESET_SILENT_HILL, TOWN, LANDMARK_KANTO
+	map PrinceRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_PRINCE
+	map Prince, TILESET_SILENT_HILL, TOWN, LANDMARK_PRINCE
 
 MapGroup_MtFuji:
-	map MtFujiRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_PRINCE
-	map MtFuji, TILESET_SILENT_HILL, TOWN, LANDMARK_PRINCE
+	map MtFujiRoute, TILESET_SILENT_HILL, ROUTE, LANDMARK_MT_FUJI
+	map MtFuji, TILESET_SILENT_HILL, TOWN, LANDMARK_MT_FUJI
 
 MapGroup_South:
-	map South, TILESET_SOUTH, TOWN, LANDMARK_POKEMON_LEAGUE_1
-	map SouthHouse1, TILESET_HOUSE, INDOOR, LANDMARK_POKEMON_LEAGUE_1
-	map SouthPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_POKEMON_LEAGUE_1
-	map SouthPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_POKEMON_LEAGUE_1
-	map SouthMart, TILESET_MART, INDOOR, LANDMARK_POKEMON_LEAGUE_1
-	map SouthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_POKEMON_LEAGUE_1
+	map South, TILESET_SOUTH, TOWN, LANDMARK_SOUTH
+	map SouthHouse1, TILESET_HOUSE, INDOOR, LANDMARK_SOUTH
+	map SouthPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SOUTH
+	map SouthPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SOUTH
+	map SouthMart, TILESET_MART, INDOOR, LANDMARK_SOUTH
+	map SouthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_SOUTH
 
 MapGroup_North:
-	map North, TILESET_BULL_FOREST, TOWN, LANDMARK_SILENT
-	map NorthHouse1, TILESET_HOUSE, INDOOR, LANDMARK_SILENT
-	map NorthMart, TILESET_MART, INDOOR, LANDMARK_SILENT
-	map NorthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_SILENT
-	map NorthPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT
-	map NorthPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT
+	map North, TILESET_BULL_FOREST, TOWN, LANDMARK_NORTH
+	map NorthHouse1, TILESET_HOUSE, INDOOR, LANDMARK_NORTH
+	map NorthMart, TILESET_MART, INDOOR, LANDMARK_NORTH
+	map NorthHouse2, TILESET_HOUSE, INDOOR, LANDMARK_NORTH
+	map NorthPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_NORTH
+	map NorthPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_NORTH
 
 MapGroup_Misc:
 	map PowerPlant1, TILESET_POWER_PLANT, INDOOR, LANDMARK_NONE
diff --git a/engine/Intro.asm b/engine/Intro.asm
index 57295e9..aa10842 100644
--- a/engine/Intro.asm
+++ b/engine/Intro.asm
@@ -152,7 +152,7 @@ SetUpGameEntry:: ; 56E8
 	
 GameStartPlacement:: ; 570D
 	db $01 ; map group 
-	db PLAYER_HOUSE_2F+1 ; map
+	db MAP_PLAYER_HOUSE_2F ; map
 	dwcoord 15, 45 ; screen anchor
 	db $04 ; metatile x
 	db $04 ; metatile y
diff --git a/home/map.asm b/home/map.asm
index 7c691cb..d33242a 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1036,7 +1036,7 @@ Function275e:: ; 275e ; TODO: is this used?
 
 
 GetCoordOfUpperLeftCorner:: ; 277a
-	ld hl, wOverworldMap
+	ld hl, wOverworldMapBlocks
 	ld a, [wXCoord]
 	bit 0, a
 	jr nz, .increment_then_halve1
@@ -1324,12 +1324,12 @@ ENDR
 
 
 ChangeMap:: ; 294d
-	ld hl, wOverworldMap
-	ld bc, wOverworldMapEnd - wOverworldMap
+	ld hl, wOverworldMapBlocks
+	ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks
 	ld a, 0
 	call ByteFill
 
-	ld hl, wOverworldMap
+	ld hl, wOverworldMapBlocks
 	ld a, [wMapWidth]
 	ldh [hConnectedMapWidth], a
 	add a, 6
diff --git a/home/tileset.asm b/home/tileset.asm
index aabf249..38b9779 100644
--- a/home/tileset.asm
+++ b/home/tileset.asm
@@ -331,7 +331,7 @@ GetBlockLocation:: ; 2ef8
 	add a, 6
 	ld c, a
 	ld b, 0
-	ld hl, wOverworldMap + 1
+	ld hl, wOverworldMapBlocks + 1
 	add hl, bc
 	ld a, e
 	srl a
diff --git a/shim.sym b/shim.sym
index 5eb4f08..816289e 100644
--- a/shim.sym
+++ b/shim.sym
@@ -183,189 +183,6 @@
 24:4000 SetClockDialog
 24:4239 SlotMachineGame
 
-25:4000 Route2Gate1F_MapAttributes
-25:407C Route2Gate2F_MapAttributes
-25:40DC Route2House_MapAttributes
-25:414A OldCityMuseum_MapAttributes
-25:41CD OldCityGym_MapAttributes
-25:4289 OldCityTower1F_MapAttributes
-25:4319 OldCityTower2F_MapAttributes
-25:439E OldCityTower3F_MapAttributes
-25:4423 OldCityTower4F_MapAttributes
-25:44A8 OldCityTower5F_MapAttributes
-25:44FC OldCityBillsHouse_MapAttributes
-25:456A OldCityMart_MapAttributes
-25:45EE OldCityHouse_MapAttributes
-25:466E OldCityPokecenter1F_MapAttributes
-25:46FE OldCityPokecenter2F_MapAttributes
-25:4826 OldCityPokecenterTrade_MapAttributes
-25:48AC OldCityPokecenterBattle_MapAttributes
-25:492F OldCityPokecenterTimeMachine_MapAttributes
-25:49AC OldCityKurtsHouse_MapAttributes
-25:4A26 OldCitySchool_MapAttributes
-
-26:4000 Route1Gate1F_MapAttributes
-26:40DA Route1Gate2F_MapAttributes
-26:4224 WestMart1F_MapAttributes
-26:42A0 WestMart2F_MapAttributes
-26:4374 WestMart3F_MapAttributes
-26:4433 WestMart4F_MapAttributes
-26:44F2 WestMart5F_MapAttributes
-26:4581 WestMart6F_MapAttributes
-26:460E WestMartElevator_MapAttributes
-26:464B WestRadioTower1F_MapAttributes
-26:46CA WestRadioTower2F_MapAttributes
-26:4772 WestRadioTower3F_MapAttributes
-26:4827 WestRadioTower4F_MapAttributes
-26:48E9 WestRadioTower5F_MapAttributes
-26:499F WestRocketRaidedHouse_MapAttributes
-26:4A49 WestPokecenter1F_MapAttributes
-26:4AE1 WestPokecenter2F_MapAttributes
-26:4B5E WestGym_MapAttributes
-26:4C1A WestHouse1_MapAttributes
-26:4C9E WestHouse2_MapAttributes
-
-27:4000 HaitekuWestRouteGate_MapAttributes
-27:405B HaitekuPokecenter1F_MapAttributes
-27:40EF HaitekuPokecenter2F_MapAttributes
-27:4168 HaitekuLeague1F_MapAttributes
-27:4209 HaitekuLeague2F_MapAttributes
-27:42A9 HaitekuMart_MapAttributes
-27:4329 HaitekuHouse1_MapAttributes
-27:4383 HaitekuHouse2_MapAttributes
-27:43DD HaitekuImposterOakHouse_MapAttributes
-27:4444 HaitekuAquarium1F_MapAttributes
-27:44CB HaitekuAquarium2F_MapAttributes
-27:4537 FontoRouteGate1_MapAttributes
-27:4592 FontoRouteGate2_MapAttributes
-27:45ED FontoRouteGate3_MapAttributes
-27:4648 FontoRocketHouse_MapAttributes
-27:46D5 FontoMart_MapAttributes
-27:4755 FontoHouse_MapAttributes
-27:47AF FontoPokecenter1F_MapAttributes
-27:4843 FontoPokecenter2F_MapAttributes
-27:48BC FontoLab_MapAttributes
-27:4923 BaadonMart_MapAttributes
-27:49A3 BaadonPokecenter1F_MapAttributes
-27:4A2A BaadonPokecenter2F_MapAttributes
-27:4AA3 BaadonHouse1_MapAttributes
-27:4AF9 BaadonWallpaperHouse_MapAttributes
-27:4B42 BaadonHouse2_MapAttributes
-27:4B9C BaadonLeague1F_MapAttributes
-27:4C3D BaadonLeague2F_MapAttributes
-27:4CDD BaadonRouteGateWest_MapAttributes
-27:4D38 BaadonRouteGateNewtype_MapAttributes
-27:4D93 NewtypePokecenter1F_MapAttributes
-27:4E27 NewtypePokecenter2F_MapAttributes
-27:4EA0 NewtypeLeague1F_MapAttributes
-27:4F41 NewtypeLeague2F_MapAttributes
-27:4FE1 NewtypeSailorHouse_MapAttributes
-27:503B NewtypeMart_MapAttributes
-27:50BB NewtypeDojo_MapAttributes
-27:5155 NewtypeHouse1_MapAttributes
-27:51AF NewtypeDiner_MapAttributes
-27:522C NewtypeHouse2_MapAttributes
-27:5286 NewtypeHouse3_MapAttributes
-27:52E0 Route15Pokecenter1F_MapAttributes
-27:5374 Route15Pokecenter2F_MapAttributes
-27:53C6 NewtypeRouteGate_MapAttributes
-27:5421 Route18Pokecenter1F_MapAttributes
-27:54B5 Route18Pokecenter2F_MapAttributes
-27:5507 SugarRouteGate_MapAttributes
-27:5562 SugarHouse_MapAttributes
-27:55E2 SugarHouse2_MapAttributes
-27:5638 SugarMart_MapAttributes
-27:56B8 SugarPokecenter1F_MapAttributes
-27:574C SugarPokecenter2F_MapAttributes
-27:57C5 BullForestRoute1House_MapAttributes
-27:581F BullForestRouteGateStand_MapAttributes
-27:587A BullMart_MapAttributes
-27:58FA BullHouse1_MapAttributes
-27:5950 BullHouse2_MapAttributes
-27:59AA BullHouse3_MapAttributes
-27:5A04 BullPokecenter1F_MapAttributes
-27:5A98 BullPokecenter2F_MapAttributes
-27:5B11 BullLeague1F_MapAttributes
-27:5BB2 BullLeague2F_MapAttributes
-27:5C52 BullHouse4_MapAttributes
-27:5C9F StandRouteGateKanto_MapAttributes
-27:5CFA StandLab_MapAttributes
-27:5D50 StandPokecenter1F_MapAttributes
-27:5DE4 StandPokecenter2F_MapAttributes
-27:5E5D StandOffice_MapAttributes
-27:5EDD StandMart_MapAttributes
-27:5F5D StandHouse_MapAttributes
-27:5FB7 StandRocketHouse1F_MapAttributes
-27:6024 StandRocketHouse2F_MapAttributes
-27:6083 StandLeague1F_MapAttributes
-27:6124 StandLeague2F_MapAttributes
-27:61C4 KantoCeruleanHouse_MapAttributes
-27:621E KantoPokecenter1F_MapAttributes
-27:62B2 KantoPokecenter2F_MapAttributes
-27:632B KantoLeague1F_MapAttributes
-27:63CC KantoLeague2F_MapAttributes
-27:646C KantoLavenderHouse_MapAttributes
-27:64D3 KantoCeladonMart1F_MapAttributes
-27:6547 KantoCeladonMart2F_MapAttributes
-27:65C1 KantoCeladonMart3F_MapAttributes
-27:663B KantoCeladonMart4F_MapAttributes
-27:66C2 KantoCeladonMart5F_MapAttributes
-27:6742 KantoCeladonElevator_MapAttributes
-27:677F KantoMart_MapAttributes
-27:67FF KantoGamefreakHQ1_MapAttributes
-27:6899 KantoGamefreakHQ2_MapAttributes
-27:6905 KantoGamefreakHQ3_MapAttributes
-27:698B KantoGamefreakHQ4_MapAttributes
-27:69E3 KantoGamefreakHQ5_MapAttributes
-27:6A2C KantoSilphCo_MapAttributes
-27:6ADF KantoViridianHouse_MapAttributes
-27:6B46 KantoGameCorner_MapAttributes
-27:6C55 KantoUnusedArea_MapAttributes
-27:6C90 KantoGameCornerPrizes_MapAttributes
-27:6D04 KantoDiner_MapAttributes
-27:6D51 KantoSchool_MapAttributes
-27:6DEB KantoHospital_MapAttributes
-27:6E6B KantoPokecenter21F_MapAttributes
-27:6EFF KantoPokecenter22F_MapAttributes
-27:6F78 KantoRedsHouse_MapAttributes
-27:6FDF KantoGreensHouse1F_MapAttributes
-27:703C KantoGreensHouse2F_MapAttributes
-27:707E KantoEldersHouse_MapAttributes
-27:70E5 KantoOaksLab_MapAttributes
-27:713B KantoLeague21F_MapAttributes
-27:71DC KantoLeague22F_MapAttributes
-27:727C KantoFishingGuru_MapAttributes
-27:72D6 SouthHouse1_MapAttributes
-27:7330 SouthPokecenter1F_MapAttributes
-27:73C4 SouthPokecenter2F_MapAttributes
-27:743D SouthMart_MapAttributes
-27:74BD SouthHouse2_MapAttributes
-27:7517 NorthHouse1_MapAttributes
-27:7571 NorthMart_MapAttributes
-27:75F1 NorthHouse2_MapAttributes
-27:764B NorthPokecenter1F_MapAttributes
-27:76DF NorthPokecenter2F_MapAttributes
-
-2F:4000 PowerPlant1_MapAttributes
-2F:407D PowerPlant2_MapAttributes
-2F:40FA PowerPlant3_MapAttributes
-2F:422B PowerPlant4_MapAttributes
-2F:435C RuinsOfAlphEntrance_MapAttributes
-2F:43D9 RuinsOfAlphMain_MapAttributes
-2F:469F CaveMinecarts1_MapAttributes
-2F:482A CaveMinecarts2_MapAttributes
-2F:49B5 CaveMinecarts3_MapAttributes
-2F:4B40 CaveMinecarts4_MapAttributes
-2F:4CCB CaveMinecarts5_MapAttributes
-2F:4E56 CaveMinecarts6_MapAttributes
-2F:4F2D CaveMinecarts7_MapAttributes
-2F:5004 Office1_MapAttributes
-2F:5081 Office2_MapAttributes
-2F:51B2 Office3_MapAttributes
-2F:5289 SlowpokeWellEntrance_MapAttributes
-2F:5306 SlowpokeWellMain_MapAttributes
-2F:53DD ShizukanaOka_MapAttributes
-
 32:76FF Functioncb6ff
 32:7710 Functioncb710
 32:7733 Functioncb733
@@ -377,57 +194,8 @@
 33:625D BattleAnim_Sine_e
 33:6263 BattleAnim_Cosine_e
 
-34:4000 RouteSilentEastGate_MapAttributes
-34:4042 PlayerHouse1F_MapAttributes
-34:4132 PlayerHouse2F_MapAttributes
-34:45FF SilentPokecenter_MapAttributes
-34:47D5 SilentHillHouse_MapAttributes
-34:4AAC SilentHillLab_MapAttributes
-34:5BE6 SilentHillLab2_MapAttributes
-34:605D Unused13_MapAttributes
-
-36:4014 SilentHill_MapAttributes
-36:410D OldCity_MapAttributes
-36:4372 West_MapAttributes
-36:45D2 Haiteku_MapAttributes
-36:47F8 Fonto_MapAttributes
-36:48F3 Baadon_MapAttributes
-36:49F9 Newtype_MapAttributes
-36:4C3A Sugar_MapAttributes
-36:4D05 BullForest_MapAttributes
-36:4F28 Stand_MapAttributes
-36:519D Kanto_MapAttributes
-36:55F3 Prince_MapAttributes
-36:5677 MtFuji_MapAttributes
-36:56EF South_MapAttributes
-36:5914 North_MapAttributes
-36:59DF Route1P1_MapAttributes
-36:5ABE Route1P2_MapAttributes
-36:5BD4 Route2_MapAttributes
-36:5CC6 HaitekuWestRoute_MapAttributes
-36:5DD1 HaitekuWestRouteOcean_MapAttributes
-36:5F17 FontoRoute1_MapAttributes
-36:6083 FontoRoute6_MapAttributes
-36:61E8 FontoRoute2_MapAttributes
-36:62C6 FontoRoute4_MapAttributes
-36:63B2 FontoRoute3_MapAttributes
-36:64BD BaadonRoute1_MapAttributes
-36:6603 BaadonRoute2_MapAttributes
-36:67EF BaadonRoute3_MapAttributes
-36:68DB Route15_MapAttributes
-36:69BD NewtypeRoute_MapAttributes
-36:6A6E Route18_MapAttributes
-36:6C6F BullForestRoute1_MapAttributes
-36:6D8F SugarRoute_MapAttributes
-36:6ED5 BullForestRoute2_MapAttributes
-36:701B StandRoute_MapAttributes
-36:7161 KantoEastRoute_MapAttributes
-36:724D RouteSilentEast_MapAttributes
-36:738C PrinceRoute_MapAttributes
-36:73E8 MtFujiRoute_MapAttributes
-36:7444 FontoRoute5_MapAttributes
-36:7530 BullForestRoute3_MapAttributes
 36:7AE4 SetTime
+
 38:4000 PikachuMiniGame
 39:4000 GameFreakIntro
 39:432F OpeningCutscene
@@ -460,3 +228,917 @@
 01:D35F wOptions
 01:D513 wWarpNumber
 01:DA3B wOTPartyMonOT
+
+; Maps
+25:404D Route2Gate1F_Blocks
+25:4062 Route2Gate1F_Unk
+25:4061 Route2Gate1F_MapScripts
+25:400B Route2Gate1F_MapEvents
+25:40B5 Route2Gate2F_Blocks
+25:40C2 Route2Gate2F_Unk
+25:40C1 Route2Gate2F_MapScripts
+25:4087 Route2Gate2F_MapEvents
+25:411F Route2House_Blocks
+25:4130 Route2House_Unk
+25:412F Route2House_MapScripts
+25:40E7 Route2House_MapEvents
+25:4192 OldCityMuseum_Blocks
+25:41B3 OldCityMuseum_Unk
+25:41B2 OldCityMuseum_MapScripts
+25:4155 OldCityMuseum_MapEvents
+25:4241 OldCityGym_Blocks
+25:426F OldCityGym_Unk
+25:426E OldCityGym_MapScripts
+25:41D8 OldCityGym_MapEvents
+25:42EE OldCityTower1F_Blocks
+25:42FF OldCityTower1F_Unk
+25:42FE OldCityTower1F_MapScripts
+25:4294 OldCityTower1F_MapEvents
+25:4373 OldCityTower2F_Blocks
+25:4384 OldCityTower2F_Unk
+25:4383 OldCityTower2F_MapScripts
+25:4324 OldCityTower2F_MapEvents
+25:43F8 OldCityTower3F_Blocks
+25:4409 OldCityTower3F_Unk
+25:4408 OldCityTower3F_MapScripts
+25:43A9 OldCityTower3F_MapEvents
+25:447D OldCityTower4F_Blocks
+25:448E OldCityTower4F_Unk
+25:448D OldCityTower4F_MapScripts
+25:442E OldCityTower4F_MapEvents
+25:44D8 OldCityTower5F_Blocks
+25:44E2 OldCityTower5F_Unk
+25:44E1 OldCityTower5F_MapScripts
+25:44B3 OldCityTower5F_MapEvents
+25:453F OldCityBillsHouse_Blocks
+25:4550 OldCityBillsHouse_Unk
+25:454F OldCityBillsHouse_MapScripts
+25:4507 OldCityBillsHouse_MapEvents
+25:45B3 OldCityMart_Blocks
+25:45D4 OldCityMart_Unk
+25:45D3 OldCityMart_MapScripts
+25:4575 OldCityMart_MapEvents
+25:4643 OldCityHouse_Blocks
+25:4654 OldCityHouse_Unk
+25:4653 OldCityHouse_MapScripts
+25:45F9 OldCityHouse_MapEvents
+25:46CB OldCityPokecenter1F_Blocks
+25:46EC OldCityPokecenter1F_Unk
+25:46EB OldCityPokecenter1F_MapScripts
+25:4679 OldCityPokecenter1F_MapEvents
+25:4762 OldCityPokecenter2F_Blocks
+25:47A4 OldCityPokecenter2F_Unk
+25:4782 OldCityPokecenter2F_MapScripts
+25:4709 OldCityPokecenter2F_MapEvents
+25:4851 OldCityPokecenterTrade_Blocks
+25:4882 OldCityPokecenterTrade_Unk
+25:4866 OldCityPokecenterTrade_MapScripts
+25:4831 OldCityPokecenterTrade_MapEvents
+25:48D7 OldCityPokecenterBattle_Blocks
+25:4907 OldCityPokecenterBattle_Unk
+25:48EB OldCityPokecenterBattle_MapScripts
+25:48B7 OldCityPokecenterBattle_MapEvents
+25:495E OldCityPokecenterTimeMachine_Blocks
+25:499D OldCityPokecenterTimeMachine_Unk
+25:497E OldCityPokecenterTimeMachine_MapScripts
+25:493A OldCityPokecenterTimeMachine_MapEvents
+25:49EB OldCityKurtsHouse_Blocks
+25:4A0C OldCityKurtsHouse_Unk
+25:4A0B OldCityKurtsHouse_MapScripts
+25:49B7 OldCityKurtsHouse_MapEvents
+25:4AA2 OldCitySchool_Blocks
+25:4AC3 OldCitySchool_Unk
+25:4AC2 OldCitySchool_MapScripts
+25:4A31 OldCitySchool_MapEvents
+26:404D Route1Gate1F_Blocks
+26:4074 Route1Gate1F_Unk
+26:4061 Route1Gate1F_MapScripts
+26:400B Route1Gate1F_MapEvents
+26:4113 Route1Gate2F_Blocks
+26:4134 Route1Gate2F_Unk
+26:411F Route1Gate2F_MapScripts
+26:40E5 Route1Gate2F_MapEvents
+26:4265 WestMart1F_Blocks
+26:4286 WestMart1F_Unk
+26:4285 WestMart1F_MapScripts
+26:422F WestMart1F_MapEvents
+26:4339 WestMart2F_Blocks
+26:435A WestMart2F_Unk
+26:4359 WestMart2F_MapScripts
+26:42AB WestMart2F_MapEvents
+26:43F8 WestMart3F_Blocks
+26:4419 WestMart3F_Unk
+26:4418 WestMart3F_MapScripts
+26:437F WestMart3F_MapEvents
+26:44B7 WestMart4F_Blocks
+26:44D8 WestMart4F_Unk
+26:44D7 WestMart4F_MapScripts
+26:443E WestMart4F_MapEvents
+26:4546 WestMart5F_Blocks
+26:4567 WestMart5F_Unk
+26:4566 WestMart5F_MapScripts
+26:44FD WestMart5F_MapEvents
+26:45D3 WestMart6F_Blocks
+26:45F4 WestMart6F_Unk
+26:45F3 WestMart6F_MapScripts
+26:458C WestMart6F_MapEvents
+26:462C WestMartElevator_Blocks
+26:4631 WestMartElevator_Unk
+26:4630 WestMartElevator_MapScripts
+26:4619 WestMartElevator_MapEvents
+26:469F WestRadioTower1F_Blocks
+26:46B0 WestRadioTower1F_Unk
+26:46AF WestRadioTower1F_MapScripts
+26:4656 WestRadioTower1F_MapEvents
+26:4747 WestRadioTower2F_Blocks
+26:4758 WestRadioTower2F_Unk
+26:4757 WestRadioTower2F_MapScripts
+26:46D5 WestRadioTower2F_MapEvents
+26:47FC WestRadioTower3F_Blocks
+26:480D WestRadioTower3F_Unk
+26:480C WestRadioTower3F_MapScripts
+26:477D WestRadioTower3F_MapEvents
+26:48BE WestRadioTower4F_Blocks
+26:48CF WestRadioTower4F_Unk
+26:48CE WestRadioTower4F_MapScripts
+26:4832 WestRadioTower4F_MapEvents
+26:4974 WestRadioTower5F_Blocks
+26:4985 WestRadioTower5F_Unk
+26:4984 WestRadioTower5F_MapScripts
+26:48F4 WestRadioTower5F_MapEvents
+26:4A1A WestRocketRaidedHouse_Blocks
+26:4A2F WestRocketRaidedHouse_Unk
+26:4A2E WestRocketRaidedHouse_MapScripts
+26:49AA WestRocketRaidedHouse_MapEvents
+26:4AA6 WestPokecenter1F_Blocks
+26:4AC7 WestPokecenter1F_Unk
+26:4AC6 WestPokecenter1F_MapScripts
+26:4A54 WestPokecenter1F_MapEvents
+26:4B23 WestPokecenter2F_Blocks
+26:4B44 WestPokecenter2F_Unk
+26:4B43 WestPokecenter2F_MapScripts
+26:4AEC WestPokecenter2F_MapEvents
+26:4BD2 WestGym_Blocks
+26:4C00 WestGym_Unk
+26:4BFF WestGym_MapScripts
+26:4B69 WestGym_MapEvents
+26:4C6F WestHouse1_Blocks
+26:4C84 WestHouse1_Unk
+26:4C83 WestHouse1_MapScripts
+26:4C25 WestHouse1_MapEvents
+26:4CF3 WestHouse2_Blocks
+26:4D08 WestHouse2_Unk
+26:4D07 WestHouse2_MapScripts
+26:4CA9 WestHouse2_MapEvents
+27:402C HaitekuWestRouteGate_Blocks
+27:4041 HaitekuWestRouteGate_Unk
+27:4040 HaitekuWestRouteGate_MapScripts
+27:400B HaitekuWestRouteGate_MapEvents
+27:40B4 HaitekuPokecenter1F_Blocks
+27:40D5 HaitekuPokecenter1F_Unk
+27:40D4 HaitekuPokecenter1F_MapScripts
+27:4066 HaitekuPokecenter1F_MapEvents
+27:412D HaitekuPokecenter2F_Blocks
+27:414E HaitekuPokecenter2F_Unk
+27:414D HaitekuPokecenter2F_MapScripts
+27:40FA HaitekuPokecenter2F_MapEvents
+27:41CE HaitekuLeague1F_Blocks
+27:41EF HaitekuLeague1F_Unk
+27:41EE HaitekuLeague1F_MapScripts
+27:4173 HaitekuLeague1F_MapEvents
+27:4261 HaitekuLeague2F_Blocks
+27:428F HaitekuLeague2F_Unk
+27:428E HaitekuLeague2F_MapScripts
+27:4214 HaitekuLeague2F_MapEvents
+27:42EE HaitekuMart_Blocks
+27:430F HaitekuMart_Unk
+27:430E HaitekuMart_MapScripts
+27:42B4 HaitekuMart_MapEvents
+27:4354 HaitekuHouse1_Blocks
+27:4369 HaitekuHouse1_Unk
+27:4368 HaitekuHouse1_MapScripts
+27:4334 HaitekuHouse1_MapEvents
+27:43AE HaitekuHouse2_Blocks
+27:43C3 HaitekuHouse2_Unk
+27:43C2 HaitekuHouse2_MapScripts
+27:438E HaitekuHouse2_MapEvents
+27:4415 HaitekuImposterOakHouse_Blocks
+27:442A HaitekuImposterOakHouse_Unk
+27:4429 HaitekuImposterOakHouse_MapScripts
+27:43E8 HaitekuImposterOakHouse_MapEvents
+27:4490 HaitekuAquarium1F_Blocks
+27:44B1 HaitekuAquarium1F_Unk
+27:44B0 HaitekuAquarium1F_MapScripts
+27:444F HaitekuAquarium1F_MapEvents
+27:44FC HaitekuAquarium2F_Blocks
+27:451D HaitekuAquarium2F_Unk
+27:451C HaitekuAquarium2F_MapScripts
+27:44D6 HaitekuAquarium2F_MapEvents
+27:4563 FontoRouteGate1_Blocks
+27:4578 FontoRouteGate1_Unk
+27:4577 FontoRouteGate1_MapScripts
+27:4542 FontoRouteGate1_MapEvents
+27:45BE FontoRouteGate2_Blocks
+27:45D3 FontoRouteGate2_Unk
+27:45D2 FontoRouteGate2_MapScripts
+27:459D FontoRouteGate2_MapEvents
+27:4619 FontoRouteGate3_Blocks
+27:462E FontoRouteGate3_Unk
+27:462D FontoRouteGate3_MapScripts
+27:45F8 FontoRouteGate3_MapEvents
+27:469A FontoRocketHouse_Blocks
+27:46BB FontoRocketHouse_Unk
+27:46BA FontoRocketHouse_MapScripts
+27:4653 FontoRocketHouse_MapEvents
+27:471A FontoMart_Blocks
+27:473B FontoMart_Unk
+27:473A FontoMart_MapScripts
+27:46E0 FontoMart_MapEvents
+27:4780 FontoHouse_Blocks
+27:4795 FontoHouse_Unk
+27:4794 FontoHouse_MapScripts
+27:4760 FontoHouse_MapEvents
+27:4808 FontoPokecenter1F_Blocks
+27:4829 FontoPokecenter1F_Unk
+27:4828 FontoPokecenter1F_MapScripts
+27:47BA FontoPokecenter1F_MapEvents
+27:4881 FontoPokecenter2F_Blocks
+27:48A2 FontoPokecenter2F_Unk
+27:48A1 FontoPokecenter2F_MapScripts
+27:484E FontoPokecenter2F_MapEvents
+27:48F4 FontoLab_Blocks
+27:4909 FontoLab_Unk
+27:4908 FontoLab_MapScripts
+27:48C7 FontoLab_MapEvents
+27:4968 BaadonMart_Blocks
+27:4989 BaadonMart_Unk
+27:4988 BaadonMart_MapScripts
+27:492E BaadonMart_MapEvents
+27:49EF BaadonPokecenter1F_Blocks
+27:4A10 BaadonPokecenter1F_Unk
+27:4A0F BaadonPokecenter1F_MapScripts
+27:49AE BaadonPokecenter1F_MapEvents
+27:4A68 BaadonPokecenter2F_Blocks
+27:4A89 BaadonPokecenter2F_Unk
+27:4A88 BaadonPokecenter2F_MapScripts
+27:4A35 BaadonPokecenter2F_MapEvents
+27:4ACE BaadonHouse1_Blocks
+27:4ADF BaadonHouse1_Unk
+27:4ADE BaadonHouse1_MapScripts
+27:4AAE BaadonHouse1_MapEvents
+27:4B17 BaadonWallpaperHouse_Blocks
+27:4B28 BaadonWallpaperHouse_Unk
+27:4B27 BaadonWallpaperHouse_MapScripts
+27:4B04 BaadonWallpaperHouse_MapEvents
+27:4B6D BaadonHouse2_Blocks
+27:4B82 BaadonHouse2_Unk
+27:4B81 BaadonHouse2_MapScripts
+27:4B4D BaadonHouse2_MapEvents
+27:4C02 BaadonLeague1F_Blocks
+27:4C23 BaadonLeague1F_Unk
+27:4C22 BaadonLeague1F_MapScripts
+27:4BA7 BaadonLeague1F_MapEvents
+27:4C95 BaadonLeague2F_Blocks
+27:4CC3 BaadonLeague2F_Unk
+27:4CC2 BaadonLeague2F_MapScripts
+27:4C48 BaadonLeague2F_MapEvents
+27:4D09 BaadonRouteGateWest_Blocks
+27:4D1E BaadonRouteGateWest_Unk
+27:4D1D BaadonRouteGateWest_MapScripts
+27:4CE8 BaadonRouteGateWest_MapEvents
+27:4D64 BaadonRouteGateNewtype_Blocks
+27:4D79 BaadonRouteGateNewtype_Unk
+27:4D78 BaadonRouteGateNewtype_MapScripts
+27:4D43 BaadonRouteGateNewtype_MapEvents
+27:4DEC NewtypePokecenter1F_Blocks
+27:4E0D NewtypePokecenter1F_Unk
+27:4E0C NewtypePokecenter1F_MapScripts
+27:4D9E NewtypePokecenter1F_MapEvents
+27:4E65 NewtypePokecenter2F_Blocks
+27:4E86 NewtypePokecenter2F_Unk
+27:4E85 NewtypePokecenter2F_MapScripts
+27:4E32 NewtypePokecenter2F_MapEvents
+27:4F06 NewtypeLeague1F_Blocks
+27:4F27 NewtypeLeague1F_Unk
+27:4F26 NewtypeLeague1F_MapScripts
+27:4EAB NewtypeLeague1F_MapEvents
+27:4F99 NewtypeLeague2F_Blocks
+27:4FC7 NewtypeLeague2F_Unk
+27:4FC6 NewtypeLeague2F_MapScripts
+27:4F4C NewtypeLeague2F_MapEvents
+27:500C NewtypeSailorHouse_Blocks
+27:5021 NewtypeSailorHouse_Unk
+27:5020 NewtypeSailorHouse_MapScripts
+27:4FEC NewtypeSailorHouse_MapEvents
+27:5080 NewtypeMart_Blocks
+27:50A1 NewtypeMart_Unk
+27:50A0 NewtypeMart_MapScripts
+27:5046 NewtypeMart_MapEvents
+27:511A NewtypeDojo_Blocks
+27:513B NewtypeDojo_Unk
+27:513A NewtypeDojo_MapScripts
+27:50C6 NewtypeDojo_MapEvents
+27:5180 NewtypeHouse1_Blocks
+27:5195 NewtypeHouse1_Unk
+27:5194 NewtypeHouse1_MapScripts
+27:5160 NewtypeHouse1_MapEvents
+27:5201 NewtypeDiner_Blocks
+27:5212 NewtypeDiner_Unk
+27:5211 NewtypeDiner_MapScripts
+27:51BA NewtypeDiner_MapEvents
+27:5257 NewtypeHouse2_Blocks
+27:526C NewtypeHouse2_Unk
+27:526B NewtypeHouse2_MapScripts
+27:5237 NewtypeHouse2_MapEvents
+27:52B1 NewtypeHouse3_Blocks
+27:52C6 NewtypeHouse3_Unk
+27:52C5 NewtypeHouse3_MapScripts
+27:5291 NewtypeHouse3_MapEvents
+27:5339 Route15Pokecenter1F_Blocks
+27:535A Route15Pokecenter1F_Unk
+27:5359 Route15Pokecenter1F_MapScripts
+27:52EB Route15Pokecenter1F_MapEvents
+27:538B Route15Pokecenter2F_Blocks
+27:53AC Route15Pokecenter2F_Unk
+27:53AB Route15Pokecenter2F_MapScripts
+27:537F Route15Pokecenter2F_MapEvents
+27:53F2 NewtypeRouteGate_Blocks
+27:5407 NewtypeRouteGate_Unk
+27:5406 NewtypeRouteGate_MapScripts
+27:53D1 NewtypeRouteGate_MapEvents
+27:547A Route18Pokecenter1F_Blocks
+27:549B Route18Pokecenter1F_Unk
+27:549A Route18Pokecenter1F_MapScripts
+27:542C Route18Pokecenter1F_MapEvents
+27:54CC Route18Pokecenter2F_Blocks
+27:54ED Route18Pokecenter2F_Unk
+27:54EC Route18Pokecenter2F_MapScripts
+27:54C0 Route18Pokecenter2F_MapEvents
+27:5533 SugarRouteGate_Blocks
+27:5548 SugarRouteGate_Unk
+27:5547 SugarRouteGate_MapScripts
+27:5512 SugarRouteGate_MapEvents
+27:55A7 SugarHouse_Blocks
+27:55C8 SugarHouse_Unk
+27:55C7 SugarHouse_MapScripts
+27:556D SugarHouse_MapEvents
+27:560D SugarHouse2_Blocks
+27:561E SugarHouse2_Unk
+27:561D SugarHouse2_MapScripts
+27:55ED SugarHouse2_MapEvents
+27:567D SugarMart_Blocks
+27:569E SugarMart_Unk
+27:569D SugarMart_MapScripts
+27:5643 SugarMart_MapEvents
+27:5711 SugarPokecenter1F_Blocks
+27:5732 SugarPokecenter1F_Unk
+27:5731 SugarPokecenter1F_MapScripts
+27:56C3 SugarPokecenter1F_MapEvents
+27:578A SugarPokecenter2F_Blocks
+27:57AB SugarPokecenter2F_Unk
+27:57AA SugarPokecenter2F_MapScripts
+27:5757 SugarPokecenter2F_MapEvents
+27:57F0 BullForestRoute1House_Blocks
+27:5805 BullForestRoute1House_Unk
+27:5804 BullForestRoute1House_MapScripts
+27:57D0 BullForestRoute1House_MapEvents
+27:584B BullForestRouteGateStand_Blocks
+27:5860 BullForestRouteGateStand_Unk
+27:585F BullForestRouteGateStand_MapScripts
+27:582A BullForestRouteGateStand_MapEvents
+27:58BF BullMart_Blocks
+27:58E0 BullMart_Unk
+27:58DF BullMart_MapScripts
+27:5885 BullMart_MapEvents
+27:5925 BullHouse1_Blocks
+27:5936 BullHouse1_Unk
+27:5935 BullHouse1_MapScripts
+27:5905 BullHouse1_MapEvents
+27:597B BullHouse2_Blocks
+27:5990 BullHouse2_Unk
+27:598F BullHouse2_MapScripts
+27:595B BullHouse2_MapEvents
+27:59D5 BullHouse3_Blocks
+27:59EA BullHouse3_Unk
+27:59E9 BullHouse3_MapScripts
+27:59B5 BullHouse3_MapEvents
+27:5A5D BullPokecenter1F_Blocks
+27:5A7E BullPokecenter1F_Unk
+27:5A7D BullPokecenter1F_MapScripts
+27:5A0F BullPokecenter1F_MapEvents
+27:5AD6 BullPokecenter2F_Blocks
+27:5AF7 BullPokecenter2F_Unk
+27:5AF6 BullPokecenter2F_MapScripts
+27:5AA3 BullPokecenter2F_MapEvents
+27:5B77 BullLeague1F_Blocks
+27:5B98 BullLeague1F_Unk
+27:5B97 BullLeague1F_MapScripts
+27:5B1C BullLeague1F_MapEvents
+27:5C0A BullLeague2F_Blocks
+27:5C38 BullLeague2F_Unk
+27:5C37 BullLeague2F_MapScripts
+27:5BBD BullLeague2F_MapEvents
+27:5C70 BullHouse4_Blocks
+27:5C85 BullHouse4_Unk
+27:5C84 BullHouse4_MapScripts
+27:5C5D BullHouse4_MapEvents
+27:5CCB StandRouteGateKanto_Blocks
+27:5CE0 StandRouteGateKanto_Unk
+27:5CDF StandRouteGateKanto_MapScripts
+27:5CAA StandRouteGateKanto_MapEvents
+27:5D25 StandLab_Blocks
+27:5D36 StandLab_Unk
+27:5D35 StandLab_MapScripts
+27:5D05 StandLab_MapEvents
+27:5DA9 StandPokecenter1F_Blocks
+27:5DCA StandPokecenter1F_Unk
+27:5DC9 StandPokecenter1F_MapScripts
+27:5D5B StandPokecenter1F_MapEvents
+27:5E22 StandPokecenter2F_Blocks
+27:5E43 StandPokecenter2F_Unk
+27:5E42 StandPokecenter2F_MapScripts
+27:5DEF StandPokecenter2F_MapEvents
+27:5EA2 StandOffice_Blocks
+27:5EC3 StandOffice_Unk
+27:5EC2 StandOffice_MapScripts
+27:5E68 StandOffice_MapEvents
+27:5F22 StandMart_Blocks
+27:5F43 StandMart_Unk
+27:5F42 StandMart_MapScripts
+27:5EE8 StandMart_MapEvents
+27:5F88 StandHouse_Blocks
+27:5F9D StandHouse_Unk
+27:5F9C StandHouse_MapScripts
+27:5F68 StandHouse_MapEvents
+27:5FE9 StandRocketHouse1F_Blocks
+27:600A StandRocketHouse1F_Unk
+27:6009 StandRocketHouse1F_MapScripts
+27:5FC2 StandRocketHouse1F_MapEvents
+27:6048 StandRocketHouse2F_Blocks
+27:6069 StandRocketHouse2F_Unk
+27:6068 StandRocketHouse2F_MapScripts
+27:602F StandRocketHouse2F_MapEvents
+27:60E9 StandLeague1F_Blocks
+27:610A StandLeague1F_Unk
+27:6109 StandLeague1F_MapScripts
+27:608E StandLeague1F_MapEvents
+27:617C StandLeague2F_Blocks
+27:61AA StandLeague2F_Unk
+27:61A9 StandLeague2F_MapScripts
+27:612F StandLeague2F_MapEvents
+27:61EF KantoCeruleanHouse_Blocks
+27:6204 KantoCeruleanHouse_Unk
+27:6203 KantoCeruleanHouse_MapScripts
+27:61CF KantoCeruleanHouse_MapEvents
+27:6277 KantoPokecenter1F_Blocks
+27:6298 KantoPokecenter1F_Unk
+27:6297 KantoPokecenter1F_MapScripts
+27:6229 KantoPokecenter1F_MapEvents
+27:62F0 KantoPokecenter2F_Blocks
+27:6311 KantoPokecenter2F_Unk
+27:6310 KantoPokecenter2F_MapScripts
+27:62BD KantoPokecenter2F_MapEvents
+27:6391 KantoLeague1F_Blocks
+27:63B2 KantoLeague1F_Unk
+27:63B1 KantoLeague1F_MapScripts
+27:6336 KantoLeague1F_MapEvents
+27:6424 KantoLeague2F_Blocks
+27:6452 KantoLeague2F_Unk
+27:6451 KantoLeague2F_MapScripts
+27:63D7 KantoLeague2F_MapEvents
+27:64A4 KantoLavenderHouse_Blocks
+27:64B9 KantoLavenderHouse_Unk
+27:64B8 KantoLavenderHouse_MapScripts
+27:6477 KantoLavenderHouse_MapEvents
+27:650C KantoCeladonMart1F_Blocks
+27:652D KantoCeladonMart1F_Unk
+27:652C KantoCeladonMart1F_MapScripts
+27:64DE KantoCeladonMart1F_MapEvents
+27:6586 KantoCeladonMart2F_Blocks
+27:65A7 KantoCeladonMart2F_Unk
+27:65A6 KantoCeladonMart2F_MapScripts
+27:6552 KantoCeladonMart2F_MapEvents
+27:6600 KantoCeladonMart3F_Blocks
+27:6621 KantoCeladonMart3F_Unk
+27:6620 KantoCeladonMart3F_MapScripts
+27:65CC KantoCeladonMart3F_MapEvents
+27:6687 KantoCeladonMart4F_Blocks
+27:66A8 KantoCeladonMart4F_Unk
+27:66A7 KantoCeladonMart4F_MapScripts
+27:6646 KantoCeladonMart4F_MapEvents
+27:6707 KantoCeladonMart5F_Blocks
+27:6728 KantoCeladonMart5F_Unk
+27:6727 KantoCeladonMart5F_MapScripts
+27:66CD KantoCeladonMart5F_MapEvents
+27:6760 KantoCeladonElevator_Blocks
+27:6765 KantoCeladonElevator_Unk
+27:6764 KantoCeladonElevator_MapScripts
+27:674D KantoCeladonElevator_MapEvents
+27:67C4 KantoMart_Blocks
+27:67E5 KantoMart_Unk
+27:67E4 KantoMart_MapScripts
+27:678A KantoMart_MapEvents
+27:6866 KantoGamefreakHQ1_Blocks
+27:687F KantoGamefreakHQ1_Unk
+27:687E KantoGamefreakHQ1_MapScripts
+27:680A KantoGamefreakHQ1_MapEvents
+27:68D2 KantoGamefreakHQ2_Blocks
+27:68EB KantoGamefreakHQ2_Unk
+27:68EA KantoGamefreakHQ2_MapScripts
+27:68A4 KantoGamefreakHQ2_MapEvents
+27:6958 KantoGamefreakHQ3_Blocks
+27:6971 KantoGamefreakHQ3_Unk
+27:6970 KantoGamefreakHQ3_MapScripts
+27:6910 KantoGamefreakHQ3_MapEvents
+27:69B0 KantoGamefreakHQ4_Blocks
+27:69C9 KantoGamefreakHQ4_Unk
+27:69C8 KantoGamefreakHQ4_MapScripts
+27:6996 KantoGamefreakHQ4_MapEvents
+27:6A01 KantoGamefreakHQ5_Blocks
+27:6A12 KantoGamefreakHQ5_Unk
+27:6A11 KantoGamefreakHQ5_MapScripts
+27:69EE KantoGamefreakHQ5_MapEvents
+27:6A64 KantoSilphCo_Blocks
+27:6AC5 KantoSilphCo_Unk
+27:6AC4 KantoSilphCo_MapScripts
+27:6A37 KantoSilphCo_MapEvents
+27:6B17 KantoViridianHouse_Blocks
+27:6B2C KantoViridianHouse_Unk
+27:6B2B KantoViridianHouse_MapScripts
+27:6AEA KantoViridianHouse_MapEvents
+27:6BF4 KantoGameCorner_Blocks
+27:6C3B KantoGameCorner_Unk
+27:6C3A KantoGameCorner_MapScripts
+27:6B51 KantoGameCorner_MapEvents
+27:6C65 KantoUnusedArea_Blocks
+27:6C76 KantoUnusedArea_Unk
+27:6C75 KantoUnusedArea_MapScripts
+27:6C60 KantoUnusedArea_MapEvents
+27:6CD5 KantoGameCornerPrizes_Blocks
+27:6CEA KantoGameCornerPrizes_Unk
+27:6CE9 KantoGameCornerPrizes_MapScripts
+27:6C9B KantoGameCornerPrizes_MapEvents
+27:6D22 KantoDiner_Blocks
+27:6D37 KantoDiner_Unk
+27:6D36 KantoDiner_MapScripts
+27:6D0F KantoDiner_MapEvents
+27:6DB0 KantoSchool_Blocks
+27:6DD1 KantoSchool_Unk
+27:6DD0 KantoSchool_MapScripts
+27:6D5C KantoSchool_MapEvents
+27:6E30 KantoHospital_Blocks
+27:6E51 KantoHospital_Unk
+27:6E50 KantoHospital_MapScripts
+27:6DF6 KantoHospital_MapEvents
+27:6EC4 KantoPokecenter21F_Blocks
+27:6EE5 KantoPokecenter21F_Unk
+27:6EE4 KantoPokecenter21F_MapScripts
+27:6E76 KantoPokecenter21F_MapEvents
+27:6F3D KantoPokecenter22F_Blocks
+27:6F5E KantoPokecenter22F_Unk
+27:6F5D KantoPokecenter22F_MapScripts
+27:6F0A KantoPokecenter22F_MapEvents
+27:6FB0 KantoRedsHouse_Blocks
+27:6FC5 KantoRedsHouse_Unk
+27:6FC4 KantoRedsHouse_MapScripts
+27:6F83 KantoRedsHouse_MapEvents
+27:7011 KantoGreensHouse1F_Blocks
+27:7022 KantoGreensHouse1F_Unk
+27:7021 KantoGreensHouse1F_MapScripts
+27:6FEA KantoGreensHouse1F_MapEvents
+27:7053 KantoGreensHouse2F_Blocks
+27:7064 KantoGreensHouse2F_Unk
+27:7063 KantoGreensHouse2F_MapScripts
+27:7047 KantoGreensHouse2F_MapEvents
+27:70B6 KantoEldersHouse_Blocks
+27:70CB KantoEldersHouse_Unk
+27:70CA KantoEldersHouse_MapScripts
+27:7089 KantoEldersHouse_MapEvents
+27:7110 KantoOaksLab_Blocks
+27:7121 KantoOaksLab_Unk
+27:7120 KantoOaksLab_MapScripts
+27:70F0 KantoOaksLab_MapEvents
+27:71A1 KantoLeague21F_Blocks
+27:71C2 KantoLeague21F_Unk
+27:71C1 KantoLeague21F_MapScripts
+27:7146 KantoLeague21F_MapEvents
+27:7234 KantoLeague22F_Blocks
+27:7262 KantoLeague22F_Unk
+27:7261 KantoLeague22F_MapScripts
+27:71E7 KantoLeague22F_MapEvents
+27:72A7 KantoFishingGuru_Blocks
+27:72BC KantoFishingGuru_Unk
+27:72BB KantoFishingGuru_MapScripts
+27:7287 KantoFishingGuru_MapEvents
+27:7301 SouthHouse1_Blocks
+27:7316 SouthHouse1_Unk
+27:7315 SouthHouse1_MapScripts
+27:72E1 SouthHouse1_MapEvents
+27:7389 SouthPokecenter1F_Blocks
+27:73AA SouthPokecenter1F_Unk
+27:73A9 SouthPokecenter1F_MapScripts
+27:733B SouthPokecenter1F_MapEvents
+27:7402 SouthPokecenter2F_Blocks
+27:7423 SouthPokecenter2F_Unk
+27:7422 SouthPokecenter2F_MapScripts
+27:73CF SouthPokecenter2F_MapEvents
+27:7482 SouthMart_Blocks
+27:74A3 SouthMart_Unk
+27:74A2 SouthMart_MapScripts
+27:7448 SouthMart_MapEvents
+27:74E8 SouthHouse2_Blocks
+27:74FD SouthHouse2_Unk
+27:74FC SouthHouse2_MapScripts
+27:74C8 SouthHouse2_MapEvents
+27:7542 NorthHouse1_Blocks
+27:7557 NorthHouse1_Unk
+27:7556 NorthHouse1_MapScripts
+27:7522 NorthHouse1_MapEvents
+27:75B6 NorthMart_Blocks
+27:75D7 NorthMart_Unk
+27:75D6 NorthMart_MapScripts
+27:757C NorthMart_MapEvents
+27:761C NorthHouse2_Blocks
+27:7631 NorthHouse2_Unk
+27:7630 NorthHouse2_MapScripts
+27:75FC NorthHouse2_MapEvents
+27:76A4 NorthPokecenter1F_Blocks
+27:76C5 NorthPokecenter1F_Unk
+27:76C4 NorthPokecenter1F_MapScripts
+27:7656 NorthPokecenter1F_MapEvents
+27:771D NorthPokecenter2F_Blocks
+27:773E NorthPokecenter2F_Unk
+27:773D NorthPokecenter2F_MapScripts
+27:76EA NorthPokecenter2F_MapEvents
+2F:4010 PowerPlant1_Blocks
+2F:406B PowerPlant1_Unk
+2F:406A PowerPlant1_MapScripts
+2F:400B PowerPlant1_MapEvents
+2F:408D PowerPlant2_Blocks
+2F:40E8 PowerPlant2_Unk
+2F:40E7 PowerPlant2_MapScripts
+2F:4088 PowerPlant2_MapEvents
+2F:410A PowerPlant3_Blocks
+2F:4219 PowerPlant3_Unk
+2F:4218 PowerPlant3_MapScripts
+2F:4105 PowerPlant3_MapEvents
+2F:423B PowerPlant4_Blocks
+2F:434A PowerPlant4_Unk
+2F:4349 PowerPlant4_MapScripts
+2F:4236 PowerPlant4_MapEvents
+2F:436C RuinsOfAlphEntrance_Blocks
+2F:43C7 RuinsOfAlphEntrance_Unk
+2F:43C6 RuinsOfAlphEntrance_MapScripts
+2F:4367 RuinsOfAlphEntrance_MapEvents
+2F:43E9 RuinsOfAlphMain_Blocks
+2F:468D RuinsOfAlphMain_Unk
+2F:468C RuinsOfAlphMain_MapScripts
+2F:43E4 RuinsOfAlphMain_MapEvents
+2F:46AF CaveMinecarts1_Blocks
+2F:4818 CaveMinecarts1_Unk
+2F:4817 CaveMinecarts1_MapScripts
+2F:46AA CaveMinecarts1_MapEvents
+2F:483A CaveMinecarts2_Blocks
+2F:49A3 CaveMinecarts2_Unk
+2F:49A2 CaveMinecarts2_MapScripts
+2F:4835 CaveMinecarts2_MapEvents
+2F:49C5 CaveMinecarts3_Blocks
+2F:4B2E CaveMinecarts3_Unk
+2F:4B2D CaveMinecarts3_MapScripts
+2F:49C0 CaveMinecarts3_MapEvents
+2F:4B50 CaveMinecarts4_Blocks
+2F:4CB9 CaveMinecarts4_Unk
+2F:4CB8 CaveMinecarts4_MapScripts
+2F:4B4B CaveMinecarts4_MapEvents
+2F:4CDB CaveMinecarts5_Blocks
+2F:4E44 CaveMinecarts5_Unk
+2F:4E43 CaveMinecarts5_MapScripts
+2F:4CD6 CaveMinecarts5_MapEvents
+2F:4E66 CaveMinecarts6_Blocks
+2F:4F1B CaveMinecarts6_Unk
+2F:4F1A CaveMinecarts6_MapScripts
+2F:4E61 CaveMinecarts6_MapEvents
+2F:4F3D CaveMinecarts7_Blocks
+2F:4FF2 CaveMinecarts7_Unk
+2F:4FF1 CaveMinecarts7_MapScripts
+2F:4F38 CaveMinecarts7_MapEvents
+2F:5014 Office1_Blocks
+2F:506F Office1_Unk
+2F:506E Office1_MapScripts
+2F:500F Office1_MapEvents
+2F:5091 Office2_Blocks
+2F:51A0 Office2_Unk
+2F:519F Office2_MapScripts
+2F:508C Office2_MapEvents
+2F:51C2 Office3_Blocks
+2F:5277 Office3_Unk
+2F:5276 Office3_MapScripts
+2F:51BD Office3_MapEvents
+2F:5299 SlowpokeWellEntrance_Blocks
+2F:52F4 SlowpokeWellEntrance_Unk
+2F:52F3 SlowpokeWellEntrance_MapScripts
+2F:5294 SlowpokeWellEntrance_MapEvents
+2F:5316 SlowpokeWellMain_Blocks
+2F:53CB SlowpokeWellMain_Unk
+2F:53CA SlowpokeWellMain_MapScripts
+2F:5311 SlowpokeWellMain_MapEvents
+2F:5489 ShizukanaOka_Blocks
+2F:5664 ShizukanaOka_Unk
+2F:564B ShizukanaOka_MapScripts
+2F:53E8 ShizukanaOka_MapEvents
+34:402C RouteSilentEastGate_Blocks
+34:4041 RouteSilentEastGate_Unk
+34:4040 RouteSilentEastGate_MapScripts
+34:400B RouteSilentEastGate_MapEvents
+34:4088 PlayerHouse1F_Blocks
+34:40CF PlayerHouse1F_Unk
+34:409C PlayerHouse1F_MapScripts
+34:404D PlayerHouse1F_MapEvents
+34:4177 PlayerHouse2F_Blocks
+34:419D PlayerHouse2F_Unk
+34:418B PlayerHouse2F_MapScripts
+34:413D PlayerHouse2F_MapEvents
+34:4662 SilentPokecenter_Blocks
+34:46BC SilentPokecenter_Unk
+34:4682 SilentPokecenter_MapScripts
+34:460A SilentPokecenter_MapEvents
+34:4825 SilentHillHouse_Blocks
+34:494C SilentHillHouse_Unk
+34:4839 SilentHillHouse_MapScripts
+34:47E0 SilentHillHouse_MapEvents
+34:4B9C SilentHillLab_Blocks
+34:4C48 SilentHillLab_Unk
+34:4BBC SilentHillLab_MapScripts
+34:4AB7 SilentHillLab_MapEvents
+34:5C59 SilentHillLab2_Blocks
+34:5CA1 SilentHillLab2_Unk
+34:5C69 SilentHillLab2_MapScripts
+34:5BF1 SilentHillLab2_MapEvents
+34:6068 Unused13_Blocks
+34:6089 Unused13_Unk
+34:6078 Unused13_MapScripts
+34:6068 Unused13_MapEvents
+36:40B3 SilentHill_Blocks
+36:78D5 SilentHill_Unk
+36:7669 SilentHill_MapScripts
+36:4043 SilentHill_MapEvents
+36:4208 OldCity_Blocks
+36:4000 OldCity_Unk
+36:4370 OldCity_MapScripts
+36:4130 OldCity_MapEvents
+36:4468 West_Blocks
+36:4000 West_Unk
+36:45D0 West_MapScripts
+36:4395 West_MapEvents
+36:468E Haiteku_Blocks
+36:4000 Haiteku_Unk
+36:47F6 Haiteku_MapScripts
+36:45E9 Haiteku_MapEvents
+36:4897 Fonto_Blocks
+36:4000 Fonto_Unk
+36:48F1 Fonto_MapScripts
+36:4827 Fonto_MapEvents
+36:499D Baadon_Blocks
+36:4000 Baadon_Unk
+36:49F7 Baadon_MapScripts
+36:4922 Baadon_MapEvents
+36:4AD0 Newtype_Blocks
+36:4000 Newtype_Unk
+36:4C38 Newtype_MapScripts
+36:4A28 Newtype_MapEvents
+36:4CA9 Sugar_Blocks
+36:4000 Sugar_Unk
+36:4D03 Sugar_MapScripts
+36:4C51 Sugar_MapEvents
+36:4DBE BullForest_Blocks
+36:4000 BullForest_Unk
+36:4F26 BullForest_MapScripts
+36:4D34 BullForest_MapEvents
+36:5033 Stand_Blocks
+36:4000 Stand_Unk
+36:519B Stand_MapScripts
+36:4F4B Stand_MapEvents
+36:52C7 Kanto_Blocks
+36:4000 Kanto_Unk
+36:55F1 Kanto_MapScripts
+36:51C0 Kanto_MapEvents
+36:561B Prince_Blocks
+36:4000 Prince_Unk
+36:5675 Prince_MapScripts
+36:5616 Prince_MapEvents
+36:5693 MtFuji_Blocks
+36:4000 MtFuji_Unk
+36:56ED MtFuji_MapScripts
+36:568E MtFuji_MapEvents
+36:57AA South_Blocks
+36:4000 South_Unk
+36:5912 South_MapScripts
+36:571E South_MapEvents
+36:5983 North_Blocks
+36:4000 North_Unk
+36:59DD North_MapScripts
+36:592B North_MapEvents
+36:5A37 Route1P1_Blocks
+36:7BAD Route1P1_Unk
+36:7B98 Route1P1_MapScripts
+36:5A02 Route1P1_MapEvents
+36:5B20 Route1P2_Blocks
+36:7C7B Route1P2_Unk
+36:7C68 Route1P2_MapScripts
+36:5AE1 Route1P2_MapEvents
+36:5C3D Route2_Blocks
+36:4000 Route2_Unk
+36:5CC4 Route2_MapScripts
+36:5BF7 Route2_MapEvents
+36:5CEE HaitekuWestRoute_Blocks
+36:4000 HaitekuWestRoute_Unk
+36:5DCF HaitekuWestRoute_MapScripts
+36:5CE9 HaitekuWestRoute_MapEvents
+36:5E07 HaitekuWestRouteOcean_Blocks
+36:4000 HaitekuWestRouteOcean_Unk
+36:5F15 HaitekuWestRouteOcean_MapScripts
+36:5DF4 HaitekuWestRouteOcean_MapEvents
+36:5F46 FontoRoute1_Blocks
+36:4000 FontoRoute1_Unk
+36:6081 FontoRoute1_MapScripts
+36:5F3A FontoRoute1_MapEvents
+36:60AB FontoRoute6_Blocks
+36:4000 FontoRoute6_Unk
+36:61E6 FontoRoute6_MapScripts
+36:60A6 FontoRoute6_MapEvents
+36:6210 FontoRoute2_Blocks
+36:4000 FontoRoute2_Unk
+36:62C4 FontoRoute2_MapScripts
+36:620B FontoRoute2_MapEvents
+36:62FC FontoRoute4_Blocks
+36:4000 FontoRoute4_Unk
+36:63B0 FontoRoute4_MapScripts
+36:62E9 FontoRoute4_MapEvents
+36:63DA FontoRoute3_Blocks
+36:4000 FontoRoute3_Unk
+36:64BB FontoRoute3_MapScripts
+36:63D5 FontoRoute3_MapEvents
+36:64F3 BaadonRoute1_Blocks
+36:4000 BaadonRoute1_Unk
+36:6601 BaadonRoute1_MapScripts
+36:64E0 BaadonRoute1_MapEvents
+36:662B BaadonRoute2_Blocks
+36:4000 BaadonRoute2_Unk
+36:67ED BaadonRoute2_MapScripts
+36:6626 BaadonRoute2_MapEvents
+36:6825 BaadonRoute3_Blocks
+36:4000 BaadonRoute3_Unk
+36:68D9 BaadonRoute3_MapScripts
+36:6812 BaadonRoute3_MapEvents
+36:6934 Route15_Blocks
+36:4000 Route15_Unk
+36:69BB Route15_MapScripts
+36:68FE Route15_MapEvents
+36:69E5 NewtypeRoute_Blocks
+36:4000 NewtypeRoute_Unk
+36:6A6C NewtypeRoute_MapScripts
+36:69E0 NewtypeRoute_MapEvents
+36:6AAB Route18_Blocks
+36:4000 Route18_Unk
+36:6C6D Route18_MapScripts
+36:6A91 Route18_MapEvents
+36:6CAC BullForestRoute1_Blocks
+36:4000 BullForestRoute1_Unk
+36:6D8D BullForestRoute1_MapScripts
+36:6C92 BullForestRoute1_MapEvents
+36:6DC5 SugarRoute_Blocks
+36:4000 SugarRoute_Unk
+36:6ED3 SugarRoute_MapScripts
+36:6DB2 SugarRoute_MapEvents
+36:6F0B BullForestRoute2_Blocks
+36:4000 BullForestRoute2_Unk
+36:7019 BullForestRoute2_MapScripts
+36:6EF8 BullForestRoute2_MapEvents
+36:7051 StandRoute_Blocks
+36:4000 StandRoute_Unk
+36:715F StandRoute_MapScripts
+36:703E StandRoute_MapEvents
+36:7197 KantoEastRoute_Blocks
+36:4000 KantoEastRoute_Unk
+36:724B KantoEastRoute_MapScripts
+36:7184 KantoEastRoute_MapEvents
+36:727C RouteSilentEast_Blocks
+36:4000 RouteSilentEast_Unk
+36:738A RouteSilentEast_MapScripts
+36:7270 RouteSilentEast_MapEvents
+36:73B4 PrinceRoute_Blocks
+36:4000 PrinceRoute_Unk
+36:73E6 PrinceRoute_MapScripts
+36:73AF PrinceRoute_MapEvents
+36:7410 MtFujiRoute_Blocks
+36:4000 MtFujiRoute_Unk
+36:7442 MtFujiRoute_MapScripts
+36:740B MtFujiRoute_MapEvents
+36:747A FontoRoute5_Blocks
+36:4000 FontoRoute5_Unk
+36:752E FontoRoute5_MapScripts
+36:7467 FontoRoute5_MapEvents
+36:7558 BullForestRoute3_Blocks
+36:4000 BullForestRoute3_Unk
+36:7666 BullForestRoute3_MapScripts
+36:7553 BullForestRoute3_MapEvents
diff --git a/wram.asm b/wram.asm
index e993003..833ae49 100644
--- a/wram.asm
+++ b/wram.asm
@@ -116,9 +116,8 @@ wMapBufferEnd:: ; c600
 
 UNION
 
-wOverworldMap:: ; c600
-    ds $514 ; TODO: constantify this
-wOverworldMapEnd:: ; cb14
+wOverworldMapBlocks:: ds 1300 ; c600
+wOverworldMapBlocksEnd:: ; cb14
 
 NEXTU