Add macros for maps and scripts.

Change map constants to resemble labels to avoid having to convert.

3 files changed, 464 insertions, 460 deletions

diff --git a/constants/constants.s b/constants/constants.s
index 0b706eee6..8e6dd101f 100644
--- a/constants/constants.s
+++ b/constants/constants.s
@@ -16,3 +16,4 @@
 	.include "constants/map_object_constants.s"
 	.include "constants/battle_tower_constants.s"
 	.include "constants/opponent_constants.s"
+	.include "constants/variables.s"
diff --git a/constants/map_constants.s b/constants/map_constants.s
index 018bf67a0..d7a8a323e 100644
--- a/constants/map_constants.s
+++ b/constants/map_constants.s
@@ -1,463 +1,463 @@
 	.set cur_map_group, -1
 
 	new_map_group
-	map_group PETALBURG_CITY   @ 0.0
-	map_group SLATEPORT_CITY   @ 0.1
-	map_group MAUVILLE_CITY    @ 0.2
-	map_group RUSTBORO_CITY    @ 0.3
-	map_group FORTREE_CITY     @ 0.4
-	map_group LILYCOVE_CITY    @ 0.5
-	map_group MOSSDEEP_CITY    @ 0.6
-	map_group SOOTOPOLIS_CITY  @ 0.7
-	map_group EVER_GRANDE_CITY @ 0.8
-	map_group LITTLEROOT_TOWN  @ 0.9
-	map_group OLDALE_TOWN      @ 0.10
-	map_group DEWFORD_TOWN     @ 0.11
-	map_group LAVARIDGE_TOWN   @ 0.12
-	map_group FALLARBOR_TOWN   @ 0.13
-	map_group VERDANTURF_TOWN  @ 0.14
-	map_group PACIFIDLOG_TOWN  @ 0.15
-	map_group ROUTE_101        @ 0.16
-	map_group ROUTE_102        @ 0.17
-	map_group ROUTE_103        @ 0.18
-	map_group ROUTE_104        @ 0.19
-	map_group ROUTE_105        @ 0.20
-	map_group ROUTE_106        @ 0.21
-	map_group ROUTE_107        @ 0.22
-	map_group ROUTE_108        @ 0.23
-	map_group ROUTE_109        @ 0.24
-	map_group ROUTE_110        @ 0.25
-	map_group ROUTE_111        @ 0.26
-	map_group ROUTE_112        @ 0.27
-	map_group ROUTE_113        @ 0.28
-	map_group ROUTE_114        @ 0.29
-	map_group ROUTE_115        @ 0.30
-	map_group ROUTE_116        @ 0.31
-	map_group ROUTE_117        @ 0.32
-	map_group ROUTE_118        @ 0.33
-	map_group ROUTE_119        @ 0.34
-	map_group ROUTE_120        @ 0.35
-	map_group ROUTE_121        @ 0.36
-	map_group ROUTE_122        @ 0.37
-	map_group ROUTE_123        @ 0.38
-	map_group ROUTE_124        @ 0.39
-	map_group ROUTE_125        @ 0.40
-	map_group ROUTE_126        @ 0.41
-	map_group ROUTE_127        @ 0.42
-	map_group ROUTE_128        @ 0.43
-	map_group ROUTE_129        @ 0.44
-	map_group ROUTE_130        @ 0.45
-	map_group ROUTE_131        @ 0.46
-	map_group ROUTE_132        @ 0.47
-	map_group ROUTE_133        @ 0.48
-	map_group ROUTE_134        @ 0.49
-	map_group UNDERWATER_1     @ 0.50
-	map_group UNDERWATER_2     @ 0.51
-	map_group UNDERWATER_3     @ 0.52
-	map_group UNDERWATER_4     @ 0.53
-
-	new_map_group
-	map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    @ 1.0
-	map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_2F    @ 1.1
-	map_group LITTLEROOT_TOWN_MAYS_HOUSE_1F        @ 1.2
-	map_group LITTLEROOT_TOWN_MAYS_HOUSE_2F        @ 1.3
-	map_group LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB @ 1.4
-
-	new_map_group
-	map_group OLDALE_TOWN_HOUSE_1           @ 2.0
-	map_group OLDALE_TOWN_HOUSE_2           @ 2.1
-	map_group OLDALE_TOWN_POKEMON_CENTER_1F @ 2.2
-	map_group OLDALE_TOWN_POKEMON_CENTER_2F @ 2.3
-	map_group OLDALE_TOWN_MART              @ 2.4
-
-	new_map_group
-	map_group DEWFORD_TOWN_HOUSE_1           @ 3.0
-	map_group DEWFORD_TOWN_POKEMON_CENTER_1F @ 3.1
-	map_group DEWFORD_TOWN_POKEMON_CENTER_2F @ 3.2
-	map_group DEWFORD_TOWN_GYM               @ 3.3
-	map_group DEWFORD_TOWN_HALL              @ 3.4
-	map_group DEWFORD_TOWN_HOUSE_2           @ 3.5
-
-	new_map_group
-	map_group LAVARIDGE_TOWN_HERB_SHOP         @ 4.0
-	map_group LAVARIDGE_TOWN_GYM_1F            @ 4.1
-	map_group LAVARIDGE_TOWN_GYM_B1F           @ 4.2
-	map_group LAVARIDGE_TOWN_HOUSE             @ 4.3
-	map_group LAVARIDGE_TOWN_MART              @ 4.4
-	map_group LAVARIDGE_TOWN_POKEMON_CENTER_1F @ 4.5
-	map_group LAVARIDGE_TOWN_POKEMON_CENTER_2F @ 4.6
-
-	new_map_group
-	map_group FALLARBOR_TOWN_MART              @ 5.0
-	map_group FALLARBOR_TOWN_CONTEST_LOBBY     @ 5.1
-	map_group FALLARBOR_TOWN_CONTEST_HALL      @ 5.2
-	map_group FALLARBOR_TOWN_POKEMON_CENTER_1F @ 5.3
-	map_group FALLARBOR_TOWN_POKEMON_CENTER_2F @ 5.4
-	map_group FALLARBOR_TOWN_HOUSE_1           @ 5.5
-	map_group FALLARBOR_TOWN_HOUSE_2           @ 5.6
-
-	new_map_group
-	map_group VERDANTURF_TOWN_CONTEST_LOBBY           @ 6.0
-	map_group VERDANTURF_TOWN_CONTEST_HALL            @ 6.1
-	map_group VERDANTURF_TOWN_MART                    @ 6.2
-	map_group VERDANTURF_TOWN_POKEMON_CENTER_1F       @ 6.3
-	map_group VERDANTURF_TOWN_POKEMON_CENTER_2F       @ 6.4
-	map_group VERDANTURF_TOWN_WANDAS_HOUSE            @ 6.5
-	map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE @ 6.6
-	map_group VERDANTURF_TOWN_HOUSE                   @ 6.7
-
-	new_map_group
-	map_group PACIFIDLOG_TOWN_POKEMON_CENTER_1F @ 7.0
-	map_group PACIFIDLOG_TOWN_POKEMON_CENTER_2F @ 7.1
-	map_group PACIFIDLOG_TOWN_HOUSE_1           @ 7.2
-	map_group PACIFIDLOG_TOWN_HOUSE_2           @ 7.3
-	map_group PACIFIDLOG_TOWN_HOUSE_3           @ 7.4
-	map_group PACIFIDLOG_TOWN_HOUSE_4           @ 7.5
-	map_group PACIFIDLOG_TOWN_HOUSE_5           @ 7.6
-
-	new_map_group
-	map_group PETALBURG_CITY_WALLYS_HOUSE      @ 8.0
-	map_group PETALBURG_CITY_GYM               @ 8.1
-	map_group PETALBURG_CITY_HOUSE_1           @ 8.2
-	map_group PETALBURG_CITY_HOUSE_2           @ 8.3
-	map_group PETALBURG_CITY_POKEMON_CENTER_1F @ 8.4
-	map_group PETALBURG_CITY_POKEMON_CENTER_2F @ 8.5
-	map_group PETALBURG_CITY_MART              @ 8.6
-
-	new_map_group
-	map_group SLATEPORT_CITY_STERNS_SHIPYARD_1F @ 9.0
-	map_group SLATEPORT_CITY_STERNS_SHIPYARD_2F @ 9.1
-	map_group SLATEPORT_CITY_CONTEST_LOBBY      @ 9.2
-	map_group SLATEPORT_CITY_CONTEST_HALL       @ 9.3
-	map_group SLATEPORT_CITY_HOUSE_1            @ 9.4
-	map_group SLATEPORT_CITY_POKEMON_FAN_CLUB   @ 9.5
-	map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F  @ 9.6
-	map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F  @ 9.7
-	map_group SLATEPORT_CITY_HARBOR             @ 9.8
-	map_group SLATEPORT_CITY_HOUSE_2            @ 9.9
-	map_group SLATEPORT_CITY_POKEMON_CENTER_1F  @ 9.10
-	map_group SLATEPORT_CITY_POKEMON_CENTER_2F  @ 9.11
-	map_group SLATEPORT_CITY_MART               @ 9.12
-
-	new_map_group
-	map_group MAUVILLE_CITY_GYM               @ 10.0
-	map_group MAUVILLE_CITY_BIKE_SHOP         @ 10.1
-	map_group MAUVILLE_CITY_HOUSE_1           @ 10.2
-	map_group MAUVILLE_CITY_GAME_CORNER       @ 10.3
-	map_group MAUVILLE_CITY_HOUSE_2           @ 10.4
-	map_group MAUVILLE_CITY_POKEMON_CENTER_1F @ 10.5
-	map_group MAUVILLE_CITY_POKEMON_CENTER_2F @ 10.6
-	map_group MAUVILLE_CITY_MART              @ 10.7
-
-	new_map_group
-	map_group RUSTBORO_CITY_DEVON_CORP_1F     @ 11.0
-	map_group RUSTBORO_CITY_DEVON_CORP_2F     @ 11.1
-	map_group RUSTBORO_CITY_DEVON_CORP_3F     @ 11.2
-	map_group RUSTBORO_CITY_GYM               @ 11.3
-	map_group RUSTBORO_CITY_POKEMON_SCHOOL    @ 11.4
-	map_group RUSTBORO_CITY_POKEMON_CENTER_1F @ 11.5
-	map_group RUSTBORO_CITY_POKEMON_CENTER_2F @ 11.6
-	map_group RUSTBORO_CITY_MART              @ 11.7
-	map_group RUSTBORO_CITY_FLAT_1_1F         @ 11.8
-	map_group RUSTBORO_CITY_FLAT_1_2F         @ 11.9
-	map_group RUSTBORO_CITY_HOUSE_1           @ 11.10
-	map_group RUSTBORO_CITY_CUTTERS_HOUSE     @ 11.11
-	map_group RUSTBORO_CITY_HOUSE_2           @ 11.12
-	map_group RUSTBORO_CITY_FLAT_2_1F         @ 11.13
-	map_group RUSTBORO_CITY_FLAT_2_2F         @ 11.14
-	map_group RUSTBORO_CITY_FLAT_2_3F         @ 11.15
-	map_group RUSTBORO_CITY_HOUSE_3           @ 11.16
-
-	new_map_group
-	map_group FORTREE_CITY_HOUSE_1           @ 12.0
-	map_group FORTREE_CITY_GYM               @ 12.1
-	map_group FORTREE_CITY_POKEMON_CENTER_1F @ 12.2
-	map_group FORTREE_CITY_POKEMON_CENTER_2F @ 12.3
-	map_group FORTREE_CITY_MART              @ 12.4
-	map_group FORTREE_CITY_HOUSE_2           @ 12.5
-	map_group FORTREE_CITY_HOUSE_3           @ 12.6
-	map_group FORTREE_CITY_HOUSE_4           @ 12.7
-	map_group FORTREE_CITY_HOUSE_5           @ 12.8
-	map_group FORTREE_CITY_DECORATION_SHOP   @ 12.9
-
-	new_map_group
-	map_group LILYCOVE_CITY_COVE_LILY_MOTEL_1F        @ 13.0
-	map_group LILYCOVE_CITY_COVE_LILY_MOTEL_2F        @ 13.1
-	map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_1F        @ 13.2
-	map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_2F        @ 13.3
-	map_group LILYCOVE_CITY_CONTEST_LOBBY             @ 13.4
-	map_group LILYCOVE_CITY_CONTEST_HALL              @ 13.5
-	map_group LILYCOVE_CITY_POKEMON_CENTER_1F         @ 13.6
-	map_group LILYCOVE_CITY_POKEMON_CENTER_2F         @ 13.7
-	map_group LILYCOVE_CITY_UNUSED_MART               @ 13.8
-	map_group LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB  @ 13.9
-	map_group LILYCOVE_CITY_HARBOR                    @ 13.10
-	map_group LILYCOVE_CITY_EMPTY_MAP                 @ 13.11
-	map_group LILYCOVE_CITY_MOVE_DELETERS_HOUSE       @ 13.12
-	map_group LILYCOVE_CITY_HOUSE_1                   @ 13.13
-	map_group LILYCOVE_CITY_HOUSE_2                   @ 13.14
-	map_group LILYCOVE_CITY_HOUSE_3                   @ 13.15
-	map_group LILYCOVE_CITY_HOUSE_4                   @ 13.16
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F       @ 13.17
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F       @ 13.18
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F       @ 13.19
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F       @ 13.20
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F       @ 13.21
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP  @ 13.22
-	map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR @ 13.23
-
-	new_map_group
-	map_group MOSSDEEP_CITY_GYM               @ 14.0
-	map_group MOSSDEEP_CITY_HOUSE_1           @ 14.1
-	map_group MOSSDEEP_CITY_HOUSE_2           @ 14.2
-	map_group MOSSDEEP_CITY_POKEMON_CENTER_1F @ 14.3
-	map_group MOSSDEEP_CITY_POKEMON_CENTER_2F @ 14.4
-	map_group MOSSDEEP_CITY_MART              @ 14.5
-	map_group MOSSDEEP_CITY_HOUSE_3           @ 14.6
-	map_group MOSSDEEP_CITY_STEVENS_HOUSE     @ 14.7
-	map_group MOSSDEEP_CITY_HOUSE_4           @ 14.8
-	map_group MOSSDEEP_CITY_SPACE_CENTER_1F   @ 14.9
-	map_group MOSSDEEP_CITY_SPACE_CENTER_2F   @ 14.10
-	map_group MOSSDEEP_CITY_GAME_CORNER_1F    @ 14.11
-	map_group MOSSDEEP_CITY_GAME_CORNER_B1F   @ 14.12
-
-	new_map_group
-	map_group SOOTOPOLIS_CITY_GYM_1F            @ 15.0
-	map_group SOOTOPOLIS_CITY_GYM_B1F           @ 15.1
-	map_group SOOTOPOLIS_CITY_POKEMON_CENTER_1F @ 15.2
-	map_group SOOTOPOLIS_CITY_POKEMON_CENTER_2F @ 15.3
-	map_group SOOTOPOLIS_CITY_MART              @ 15.4
-	map_group SOOTOPOLIS_CITY_HOUSE_1           @ 15.5
-	map_group SOOTOPOLIS_CITY_HOUSE_2           @ 15.6
-	map_group SOOTOPOLIS_CITY_HOUSE_3           @ 15.7
-	map_group SOOTOPOLIS_CITY_HOUSE_4           @ 15.8
-	map_group SOOTOPOLIS_CITY_HOUSE_5           @ 15.9
-	map_group SOOTOPOLIS_CITY_HOUSE_6           @ 15.10
-	map_group SOOTOPOLIS_CITY_HOUSE_7           @ 15.11
-	map_group SOOTOPOLIS_CITY_HOUSE_8           @ 15.12
-
-	new_map_group
-	map_group EVER_GRANDE_CITY_SIDNEYS_ROOM      @ 16.0
-	map_group EVER_GRANDE_CITY_PHOEBES_ROOM      @ 16.1
-	map_group EVER_GRANDE_CITY_GLACIAS_ROOM      @ 16.2
-	map_group EVER_GRANDE_CITY_DRAKES_ROOM       @ 16.3
-	map_group EVER_GRANDE_CITY_CHAMPIONS_ROOM    @ 16.4
-	map_group EVER_GRANDE_CITY_CORRIDOR_1        @ 16.5
-	map_group EVER_GRANDE_CITY_CORRIDOR_2        @ 16.6
-	map_group EVER_GRANDE_CITY_CORRIDOR_3        @ 16.7
-	map_group EVER_GRANDE_CITY_CORRIDOR_4        @ 16.8
-	map_group EVER_GRANDE_CITY_CORRIDOR_5        @ 16.9
-	map_group EVER_GRANDE_CITY_POKEMON_LEAGUE    @ 16.10
-	map_group EVER_GRANDE_CITY_HALL_OF_FAME      @ 16.11
-	map_group EVER_GRANDE_CITY_POKEMON_CENTER_1F @ 16.12
-	map_group EVER_GRANDE_CITY_POKEMON_CENTER_2F @ 16.13
-
-	new_map_group
-	map_group ROUTE_104_MR_BRINEYS_HOUSE         @ 17.0
-	map_group ROUTE_104_PRETTY_PETAL_FLOWER_SHOP @ 17.1
-
-	new_map_group
-	map_group ROUTE_111_WINSTRATE_FAMILYS_HOUSE @ 18.0
-	map_group ROUTE_111_OLD_LADYS_REST_STOP     @ 18.1
-
-	new_map_group
-	map_group ROUTE_112_CABLE_CAR_STATION  @ 19.0
-	map_group MT_CHIMNEY_CABLE_CAR_STATION @ 19.1
-
-	new_map_group
-	map_group ROUTE_114_FOSSIL_MANIACS_HOUSE  @ 20.0
-	map_group ROUTE_114_FOSSIL_MANIACS_TUNNEL @ 20.1
-	map_group ROUTE_114_LANETTES_HOUSE        @ 20.2
-
-	new_map_group
-	map_group ROUTE_116_TUNNELERS_REST_HOUSE @ 21.0
-
-	new_map_group
-	map_group ROUTE_117_POKEMON_DAY_CARE @ 22.0
-
-	new_map_group
-	map_group ROUTE_121_SAFARI_ZONE_ENTRANCE @ 23.0
-
-	new_map_group
-	map_group METEOR_FALLS_1F_1R                    @ 24.0
-	map_group METEOR_FALLS_1F_2R                    @ 24.1
-	map_group METEOR_FALLS_B1F_1R                   @ 24.2
-	map_group METEOR_FALLS_B1F_2R                   @ 24.3
-	map_group RUSTURF_TUNNEL                        @ 24.4
-	map_group UNDERWATER_SOOTOPOLIS_CITY            @ 24.5
-	map_group DESERT_RUINS                          @ 24.6
-	map_group GRANITE_CAVE_1F                       @ 24.7
-	map_group GRANITE_CAVE_B1F                      @ 24.8
-	map_group GRANITE_CAVE_B2F                      @ 24.9
-	map_group GRANITE_CAVE_STEVENS_ROOM             @ 24.10
-	map_group PETALBURG_WOODS                       @ 24.11
-	map_group MT_CHIMNEY                            @ 24.12
-	map_group JAGGED_PASS                           @ 24.13
-	map_group FIERY_PATH                            @ 24.14
-	map_group MT_PYRE_1F                            @ 24.15
-	map_group MT_PYRE_2F                            @ 24.16
-	map_group MT_PYRE_3F                            @ 24.17
-	map_group MT_PYRE_4F                            @ 24.18
-	map_group MT_PYRE_5F                            @ 24.19
-	map_group MT_PYRE_6F                            @ 24.20
-	map_group MT_PYRE_EXTERIOR                      @ 24.21
-	map_group MT_PYRE_SUMMIT                        @ 24.22
-	map_group AQUA_HIDEOUT_1F                       @ 24.23
-	map_group AQUA_HIDEOUT_B1F                      @ 24.24
-	map_group AQUA_HIDEOUT_B2F                      @ 24.25
-	map_group UNDERWATER_SEAFLOOR_CAVERN            @ 24.26
-	map_group SEAFLOOR_CAVERN_ENTRANCE              @ 24.27
-	map_group SEAFLOOR_CAVERN_ROOM_1                @ 24.28
-	map_group SEAFLOOR_CAVERN_ROOM_2                @ 24.29
-	map_group SEAFLOOR_CAVERN_ROOM_3                @ 24.30
-	map_group SEAFLOOR_CAVERN_ROOM_4                @ 24.31
-	map_group SEAFLOOR_CAVERN_ROOM_5                @ 24.32
-	map_group SEAFLOOR_CAVERN_ROOM_6                @ 24.33
-	map_group SEAFLOOR_CAVERN_ROOM_7                @ 24.34
-	map_group SEAFLOOR_CAVERN_ROOM_8                @ 24.35
-	map_group SEAFLOOR_CAVERN_ROOM_9                @ 24.36
-	map_group CAVE_OF_ORIGIN_ENTRANCE               @ 24.37
-	map_group CAVE_OF_ORIGIN_1F                     @ 24.38
-	map_group CAVE_OF_ORIGIN_B1F                    @ 24.39
-	map_group CAVE_OF_ORIGIN_B2F                    @ 24.40
-	map_group CAVE_OF_ORIGIN_B3F                    @ 24.41
-	map_group CAVE_OF_ORIGIN_B4F                    @ 24.42
-	map_group VICTORY_ROAD_1F                       @ 24.43
-	map_group VICTORY_ROAD_B1F                      @ 24.44
-	map_group VICTORY_ROAD_B2F                      @ 24.45
-	map_group SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM     @ 24.46
-	map_group SHOAL_CAVE_LOW_TIDE_INNER_ROOM        @ 24.47
-	map_group SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM       @ 24.48
-	map_group SHOAL_CAVE_LOW_TIDE_LOWER_ROOM        @ 24.49
-	map_group SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM    @ 24.50
-	map_group SHOAL_CAVE_HIGH_TIDE_INNER_ROOM       @ 24.51
-	map_group NEW_MAUVILLE_ENTRANCE                 @ 24.52
-	map_group NEW_MAUVILLE_INSIDE                   @ 24.53
-	map_group ABANDONED_SHIP_DECK                   @ 24.54
-	map_group ABANDONED_SHIP_CORRIDORS_1F           @ 24.55
-	map_group ABANDONED_SHIP_ROOMS_1F               @ 24.56
-	map_group ABANDONED_SHIP_CORRIDORS_B1F          @ 24.57
-	map_group ABANDONED_SHIP_ROOMS_B1F              @ 24.58
-	map_group ABANDONED_SHIP_ROOMS_2_B1F            @ 24.59
-	map_group ABANDONED_SHIP_UNDERWATER_1           @ 24.60
-	map_group ABANDONED_SHIP_ROOM_B1F               @ 24.61
-	map_group ABANDONED_SHIP_ROOMS_2_1F             @ 24.62
-	map_group ABANDONED_SHIP_CAPTAINS_OFFICE        @ 24.63
-	map_group ABANDONED_SHIP_UNDERWATER_2           @ 24.64
-	map_group ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @ 24.65
-	map_group ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS     @ 24.66
-	map_group ISLAND_CAVE                           @ 24.67
-	map_group ANCIENT_TOMB                          @ 24.68
-	map_group UNDERWATER_ROUTE_134                  @ 24.69
-	map_group UNDERWATER_SEALED_CHAMBER             @ 24.70
-	map_group SEALED_CHAMBER_OUTER_ROOM             @ 24.71
-	map_group SEALED_CHAMBER_INNER_ROOM             @ 24.72
-	map_group SCORCHED_SLAB                         @ 24.73
-	map_group MAGMA_HIDEOUT_1F                      @ 24.74
-	map_group MAGMA_HIDEOUT_B1F                     @ 24.75
-	map_group MAGMA_HIDEOUT_B2F                     @ 24.76
-	map_group SKY_PILLAR_ENTRANCE                   @ 24.77
-	map_group SKY_PILLAR_OUTSIDE                    @ 24.78
-	map_group SKY_PILLAR_1F                         @ 24.79
-	map_group SKY_PILLAR_2F                         @ 24.80
-	map_group SKY_PILLAR_3F                         @ 24.81
-	map_group SKY_PILLAR_4F                         @ 24.82
-	map_group SHOAL_CAVE_LOW_TIDE_ICE_ROOM          @ 24.83
-	map_group SKY_PILLAR_5F                         @ 24.84
-	map_group SKY_PILLAR_TOP                        @ 24.85
-
-	new_map_group
-	map_group SECRET_BASE_RED_CAVE_1    @ 25.0
-	map_group SECRET_BASE_BROWN_CAVE_1  @ 25.1
-	map_group SECRET_BASE_BLUE_CAVE_1   @ 25.2
-	map_group SECRET_BASE_YELLOW_CAVE_1 @ 25.3
-	map_group SECRET_BASE_TREE_1        @ 25.4
-	map_group SECRET_BASE_SHRUB_1       @ 25.5
-	map_group SECRET_BASE_RED_CAVE_2    @ 25.6
-	map_group SECRET_BASE_BROWN_CAVE_2  @ 25.7
-	map_group SECRET_BASE_BLUE_CAVE_2   @ 25.8
-	map_group SECRET_BASE_YELLOW_CAVE_2 @ 25.9
-	map_group SECRET_BASE_TREE_2        @ 25.10
-	map_group SECRET_BASE_SHRUB_2       @ 25.11
-	map_group SECRET_BASE_RED_CAVE_3    @ 25.12
-	map_group SECRET_BASE_BROWN_CAVE_3  @ 25.13
-	map_group SECRET_BASE_BLUE_CAVE_3   @ 25.14
-	map_group SECRET_BASE_YELLOW_CAVE_3 @ 25.15
-	map_group SECRET_BASE_TREE_3        @ 25.16
-	map_group SECRET_BASE_SHRUB_3       @ 25.17
-	map_group SECRET_BASE_RED_CAVE_4    @ 25.18
-	map_group SECRET_BASE_BROWN_CAVE_4  @ 25.19
-	map_group SECRET_BASE_BLUE_CAVE_4   @ 25.20
-	map_group SECRET_BASE_YELLOW_CAVE_4 @ 25.21
-	map_group SECRET_BASE_TREE_4        @ 25.22
-	map_group SECRET_BASE_SHRUB_4       @ 25.23
-	map_group SINGLE_BATTLE_COLOSSEUM   @ 25.24
-	map_group TRADE_CENTER              @ 25.25
-	map_group RECORD_CORNER             @ 25.26
-	map_group DOUBLE_BATTLE_COLOSSEUM   @ 25.27
-	map_group LINK_CONTEST_ROOM_1       @ 25.28
-	map_group UNKNOWN_MAP_25_29         @ 25.29
-	map_group UNKNOWN_MAP_25_30         @ 25.30
-	map_group UNKNOWN_MAP_25_31         @ 25.31
-	map_group UNKNOWN_MAP_25_32         @ 25.32
-	map_group UNKNOWN_MAP_25_33         @ 25.33
-	map_group UNKNOWN_MAP_25_34         @ 25.34
-	map_group LINK_CONTEST_ROOM_2       @ 25.35
-	map_group LINK_CONTEST_ROOM_3       @ 25.36
-	map_group LINK_CONTEST_ROOM_4       @ 25.37
-	map_group LINK_CONTEST_ROOM_5       @ 25.38
-	map_group LINK_CONTEST_ROOM_6       @ 25.39
-	map_group INSIDE_OF_TRUCK           @ 25.40
-	map_group SS_TIDAL_CORRIDOR         @ 25.41
-	map_group SS_TIDAL_LOWER_DECK       @ 25.42
-	map_group SS_TIDAL_ROOMS            @ 25.43
-
-	new_map_group
-	map_group SAFARI_ZONE_NORTHWEST    @ 26.0
-	map_group SAFARI_ZONE_NORTHEAST    @ 26.1
-	map_group SAFARI_ZONE_SOUTHWEST    @ 26.2
-	map_group SAFARI_ZONE_SOUTHEAST    @ 26.3
-	map_group BATTLE_TOWER_OUTSIDE     @ 26.4
-	map_group BATTLE_TOWER_LOBBY       @ 26.5
-	map_group BATTLE_TOWER_ELEVATOR    @ 26.6
-	map_group BATTLE_TOWER_CORRIDOR    @ 26.7
-	map_group BATTLE_TOWER_BATTLE_ROOM @ 26.8
-	map_group SOUTHERN_ISLAND_EXTERIOR @ 26.9
-	map_group SOUTHERN_ISLAND_INTERIOR @ 26.10
-	map_group SAFARI_ZONE_REST_HOUSE   @ 26.11
-
-	new_map_group
-	map_group ROUTE_104_PROTOTYPE                          @ 27.0
-	map_group ROUTE_104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP @ 27.1
-
-	new_map_group
-	map_group ROUTE_109_SEASHORE_HOUSE @ 28.0
-
-	new_map_group
-	map_group ROUTE_110_TRICK_HOUSE_ENTRANCE                @ 29.0
-	map_group ROUTE_110_TRICK_HOUSE_END                     @ 29.1
-	map_group ROUTE_110_TRICK_HOUSE_CORRIDOR                @ 29.2
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_1                @ 29.3
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_2                @ 29.4
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_3                @ 29.5
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_4                @ 29.6
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_5                @ 29.7
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_6                @ 29.8
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_7                @ 29.9
-	map_group ROUTE_110_TRICK_HOUSE_PUZZLE_8                @ 29.10
-	map_group ROUTE_110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE @ 29.11
-	map_group ROUTE_110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE @ 29.12
-
-	new_map_group
-	map_group ROUTE_113_GLASS_WORKSHOP @ 30.0
-
-	new_map_group
-	map_group ROUTE_123_BERRY_MASTERS_HOUSE @ 31.0
-
-	new_map_group
-	map_group ROUTE_119_WEATHER_INSTITUTE_1F @ 32.0
-	map_group ROUTE_119_WEATHER_INSTITUTE_2F @ 32.1
-	map_group ROUTE_119_HOUSE                @ 32.2
-
-	new_map_group
-	map_group ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE @ 33.0
+	map_group PetalburgCity    @ 0.0
+	map_group SlateportCity    @ 0.1
+	map_group MauvilleCity     @ 0.2
+	map_group RustboroCity     @ 0.3
+	map_group FortreeCity      @ 0.4
+	map_group LilycoveCity     @ 0.5
+	map_group MossdeepCity     @ 0.6
+	map_group SootopolisCity   @ 0.7
+	map_group EverGrandeCity   @ 0.8
+	map_group LittlerootTown   @ 0.9
+	map_group OldaleTown       @ 0.10
+	map_group DewfordTown      @ 0.11
+	map_group LavaridgeTown    @ 0.12
+	map_group FallarborTown    @ 0.13
+	map_group VerdanturfTown   @ 0.14
+	map_group PacifidlogTown   @ 0.15
+	map_group Route101         @ 0.16
+	map_group Route102         @ 0.17
+	map_group Route103         @ 0.18
+	map_group Route104         @ 0.19
+	map_group Route105         @ 0.20
+	map_group Route106         @ 0.21
+	map_group Route107         @ 0.22
+	map_group Route108         @ 0.23
+	map_group Route109         @ 0.24
+	map_group Route110         @ 0.25
+	map_group Route111         @ 0.26
+	map_group Route112         @ 0.27
+	map_group Route113         @ 0.28
+	map_group Route114         @ 0.29
+	map_group Route115         @ 0.30
+	map_group Route116         @ 0.31
+	map_group Route117         @ 0.32
+	map_group Route118         @ 0.33
+	map_group Route119         @ 0.34
+	map_group Route120         @ 0.35
+	map_group Route121         @ 0.36
+	map_group Route122         @ 0.37
+	map_group Route123         @ 0.38
+	map_group Route124         @ 0.39
+	map_group Route125         @ 0.40
+	map_group Route126         @ 0.41
+	map_group Route127         @ 0.42
+	map_group Route128         @ 0.43
+	map_group Route129         @ 0.44
+	map_group Route130         @ 0.45
+	map_group Route131         @ 0.46
+	map_group Route132         @ 0.47
+	map_group Route133         @ 0.48
+	map_group Route134         @ 0.49
+	map_group Underwater1      @ 0.50
+	map_group Underwater2      @ 0.51
+	map_group Underwater3      @ 0.52
+	map_group Underwater4      @ 0.53
+
+	new_map_group
+	map_group LittlerootTown_BrendansHouse_1F      @ 1.0
+	map_group LittlerootTown_BrendansHouse_2F      @ 1.1
+	map_group LittlerootTown_MaysHouse_1F          @ 1.2
+	map_group LittlerootTown_MaysHouse_2F          @ 1.3
+	map_group LittlerootTown_ProfessorBirchsLab    @ 1.4
+
+	new_map_group
+	map_group OldaleTown_House1             @ 2.0
+	map_group OldaleTown_House2             @ 2.1
+	map_group OldaleTown_PokemonCenter_1F   @ 2.2
+	map_group OldaleTown_PokemonCenter_2F   @ 2.3
+	map_group OldaleTown_Mart               @ 2.4
+
+	new_map_group
+	map_group DewfordTown_House1             @ 3.0
+	map_group DewfordTown_PokemonCenter_1F   @ 3.1
+	map_group DewfordTown_PokemonCenter_2F   @ 3.2
+	map_group DewfordTown_Gym                @ 3.3
+	map_group DewfordTown_Hall               @ 3.4
+	map_group DewfordTown_House2             @ 3.5
+
+	new_map_group
+	map_group LavaridgeTown_HerbShop           @ 4.0
+	map_group LavaridgeTown_Gym_1F             @ 4.1
+	map_group LavaridgeTown_Gym_B1F            @ 4.2
+	map_group LavaridgeTown_House              @ 4.3
+	map_group LavaridgeTown_Mart               @ 4.4
+	map_group LavaridgeTown_PokemonCenter_1F   @ 4.5
+	map_group LavaridgeTown_PokemonCenter_2F   @ 4.6
+
+	new_map_group
+	map_group FallarborTown_Mart               @ 5.0
+	map_group FallarborTown_ContestLobby       @ 5.1
+	map_group FallarborTown_ContestHall        @ 5.2
+	map_group FallarborTown_PokemonCenter_1F   @ 5.3
+	map_group FallarborTown_PokemonCenter_2F   @ 5.4
+	map_group FallarborTown_House1             @ 5.5
+	map_group FallarborTown_House2             @ 5.6
+
+	new_map_group
+	map_group VerdanturfTown_ContestLobby             @ 6.0
+	map_group VerdanturfTown_ContestHall              @ 6.1
+	map_group VerdanturfTown_Mart                     @ 6.2
+	map_group VerdanturfTown_PokemonCenter_1F         @ 6.3
+	map_group VerdanturfTown_PokemonCenter_2F         @ 6.4
+	map_group VerdanturfTown_WandasHouse              @ 6.5
+	map_group VerdanturfTown_FriendshipRatersHouse    @ 6.6
+	map_group VerdanturfTown_House                    @ 6.7
+
+	new_map_group
+	map_group PacifidlogTown_PokemonCenter_1F   @ 7.0
+	map_group PacifidlogTown_PokemonCenter_2F   @ 7.1
+	map_group PacifidlogTown_House1             @ 7.2
+	map_group PacifidlogTown_House2             @ 7.3
+	map_group PacifidlogTown_House3             @ 7.4
+	map_group PacifidlogTown_House4             @ 7.5
+	map_group PacifidlogTown_House5             @ 7.6
+
+	new_map_group
+	map_group PetalburgCity_WallysHouse        @ 8.0
+	map_group PetalburgCity_Gym                @ 8.1
+	map_group PetalburgCity_House1             @ 8.2
+	map_group PetalburgCity_House2             @ 8.3
+	map_group PetalburgCity_PokemonCenter_1F   @ 8.4
+	map_group PetalburgCity_PokemonCenter_2F   @ 8.5
+	map_group PetalburgCity_Mart               @ 8.6
+
+	new_map_group
+	map_group SlateportCity_SternsShipyard_1F   @ 9.0
+	map_group SlateportCity_SternsShipyard_2F   @ 9.1
+	map_group SlateportCity_ContestLobby        @ 9.2
+	map_group SlateportCity_ContestHall         @ 9.3
+	map_group SlateportCity_House1              @ 9.4
+	map_group SlateportCity_PokemonFanClub      @ 9.5
+	map_group SlateportCity_OceanicMuseum_1F    @ 9.6
+	map_group SlateportCity_OceanicMuseum_2F    @ 9.7
+	map_group SlateportCity_Harbor              @ 9.8
+	map_group SlateportCity_House2              @ 9.9
+	map_group SlateportCity_PokemonCenter_1F    @ 9.10
+	map_group SlateportCity_PokemonCenter_2F    @ 9.11
+	map_group SlateportCity_Mart                @ 9.12
+
+	new_map_group
+	map_group MauvilleCity_Gym                @ 10.0
+	map_group MauvilleCity_BikeShop           @ 10.1
+	map_group MauvilleCity_House1             @ 10.2
+	map_group MauvilleCity_GameCorner         @ 10.3
+	map_group MauvilleCity_House2             @ 10.4
+	map_group MauvilleCity_PokemonCenter_1F   @ 10.5
+	map_group MauvilleCity_PokemonCenter_2F   @ 10.6
+	map_group MauvilleCity_Mart               @ 10.7
+
+	new_map_group
+	map_group RustboroCity_DevonCorp_1F       @ 11.0
+	map_group RustboroCity_DevonCorp_2F       @ 11.1
+	map_group RustboroCity_DevonCorp_3F       @ 11.2
+	map_group RustboroCity_Gym                @ 11.3
+	map_group RustboroCity_PokemonSchool      @ 11.4
+	map_group RustboroCity_PokemonCenter_1F   @ 11.5
+	map_group RustboroCity_PokemonCenter_2F   @ 11.6
+	map_group RustboroCity_Mart               @ 11.7
+	map_group RustboroCity_Flat1_1F           @ 11.8
+	map_group RustboroCity_Flat1_2F           @ 11.9
+	map_group RustboroCity_House1             @ 11.10
+	map_group RustboroCity_CuttersHouse       @ 11.11
+	map_group RustboroCity_House2             @ 11.12
+	map_group RustboroCity_Flat2_1F           @ 11.13
+	map_group RustboroCity_Flat2_2F           @ 11.14
+	map_group RustboroCity_Flat2_3F           @ 11.15
+	map_group RustboroCity_House3             @ 11.16
+
+	new_map_group
+	map_group FortreeCity_House1             @ 12.0
+	map_group FortreeCity_Gym                @ 12.1
+	map_group FortreeCity_PokemonCenter_1F   @ 12.2
+	map_group FortreeCity_PokemonCenter_2F   @ 12.3
+	map_group FortreeCity_Mart               @ 12.4
+	map_group FortreeCity_House2             @ 12.5
+	map_group FortreeCity_House3             @ 12.6
+	map_group FortreeCity_House4             @ 12.7
+	map_group FortreeCity_House5             @ 12.8
+	map_group FortreeCity_DecorationShop     @ 12.9
+
+	new_map_group
+	map_group LilycoveCity_CoveLilyMotel_1F           @ 13.0
+	map_group LilycoveCity_CoveLilyMotel_2F           @ 13.1
+	map_group LilycoveCity_LilycoveMuseum_1F          @ 13.2
+	map_group LilycoveCity_LilycoveMuseum_2F          @ 13.3
+	map_group LilycoveCity_ContestLobby               @ 13.4
+	map_group LilycoveCity_ContestHall                @ 13.5
+	map_group LilycoveCity_PokemonCenter_1F           @ 13.6
+	map_group LilycoveCity_PokemonCenter_2F           @ 13.7
+	map_group LilycoveCity_UnusedMart                 @ 13.8
+	map_group LilycoveCity_PokemonTrainerFanClub      @ 13.9
+	map_group LilycoveCity_Harbor                     @ 13.10
+	map_group LilycoveCity_EmptyMap                   @ 13.11
+	map_group LilycoveCity_MoveDeletersHouse          @ 13.12
+	map_group LilycoveCity_House1                     @ 13.13
+	map_group LilycoveCity_House2                     @ 13.14
+	map_group LilycoveCity_House3                     @ 13.15
+	map_group LilycoveCity_House4                     @ 13.16
+	map_group LilycoveCity_DepartmentStore_1F         @ 13.17
+	map_group LilycoveCity_DepartmentStore_2F         @ 13.18
+	map_group LilycoveCity_DepartmentStore_3F         @ 13.19
+	map_group LilycoveCity_DepartmentStore_4F         @ 13.20
+	map_group LilycoveCity_DepartmentStore_5F         @ 13.21
+	map_group LilycoveCity_DepartmentStoreRooftop     @ 13.22
+	map_group LilycoveCity_DepartmentStoreElevator    @ 13.23
+
+	new_map_group
+	map_group MossdeepCity_Gym                @ 14.0
+	map_group MossdeepCity_House1             @ 14.1
+	map_group MossdeepCity_House2             @ 14.2
+	map_group MossdeepCity_PokemonCenter_1F   @ 14.3
+	map_group MossdeepCity_PokemonCenter_2F   @ 14.4
+	map_group MossdeepCity_Mart               @ 14.5
+	map_group MossdeepCity_House3             @ 14.6
+	map_group MossdeepCity_StevensHouse       @ 14.7
+	map_group MossdeepCity_House4             @ 14.8
+	map_group MossdeepCity_SpaceCenter_1F     @ 14.9
+	map_group MossdeepCity_SpaceCenter_2F     @ 14.10
+	map_group MossdeepCity_GameCorner_1F      @ 14.11
+	map_group MossdeepCity_GameCorner_B1F     @ 14.12
+
+	new_map_group
+	map_group SootopolisCity_Gym_1F             @ 15.0
+	map_group SootopolisCity_Gym_B1F            @ 15.1
+	map_group SootopolisCity_PokemonCenter_1F   @ 15.2
+	map_group SootopolisCity_PokemonCenter_2F   @ 15.3
+	map_group SootopolisCity_Mart               @ 15.4
+	map_group SootopolisCity_House1             @ 15.5
+	map_group SootopolisCity_House2             @ 15.6
+	map_group SootopolisCity_House3             @ 15.7
+	map_group SootopolisCity_House4             @ 15.8
+	map_group SootopolisCity_House5             @ 15.9
+	map_group SootopolisCity_House6             @ 15.10
+	map_group SootopolisCity_House7             @ 15.11
+	map_group SootopolisCity_House8             @ 15.12
+
+	new_map_group
+	map_group EverGrandeCity_SidneysRoom         @ 16.0
+	map_group EverGrandeCity_PhoebesRoom         @ 16.1
+	map_group EverGrandeCity_GlaciasRoom         @ 16.2
+	map_group EverGrandeCity_DrakesRoom          @ 16.3
+	map_group EverGrandeCity_ChampionsRoom       @ 16.4
+	map_group EverGrandeCity_Corridor1           @ 16.5
+	map_group EverGrandeCity_Corridor2           @ 16.6
+	map_group EverGrandeCity_Corridor3           @ 16.7
+	map_group EverGrandeCity_Corridor4           @ 16.8
+	map_group EverGrandeCity_Corridor5           @ 16.9
+	map_group EverGrandeCity_PokemonLeague       @ 16.10
+	map_group EverGrandeCity_HallOfFame          @ 16.11
+	map_group EverGrandeCity_PokemonCenter_1F    @ 16.12
+	map_group EverGrandeCity_PokemonCenter_2F    @ 16.13
+
+	new_map_group
+	map_group Route104_MrBrineysHouse            @ 17.0
+	map_group Route104_PrettyPetalFlowerShop     @ 17.1
+
+	new_map_group
+	map_group Route111_WinstrateFamilysHouse    @ 18.0
+	map_group Route111_OldLadysRestStop         @ 18.1
+
+	new_map_group
+	map_group Route112_CableCarStation     @ 19.0
+	map_group MtChimney_CableCarStation    @ 19.1
+
+	new_map_group
+	map_group Route114_FossilManiacsHouse     @ 20.0
+	map_group Route114_FossilManiacsTunnel    @ 20.1
+	map_group Route114_LanettesHouse          @ 20.2
+
+	new_map_group
+	map_group Route116_TunnelersRestHouse    @ 21.0
+
+	new_map_group
+	map_group Route117_PokemonDayCare    @ 22.0
+
+	new_map_group
+	map_group Route121_SafariZoneEntrance    @ 23.0
+
+	new_map_group
+	map_group MeteorFalls_1F_1R                     @ 24.0
+	map_group MeteorFalls_1F_2R                     @ 24.1
+	map_group MeteorFalls_B1F_1R                    @ 24.2
+	map_group MeteorFalls_B1F_2R                    @ 24.3
+	map_group RusturfTunnel                         @ 24.4
+	map_group Underwater_SootopolisCity             @ 24.5
+	map_group DesertRuins                           @ 24.6
+	map_group GraniteCave_1F                        @ 24.7
+	map_group GraniteCave_B1F                       @ 24.8
+	map_group GraniteCave_B2F                       @ 24.9
+	map_group GraniteCave_StevensRoom               @ 24.10
+	map_group PetalburgWoods                        @ 24.11
+	map_group MtChimney                             @ 24.12
+	map_group JaggedPass                            @ 24.13
+	map_group FieryPath                             @ 24.14
+	map_group MtPyre_1F                             @ 24.15
+	map_group MtPyre_2F                             @ 24.16
+	map_group MtPyre_3F                             @ 24.17
+	map_group MtPyre_4F                             @ 24.18
+	map_group MtPyre_5F                             @ 24.19
+	map_group MtPyre_6F                             @ 24.20
+	map_group MtPyre_Exterior                       @ 24.21
+	map_group MtPyre_Summit                         @ 24.22
+	map_group AquaHideout_1F                        @ 24.23
+	map_group AquaHideout_B1F                       @ 24.24
+	map_group AquaHideout_B2F                       @ 24.25
+	map_group Underwater_SeafloorCavern             @ 24.26
+	map_group SeafloorCavern_Entrance               @ 24.27
+	map_group SeafloorCavern_Room1                  @ 24.28
+	map_group SeafloorCavern_Room2                  @ 24.29
+	map_group SeafloorCavern_Room3                  @ 24.30
+	map_group SeafloorCavern_Room4                  @ 24.31
+	map_group SeafloorCavern_Room5                  @ 24.32
+	map_group SeafloorCavern_Room6                  @ 24.33
+	map_group SeafloorCavern_Room7                  @ 24.34
+	map_group SeafloorCavern_Room8                  @ 24.35
+	map_group SeafloorCavern_Room9                  @ 24.36
+	map_group CaveOfOrigin_Entrance                 @ 24.37
+	map_group CaveOfOrigin_1F                       @ 24.38
+	map_group CaveOfOrigin_B1F                      @ 24.39
+	map_group CaveOfOrigin_B2F                      @ 24.40
+	map_group CaveOfOrigin_B3F                      @ 24.41
+	map_group CaveOfOrigin_B4F                      @ 24.42
+	map_group VictoryRoad_1F                        @ 24.43
+	map_group VictoryRoad_B1F                       @ 24.44
+	map_group VictoryRoad_B2F                       @ 24.45
+	map_group ShoalCave_LowTideEntranceRoom         @ 24.46
+	map_group ShoalCave_LowTideInnerRoom            @ 24.47
+	map_group ShoalCave_LowTideStairsRoom           @ 24.48
+	map_group ShoalCave_LowTideLowerRoom            @ 24.49
+	map_group ShoalCave_HighTideEntranceRoom        @ 24.50
+	map_group ShoalCave_HighTideInnerRoom           @ 24.51
+	map_group NewMauville_Entrance                  @ 24.52
+	map_group NewMauville_Inside                    @ 24.53
+	map_group AbandonedShip_Deck                    @ 24.54
+	map_group AbandonedShip_Corridors_1F            @ 24.55
+	map_group AbandonedShip_Rooms_1F                @ 24.56
+	map_group AbandonedShip_Corridors_B1F           @ 24.57
+	map_group AbandonedShip_Rooms_B1F               @ 24.58
+	map_group AbandonedShip_Rooms2_B1F              @ 24.59
+	map_group AbandonedShip_Underwater1             @ 24.60
+	map_group AbandonedShip_Room_B1F                @ 24.61
+	map_group AbandonedShip_Rooms2_1F               @ 24.62
+	map_group AbandonedShip_CaptainsOffice          @ 24.63
+	map_group AbandonedShip_Underwater2             @ 24.64
+	map_group AbandonedShip_HiddenFloorCorridors    @ 24.65
+	map_group AbandonedShip_HiddenFloorRooms        @ 24.66
+	map_group IslandCave                            @ 24.67
+	map_group AncientTomb                           @ 24.68
+	map_group Underwater_Route134                   @ 24.69
+	map_group Underwater_SealedChamber              @ 24.70
+	map_group SealedChamber_OuterRoom               @ 24.71
+	map_group SealedChamber_InnerRoom               @ 24.72
+	map_group ScorchedSlab                          @ 24.73
+	map_group MagmaHideout_1F                       @ 24.74
+	map_group MagmaHideout_B1F                      @ 24.75
+	map_group MagmaHideout_B2F                      @ 24.76
+	map_group SkyPillar_Entrance                    @ 24.77
+	map_group SkyPillar_Outside                     @ 24.78
+	map_group SkyPillar_1F                          @ 24.79
+	map_group SkyPillar_2F                          @ 24.80
+	map_group SkyPillar_3F                          @ 24.81
+	map_group SkyPillar_4F                          @ 24.82
+	map_group ShoalCave_LowTideIceRoom              @ 24.83
+	map_group SkyPillar_5F                          @ 24.84
+	map_group SkyPillar_Top                         @ 24.85
+
+	new_map_group
+	map_group SecretBase_RedCave1       @ 25.0
+	map_group SecretBase_BrownCave1     @ 25.1
+	map_group SecretBase_BlueCave1      @ 25.2
+	map_group SecretBase_YellowCave1    @ 25.3
+	map_group SecretBase_Tree1          @ 25.4
+	map_group SecretBase_Shrub1         @ 25.5
+	map_group SecretBase_RedCave2       @ 25.6
+	map_group SecretBase_BrownCave2     @ 25.7
+	map_group SecretBase_BlueCave2      @ 25.8
+	map_group SecretBase_YellowCave2    @ 25.9
+	map_group SecretBase_Tree2          @ 25.10
+	map_group SecretBase_Shrub2         @ 25.11
+	map_group SecretBase_RedCave3       @ 25.12
+	map_group SecretBase_BrownCave3     @ 25.13
+	map_group SecretBase_BlueCave3      @ 25.14
+	map_group SecretBase_YellowCave3    @ 25.15
+	map_group SecretBase_Tree3          @ 25.16
+	map_group SecretBase_Shrub3         @ 25.17
+	map_group SecretBase_RedCave4       @ 25.18
+	map_group SecretBase_BrownCave4     @ 25.19
+	map_group SecretBase_BlueCave4      @ 25.20
+	map_group SecretBase_YellowCave4    @ 25.21
+	map_group SecretBase_Tree4          @ 25.22
+	map_group SecretBase_Shrub4         @ 25.23
+	map_group SingleBattleColosseum     @ 25.24
+	map_group TradeCenter               @ 25.25
+	map_group RecordCorner              @ 25.26
+	map_group DoubleBattleColosseum     @ 25.27
+	map_group LinkContestRoom1          @ 25.28
+	map_group UnknownMap_25_29          @ 25.29
+	map_group UnknownMap_25_30          @ 25.30
+	map_group UnknownMap_25_31          @ 25.31
+	map_group UnknownMap_25_32          @ 25.32
+	map_group UnknownMap_25_33          @ 25.33
+	map_group UnknownMap_25_34          @ 25.34
+	map_group LinkContestRoom2          @ 25.35
+	map_group LinkContestRoom3          @ 25.36
+	map_group LinkContestRoom4          @ 25.37
+	map_group LinkContestRoom5          @ 25.38
+	map_group LinkContestRoom6          @ 25.39
+	map_group InsideOfTruck             @ 25.40
+	map_group SSTidalCorridor           @ 25.41
+	map_group SSTidalLowerDeck          @ 25.42
+	map_group SSTidalRooms              @ 25.43
+
+	new_map_group
+	map_group SafariZone_Northwest     @ 26.0
+	map_group SafariZone_Northeast     @ 26.1
+	map_group SafariZone_Southwest     @ 26.2
+	map_group SafariZone_Southeast     @ 26.3
+	map_group BattleTower_Outside      @ 26.4
+	map_group BattleTower_Lobby        @ 26.5
+	map_group BattleTower_Elevator     @ 26.6
+	map_group BattleTower_Corridor     @ 26.7
+	map_group BattleTower_BattleRoom   @ 26.8
+	map_group SouthernIsland_Exterior  @ 26.9
+	map_group SouthernIsland_Interior  @ 26.10
+	map_group SafariZone_RestHouse     @ 26.11
+
+	new_map_group
+	map_group Route104_Prototype                           @ 27.0
+	map_group Route104_PrototypePrettyPetalFlowerShop      @ 27.1
+
+	new_map_group
+	map_group Route109_SeashoreHouse   @ 28.0
+
+	new_map_group
+	map_group Route110_TrickHouseEntrance                   @ 29.0
+	map_group Route110_TrickHouseEnd                        @ 29.1
+	map_group Route110_TrickHouseCorridor                   @ 29.2
+	map_group Route110_TrickHousePuzzle1                    @ 29.3
+	map_group Route110_TrickHousePuzzle2                    @ 29.4
+	map_group Route110_TrickHousePuzzle3                    @ 29.5
+	map_group Route110_TrickHousePuzzle4                    @ 29.6
+	map_group Route110_TrickHousePuzzle5                    @ 29.7
+	map_group Route110_TrickHousePuzzle6                    @ 29.8
+	map_group Route110_TrickHousePuzzle7                    @ 29.9
+	map_group Route110_TrickHousePuzzle8                    @ 29.10
+	map_group Route110_SeasideCyclingRoadSouthEntrance      @ 29.11
+	map_group Route110_SeasideCyclingRoadNorthEntrance      @ 29.12
+
+	new_map_group
+	map_group Route113_GlassWorkshop   @ 30.0
+
+	new_map_group
+	map_group Route123_BerryMastersHouse    @ 31.0
+
+	new_map_group
+	map_group Route119_WeatherInstitute_1F   @ 32.0
+	map_group Route119_WeatherInstitute_2F   @ 32.1
+	map_group Route119_House                 @ 32.2
+
+	new_map_group
+	map_group Route124_DivingTreasureHuntersHouse     @ 33.0
diff --git a/constants/variables.s b/constants/variables.s
new file mode 100644
index 000000000..b92ca5975
--- /dev/null
+++ b/constants/variables.s
@@ -0,0 +1,3 @@
+	.equiv FACING, 0x800c
+	.equiv RESULT, 0x800d
+	.equiv LAST_TALKED, 0x800f