Add maps and map attributes.

4 files changed, 370 insertions, 363 deletions

diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm
index 5aa14f97..6dbb7aa7 100644
--- a/constants/landmark_constants.asm
+++ b/constants/landmark_constants.asm
@@ -30,73 +30,72 @@
 	const ROUTE_39          ; 1a
 	const OLIVINE_CITY      ; 1b
 	const LIGHTHOUSE        ; 1c
-	const BATTLE_TOWER      ; 1d
-	const ROUTE_40          ; 1e
-	const WHIRL_ISLANDS     ; 1f
-	const ROUTE_41          ; 20
-	const CIANWOOD_CITY     ; 21
-	const ROUTE_42          ; 22
-	const MT_MORTAR         ; 23
-	const MAHOGANY_TOWN     ; 24
-	const ROUTE_43          ; 25
-	const LAKE_OF_RAGE      ; 26
-	const ROUTE_44          ; 27
-	const ICE_PATH          ; 28
-	const BLACKTHORN_CITY   ; 29
-	const DRAGONS_DEN       ; 2a
-	const ROUTE_45          ; 2b
-	const DARK_CAVE         ; 2c
-	const ROUTE_46          ; 2d
-	const SILVER_CAVE       ; 2e
+	const ROUTE_40          ; 1d
+	const WHIRL_ISLANDS     ; 1e
+	const ROUTE_41          ; 1f
+	const CIANWOOD_CITY     ; 20
+	const ROUTE_42          ; 21
+	const MT_MORTAR         ; 22
+	const MAHOGANY_TOWN     ; 23
+	const ROUTE_43          ; 24
+	const LAKE_OF_RAGE      ; 25
+	const ROUTE_44          ; 26
+	const ICE_PATH          ; 27
+	const BLACKTHORN_CITY   ; 28
+	const DRAGONS_DEN       ; 29
+	const ROUTE_45          ; 2a
+	const DARK_CAVE         ; 2b
+	const ROUTE_46          ; 2c
+	const SILVER_CAVE       ; 2d
 
 KANTO_LANDMARK EQU const_value
 
-	const PALLET_TOWN       ; 2f
-	const ROUTE_1           ; 30
-	const VIRIDIAN_CITY     ; 31
-	const ROUTE_2           ; 32
-	const PEWTER_CITY       ; 33
-	const ROUTE_3           ; 34
-	const MT_MOON           ; 35
-	const ROUTE_4           ; 36
-	const CERULEAN_CITY     ; 37
-	const ROUTE_24          ; 38
-	const ROUTE_25          ; 39
-	const ROUTE_5           ; 3a
-	const UNDERGROUND       ; 3b
-	const ROUTE_6           ; 3c
-	const VERMILION_CITY    ; 3d
-	const DIGLETTS_CAVE     ; 3e
-	const ROUTE_7           ; 3f
-	const ROUTE_8           ; 40
-	const ROUTE_9           ; 41
-	const ROCK_TUNNEL       ; 42
-	const ROUTE_10          ; 43
-	const POWER_PLANT       ; 44
-	const LAVENDER_TOWN     ; 45
-	const LAV_RADIO_TOWER   ; 46
-	const CELADON_CITY      ; 47
-	const SAFFRON_CITY      ; 48
-	const ROUTE_11          ; 49
-	const ROUTE_12          ; 4a
-	const ROUTE_13          ; 4b
-	const ROUTE_14          ; 4c
-	const ROUTE_15          ; 4d
-	const ROUTE_16          ; 4e
-	const ROUTE_17          ; 4f
-	const ROUTE_18          ; 50
-	const FUCHSIA_CITY      ; 51
-	const ROUTE_19          ; 52
-	const ROUTE_20          ; 53
-	const SEAFOAM_ISLANDS   ; 54
-	const CINNABAR_ISLAND   ; 55
-	const ROUTE_21          ; 56
-	const ROUTE_22          ; 57
-	const VICTORY_ROAD      ; 58
-	const ROUTE_23          ; 59
-	const INDIGO_PLATEAU    ; 5a
-	const ROUTE_26          ; 5b
-	const ROUTE_27          ; 5c
-	const TOHJO_FALLS       ; 5d
-	const ROUTE_28          ; 5e
-	const FAST_SHIP         ; 5f
+	const PALLET_TOWN       ; 2e
+	const ROUTE_1           ; 2f
+	const VIRIDIAN_CITY     ; 30
+	const ROUTE_2           ; 31
+	const PEWTER_CITY       ; 32
+	const ROUTE_3           ; 33
+	const MT_MOON           ; 34
+	const ROUTE_4           ; 35
+	const CERULEAN_CITY     ; 36
+	const ROUTE_24          ; 37
+	const ROUTE_25          ; 38
+	const ROUTE_5           ; 39
+	const UNDERGROUND_PATH  ; 3a
+	const ROUTE_6           ; 3b
+	const VERMILION_CITY    ; 3c
+	const DIGLETTS_CAVE     ; 3d
+	const ROUTE_7           ; 3e
+	const ROUTE_8           ; 3f
+	const ROUTE_9           ; 40
+	const ROCK_TUNNEL       ; 41
+	const ROUTE_10          ; 42
+	const POWER_PLANT       ; 43
+	const LAVENDER_TOWN     ; 44
+	const LAV_RADIO_TOWER   ; 45
+	const CELADON_CITY      ; 46
+	const SAFFRON_CITY      ; 47
+	const ROUTE_11          ; 48
+	const ROUTE_12          ; 49
+	const ROUTE_13          ; 4a
+	const ROUTE_14          ; 4b
+	const ROUTE_15          ; 4c
+	const ROUTE_16          ; 4d
+	const ROUTE_17          ; 4e
+	const ROUTE_18          ; 4f
+	const FUCHSIA_CITY      ; 50
+	const ROUTE_19          ; 51
+	const ROUTE_20          ; 52
+	const SEAFOAM_ISLANDS   ; 53
+	const CINNABAR_ISLAND   ; 54
+	const ROUTE_21          ; 55
+	const ROUTE_22          ; 56
+	const VICTORY_ROAD      ; 57
+	const ROUTE_23          ; 58
+	const INDIGO_PLATEAU    ; 59
+	const ROUTE_26          ; 5a
+	const ROUTE_27          ; 5b
+	const TOHJO_FALLS       ; 5c
+	const ROUTE_28          ; 5d
+	const FAST_SHIP         ; 5e
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 62915e7c..8d9762d9 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -30,446 +30,446 @@ ENDM
 
 	newgroup                                                    ;  1
 
-	map_const OLIVINE_POKECENTER_1F,                       4,  5 ;  1
-	map_const OLIVINE_GYM,                                 8,  5 ;  2
+	map_const OLIVINE_POKECENTER_1F,                       5,  4 ;  1
+	map_const OLIVINE_GYM,                                 5,  8 ;  2
 	map_const OLIVINE_TIMS_HOUSE,                          4,  4 ;  3
 	map_const OLIVINE_HOUSE_BETA,                          4,  4 ;  4
 	map_const OLIVINE_PUNISHMENT_SPEECH_HOUSE,             4,  4 ;  5
 	map_const OLIVINE_GOOD_ROD_HOUSE,                      4,  4 ;  6
 	map_const OLIVINE_CAFE,                                4,  4 ;  7
-	map_const OLIVINE_MART,                                4,  6 ;  8
-	map_const ROUTE_38_ECRUTEAK_GATE,                      4,  5 ;  9
+	map_const OLIVINE_MART,                                6,  4 ;  8
+	map_const ROUTE_38_ECRUTEAK_GATE,                      5,  4 ;  9
 	map_const ROUTE_39_BARN,                               4,  4 ; 10
 	map_const ROUTE_39_FARMHOUSE,                          4,  4 ; 11
-	map_const ROUTE_38,                                    9, 20 ; 12
-	map_const ROUTE_39,                                   18, 10 ; 13
-	map_const OLIVINE_CITY,                               18, 20 ; 14
+	map_const ROUTE_38,                                   20,  9 ; 12
+	map_const ROUTE_39,                                   10, 18 ; 13
+	map_const OLIVINE_CITY,                               20, 18 ; 14
 
 	newgroup                                                    ;  2
 
 	map_const MAHOGANY_RED_GYARADOS_SPEECH_HOUSE,          4,  4 ;  1
-	map_const MAHOGANY_GYM,                                9,  5 ;  2
-	map_const MAHOGANY_POKECENTER_1F,                      4,  5 ;  3
-	map_const ROUTE_42_ECRUTEAK_GATE,                      4,  5 ;  4
-	map_const ROUTE_42,                                    9, 30 ;  5
-	map_const ROUTE_44,                                    9, 30 ;  6
-	map_const MAHOGANY_TOWN,                               9, 10 ;  7
+	map_const MAHOGANY_GYM,                                5,  9 ;  2
+	map_const MAHOGANY_POKECENTER_1F,                      5,  4 ;  3
+	map_const ROUTE_42_ECRUTEAK_GATE,                      5,  4 ;  4
+	map_const ROUTE_42,                                   30,  9 ;  5
+	map_const ROUTE_44,                                   30,  9 ;  6
+	map_const MAHOGANY_TOWN,                              10,  9 ;  7
 
 	newgroup                                                    ;  3
 
-	map_const SPROUT_TOWER_1F,                             8, 10 ;  1
-	map_const SPROUT_TOWER_2F,                             8, 10 ;  2
-	map_const SPROUT_TOWER_3F,                             8, 10 ;  3
-	map_const TIN_TOWER_1F,                                9, 10 ;  4
-	map_const TIN_TOWER_2F,                                9, 10 ;  5
-	map_const TIN_TOWER_3F,                                9, 10 ;  6
-	map_const TIN_TOWER_4F,                                9, 10 ;  7
-	map_const TIN_TOWER_5F,                                9, 10 ;  8
-	map_const TIN_TOWER_6F,                                9, 10 ;  9
-	map_const TIN_TOWER_7F,                                9, 10 ; 10
-	map_const TIN_TOWER_8F,                                9, 10 ; 11
-	map_const TIN_TOWER_9F,                                9, 10 ; 12
-	map_const BURNED_TOWER_1F,                             9, 10 ; 13
-	map_const BURNED_TOWER_B1F,                            9, 10 ; 14
-	map_const NATIONAL_PARK,                              27, 20 ; 15
-	map_const NATIONAL_PARK_BUG_CONTEST,                  27, 20 ; 16
-	map_const RADIO_TOWER_1F,                              4,  9 ; 17
-	map_const RADIO_TOWER_2F,                              4,  9 ; 18
-	map_const RADIO_TOWER_3F,                              4,  9 ; 19
-	map_const RADIO_TOWER_4F,                              4,  9 ; 20
-	map_const RADIO_TOWER_5F,                              4,  9 ; 21
-	map_const RUINS_OF_ALPH_OUTSIDE,                      18, 10 ; 22
-	map_const RUINS_OF_ALPH_HO_OH_CHAMBER,                 5,  4 ; 23
-	map_const RUINS_OF_ALPH_KABUTO_CHAMBER,                5,  4 ; 24
-	map_const RUINS_OF_ALPH_OMANYTE_CHAMBER,               5,  4 ; 25
-	map_const RUINS_OF_ALPH_AERODACTYL_CHAMBER,            5,  4 ; 26
-	map_const RUINS_OF_ALPH_INNER_CHAMBER,                14, 10 ; 27
+	map_const SPROUT_TOWER_1F,                            10,  8 ;  1
+	map_const SPROUT_TOWER_2F,                            10,  8 ;  2
+	map_const SPROUT_TOWER_3F,                            10,  8 ;  3
+	map_const TIN_TOWER_1F,                               10,  9 ;  4
+	map_const TIN_TOWER_2F,                               10,  9 ;  5
+	map_const TIN_TOWER_3F,                               10,  9 ;  6
+	map_const TIN_TOWER_4F,                               10,  9 ;  7
+	map_const TIN_TOWER_5F,                               10,  9 ;  8
+	map_const TIN_TOWER_6F,                               10,  9 ;  9
+	map_const TIN_TOWER_7F,                               10,  9 ; 10
+	map_const TIN_TOWER_8F,                               10,  9 ; 11
+	map_const TIN_TOWER_9F,                               10,  9 ; 12
+	map_const BURNED_TOWER_1F,                            10,  9 ; 13
+	map_const BURNED_TOWER_B1F,                           10,  9 ; 14
+	map_const NATIONAL_PARK,                              20, 27 ; 15
+	map_const NATIONAL_PARK_BUG_CONTEST,                  20, 27 ; 16
+	map_const RADIO_TOWER_1F,                              9,  4 ; 17
+	map_const RADIO_TOWER_2F,                              9,  4 ; 18
+	map_const RADIO_TOWER_3F,                              9,  4 ; 19
+	map_const RADIO_TOWER_4F,                              9,  4 ; 20
+	map_const RADIO_TOWER_5F,                              9,  4 ; 21
+	map_const RUINS_OF_ALPH_OUTSIDE,                      10, 18 ; 22
+	map_const RUINS_OF_ALPH_HO_OH_CHAMBER,                 4,  5 ; 23
+	map_const RUINS_OF_ALPH_KABUTO_CHAMBER,                4,  5 ; 24
+	map_const RUINS_OF_ALPH_OMANYTE_CHAMBER,               4,  5 ; 25
+	map_const RUINS_OF_ALPH_AERODACTYL_CHAMBER,            4,  5 ; 26
+	map_const RUINS_OF_ALPH_INNER_CHAMBER,                10, 14 ; 27
 	map_const RUINS_OF_ALPH_RESEARCH_CENTER,               4,  4 ; 28
-	map_const UNION_CAVE_1F,                              18, 10 ; 37
-	map_const UNION_CAVE_B1F,                             18, 10 ; 38
-	map_const UNION_CAVE_B2F,                             18, 10 ; 39
-	map_const SLOWPOKE_WELL_B1F,                           9, 10 ; 40
-	map_const SLOWPOKE_WELL_B2F,                           9, 10 ; 41
-	map_const OLIVINE_LIGHTHOUSE_1F,                       9, 10 ; 42
-	map_const OLIVINE_LIGHTHOUSE_2F,                       9, 10 ; 43
-	map_const OLIVINE_LIGHTHOUSE_3F,                       9, 10 ; 44
-	map_const OLIVINE_LIGHTHOUSE_4F,                       9, 10 ; 45
-	map_const OLIVINE_LIGHTHOUSE_5F,                       9, 10 ; 46
-	map_const OLIVINE_LIGHTHOUSE_6F,                       9, 10 ; 47
+	map_const UNION_CAVE_1F,                              10, 18 ; 37
+	map_const UNION_CAVE_B1F,                             10, 18 ; 38
+	map_const UNION_CAVE_B2F,                             10, 18 ; 39
+	map_const SLOWPOKE_WELL_B1F,                          10,  9 ; 40
+	map_const SLOWPOKE_WELL_B2F,                          10,  9 ; 41
+	map_const OLIVINE_LIGHTHOUSE_1F,                      10,  9 ; 42
+	map_const OLIVINE_LIGHTHOUSE_2F,                      10,  9 ; 43
+	map_const OLIVINE_LIGHTHOUSE_3F,                      10,  9 ; 44
+	map_const OLIVINE_LIGHTHOUSE_4F,                      10,  9 ; 45
+	map_const OLIVINE_LIGHTHOUSE_5F,                      10,  9 ; 46
+	map_const OLIVINE_LIGHTHOUSE_6F,                      10,  9 ; 47
 	map_const MAHOGANY_MART_1F,                            4,  4 ; 48
-	map_const TEAM_ROCKET_BASE_B1F,                        9, 15 ; 49
-	map_const TEAM_ROCKET_BASE_B2F,                        9, 15 ; 50
-	map_const TEAM_ROCKET_BASE_B3F,                        9, 15 ; 51
-	map_const ILEX_FOREST,                                27, 15 ; 52
-	map_const GOLDENROD_UNDERGROUND,                      18, 15 ; 53
-	map_const GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES,18, 15 ; 54
-	map_const GOLDENROD_DEPT_STORE_B1F,                    9, 10 ; 55
-	map_const GOLDENROD_UNDERGROUND_WAREHOUSE,             9, 10 ; 56
-	map_const MOUNT_MORTAR_1F_OUTSIDE,                    18, 20 ; 57
-	map_const MOUNT_MORTAR_1F_INSIDE,                     27, 20 ; 58
-	map_const MOUNT_MORTAR_2F_INSIDE,                     18, 20 ; 59
-	map_const MOUNT_MORTAR_B1F,                           18, 20 ; 60
-	map_const ICE_PATH_1F,                                18, 20 ; 61
-	map_const ICE_PATH_B1F,                               18, 10 ; 62
-	map_const ICE_PATH_B2F_MAHOGANY_SIDE,                  9, 10 ; 63
-	map_const ICE_PATH_B2F_BLACKTHORN_SIDE,                9,  5 ; 64
-	map_const ICE_PATH_B3F,                                9, 10 ; 65
-	map_const WHIRL_ISLAND_NW,                             9,  5 ; 66
-	map_const WHIRL_ISLAND_NE,                             9, 10 ; 67
-	map_const WHIRL_ISLAND_SW,                             9, 10 ; 68
-	map_const WHIRL_ISLAND_CAVE,                           9,  5 ; 69
-	map_const WHIRL_ISLAND_SE,                             9,  5 ; 70
-	map_const WHIRL_ISLAND_B1F,                           18, 20 ; 71
-	map_const WHIRL_ISLAND_B2F,                           18, 10 ; 72
-	map_const WHIRL_ISLAND_LUGIA_CHAMBER,                  9, 10 ; 73
-	map_const SILVER_CAVE_ROOM_1,                         18, 10 ; 74
-	map_const SILVER_CAVE_ROOM_2,                         18, 15 ; 75
-	map_const SILVER_CAVE_ROOM_3,                         18, 10 ; 76
-	map_const SILVER_CAVE_ITEM_ROOMS,                      9, 10 ; 77
-	map_const DARK_CAVE_VIOLET_ENTRANCE,                  18, 20 ; 78
-	map_const DARK_CAVE_BLACKTHORN_ENTRANCE,              18, 15 ; 79
-	map_const DRAGONS_DEN_1F,                              9,  5 ; 80
-	map_const DRAGONS_DEN_B1F,                            18, 20 ; 81
-	map_const TOHJO_FALLS,                                 9, 15 ; 83
-	map_const DIGLETTS_CAVE,                              18, 10 ; 84
-	map_const MOUNT_MOON,                                  9, 15 ; 85
-	map_const UNDERGROUND_PATH,                           14,  3 ; 86
-	map_const ROCK_TUNNEL_1F,                             18, 15 ; 87
-	map_const ROCK_TUNNEL_B1F,                            18, 15 ; 88
-	map_const SAFARI_ZONE_FUCHSIA_GATE_BETA,               4,  5 ; 89
-	map_const SAFARI_ZONE_BETA,                           18, 10 ; 90
-	map_const VICTORY_ROAD,                               36, 10 ; 91
+	map_const TEAM_ROCKET_BASE_B1F,                       15,  9 ; 49
+	map_const TEAM_ROCKET_BASE_B2F,                       15,  9 ; 50
+	map_const TEAM_ROCKET_BASE_B3F,                       15,  9 ; 51
+	map_const ILEX_FOREST,                                15, 27 ; 52
+	map_const GOLDENROD_UNDERGROUND,                      15, 18 ; 53
+	map_const GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES,15, 18 ; 54
+	map_const GOLDENROD_DEPT_STORE_B1F,                   10,  9 ; 55
+	map_const GOLDENROD_UNDERGROUND_WAREHOUSE,            10,  9 ; 56
+	map_const MOUNT_MORTAR_1F_OUTSIDE,                    20, 18 ; 57
+	map_const MOUNT_MORTAR_1F_INSIDE,                     20, 27 ; 58
+	map_const MOUNT_MORTAR_2F_INSIDE,                     20, 18 ; 59
+	map_const MOUNT_MORTAR_B1F,                           20, 18 ; 60
+	map_const ICE_PATH_1F,                                20, 18 ; 61
+	map_const ICE_PATH_B1F,                               10, 18 ; 62
+	map_const ICE_PATH_B2F_MAHOGANY_SIDE,                 10,  9 ; 63
+	map_const ICE_PATH_B2F_BLACKTHORN_SIDE,                5,  9 ; 64
+	map_const ICE_PATH_B3F,                               10,  9 ; 65
+	map_const WHIRL_ISLAND_NW,                             5,  9 ; 66
+	map_const WHIRL_ISLAND_NE,                            10,  9 ; 67
+	map_const WHIRL_ISLAND_SW,                            10,  9 ; 68
+	map_const WHIRL_ISLAND_CAVE,                           5,  9 ; 69
+	map_const WHIRL_ISLAND_SE,                             5,  9 ; 70
+	map_const WHIRL_ISLAND_B1F,                           20, 18 ; 71
+	map_const WHIRL_ISLAND_B2F,                           10, 18 ; 72
+	map_const WHIRL_ISLAND_LUGIA_CHAMBER,                 10,  9 ; 73
+	map_const SILVER_CAVE_ROOM_1,                         10, 18 ; 74
+	map_const SILVER_CAVE_ROOM_2,                         15, 18 ; 75
+	map_const SILVER_CAVE_ROOM_3,                         10, 18 ; 76
+	map_const SILVER_CAVE_ITEM_ROOMS,                     10,  9 ; 77
+	map_const DARK_CAVE_VIOLET_ENTRANCE,                  20, 18 ; 78
+	map_const DARK_CAVE_BLACKTHORN_ENTRANCE,              15, 18 ; 79
+	map_const DRAGONS_DEN_1F,                              5,  9 ; 80
+	map_const DRAGONS_DEN_B1F,                            20, 18 ; 81
+	map_const TOHJO_FALLS,                                15,  9 ; 83
+	map_const DIGLETTS_CAVE,                              10, 18 ; 84
+	map_const MOUNT_MOON,                                 15,  9 ; 85
+	map_const UNDERGROUND_PATH,                            3, 14 ; 86
+	map_const ROCK_TUNNEL_1F,                             15, 18 ; 87
+	map_const ROCK_TUNNEL_B1F,                            15, 18 ; 88
+	map_const SAFARI_ZONE_FUCHSIA_GATE_BETA,               5,  4 ; 89
+	map_const SAFARI_ZONE_BETA,                           10, 18 ; 90
+	map_const VICTORY_ROAD,                               10, 36 ; 91
 
 	newgroup                                                    ;  4
 
-	map_const ECRUTEAK_TIN_TOWER_ENTRANCE,                 9, 10 ;  1
+	map_const ECRUTEAK_TIN_TOWER_ENTRANCE,                10,  9 ;  1
 	map_const WISE_TRIOS_ROOM,                             4,  4 ;  2
-	map_const ECRUTEAK_POKECENTER_1F,                      4,  5 ;  3
+	map_const ECRUTEAK_POKECENTER_1F,                      5,  4 ;  3
 	map_const ECRUTEAK_LUGIA_SPEECH_HOUSE,                 4,  4 ;  4
-	map_const DANCE_THEATRE,                               7,  6 ;  5
-	map_const ECRUTEAK_MART,                               4,  6 ;  6
-	map_const ECRUTEAK_GYM,                                9,  5 ;  7
+	map_const DANCE_THEATRE,                               6,  7 ;  5
+	map_const ECRUTEAK_MART,                               6,  4 ;  6
+	map_const ECRUTEAK_GYM,                                5,  9 ;  7
 	map_const ECRUTEAK_ITEMFINDER_HOUSE,                   4,  4 ;  8
-	map_const ECRUTEAK_CITY,                              18, 20 ;  9
+	map_const ECRUTEAK_CITY,                              20, 18 ;  9
 
 	newgroup                                                    ;  5
 
-	map_const BLACKTHORN_GYM_1F,                           9,  5 ;  1
-	map_const BLACKTHORN_GYM_2F,                           9,  5 ;  2
+	map_const BLACKTHORN_GYM_1F,                           5,  9 ;  1
+	map_const BLACKTHORN_GYM_2F,                           5,  9 ;  2
 	map_const BLACKTHORN_DRAGON_SPEECH_HOUSE,              4,  4 ;  3
 	map_const BLACKTHORN_EMYS_HOUSE,                       4,  4 ;  4
-	map_const BLACKTHORN_MART,                             4,  6 ;  5
-	map_const BLACKTHORN_POKECENTER_1F,                    4,  5 ;  6
+	map_const BLACKTHORN_MART,                             6,  4 ;  5
+	map_const BLACKTHORN_POKECENTER_1F,                    5,  4 ;  6
 	map_const MOVE_DELETERS_HOUSE,                         4,  4 ;  7
-	map_const ROUTE_45,                                   45, 10 ;  8
-	map_const ROUTE_46,                                   18, 10 ;  9
-	map_const BLACKTHORN_CITY,                            18, 20 ; 10
+	map_const ROUTE_45,                                   10, 45 ;  8
+	map_const ROUTE_46,                                   10, 18 ;  9
+	map_const BLACKTHORN_CITY,                            20, 18 ; 10
 
 	newgroup                                                    ;  6
 
-	map_const CINNABAR_POKECENTER_1F,                      4,  5 ;  1
-	map_const CINNABAR_POKECENTER_2F_BETA,                 4,  8 ;  2
-	map_const ROUTE_19_FUCHSIA_GATE,                       4,  5 ;  3
-	map_const SEAFOAM_GYM,                                 4,  5 ;  4
-	map_const ROUTE_19,                                   18, 10 ;  5
-	map_const ROUTE_20,                                    9, 30 ;  6
-	map_const ROUTE_21,                                   18, 10 ;  7
-	map_const CINNABAR_ISLAND,                             9, 10 ;  8
+	map_const CINNABAR_POKECENTER_1F,                      5,  4 ;  1
+	map_const CINNABAR_POKECENTER_2F_BETA,                 8,  4 ;  2
+	map_const ROUTE_19_FUCHSIA_GATE,                       5,  4 ;  3
+	map_const SEAFOAM_GYM,                                 5,  4 ;  4
+	map_const ROUTE_19,                                   10, 18 ;  5
+	map_const ROUTE_20,                                   30,  9 ;  6
+	map_const ROUTE_21,                                   10, 18 ;  7
+	map_const CINNABAR_ISLAND,                            10,  9 ;  8
 
 	newgroup                                                    ;  7
 
 	map_const CERULEAN_GYM_BADGE_SPEECH_HOUSE,             4,  4 ;  1
 	map_const CERULEAN_POLICE_STATION,                     4,  4 ;  2
 	map_const CERULEAN_TRADE_SPEECH_HOUSE,                 4,  4 ;  3
-	map_const CERULEAN_POKECENTER_1F,                      4,  5 ;  4
-	map_const CERULEAN_POKECENTER_2F_BETA,                 4,  8 ;  5
-	map_const CERULEAN_GYM,                                8,  5 ;  6
-	map_const CERULEAN_MART,                               4,  6 ;  7
-	map_const ROUTE_10_POKECENTER_1F,                      4,  5 ;  8
-	map_const ROUTE_10_POKECENTER_2F_BETA,                 4,  8 ;  9
-	map_const POWER_PLANT,                                 9, 10 ; 10
+	map_const CERULEAN_POKECENTER_1F,                      5,  4 ;  4
+	map_const CERULEAN_POKECENTER_2F_BETA,                 8,  4 ;  5
+	map_const CERULEAN_GYM,                                5,  8 ;  6
+	map_const CERULEAN_MART,                               6,  4 ;  7
+	map_const ROUTE_10_POKECENTER_1F,                      5,  4 ;  8
+	map_const ROUTE_10_POKECENTER_2F_BETA,                 8,  4 ;  9
+	map_const POWER_PLANT,                                10,  9 ; 10
 	map_const BILLS_HOUSE,                                 4,  4 ; 11
-	map_const ROUTE_4,                                     9, 20 ; 12
-	map_const ROUTE_9,                                     9, 30 ; 13
-	map_const ROUTE_10_NORTH,                              9, 10 ; 14
-	map_const ROUTE_24,                                    9, 10 ; 15
-	map_const ROUTE_25,                                    9, 30 ; 16
-	map_const CERULEAN_CITY,                              18, 20 ; 17
+	map_const ROUTE_4,                                    20,  9 ; 12
+	map_const ROUTE_9,                                    30,  9 ; 13
+	map_const ROUTE_10_NORTH,                             10,  9 ; 14
+	map_const ROUTE_24,                                   10,  9 ; 15
+	map_const ROUTE_25,                                   30,  9 ; 16
+	map_const CERULEAN_CITY,                              20, 18 ; 17
 
 	newgroup                                                    ;  8
 
-	map_const AZALEA_POKECENTER_1F,                        4,  5 ;  1
+	map_const AZALEA_POKECENTER_1F,                        5,  4 ;  1
 	map_const CHARCOAL_KILN,                               4,  4 ;  2
-	map_const AZALEA_MART,                                 4,  6 ;  3
-	map_const KURTS_HOUSE,                                 4,  8 ;  4
-	map_const AZALEA_GYM,                                  8,  5 ;  5
-	map_const ROUTE_33,                                    9, 10 ;  6
-	map_const AZALEA_TOWN,                                 9, 20 ;  7
+	map_const AZALEA_MART,                                 6,  4 ;  3
+	map_const KURTS_HOUSE,                                 8,  4 ;  4
+	map_const AZALEA_GYM,                                  5,  8 ;  5
+	map_const ROUTE_33,                                   10,  9 ;  6
+	map_const AZALEA_TOWN,                                20,  9 ;  7
 
 	newgroup                                                    ;  9
 
 	map_const LAKE_OF_RAGE_HIDDEN_POWER_HOUSE,             4,  4 ;  1
 	map_const LAKE_OF_RAGE_MAGIKARP_HOUSE,                 4,  4 ;  2
-	map_const ROUTE_43_MAHOGANY_GATE,                      4,  5 ;  3
-	map_const ROUTE_43_GATE,                               4,  5 ;  4
-	map_const ROUTE_43,                                   27, 10 ;  5
-	map_const LAKE_OF_RAGE,                               18, 20 ;  6
+	map_const ROUTE_43_MAHOGANY_GATE,                      5,  4 ;  3
+	map_const ROUTE_43_GATE,                               5,  4 ;  4
+	map_const ROUTE_43,                                   10, 27 ;  5
+	map_const LAKE_OF_RAGE,                               20, 18 ;  6
 
 	newgroup                                                    ; 10
 
-	map_const ROUTE_32,                                   45, 10 ;  1
-	map_const ROUTE_35,                                   18, 10 ;  2
-	map_const ROUTE_36,                                    9, 30 ;  3
-	map_const ROUTE_37,                                    9, 10 ;  4
-	map_const VIOLET_CITY,                                18, 20 ;  5
-	map_const VIOLET_MART,                                 4,  6 ;  6
-	map_const VIOLET_GYM,                                  8,  5 ;  7
-	map_const EARLS_POKEMON_ACADEMY,                       8,  4 ;  8
+	map_const ROUTE_32,                                   10, 45 ;  1
+	map_const ROUTE_35,                                   10, 18 ;  2
+	map_const ROUTE_36,                                   30,  9 ;  3
+	map_const ROUTE_37,                                   10,  9 ;  4
+	map_const VIOLET_CITY,                                20, 18 ;  5
+	map_const VIOLET_MART,                                 6,  4 ;  6
+	map_const VIOLET_GYM,                                  5,  8 ;  7
+	map_const EARLS_POKEMON_ACADEMY,                       4,  8 ;  8
 	map_const VIOLET_NICKNAME_SPEECH_HOUSE,                4,  4 ;  9
-	map_const VIOLET_POKECENTER_1F,                        4,  5 ; 10
+	map_const VIOLET_POKECENTER_1F,                        5,  4 ; 10
 	map_const VIOLET_KYLES_HOUSE,                          4,  4 ; 11
-	map_const ROUTE_32_RUINS_OF_ALPH_GATE,                 4,  5 ; 12
-	map_const ROUTE_32_POKECENTER_1F,                      4,  5 ; 13
-	map_const ROUTE_35_GOLDENROD_GATE,                     4,  5 ; 14
+	map_const ROUTE_32_RUINS_OF_ALPH_GATE,                 5,  4 ; 12
+	map_const ROUTE_32_POKECENTER_1F,                      5,  4 ; 13
+	map_const ROUTE_35_GOLDENROD_GATE,                     5,  4 ; 14
 	map_const ROUTE_35_NATIONAL_PARK_GATE,                 4,  4 ; 15
-	map_const ROUTE_36_RUINS_OF_ALPH_GATE,                 4,  5 ; 16
-	map_const ROUTE_36_NATIONAL_PARK_GATE,                 4,  5 ; 17
+	map_const ROUTE_36_RUINS_OF_ALPH_GATE,                 5,  4 ; 16
+	map_const ROUTE_36_NATIONAL_PARK_GATE,                 5,  4 ; 17
 
 	newgroup                                                    ; 11
 
-	map_const ROUTE_34,                                   27, 10 ;  1
-	map_const GOLDENROD_CITY,                             18, 20 ;  2
-	map_const GOLDENROD_GYM,                               9, 10 ;  3
+	map_const ROUTE_34,                                   10, 27 ;  1
+	map_const GOLDENROD_CITY,                             20, 18 ;  2
+	map_const GOLDENROD_GYM,                              10,  9 ;  3
 	map_const GOLDENROD_BIKE_SHOP,                         4,  4 ;  4
 	map_const GOLDENROD_HAPPINESS_RATER,                   4,  4 ;  5
 	map_const BILLS_FAMILYS_HOUSE,                         4,  4 ;  6
-	map_const GOLDENROD_MAGNET_TRAIN_STATION,              9, 10 ;  7
+	map_const GOLDENROD_MAGNET_TRAIN_STATION,             10,  9 ;  7
 	map_const GOLDENROD_FLOWER_SHOP,                       4,  4 ;  8
-	map_const GOLDENROD_POKECENTER_1F,                     4,  5 ;  9
+	map_const GOLDENROD_POKECENTER_1F,                     5,  4 ;  9
 	map_const GOLDENROD_PP_SPEECH_HOUSE,                   4,  4 ; 10
 	map_const GOLDENROD_NAME_RATER,                        4,  4 ; 11
-	map_const GOLDENROD_DEPT_STORE_1F,                     4,  8 ; 12
-	map_const GOLDENROD_DEPT_STORE_2F,                     4,  8 ; 13
-	map_const GOLDENROD_DEPT_STORE_3F,                     4,  8 ; 14
-	map_const GOLDENROD_DEPT_STORE_4F,                     4,  8 ; 15
-	map_const GOLDENROD_DEPT_STORE_5F,                     4,  8 ; 16
-	map_const GOLDENROD_DEPT_STORE_6F,                     4,  8 ; 17
+	map_const GOLDENROD_DEPT_STORE_1F,                     8,  4 ; 12
+	map_const GOLDENROD_DEPT_STORE_2F,                     8,  4 ; 13
+	map_const GOLDENROD_DEPT_STORE_3F,                     8,  4 ; 14
+	map_const GOLDENROD_DEPT_STORE_4F,                     8,  4 ; 15
+	map_const GOLDENROD_DEPT_STORE_5F,                     8,  4 ; 16
+	map_const GOLDENROD_DEPT_STORE_6F,                     8,  4 ; 17
 	map_const GOLDENROD_DEPT_STORE_ELEVATOR,               2,  2 ; 18
-	map_const GOLDENROD_GAME_CORNER,                       7, 10 ; 19
-	map_const ILEX_FOREST_AZALEA_GATE,                     4,  5 ; 20
-	map_const ROUTE_34_ILEX_FOREST_GATE,                   4,  5 ; 21
-	map_const DAY_CARE,                                    4,  5 ; 22
+	map_const GOLDENROD_GAME_CORNER,                      10,  7 ; 19
+	map_const ILEX_FOREST_AZALEA_GATE,                     5,  4 ; 20
+	map_const ROUTE_34_ILEX_FOREST_GATE,                   5,  4 ; 21
+	map_const DAY_CARE,                                    5,  4 ; 22
 
 	newgroup                                                    ; 12
 
-	map_const ROUTE_6,                                     9, 10 ;  1
-	map_const ROUTE_11,                                    9, 20 ;  2
-	map_const VERMILION_CITY,                             18, 20 ;  3
+	map_const ROUTE_6,                                    10,  9 ;  1
+	map_const ROUTE_11,                                   20,  9 ;  2
+	map_const VERMILION_CITY,                             20, 18 ;  3
 	map_const VERMILION_FISHING_SPEECH_HOUSE,              4,  4 ;  4
-	map_const VERMILION_POKECENTER_1F,                     4,  5 ;  5
-	map_const VERMILION_POKECENTER_2F_BETA,                4,  8 ;  6
-	map_const POKEMON_FAN_CLUB,                            4,  5 ;  7
+	map_const VERMILION_POKECENTER_1F,                     5,  4 ;  5
+	map_const VERMILION_POKECENTER_2F_BETA,                8,  4 ;  6
+	map_const POKEMON_FAN_CLUB,                            5,  4 ;  7
 	map_const VERMILION_MAGNET_TRAIN_SPEECH_HOUSE,         4,  4 ;  8
-	map_const VERMILION_MART,                              4,  6 ;  9
+	map_const VERMILION_MART,                              6,  4 ;  9
 	map_const VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE,        4,  4 ; 10
-	map_const VERMILION_GYM,                               9,  5 ; 11
-	map_const ROUTE_6_SAFFRON_GATE,                        4,  5 ; 12
+	map_const VERMILION_GYM,                               5,  9 ; 11
+	map_const ROUTE_6_SAFFRON_GATE,                        5,  4 ; 12
 	map_const ROUTE_6_UNDERGROUND_PATH_ENTRANCE,           4,  4 ; 13
 
 	newgroup                                                    ; 13
 
-	map_const ROUTE_1,                                    18, 10 ;  1
-	map_const PALLET_TOWN,                                 9, 10 ;  2
+	map_const ROUTE_1,                                    10, 18 ;  1
+	map_const PALLET_TOWN,                                10,  9 ;  2
 	map_const REDS_HOUSE_1F,                               4,  4 ;  3
 	map_const REDS_HOUSE_2F,                               4,  4 ;  4
 	map_const BLUES_HOUSE,                                 4,  4 ;  5
-	map_const OAKS_LAB,                                    6,  5 ;  6
+	map_const OAKS_LAB,                                    5,  6 ;  6
 
 	newgroup                                                    ; 14
 
-	map_const ROUTE_3,                                     9, 30 ;  1
-	map_const PEWTER_CITY,                                18, 20 ;  2
+	map_const ROUTE_3,                                    30,  9 ;  1
+	map_const PEWTER_CITY,                                20, 18 ;  2
 	map_const PEWTER_NIDORAN_SPEECH_HOUSE,                 4,  4 ;  3
-	map_const PEWTER_GYM,                                  7,  5 ;  4
-	map_const PEWTER_MART,                                 4,  6 ;  5
-	map_const PEWTER_POKECENTER_1F,                        4,  5 ;  6
-	map_const PEWTER_POKECENTER_2F_BETA,                   4,  8 ;  7
+	map_const PEWTER_GYM,                                  5,  7 ;  4
+	map_const PEWTER_MART,                                 6,  4 ;  5
+	map_const PEWTER_POKECENTER_1F,                        5,  4 ;  6
+	map_const PEWTER_POKECENTER_2F_BETA,                   8,  4 ;  7
 	map_const PEWTER_SNOOZE_SPEECH_HOUSE,                  4,  4 ;  8
 
 	newgroup                                                    ; 15
 
-	map_const OLIVINE_PORT,                               18, 10 ;  1
-	map_const VERMILION_PORT,                             18, 10 ;  2
-	map_const FAST_SHIP_1F,                                9, 16 ;  3
-	map_const FAST_SHIP_CABINS_NNW_NNE_NE,                16,  4 ;  4
-	map_const FAST_SHIP_CABINS_SW_SSW_NW,                 16,  4 ;  5
-	map_const FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN,     17,  5 ;  6
-	map_const FAST_SHIP_B1F,                               8, 16 ;  7
-	map_const OLIVINE_PORT_PASSAGE,                        9, 10 ;  8
-	map_const VERMILION_PORT_PASSAGE,                      9, 10 ;  9
-	map_const MOUNT_MOON_SQUARE,                           9, 15 ; 10
+	map_const OLIVINE_PORT,                               10, 18 ;  1
+	map_const VERMILION_PORT,                             10, 18 ;  2
+	map_const FAST_SHIP_1F,                               16,  9 ;  3
+	map_const FAST_SHIP_CABINS_NNW_NNE_NE,                 4, 16 ;  4
+	map_const FAST_SHIP_CABINS_SW_SSW_NW,                  4, 16 ;  5
+	map_const FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN,      5, 17 ;  6
+	map_const FAST_SHIP_B1F,                              16,  8 ;  7
+	map_const OLIVINE_PORT_PASSAGE,                       10,  9 ;  8
+	map_const VERMILION_PORT_PASSAGE,                     10,  9 ;  9
+	map_const MOUNT_MOON_SQUARE,                          15,  9 ; 10
 	map_const MOUNT_MOON_GIFT_SHOP,                        4,  4 ; 11
-	map_const TIN_TOWER_ROOF,                              9, 10 ; 12
+	map_const TIN_TOWER_ROOF,                             10,  9 ; 12
 
 	newgroup                                                    ; 16
 
-	map_const ROUTE_23,                                    9, 10 ;  1
-	map_const INDIGO_PLATEAU_POKECENTER_1F,                7,  9 ;  2
-	map_const WILLS_ROOM,                                  9,  5 ;  3
-	map_const KOGAS_ROOM,                                  9,  5 ;  4
-	map_const BRUNOS_ROOM,                                 9,  5 ;  5
-	map_const KARENS_ROOM,                                 9,  5 ;  6
-	map_const LANCES_ROOM,                                12,  5 ;  7
-	map_const HALL_OF_FAME,                                7,  5 ;  8
+	map_const ROUTE_23,                                   10,  9 ;  1
+	map_const INDIGO_PLATEAU_POKECENTER_1F,                9,  7 ;  2
+	map_const WILLS_ROOM,                                  5,  9 ;  3
+	map_const KOGAS_ROOM,                                  5,  9 ;  4
+	map_const BRUNOS_ROOM,                                 5,  9 ;  5
+	map_const KARENS_ROOM,                                 5,  9 ;  6
+	map_const LANCES_ROOM,                                 5, 12 ;  7
+	map_const HALL_OF_FAME,                                5,  7 ;  8
 
 	newgroup                                                    ; 17
 
-	map_const ROUTE_13,                                    9, 30 ;  1
-	map_const ROUTE_14,                                   18, 10 ;  2
-	map_const ROUTE_15,                                    9, 20 ;  3
-	map_const ROUTE_18,                                    9, 10 ;  4
-	map_const FUCHSIA_CITY,                               18, 20 ;  5
-	map_const FUCHSIA_MART,                                4,  6 ;  6
+	map_const ROUTE_13,                                   30,  9 ;  1
+	map_const ROUTE_14,                                   10, 18 ;  2
+	map_const ROUTE_15,                                   20,  9 ;  3
+	map_const ROUTE_18,                                   10,  9 ;  4
+	map_const FUCHSIA_CITY,                               20, 18 ;  5
+	map_const FUCHSIA_MART,                                6,  4 ;  6
 	map_const SAFARI_ZONE_MAIN_OFFICE,                     4,  4 ;  7
-	map_const FUCHSIA_GYM,                                 9,  5 ;  8
+	map_const FUCHSIA_GYM,                                 5,  9 ;  8
 	map_const BILLS_BROTHERS_HOUSE,                        4,  4 ;  9
-	map_const FUCHSIA_POKECENTER_1F,                       4,  5 ; 10
-	map_const FUCHSIA_POKECENTER_2F_BETA,                  4,  8 ; 11
-	map_const SAFARI_ZONE_WARDENS_HOME,                    4,  5 ; 12
-	map_const ROUTE_15_FUCHSIA_GATE,                       4,  5 ; 13
+	map_const FUCHSIA_POKECENTER_1F,                       5,  4 ; 10
+	map_const FUCHSIA_POKECENTER_2F_BETA,                  8,  4 ; 11
+	map_const SAFARI_ZONE_WARDENS_HOME,                    5,  4 ; 12
+	map_const ROUTE_15_FUCHSIA_GATE,                       5,  4 ; 13
 
 	newgroup                                                    ; 18
 
-	map_const ROUTE_8,                                     9, 20 ;  1
-	map_const ROUTE_12,                                   27, 10 ;  2
-	map_const ROUTE_10_SOUTH,                              9, 10 ;  3
-	map_const LAVENDER_TOWN,                               9, 10 ;  4
-	map_const LAVENDER_POKECENTER_1F,                      4,  5 ;  5
-	map_const LAVENDER_POKECENTER_2F_BETA,                 4,  8 ;  6
-	map_const MR_FUJIS_HOUSE,                              4,  5 ;  7
+	map_const ROUTE_8,                                    20,  9 ;  1
+	map_const ROUTE_12,                                   10, 27 ;  2
+	map_const ROUTE_10_SOUTH,                             10,  9 ;  3
+	map_const LAVENDER_TOWN,                              10,  9 ;  4
+	map_const LAVENDER_POKECENTER_1F,                      5,  4 ;  5
+	map_const LAVENDER_POKECENTER_2F_BETA,                 8,  4 ;  6
+	map_const MR_FUJIS_HOUSE,                              5,  4 ;  7
 	map_const LAVENDER_SPEECH_HOUSE,                       4,  4 ;  8
 	map_const LAVENDER_NAME_RATER,                         4,  4 ;  9
-	map_const LAVENDER_MART,                               4,  6 ; 10
-	map_const SOUL_HOUSE,                                  4,  5 ; 11
-	map_const LAV_RADIO_TOWER_1F,                          4, 10 ; 12
-	map_const ROUTE_8_SAFFRON_GATE,                        4,  5 ; 13
+	map_const LAVENDER_MART,                               6,  4 ; 10
+	map_const SOUL_HOUSE,                                  5,  4 ; 11
+	map_const LAV_RADIO_TOWER_1F,                         10,  4 ; 12
+	map_const ROUTE_8_SAFFRON_GATE,                        5,  4 ; 13
 	map_const ROUTE_12_SUPER_ROD_HOUSE,                    4,  4 ; 14
 
 	newgroup                                                    ; 19
 
-	map_const ROUTE_28,                                    9, 20 ;  1
-	map_const SILVER_CAVE_OUTSIDE,                        18, 20 ;  2
-	map_const SILVER_CAVE_POKECENTER_1F,                   4,  5 ;  3
+	map_const ROUTE_28,                                   20,  9 ;  1
+	map_const SILVER_CAVE_OUTSIDE,                        20, 18 ;  2
+	map_const SILVER_CAVE_POKECENTER_1F,                   5,  4 ;  3
 	map_const ROUTE_28_STEEL_WING_HOUSE,                   4,  4 ;  4
 
 	newgroup                                                    ; 20
 
-	map_const POKECENTER_2F,                               4,  8 ;  1
-	map_const TRADE_CENTER,                                4,  5 ;  2
-	map_const COLOSSEUM,                                   4,  5 ;  3
-	map_const TIME_CAPSULE,                                4,  5 ;  4
+	map_const POKECENTER_2F,                               8,  4 ;  1
+	map_const TRADE_CENTER,                                5,  4 ;  2
+	map_const COLOSSEUM,                                   5,  4 ;  3
+	map_const TIME_CAPSULE,                                5,  4 ;  4
 
 	newgroup                                                    ; 21
 
-	map_const ROUTE_7,                                     9, 10 ;  1
-	map_const ROUTE_16,                                    9, 10 ;  2
-	map_const ROUTE_17,                                   45, 10 ;  3
-	map_const CELADON_CITY,                               18, 20 ;  4
-	map_const CELADON_DEPT_STORE_1F,                       4,  8 ;  5
-	map_const CELADON_DEPT_STORE_2F,                       4,  8 ;  6
-	map_const CELADON_DEPT_STORE_3F,                       4,  8 ;  7
-	map_const CELADON_DEPT_STORE_4F,                       4,  8 ;  8
-	map_const CELADON_DEPT_STORE_5F,                       4,  8 ;  9
-	map_const CELADON_DEPT_STORE_6F,                       4,  8 ; 10
+	map_const ROUTE_7,                                    10,  9 ;  1
+	map_const ROUTE_16,                                   10,  9 ;  2
+	map_const ROUTE_17,                                   10, 45 ;  3
+	map_const CELADON_CITY,                               20, 18 ;  4
+	map_const CELADON_DEPT_STORE_1F,                       8,  4 ;  5
+	map_const CELADON_DEPT_STORE_2F,                       8,  4 ;  6
+	map_const CELADON_DEPT_STORE_3F,                       8,  4 ;  7
+	map_const CELADON_DEPT_STORE_4F,                       8,  4 ;  8
+	map_const CELADON_DEPT_STORE_5F,                       8,  4 ;  9
+	map_const CELADON_DEPT_STORE_6F,                       8,  4 ; 10
 	map_const CELADON_DEPT_STORE_ELEVATOR,                 2,  2 ; 11
-	map_const CELADON_MANSION_1F,                          5,  4 ; 12
-	map_const CELADON_MANSION_2F,                          5,  4 ; 13
-	map_const CELADON_MANSION_3F,                          5,  4 ; 14
-	map_const CELADON_MANSION_ROOF,                        5,  4 ; 15
+	map_const CELADON_MANSION_1F,                          4,  5 ; 12
+	map_const CELADON_MANSION_2F,                          4,  5 ; 13
+	map_const CELADON_MANSION_3F,                          4,  5 ; 14
+	map_const CELADON_MANSION_ROOF,                        4,  5 ; 15
 	map_const CELADON_MANSION_ROOF_HOUSE,                  4,  4 ; 16
-	map_const CELADON_POKECENTER_1F,                       4,  5 ; 17
-	map_const CELADON_POKECENTER_2F_BETA,                  4,  8 ; 18
-	map_const CELADON_GAME_CORNER,                         7, 10 ; 19
+	map_const CELADON_POKECENTER_1F,                       5,  4 ; 17
+	map_const CELADON_POKECENTER_2F_BETA,                  8,  4 ; 18
+	map_const CELADON_GAME_CORNER,                        10,  7 ; 19
 	map_const CELADON_GAME_CORNER_PRIZE_ROOM,              3,  3 ; 20
-	map_const CELADON_GYM,                                 9,  5 ; 21
-	map_const CELADON_CAFE,                                4,  6 ; 22
+	map_const CELADON_GYM,                                 5,  9 ; 21
+	map_const CELADON_CAFE,                                6,  4 ; 22
 	map_const ROUTE_16_FUCHSIA_SPEECH_HOUSE,               4,  4 ; 23
-	map_const ROUTE_16_GATE,                               4,  5 ; 24
-	map_const ROUTE_7_SAFFRON_GATE,                        4,  5 ; 25
-	map_const ROUTE_17_ROUTE_18_GATE,                      4,  5 ; 26
+	map_const ROUTE_16_GATE,                               5,  4 ; 24
+	map_const ROUTE_7_SAFFRON_GATE,                        5,  4 ; 25
+	map_const ROUTE_17_ROUTE_18_GATE,                      5,  4 ; 26
 
 	newgroup                                                    ; 22
 
-	map_const ROUTE_40,                                   18, 10 ;  1
-	map_const ROUTE_41,                                   27, 25 ;  2
-	map_const CIANWOOD_CITY,                              27, 15 ;  3
+	map_const ROUTE_40,                                   10, 18 ;  1
+	map_const ROUTE_41,                                   25, 27 ;  2
+	map_const CIANWOOD_CITY,                              15, 27 ;  3
 	map_const MANIAS_HOUSE,                                4,  4 ;  4
-	map_const CIANWOOD_GYM,                                9,  5 ;  5
-	map_const CIANWOOD_POKECENTER_1F,                      4,  5 ;  6
+	map_const CIANWOOD_GYM,                                5,  9 ;  5
+	map_const CIANWOOD_POKECENTER_1F,                      5,  4 ;  6
 	map_const CIANWOOD_PHARMACY,                           4,  4 ;  7
 	map_const CIANWOOD_PHOTO_STUDIO,                       4,  4 ;  8
 	map_const CIANWOOD_LUGIA_SPEECH_HOUSE,                 4,  4 ;  9
 
 	newgroup                                                    ; 23
 
-	map_const ROUTE_2,                                    27, 10 ;  1
-	map_const ROUTE_22,                                    9, 20 ;  2
-	map_const VIRIDIAN_CITY,                              18, 20 ;  3
-	map_const VIRIDIAN_GYM,                                9,  5 ;  4
+	map_const ROUTE_2,                                    10, 27 ;  1
+	map_const ROUTE_22,                                   20,  9 ;  2
+	map_const VIRIDIAN_CITY,                              20, 18 ;  3
+	map_const VIRIDIAN_GYM,                                5,  9 ;  4
 	map_const VIRIDIAN_NICKNAME_SPEECH_HOUSE,              4,  4 ;  5
-	map_const TRAINER_HOUSE_1F,                            7,  5 ;  6
-	map_const TRAINER_HOUSE_B1F,                           8,  5 ;  7
-	map_const VIRIDIAN_MART,                               4,  6 ;  8
-	map_const VIRIDIAN_POKECENTER_1F,                      4,  5 ;  9
-	map_const VIRIDIAN_POKECENTER_2F_BETA,                 4,  8 ; 10
+	map_const TRAINER_HOUSE_1F,                            5,  7 ;  6
+	map_const TRAINER_HOUSE_B1F,                           5,  8 ;  7
+	map_const VIRIDIAN_MART,                               6,  4 ;  8
+	map_const VIRIDIAN_POKECENTER_1F,                      5,  4 ;  9
+	map_const VIRIDIAN_POKECENTER_2F_BETA,                 8,  4 ; 10
 	map_const ROUTE_2_NUGGET_HOUSE,                        4,  4 ; 11
-	map_const ROUTE_2_GATE,                                4,  5 ; 12
-	map_const VICTORY_ROAD_GATE,                           9, 10 ; 13
+	map_const ROUTE_2_GATE,                                5,  4 ; 12
+	map_const VICTORY_ROAD_GATE,                          10,  9 ; 13
 
 	newgroup                                                    ; 24
 
-	map_const ROUTE_26,                                   54, 10 ;  1
-	map_const ROUTE_27,                                    9, 40 ;  2
-	map_const ROUTE_29,                                    9, 30 ;  3
-	map_const NEW_BARK_TOWN,                               9, 10 ;  4
-	map_const ELMS_LAB,                                    6,  5 ;  5
-	map_const PLAYERS_HOUSE_1F,                            4,  5 ;  6
-	map_const PLAYERS_HOUSE_2F,                            3,  4 ;  7
+	map_const ROUTE_26,                                   10, 54 ;  1
+	map_const ROUTE_27,                                   40,  9 ;  2
+	map_const ROUTE_29,                                   30,  9 ;  3
+	map_const NEW_BARK_TOWN,                              10,  9 ;  4
+	map_const ELMS_LAB,                                    5,  6 ;  5
+	map_const PLAYERS_HOUSE_1F,                            5,  4 ;  6
+	map_const PLAYERS_HOUSE_2F,                            4,  3 ;  7
 	map_const PLAYERS_NEIGHBORS_HOUSE,                     4,  4 ;  8
 	map_const ELMS_HOUSE,                                  4,  4 ;  9
 	map_const ROUTE_26_HEAL_HOUSE,                         4,  4 ; 10
 	map_const DAY_OF_WEEK_SIBLINGS_HOUSE,                  4,  4 ; 11
 	map_const ROUTE_27_SANDSTORM_HOUSE,                    4,  4 ; 12
-	map_const ROUTE_29_ROUTE_46_GATE,                      4,  5 ; 13
+	map_const ROUTE_29_ROUTE_46_GATE,                      5,  4 ; 13
 
 	newgroup                                                    ; 25
 
-	map_const ROUTE_5,                                     9, 10 ;  1
-	map_const SAFFRON_CITY,                               18, 20 ;  2
-	map_const FIGHTING_DOJO,                               6,  5 ;  3
-	map_const SAFFRON_GYM,                                 9, 10 ;  4
-	map_const SAFFRON_MART,                                4,  6 ;  5
-	map_const SAFFRON_POKECENTER_1F,                       4,  5 ;  6
-	map_const SAFFRON_POKECENTER_2F_BETA,                  4,  8 ;  7
+	map_const ROUTE_5,                                    10,  9 ;  1
+	map_const SAFFRON_CITY,                               20, 18 ;  2
+	map_const FIGHTING_DOJO,                               5,  6 ;  3
+	map_const SAFFRON_GYM,                                10,  9 ;  4
+	map_const SAFFRON_MART,                                6,  4 ;  5
+	map_const SAFFRON_POKECENTER_1F,                       5,  4 ;  6
+	map_const SAFFRON_POKECENTER_2F_BETA,                  8,  4 ;  7
 	map_const MR_PSYCHICS_HOUSE,                           4,  4 ;  8
-	map_const SAFFRON_MAGNET_TRAIN_STATION,                9, 10 ;  9
-	map_const SILPH_CO_1F,                                 4,  8 ; 10
+	map_const SAFFRON_MAGNET_TRAIN_STATION,               10,  9 ;  9
+	map_const SILPH_CO_1F,                                 8,  4 ; 10
 	map_const COPYCATS_HOUSE_1F,                           4,  4 ; 11
-	map_const COPYCATS_HOUSE_2F,                           3,  5 ; 12
+	map_const COPYCATS_HOUSE_2F,                           5,  3 ; 12
 	map_const ROUTE_5_UNDERGROUND_PATH_ENTRANCE,           4,  4 ; 13
-	map_const ROUTE_5_SAFFRON_GATE,                        4,  5 ; 14
+	map_const ROUTE_5_SAFFRON_GATE,                        5,  4 ; 14
 	map_const ROUTE_5_CLEANSE_TAG_HOUSE,                   4,  4 ; 15
 
 	newgroup                                                    ; 26
 
-	map_const ROUTE_30,                                   27, 10 ;  1
-	map_const ROUTE_31,                                    9, 20 ;  2
-	map_const CHERRYGROVE_CITY,                            9, 20 ;  3
-	map_const CHERRYGROVE_MART,                            4,  6 ;  4
-	map_const CHERRYGROVE_POKECENTER_1F,                   4,  5 ;  5
+	map_const ROUTE_30,                                   10, 27 ;  1
+	map_const ROUTE_31,                                   20,  9 ;  2
+	map_const CHERRYGROVE_CITY,                           20,  9 ;  3
+	map_const CHERRYGROVE_MART,                            6,  4 ;  4
+	map_const CHERRYGROVE_POKECENTER_1F,                   5,  4 ;  5
 	map_const CHERRYGROVE_GYM_SPEECH_HOUSE,                4,  4 ;  6
 	map_const GUIDE_GENTS_HOUSE,                           4,  4 ;  7
 	map_const CHERRYGROVE_EVOLUTION_SPEECH_HOUSE,          4,  4 ;  8
 	map_const ROUTE_30_BERRY_HOUSE,                        4,  4 ;  9
 	map_const MR_POKEMONS_HOUSE,                           4,  4 ; 10
-	map_const ROUTE_31_VIOLET_GATE,                        4,  5 ; 11
+	map_const ROUTE_31_VIOLET_GATE,                        5,  4 ; 11
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index 1a3f60e7..985e4d02 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -48,7 +48,7 @@ const_value SET 1
 	const map_load_spawn          ; 17
 	const map_load_connection     ; 18
 	const map_load_warp           ; 19
-	const map_attributes          ; 1a
+	const map_attributes_1        ; 1a
 	const map_attributes_2        ; 1b
 	const map_clear_bg_palettes   ; 1c
 	const map_fade_out_palettes   ; 1d
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 3a73da9b..2c46d106 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -95,3 +95,11 @@
 	const MUSIC_POST_CREDITS                 ; 5c
 
 MUSIC_MAHOGANY_MART EQU $64
+
+; ExitPokegearRadio_HandleMusic uses these values
+RESTART_MAP_MUSIC EQU $fe
+ENTER_MAP_MUSIC   EQU $ff
+
+; GetMapMusic picks music for this bit flag
+RADIO_TOWER_MUSIC_F EQU 7
+RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F