diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 22:00:09 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-15 07:49:21 -0500 |
| commit | acc1a5d4461476567facf08ee0fa64e28cdd3c76 (patch) | |
| tree | 0a99ff1bf3836d2d39c2a0f380cff21fc8359d67 | |
| parent | 0c8cfc2297a0fd7fb3b9ff3c422e871d8b14595a (diff) | |
Get all map constants from include/ rather than constants/
621 files changed, 1839 insertions, 2454 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 5367ad712..a6f9f2dae 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -1,38 +1,8 @@ - .macro new_map_group - inc cur_map_group - .set cur_map_num, 0 + .macro map map_id + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num .endm - .macro map_group map_name - .set GROUP_\map_name, cur_map_group - .set MAP_\map_name, cur_map_num - inc cur_map_num - .endm - - .macro map map_name - .byte GROUP_\map_name - .byte MAP_\map_name - .endm - - .macro warp_map map_name - .byte MAP_\map_name - .byte GROUP_\map_name - .endm - - .macro heal_location map_name, x, y - .byte GROUP_\map_name - .byte MAP_\map_name - .2byte \x - .2byte \y - .space 2 - .endm - - .equiv GROUP_NONE, 0x7f - .equiv MAP_NONE, 0x7f - - .equiv GROUP_UNDEFINED, 0xff - .equiv MAP_UNDEFINED, 0xff - .macro map_script type, address .byte \type .4byte \address @@ -56,10 +26,11 @@ inc _num_npcs .endm - .macro warp_def x, y, byte, warp, map + .macro warp_def x, y, byte, warp, map_id .2byte \x, \y .byte \byte, \warp - warp_map \map + .byte \map_id & 0xFF @ map num + .byte \map_id >> 8 @ map group inc _num_warps .endm @@ -107,7 +78,7 @@ .equiv connection_dive, 5 .equiv connection_emerge, 6 - .macro connection direction, offset, map, filler + .macro connection direction, offset, map .4byte connection_\direction .4byte \offset map \map diff --git a/constants/constants.inc b/constants/constants.inc index 5e133bba4..27d554ad0 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -3,6 +3,5 @@ .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" .include "constants/battle_frontier_constants.inc" - .include "constants/map_constants.inc" .include "constants/berry_constants.inc" .include "constants/contest_move_effects.inc" diff --git a/constants/map_constants.inc b/constants/map_constants.inc deleted file mode 100644 index a061d2501..000000000 --- a/constants/map_constants.inc +++ /dev/null @@ -1,588 +0,0 @@ -@ TODO: these need to match the names in include/constants/maps.h - .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 - map_group UNDERWATER_5 @ 0.54 - map_group UNDERWATER_6 @ 0.55 - map_group UNDERWATER_7 @ 0.56 - - 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_BATTLE_TENT_LOBBY @ 5.1 - map_group FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR @ 5.2 - map_group FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM @ 5.3 - map_group FALLARBOR_TOWN_POKEMON_CENTER_1F @ 5.4 - map_group FALLARBOR_TOWN_POKEMON_CENTER_2F @ 5.5 - map_group FALLARBOR_TOWN_HOUSE_1 @ 5.6 - map_group FALLARBOR_TOWN_HOUSE_2 @ 5.7 - - new_map_group - map_group VERDANTURF_TOWN_BATTLE_TENT_LOBBY @ 6.0 - map_group VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR @ 6.1 - map_group VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM @ 6.2 - map_group VERDANTURF_TOWN_MART @ 6.3 - map_group VERDANTURF_TOWN_POKEMON_CENTER_1F @ 6.4 - map_group VERDANTURF_TOWN_POKEMON_CENTER_2F @ 6.5 - map_group VERDANTURF_TOWN_WANDAS_HOUSE @ 6.6 - map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE @ 6.7 - map_group VERDANTURF_TOWN_HOUSE @ 6.8 - - 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_BATTLE_TENT_LOBBY @ 9.2 - map_group SLATEPORT_CITY_BATTLE_TENT_CORRIDOR @ 9.3 - map_group SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM @ 9.4 - map_group SLATEPORT_CITY_HOUSE_1 @ 9.5 - map_group SLATEPORT_CITY_POKEMON_FAN_CLUB @ 9.6 - map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F @ 9.7 - map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F @ 9.8 - map_group SLATEPORT_CITY_HARBOR @ 9.9 - map_group SLATEPORT_CITY_HOUSE_2 @ 9.10 - map_group SLATEPORT_CITY_POKEMON_CENTER_1F @ 9.11 - map_group SLATEPORT_CITY_POKEMON_CENTER_2F @ 9.12 - map_group SLATEPORT_CITY_MART @ 9.13 - - 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_MOVE_DELETERS_HOUSE @ 13.11 - map_group LILYCOVE_CITY_HOUSE_1 @ 13.12 - map_group LILYCOVE_CITY_HOUSE_2 @ 13.13 - map_group LILYCOVE_CITY_HOUSE_3 @ 13.14 - map_group LILYCOVE_CITY_HOUSE_4 @ 13.15 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F @ 13.16 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F @ 13.17 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F @ 13.18 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F @ 13.19 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F @ 13.20 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP @ 13.21 - map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR @ 13.22 - - 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_LOTAD_AND_SEEDOT_HOUSE @ 15.12 - map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F @ 15.13 - map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F @ 15.14 - - 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_HALL_1 @ 16.5 - map_group EVER_GRANDE_CITY_HALL_2 @ 16.6 - map_group EVER_GRANDE_CITY_HALL_3 @ 16.7 - map_group EVER_GRANDE_CITY_HALL_4 @ 16.8 - map_group EVER_GRANDE_CITY_HALL_5 @ 16.9 - map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_1F @ 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 - map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_2F @ 16.14 - - 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_UNUSED_RUBY_SAPPHIRE_MAP_1 @ 24.39 - map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 @ 24.40 - map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3 @ 24.41 - map_group CAVE_OF_ORIGIN_B1F @ 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 AQUA_HIDEOUT_UNUSED_RUBY_MAP_1 @ 24.74 - map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_2 @ 24.75 - map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_3 @ 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 - map_group MAGMA_HIDEOUT_1F @ 24.86 - map_group MAGMA_HIDEOUT_2F_1R @ 24.87 - map_group MAGMA_HIDEOUT_2F_2R @ 24.88 - map_group MAGMA_HIDEOUT_3F_1R @ 24.89 - map_group MAGMA_HIDEOUT_3F_2R @ 24.90 - map_group MAGMA_HIDEOUT_4F @ 24.91 - map_group MAGMA_HIDEOUT_3F_3R @ 24.92 - map_group MAGMA_HIDEOUT_2F_3R @ 24.93 - map_group MIRAGE_TOWER_1F @ 24.94 - map_group MIRAGE_TOWER_2F @ 24.95 - map_group MIRAGE_TOWER_3F @ 24.96 - map_group MIRAGE_TOWER_4F @ 24.97 - map_group DESERT_UNDERPASS @ 24.98 - map_group ARTISAN_CAVE_B1F @ 24.99 - map_group ARTISAN_CAVE_1F @ 24.100 - map_group UNDERWATER_MARINE_CAVE @ 24.101 - map_group MARINE_CAVE_ENTRANCE @ 24.102 - map_group MARINE_CAVE_END @ 24.103 - map_group TERRA_CAVE_ENTRANCE @ 24.104 - map_group TERRA_CAVE_END @ 24.105 - map_group ALTERING_CAVE @ 24.106 - map_group METEOR_FALLS_STEVENS_CAVE @ 24.107 - - 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 - map_group BATTLE_PYRAMID_SQUARE_01 @ 25.44 - map_group BATTLE_PYRAMID_SQUARE_02 @ 25.45 - map_group BATTLE_PYRAMID_SQUARE_03 @ 25.46 - map_group BATTLE_PYRAMID_SQUARE_04 @ 25.47 - map_group BATTLE_PYRAMID_SQUARE_05 @ 25.48 - map_group BATTLE_PYRAMID_SQUARE_06 @ 25.49 - map_group BATTLE_PYRAMID_SQUARE_07 @ 25.50 - map_group BATTLE_PYRAMID_SQUARE_08 @ 25.51 - map_group BATTLE_PYRAMID_SQUARE_09 @ 25.52 - map_group BATTLE_PYRAMID_SQUARE_10 @ 25.53 - map_group BATTLE_PYRAMID_SQUARE_11 @ 25.54 - map_group BATTLE_PYRAMID_SQUARE_12 @ 25.55 - map_group BATTLE_PYRAMID_SQUARE_13 @ 25.56 - map_group BATTLE_PYRAMID_SQUARE_14 @ 25.57 - map_group BATTLE_PYRAMID_SQUARE_15 @ 25.58 - map_group BATTLE_PYRAMID_SQUARE_16 @ 25.59 - map_group UNION_ROOM @ 25.60 - - new_map_group - map_group SAFARI_ZONE_NORTHWEST @ 26.0 - map_group SAFARI_ZONE_NORTH @ 26.1 - map_group SAFARI_ZONE_SOUTHWEST @ 26.2 - map_group SAFARI_ZONE_SOUTH @ 26.3 - map_group BATTLE_FRONTIER_OUTSIDE_WEST @ 26.4 - map_group BATTLE_FRONTIER_BATTLE_TOWER_LOBBY @ 26.5 - map_group BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR @ 26.6 - map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR @ 26.7 - map_group BATTLE_FRONTIER_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 - map_group SAFARI_ZONE_NORTHEAST @ 26.12 - map_group SAFARI_ZONE_SOUTHEAST @ 26.13 - map_group BATTLE_FRONTIER_OUTSIDE_EAST @ 26.14 - map_group BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM @ 26.15 - map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 @ 26.16 - map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 @ 26.17 - map_group BATTLE_FRONTIER_BATTLE_DOME_LOBBY @ 26.18 - map_group BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR @ 26.19 - map_group BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM @ 26.20 - map_group BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM @ 26.21 - map_group BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @ 26.22 - map_group BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR @ 26.23 - map_group BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM @ 26.24 - map_group BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY @ 26.25 - map_group BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE @ 26.26 - map_group BATTLE_FRONTIER_BATTLE_PYRAMID_TOP @ 26.27 - map_group BATTLE_FRONTIER_BATTLE_ARENA_LOBBY @ 26.28 - map_group BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR @ 26.29 - map_group BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM @ 26.30 - map_group BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY @ 26.31 - map_group BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM @ 26.32 - map_group BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @ 26.33 - map_group BATTLE_FRONTIER_BATTLE_PIKE_LOBBY @ 26.34 - map_group BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR @ 26.35 - map_group BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM @ 26.36 - map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 @ 26.37 - map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 @ 26.38 - map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 @ 26.39 - map_group BATTLE_FRONTIER_RANKING_HALL @ 26.40 - map_group BATTLE_FRONTIER_LOUNGE_1 @ 26.41 - map_group BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER @ 26.42 - map_group BATTLE_FRONTIER_LOUNGE_2 @ 26.43 - map_group BATTLE_FRONTIER_LOUNGE_3 @ 26.44 - map_group BATTLE_FRONTIER_LOUNGE_4 @ 26.45 - map_group BATTLE_FRONTIER_SCOTTS_HOUSE @ 26.46 - map_group BATTLE_FRONTIER_LOUNGE_5 @ 26.47 - map_group BATTLE_FRONTIER_LOUNGE_6 @ 26.48 - map_group BATTLE_FRONTIER_LOUNGE_7 @ 26.49 - map_group BATTLE_FRONTIER_RECEPTION_GATE @ 26.50 - map_group BATTLE_FRONTIER_LOUNGE_8 @ 26.51 - map_group BATTLE_FRONTIER_LOUNGE_9 @ 26.52 - map_group BATTLE_FRONTIER_POKEMON_CENTER_1F @ 26.53 - map_group BATTLE_FRONTIER_POKEMON_CENTER_2F @ 26.54 - map_group BATTLE_FRONTIER_MART @ 26.55 - map_group FARAWAY_ISLAND_ENTRANCE @ 26.56 - map_group FARAWAY_ISLAND_INTERIOR @ 26.57 - map_group BIRTH_ISLAND_EXTERIOR @ 26.58 - map_group BIRTH_ISLAND_HARBOR @ 26.59 - map_group TRAINER_HILL_ENTRANCE @ 26.60 - map_group TRAINER_HILL_1F @ 26.61 - map_group TRAINER_HILL_2F @ 26.62 - map_group TRAINER_HILL_3F @ 26.63 - map_group TRAINER_HILL_4F @ 26.64 - map_group TRAINER_HILL_ROOF @ 26.65 - map_group NAVEL_ROCK_EXTERIOR @ 26.66 - map_group NAVEL_ROCK_HARBOR @ 26.67 - map_group NAVEL_ROCK_ENTRANCE @ 26.68 - map_group NAVEL_ROCK_B1F @ 26.69 - map_group NAVEL_ROCK_FORK @ 26.70 - map_group NAVEL_ROCK_UP_1 @ 26.71 - map_group NAVEL_ROCK_UP_2 @ 26.72 - map_group NAVEL_ROCK_UP_3 @ 26.73 - map_group NAVEL_ROCK_UP_4 @ 26.74 - map_group NAVEL_ROCK_TOP @ 26.75 - map_group NAVEL_ROCK_DOWN_01 @ 26.76 - map_group NAVEL_ROCK_DOWN_02 @ 26.77 - map_group NAVEL_ROCK_DOWN_03 @ 26.78 - map_group NAVEL_ROCK_DOWN_04 @ 26.79 - map_group NAVEL_ROCK_DOWN_05 @ 26.80 - map_group NAVEL_ROCK_DOWN_06 @ 26.81 - map_group NAVEL_ROCK_DOWN_07 @ 26.82 - map_group NAVEL_ROCK_DOWN_08 @ 26.83 - map_group NAVEL_ROCK_DOWN_09 @ 26.84 - map_group NAVEL_ROCK_DOWN_10 @ 26.85 - map_group NAVEL_ROCK_DOWN_11 @ 26.86 - map_group NAVEL_ROCK_BOTTOM @ 26.87 - map_group TRAINER_HILL_ELEVATOR @ 26.88 - - 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_ENTRANCE_1 @ 29.11 - map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 @ 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 diff --git a/data/event_scripts.s b/data/event_scripts.s index ec9ddb86a..e18dec836 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -2363,7 +2364,7 @@ EventScript_27222B:: @ 827222B delay 30 applymovement 255, PetalburgCity_Movement_2725A6 waitmovement 0 - showobjectat 255, PETALBURG_CITY + showobjectat 255, MAP_PETALBURG_CITY delay 30 applymovement 255, Movement_27224E waitmovement 0 @@ -2384,7 +2385,7 @@ SouthernIsland_Exterior_EventScript_272250:: @ 8272250 compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY call BattleFrontier_OutsideWest_EventScript_2721E2 return @@ -4044,35 +4045,35 @@ Underwater7_EventScript_274223:: @ 8274223 return Underwater3_EventScript_274281:: @ 8274281 - setescapewarp ROUTE_105, 255, 11, 29 + setescapewarp MAP_ROUTE105, 255, 11, 29 return Underwater3_EventScript_27428A:: @ 827428A - setescapewarp ROUTE_105, 255, 21, 54 + setescapewarp MAP_ROUTE105, 255, 21, 54 return Underwater3_EventScript_274293:: @ 8274293 - setescapewarp ROUTE_125, 255, 9, 17 + setescapewarp MAP_ROUTE125, 255, 9, 17 return Underwater3_EventScript_27429C:: @ 827429C - setescapewarp ROUTE_125, 255, 54, 19 + setescapewarp MAP_ROUTE125, 255, 54, 19 return Underwater3_EventScript_2742A5:: @ 82742A5 - setescapewarp ROUTE_127, 255, 58, 10 + setescapewarp MAP_ROUTE127, 255, 58, 10 return Underwater3_EventScript_2742AE:: @ 82742AE - setescapewarp ROUTE_127, 255, 62, 31 + setescapewarp MAP_ROUTE127, 255, 62, 31 return Underwater3_EventScript_2742B7:: @ 82742B7 - setescapewarp ROUTE_129, 255, 17, 15 + setescapewarp MAP_ROUTE129, 255, 17, 15 return Underwater3_EventScript_2742C0:: @ 82742C0 - setescapewarp ROUTE_129, 255, 43, 20 + setescapewarp MAP_ROUTE129, 255, 43, 20 return Std_RegisteredInMatchCall:: @ 82742C9 @@ -6025,7 +6026,7 @@ gUnknown_082A8337:: @ 82A8337 waitmovement 0 playse SE_RU_HYUU delay 60 - warphole UNDEFINED + warphole MAP_UNDEFINED waitstate end @@ -13232,7 +13233,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 8 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F - hideobjectat 2, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 setvar VAR_TEMP_4, 1 turnobject 255, 2 end @@ -13245,7 +13246,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F setvar VAR_TEMP_4, 1 turnobject 255, 2 - hideobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E @@ -13300,7 +13301,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1, 255, 4, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 waitstate end @@ -13308,7 +13309,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3, 255, 4, 19 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 waitstate end @@ -13389,7 +13390,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2, 255, 2, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C @@ -13397,7 +13398,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 return BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 @@ -13452,7 +13453,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -14681,7 +14682,7 @@ TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 end TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF - warpsilent TRAINER_HILL_ENTRANCE, 255, 9, 6 + warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end @@ -14696,7 +14697,7 @@ TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF setvar VAR_TEMP_1, 0 - warp TRAINER_HILL_ENTRANCE, 255, 9, 6 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 waitstate end diff --git a/data/map_events.s b/data/map_events.s index 228380e7b..31b4b00d2 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,6 +1,7 @@ +#include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" -#include "constants/event_objects.h" +#include "constants/maps.h" #include "constants/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps.s b/data/maps.s index 8848ac242..92f5544a1 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/maps.h" #include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc index 5bc70f3b4..5a2d13f7f 100644 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ b/data/maps/BattleFrontier_OutsideEast/connections.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4 - connection left, 0, BATTLE_FRONTIER_OUTSIDE_WEST, 0 + connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_OutsideEast_MapConnections: @ 8486EF0 .4byte 0x1 diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc index 2ec2e4348..1d20172f2 100644 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ b/data/maps/BattleFrontier_OutsideWest/connections.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0 - connection right, 0, BATTLE_FRONTIER_OUTSIDE_EAST, 0 + connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_OutsideWest_MapConnections: @ 8486EDC .4byte 0x1 diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index 4386e2295..d03004922 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,6 +1,6 @@ DewfordTown_MapConnectionsList: @ 8486640 - connection up, -60, ROUTE_106, 0 - connection right, 0, ROUTE_107, 0 + connection up, -60, MAP_ROUTE106 + connection right, 0, MAP_ROUTE107 DewfordTown_MapConnections: @ 8486658 .4byte 0x2 diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index a472e456a..830240b07 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapConnectionsList: @ 84867F8 - connection left, 40, ROUTE_128, 0 + connection left, 40, MAP_ROUTE128 EverGrandeCity_MapConnections: @ 8486804 .4byte 0x1 diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 27b654f90..3808099d8 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,6 +1,6 @@ FallarborTown_MapConnectionsList: @ 8486674 - connection left, 0, ROUTE_114, 0 - connection right, 0, ROUTE_113, 0 + connection left, 0, MAP_ROUTE114 + connection right, 0, MAP_ROUTE113 FallarborTown_MapConnections: @ 848668C .4byte 0x2 diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 08541215c..83b48c0ad 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,6 +1,6 @@ FortreeCity_MapConnectionsList: @ 8486784 - connection left, 0, ROUTE_119, 0 - connection right, 0, ROUTE_120, 0 + connection left, 0, MAP_ROUTE119 + connection right, 0, MAP_ROUTE120 FortreeCity_MapConnections: @ 848679C .4byte 0x2 diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index c522a3460..0b8181615 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,5 +1,5 @@ LavaridgeTown_MapConnectionsList: @ 8486660 - connection right, -40, ROUTE_112, 0 + connection right, -40, MAP_ROUTE112 LavaridgeTown_MapConnections: @ 848666C .4byte 0x1 diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index e19e02829..d5469e561 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,6 +1,6 @@ LilycoveCity_MapConnectionsList: @ 84867A4 - connection left, 10, ROUTE_121, 0 - connection right, -10, ROUTE_124, 0 + connection left, 10, MAP_ROUTE121 + connection right, -10, MAP_ROUTE124 LilycoveCity_MapConnections: @ 84867BC .4byte 0x2 diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index 3f8f421f5..0fed8d8e1 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,5 +1,5 @@ LittlerootTown_MapConnectionsList: @ 8486600 - connection up, 0, ROUTE_101, 0 + connection up, 0, MAP_ROUTE101 LittlerootTown_MapConnections: @ 848660C .4byte 0x1 diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index 172a7bc05..ee1f4e72a 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,8 +1,8 @@ MauvilleCity_MapConnectionsList: @ 8486720 - connection up, 0, ROUTE_111, 0 - connection down, 0, ROUTE_110, 0 - connection left, 0, ROUTE_117, 0 - connection right, 0, ROUTE_118, 0 + connection up, 0, MAP_ROUTE111 + connection down, 0, MAP_ROUTE110 + connection left, 0, MAP_ROUTE117 + connection right, 0, MAP_ROUTE118 MauvilleCity_MapConnections: @ 8486750 .4byte 0x4 diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index 04a3f0c4b..a1845c04c 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,7 +1,7 @@ MossdeepCity_MapConnectionsList: @ 84867C4 - connection up, 0, ROUTE_125, 0 - connection down, 0, ROUTE_127, 0 - connection left, -40, ROUTE_124, 0 + connection up, 0, MAP_ROUTE125 + connection down, 0, MAP_ROUTE127 + connection left, -40, MAP_ROUTE124 MossdeepCity_MapConnections: @ 84867E8 .4byte 0x3 diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index f6b5336bb..db0232f83 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,7 +1,7 @@ OldaleTown_MapConnectionsList: @ 8486614 - connection up, 0, ROUTE_103, 0 - connection down, 0, ROUTE_101, 0 - connection left, 0, ROUTE_102, 0 + connection up, 0, MAP_ROUTE103 + connection down, 0, MAP_ROUTE101 + connection left, 0, MAP_ROUTE102 OldaleTown_MapConnections: @ 8486638 .4byte 0x3 diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index fcbdec008..5c84301bf 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapConnectionsList: @ 84866B4 - connection left, 0, ROUTE_132, 0 - connection right, 0, ROUTE_131, 0 + connection left, 0, MAP_ROUTE132 + connection right, 0, MAP_ROUTE131 PacifidlogTown_MapConnections: @ 84866CC .4byte 0x2 diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index 4a75eea3a..96bd6cbce 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,6 +1,6 @@ PetalburgCity_MapConnectionsList: @ 84866D4 - connection left, -50, ROUTE_104, 0 - connection right, 10, ROUTE_102, 0 + connection left, -50, MAP_ROUTE104 + connection right, 10, MAP_ROUTE102 PetalburgCity_MapConnections: @ 84866EC .4byte 0x2 diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index aee630352..f5f35e974 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,6 +1,6 @@ Route101_MapConnectionsList: @ 848680C - connection up, 0, OLDALE_TOWN, 0 - connection down, 0, LITTLEROOT_TOWN, 0 + connection up, 0, MAP_OLDALE_TOWN + connection down, 0, MAP_LITTLEROOT_TOWN Route101_MapConnections: @ 8486824 .4byte 0x2 diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 7fa2d516f..419cfeec9 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,6 +1,6 @@ Route102_MapConnectionsList: @ 848682C - connection left, -10, PETALBURG_CITY, 0 - connection right, 0, OLDALE_TOWN, 0 + connection left, -10, MAP_PETALBURG_CITY + connection right, 0, MAP_OLDALE_TOWN Route102_MapConnections: @ 8486844 .4byte 0x2 diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 10d98cec7..0759d872f 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,6 +1,6 @@ Route103_MapConnectionsList: @ 848684C - connection down, 0, OLDALE_TOWN, 0 - connection right, -60, ROUTE_110, 0 + connection down, 0, MAP_OLDALE_TOWN + connection right, -60, MAP_ROUTE110 Route103_MapConnections: @ 8486864 .4byte 0x2 diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index 0486aba98..ce605c828 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,7 +1,7 @@ Route104_MapConnectionsList: @ 848686C - connection up, 0, RUSTBORO_CITY, 0 - connection down, 0, ROUTE_105, 0 - connection right, 50, PETALBURG_CITY, 0 + connection up, 0, MAP_RUSTBORO_CITY + connection down, 0, MAP_ROUTE105 + connection right, 50, MAP_PETALBURG_CITY Route104_MapConnections: @ 8486890 .4byte 0x3 diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index 44357db1e..ac03944b7 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,7 +1,7 @@ Route105_MapConnectionsList: @ 8486898 - connection up, 0, ROUTE_104, 0 - connection down, 0, ROUTE_106, 0 - connection dive, 0, UNDERWATER_6, 0 + connection up, 0, MAP_ROUTE104 + connection down, 0, MAP_ROUTE106 + connection dive, 0, MAP_UNDERWATER6 Route105_MapConnections: @ 84868BC .4byte 0x3 diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index a3b16c452..18f181d2b 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,6 +1,6 @@ Route106_MapConnectionsList: @ 84868C4 - connection up, 0, ROUTE_105, 0 - connection down, 60, DEWFORD_TOWN, 0 + connection up, 0, MAP_ROUTE105 + connection down, 60, MAP_DEWFORD_TOWN Route106_MapConnections: @ 84868DC .4byte 0x2 diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index 2e17530d6..04ad13b07 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,6 +1,6 @@ Route107_MapConnectionsList: @ 84868E4 - connection left, 0, DEWFORD_TOWN, 0 - connection right, 0, ROUTE_108, 0 + connection left, 0, MAP_DEWFORD_TOWN + connection right, 0, MAP_ROUTE108 Route107_MapConnections: @ 84868FC .4byte 0x2 diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index 1208a2138..f80d0ade2 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,6 +1,6 @@ Route108_MapConnectionsList: @ 8486904 - connection left, 0, ROUTE_107, 0 - connection right, -40, ROUTE_109, 0 + connection left, 0, MAP_ROUTE107 + connection right, -40, MAP_ROUTE109 Route108_MapConnections: @ 848691C .4byte 0x2 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 8e1ff175f..25a7a0e91 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,6 +1,6 @@ Route109_MapConnectionsList: @ 8486924 - connection up, 0, SLATEPORT_CITY, 0 - connection left, 40, ROUTE_108, 0 + connection up, 0, MAP_SLATEPORT_CITY + connection left, 40, MAP_ROUTE108 Route109_MapConnections: @ 848693C .4byte 0x2 diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index 92a12b42a..22000354f 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,7 +1,7 @@ Route110_MapConnectionsList: @ 8486944 - connection up, 0, MAUVILLE_CITY, 0 - connection down, 0, SLATEPORT_CITY, 0 - connection left, 60, ROUTE_103, 0 + connection up, 0, MAP_MAUVILLE_CITY + connection down, 0, MAP_SLATEPORT_CITY + connection left, 60, MAP_ROUTE103 Route110_MapConnections: @ 8486968 .4byte 0x3 diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 8133a0b78..6a57d275e 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,7 +1,7 @@ Route111_MapConnectionsList: @ 8486970 - connection down, 0, MAUVILLE_CITY, 0 - connection left, 0, ROUTE_113, 0 - connection left, 20, ROUTE_112, 0 + connection down, 0, MAP_MAUVILLE_CITY + connection left, 0, MAP_ROUTE113 + connection left, 20, MAP_ROUTE112 Route111_MapConnections: @ 8486994 .4byte 0x3 diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index a8d94d710..132c4ff76 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,7 +1,7 @@ Route112_MapConnectionsList: @ 848699C - connection up, -60, ROUTE_113, 0 - connection left, 40, LAVARIDGE_TOWN, 0 - connection right, -20, ROUTE_111, 0 + connection up, -60, MAP_ROUTE113 + connection left, 40, MAP_LAVARIDGE_TOWN + connection right, -20, MAP_ROUTE111 Route112_MapConnections: @ 84869C0 .4byte 0x3 diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index 1ba0cf64c..3067ee23b 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,7 +1,7 @@ Route113_MapConnectionsList: @ 84869C8 - connection down, 60, ROUTE_112, 0 - connection left, 0, FALLARBOR_TOWN, 0 - connection right, 0, ROUTE_111, 0 + connection down, 60, MAP_ROUTE112 + connection left, 0, MAP_FALLARBOR_TOWN + connection right, 0, MAP_ROUTE111 Route113_MapConnections: @ 84869EC .4byte 0x3 diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 8569b143f..760c2ddc0 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,6 +1,6 @@ Route114_MapConnectionsList: @ 84869F4 - connection left, 40, ROUTE_115, 0 - connection right, 0, FALLARBOR_TOWN, 0 + connection left, 40, MAP_ROUTE115 + connection right, 0, MAP_FALLARBOR_TOWN Route114_MapConnections: @ 8486A0C .4byte 0x2 diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 3f283eb91..4518e31fa 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,6 +1,6 @@ Route115_MapConnectionsList: @ 8486A14 - connection down, 0, RUSTBORO_CITY, 0 - connection right, -40, ROUTE_114, 0 + connection down, 0, MAP_RUSTBORO_CITY + connection right, -40, MAP_ROUTE114 Route115_MapConnections: @ 8486A2C .4byte 0x2 diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index e037bff3b..fef193c0f 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,6 +1,6 @@ Route116_MapConnectionsList: @ 8486A34 - connection down, 80, VERDANTURF_TOWN, 0 - connection left, 0, RUSTBORO_CITY, 0 + connection down, 80, MAP_VERDANTURF_TOWN + connection left, 0, MAP_RUSTBORO_CITY Route116_MapConnections: @ 8486A4C .4byte 0x2 diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index ab64dd3b6..2780eac5a 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,6 +1,6 @@ Route117_MapConnectionsList: @ 8486A54 - connection left, 0, VERDANTURF_TOWN, 0 - connection right, 0, MAUVILLE_CITY, 0 + connection left, 0, MAP_VERDANTURF_TOWN + connection right, 0, MAP_MAUVILLE_CITY Route117_MapConnections: @ 8486A6C .4byte 0x2 diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index fe473be52..8069f036e 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,7 +1,7 @@ Route118_MapConnectionsList: @ 8486A74 - connection up, 40, ROUTE_119, 0 - connection left, 0, MAUVILLE_CITY, 0 - connection right, 0, ROUTE_123, 0 + connection up, 40, MAP_ROUTE119 + connection left, 0, MAP_MAUVILLE_CITY + connection right, 0, MAP_ROUTE123 Route118_MapConnections: @ 8486A98 .4byte 0x3 diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 20dd27498..4987e049e 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,6 +1,6 @@ Route119_MapConnectionsList: @ 8486AA0 - connection down, -40, ROUTE_118, 0 - connection right, 0, FORTREE_CITY, 0 + connection down, -40, MAP_ROUTE118 + connection right, 0, MAP_FORTREE_CITY Route119_MapConnections: @ 8486AB8 .4byte 0x2 diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index f05e65739..c599e6a2c 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,6 +1,6 @@ Route120_MapConnectionsList: @ 8486AC0 - connection left, 0, FORTREE_CITY, 0 - connection right, 80, ROUTE_121, 0 + connection left, 0, MAP_FORTREE_CITY + connection right, 80, MAP_ROUTE121 Route120_MapConnections: @ 8486AD8 .4byte 0x2 diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index 47d55b65d..94116a03e 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,7 +1,7 @@ Route121_MapConnectionsList: @ 8486AE0 - connection down, 20, ROUTE_122, 0 - connection left, -80, ROUTE_120, 0 - connection right, -10, LILYCOVE_CITY, 0 + connection down, 20, MAP_ROUTE122 + connection left, -80, MAP_ROUTE120 + connection right, -10, MAP_LILYCOVE_CITY Route121_MapConnections: @ 8486B04 .4byte 0x3 diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 2d6f53859..2a0442a05 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,6 +1,6 @@ Route122_MapConnectionsList: @ 8486B0C - connection up, -20, ROUTE_121, 0 - connection down, -100, ROUTE_123, 0 + connection up, -20, MAP_ROUTE121 + connection down, -100, MAP_ROUTE123 Route122_MapConnections: @ 8486B24 .4byte 0x2 diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index ef10fb974..616c365ef 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,6 +1,6 @@ Route123_MapConnectionsList: @ 8486B2C - connection up, 100, ROUTE_122, 0 - connection left, 0, ROUTE_118, 0 + connection up, 100, MAP_ROUTE122 + connection left, 0, MAP_ROUTE118 Route123_MapConnections: @ 8486B44 .4byte 0x2 diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index 72e358f4c..ed10daab9 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,9 +1,9 @@ Route124_MapConnectionsList: @ 8486B4C - connection down, 0, ROUTE_126, 0 - connection left, 10, LILYCOVE_CITY, 0 - connection right, 0, ROUTE_125, 0 - connection right, 40, MOSSDEEP_CITY, 0 - connection dive, 0, UNDERWATER_1, 0 + connection down, 0, MAP_ROUTE126 + connection left, 10, MAP_LILYCOVE_CITY + connection right, 0, MAP_ROUTE125 + connection right, 40, MAP_MOSSDEEP_CITY + connection dive, 0, MAP_UNDERWATER1 Route124_MapConnections: @ 8486B88 .4byte 0x5 diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 1abbf0979..2b5f944c9 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,7 +1,7 @@ Route125_MapConnectionsList: @ 8486B90 - connection down, 0, MOSSDEEP_CITY, 0 - connection left, 0, ROUTE_124, 0 - connection dive, 0, UNDERWATER_7, 0 + connection down, 0, MAP_MOSSDEEP_CITY + connection left, 0, MAP_ROUTE124 + connection dive, 0, MAP_UNDERWATER7 Route125_MapConnections: @ 8486BB4 .4byte 0x3 diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index c2beee1d8..b1f0f6d81 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,7 +1,7 @@ Route126_MapConnectionsList: @ 8486BBC - connection up, 0, ROUTE_124, 0 - connection right, 0, ROUTE_127, 0 - connection dive, 0, UNDERWATER_2, 0 + connection up, 0, MAP_ROUTE124 + connection right, 0, MAP_ROUTE127 + connection dive, 0, MAP_UNDERWATER2 Route126_MapConnections: @ 8486BE0 .4byte 0x3 diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 2b4136c3c..3ad7057a3 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,8 +1,8 @@ Route127_MapConnectionsList: @ 8486BE8 - connection up, 0, MOSSDEEP_CITY, 0 - connection down, 0, ROUTE_128, 0 - connection left, 0, ROUTE_126, 0 - connection dive, 0, UNDERWATER_3, 0 + connection up, 0, MAP_MOSSDEEP_CITY + connection down, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE126 + connection dive, 0, MAP_UNDERWATER3 Route127_MapConnections: @ 8486C18 .4byte 0x4 diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index 5355677de..5b2f0665d 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,8 +1,8 @@ Route128_MapConnectionsList: @ 8486C20 - connection up, 0, ROUTE_127, 0 - connection down, 0, ROUTE_129, 0 - connection right, -40, EVER_GRANDE_CITY, 0 - connection dive, 0, UNDERWATER_4, 0 + connection up, 0, MAP_ROUTE127 + connection down, 0, MAP_ROUTE129 + connection right, -40, MAP_EVER_GRANDE_CITY + connection dive, 0, MAP_UNDERWATER4 Route128_MapConnections: @ 8486C50 .4byte 0x4 diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index f373faff2..1293e8235 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,7 +1,7 @@ Route129_MapConnectionsList: @ 8486C58 - connection up, 0, ROUTE_128, 0 - connection left, 0, ROUTE_130, 0 - connection dive, 0, UNDERWATER_5, 0 + connection up, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE130 + connection dive, 0, MAP_UNDERWATER5 Route129_MapConnections: @ 8486C7C .4byte 0x3 diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index f4972fa38..b977d43bc 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,6 +1,6 @@ Route130_MapConnectionsList: @ 8486C84 - connection left, 0, ROUTE_131, 0 - connection right, 0, ROUTE_129, 0 + connection left, 0, MAP_ROUTE131 + connection right, 0, MAP_ROUTE129 Route130_MapConnections: @ 8486C9C .4byte 0x2 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index 4470802dd..150ea7023 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,6 +1,6 @@ Route131_MapConnectionsList: @ 8486CA4 - connection left, 0, PACIFIDLOG_TOWN, 0 - connection right, 0, ROUTE_130, 0 + connection left, 0, MAP_PACIFIDLOG_TOWN + connection right, 0, MAP_ROUTE130 Route131_MapConnections: @ 8486CBC .4byte 0x2 diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index 0e18aa2f2..5a70e3471 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,6 +1,6 @@ Route132_MapConnectionsList: @ 8486CC4 - connection left, 0, ROUTE_133, 0 - connection right, 0, PACIFIDLOG_TOWN, 0 + connection left, 0, MAP_ROUTE133 + connection right, 0, MAP_PACIFIDLOG_TOWN Route132_MapConnections: @ 8486CDC .4byte 0x2 diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index b133d8804..1f22ea960 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,6 +1,6 @@ Route133_MapConnectionsList: @ 8486CE4 - connection left, 0, ROUTE_134, 0 - connection right, 0, ROUTE_132, 0 + connection left, 0, MAP_ROUTE134 + connection right, 0, MAP_ROUTE132 Route133_MapConnections: @ 8486CFC .4byte 0x2 diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 8429378e4..861c82b4d 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,6 +1,6 @@ Route134_MapConnectionsList: @ 8486D04 - connection left, 0, SLATEPORT_CITY, 0 - connection right, 0, ROUTE_133, 0 + connection left, 0, MAP_SLATEPORT_CITY + connection right, 0, MAP_ROUTE133 Route134_MapConnections: @ 8486D1C .4byte 0x2 diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index 01e5aff35..dbca1662d 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,7 +1,7 @@ RustboroCity_MapConnectionsList: @ 8486758 - connection up, 0, ROUTE_115, 0 - connection down, 0, ROUTE_104, 0 - connection right, 0, ROUTE_116, 0 + connection up, 0, MAP_ROUTE115 + connection down, 0, MAP_ROUTE104 + connection right, 0, MAP_ROUTE116 RustboroCity_MapConnections: @ 848677C .4byte 0x3 diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc index c2052ea07..d99826f0d 100644 --- a/data/maps/SafariZone_North/connections.inc +++ b/data/maps/SafariZone_North/connections.inc @@ -1,7 +1,7 @@ SafariZone_North_MapConnectionsList: @ 8486E18 - connection left, 0, SAFARI_ZONE_NORTHWEST, 0 - connection down, 0, SAFARI_ZONE_SOUTH, 0 - connection right, 0, SAFARI_ZONE_NORTHEAST, 0 + connection left, 0, MAP_SAFARI_ZONE_NORTHWEST + connection down, 0, MAP_SAFARI_ZONE_SOUTH + connection right, 0, MAP_SAFARI_ZONE_NORTHEAST SafariZone_North_MapConnections: @ 8486E3C .4byte 0x3 diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index c23dd3e4c..c762c485a 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northeast_MapConnectionsList: @ 8486E90 - connection left, 0, SAFARI_ZONE_NORTH, 0 - connection down, 0, SAFARI_ZONE_SOUTHEAST, 0 + connection left, 0, MAP_SAFARI_ZONE_NORTH + connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Northeast_MapConnections: @ 8486EA8 .4byte 0x2 diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index 9a466f082..010a13cc2 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapConnectionsList: @ 8486DF8 - connection right, 0, SAFARI_ZONE_NORTH, 0 - connection down, 0, SAFARI_ZONE_SOUTHWEST, 0 + connection right, 0, MAP_SAFARI_ZONE_NORTH + connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Northwest_MapConnections: @ 8486E10 .4byte 0x2 diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc index 79ba1a010..856bb30ab 100644 --- a/data/maps/SafariZone_South/connections.inc +++ b/data/maps/SafariZone_South/connections.inc @@ -1,7 +1,7 @@ SafariZone_South_MapConnectionsList: @ 8486E64 - connection up, 0, SAFARI_ZONE_NORTH, 0 - connection left, 0, SAFARI_ZONE_SOUTHWEST, 0 - connection right, 0, SAFARI_ZONE_SOUTHEAST, 0 + connection up, 0, MAP_SAFARI_ZONE_NORTH + connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_South_MapConnections: @ 8486E88 .4byte 0x3 diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index 4855182e9..16b39e87b 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southeast_MapConnectionsList: @ 8486EB0 - connection left, 0, SAFARI_ZONE_SOUTH, 0 - connection up, 0, SAFARI_ZONE_NORTHEAST, 0 + connection left, 0, MAP_SAFARI_ZONE_SOUTH + connection up, 0, MAP_SAFARI_ZONE_NORTHEAST SafariZone_Southeast_MapConnections: @ 8486EC8 .4byte 0x2 diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index 936a1dc82..83398e3a3 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_MapConnectionsList: @ 8486E44 - connection up, 0, SAFARI_ZONE_NORTHWEST, 0 - connection right, 0, SAFARI_ZONE_SOUTH, 0 + connection up, 0, MAP_SAFARI_ZONE_NORTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTH SafariZone_Southwest_MapConnections: @ 8486E5C .4byte 0x2 diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index d8544954a..1485b313b 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,7 +1,7 @@ SlateportCity_MapConnectionsList: @ 84866F4 - connection up, 0, ROUTE_110, 0 - connection down, 0, ROUTE_109, 0 - connection right, 0, ROUTE_134, 0 + connection up, 0, MAP_ROUTE110 + connection down, 0, MAP_ROUTE109 + connection right, 0, MAP_ROUTE134 SlateportCity_MapConnections: @ 8486718 .4byte 0x3 diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index 6215c5e88..b0b1aa108 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,6 +1,6 @@ Underwater1_MapConnectionsList: @ 8486D38 - connection down, 0, UNDERWATER_2, 0 - connection emerge, 0, ROUTE_124, 0 + connection down, 0, MAP_UNDERWATER2 + connection emerge, 0, MAP_ROUTE124 Underwater1_MapConnections: @ 8486D50 .4byte 0x2 diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 20ef02321..11df3eaec 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,7 +1,7 @@ Underwater2_MapConnectionsList: @ 8486D6C - connection up, 0, UNDERWATER_1, 0 - connection right, 0, UNDERWATER_3, 0 - connection emerge, 0, ROUTE_126, 0 + connection up, 0, MAP_UNDERWATER1 + connection right, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE126 Underwater2_MapConnections: @ 8486D90 .4byte 0x3 diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index 30ab15908..db8b0947b 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,7 +1,7 @@ Underwater3_MapConnectionsList: @ 8486D98 - connection emerge, 0, ROUTE_127, 0 - connection left, 0, UNDERWATER_2, 0 - connection down, 0, UNDERWATER_4, 0 + connection emerge, 0, MAP_ROUTE127 + connection left, 0, MAP_UNDERWATER2 + connection down, 0, MAP_UNDERWATER4 Underwater3_MapConnections: @ 8486DBC .4byte 0x3 diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 61880749b..8a63d54a4 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,6 +1,6 @@ Underwater4_MapConnectionsList: @ 8486DC4 - connection up, 0, UNDERWATER_3, 0 - connection emerge, 0, ROUTE_128, 0 + connection up, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE128 Underwater4_MapConnections: @ 8486DDC .4byte 0x2 diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc index 6eafa49d6..15a3322ed 100644 --- a/data/maps/Underwater5/connections.inc +++ b/data/maps/Underwater5/connections.inc @@ -1,5 +1,5 @@ Underwater5_MapConnectionsList: @ 8486DE4 - connection emerge, 0, ROUTE_129, 0 + connection emerge, 0, MAP_ROUTE129 Underwater5_MapConnections: @ 8486DF0 .4byte 0x1 diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc index 4d2960b36..432ab625f 100644 --- a/data/maps/Underwater6/connections.inc +++ b/data/maps/Underwater6/connections.inc @@ -1,5 +1,5 @@ Underwater6_MapConnectionsList: @ 8486D24 - connection emerge, 0, ROUTE_105, 0 + connection emerge, 0, MAP_ROUTE105 Underwater6_MapConnections: @ 8486D30 .4byte 0x1 diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc index 16d0e47e5..82803997c 100644 --- a/data/maps/Underwater7/connections.inc +++ b/data/maps/Underwater7/connections.inc @@ -1,5 +1,5 @@ Underwater7_MapConnectionsList: @ 8486D58 - connection emerge, 0, ROUTE_125, 0 + connection emerge, 0, MAP_ROUTE125 Underwater7_MapConnections: @ 8486D64 .4byte 0x1 diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index 0e2abd0af..de6fdface 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,6 +1,6 @@ VerdanturfTown_MapConnectionsList: @ 8486694 - connection up, -80, ROUTE_116, 0 - connection right, 0, ROUTE_117, 0 + connection up, -80, MAP_ROUTE116 + connection right, 0, MAP_ROUTE117 VerdanturfTown_MapConnections: @ 84866AC .4byte 0x2 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index ddfab5eab..c66185abf 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -3,8 +3,8 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C - warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK - warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK + warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index c3cf0f54d..60e5a0f4f 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -3,18 +3,18 @@ AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 - warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK - warp_def 8, 11, 3, 2, ABANDONED_SHIP_DECK - warp_def 0, 11, 3, 3, ABANDONED_SHIP_DECK - warp_def 1, 11, 3, 3, ABANDONED_SHIP_DECK - warp_def 11, 9, 3, 0, ABANDONED_SHIP_ROOMS_1F - warp_def 14, 9, 3, 3, ABANDONED_SHIP_ROOMS_1F - warp_def 11, 3, 3, 2, ABANDONED_SHIP_ROOMS_1F - warp_def 14, 3, 3, 4, ABANDONED_SHIP_ROOMS_1F - warp_def 3, 9, 3, 0, ABANDONED_SHIP_ROOMS_2_1F - warp_def 16, 2, 3, 7, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 2, 3, 6, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F + warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F + warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 8903de197..7fb31aca0 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -3,14 +3,14 @@ AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 - warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F - warp_def 3, 4, 3, 0, ABANDONED_SHIP_ROOMS_2_B1F - warp_def 5, 7, 3, 0, ABANDONED_SHIP_ROOMS_B1F - warp_def 8, 7, 3, 1, ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 7, 3, 2, ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 4, 3, 0, ABANDONED_SHIP_ROOM_B1F - warp_def 0, 2, 3, 10, ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 2, 3, 9, ABANDONED_SHIP_CORRIDORS_1F + warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F + warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8 diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc index ca01ccec8..289f917af 100644 --- a/data/maps/events/AbandonedShip_Deck.inc +++ b/data/maps/events/AbandonedShip_Deck.inc @@ -1,9 +1,9 @@ AbandonedShip_Deck_MapWarps: @ 8536684 - warp_def 13, 15, 3, 0, ROUTE_108 - warp_def 14, 15, 3, 0, ROUTE_108 - warp_def 13, 9, 3, 1, ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 9, 3, 2, ABANDONED_SHIP_CORRIDORS_1F - warp_def 12, 5, 3, 0, ABANDONED_SHIP_CAPTAINS_OFFICE + warp_def 13, 15, 3, 0, MAP_ROUTE108 + warp_def 14, 15, 3, 0, MAP_ROUTE108 + warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE AbandonedShip_Deck_MapEvents:: @ 85366AC map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc index 3bff54076..fd5cb4ac8 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc @@ -1,10 +1,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC - warp_def 3, 8, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 8, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 8, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 3, 3, 3, 6, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 3, 3, 7, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 3, 3, 8, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 27756e5a3..239d6a455 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -5,15 +5,15 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 - warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 7, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 22, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 37, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 6, 1, 3, 3, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 1, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 1, 3, 5, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index 67411fcf9..10bcc33dd 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -2,8 +2,8 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 AbandonedShip_Room_B1F_MapWarps: @ 8536994 - warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F + warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 4791919f6..18b2b031d 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -6,9 +6,9 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 - warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index e28a2ed5b..4bd68449c 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -3,10 +3,10 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 - warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F + warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index fe9b6f7da..a3b61b7e9 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -5,12 +5,12 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 - warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 6, ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 1, 3, 7, ABANDONED_SHIP_CORRIDORS_1F - warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 631b33746..03690b801 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -3,9 +3,9 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 - warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 1, 3, 3, ABANDONED_SHIP_CORRIDORS_B1F - warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F + warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc index a92bed422..5c9af3c10 100644 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ b/data/maps/events/AbandonedShip_Underwater1.inc @@ -1,6 +1,6 @@ AbandonedShip_Underwater1_MapWarps: @ 8536958 - warp_def 3, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2 - warp_def 4, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2 + warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 AbandonedShip_Underwater1_MapEvents:: @ 8536968 map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc index de84626f3..f06c21b2a 100644 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ b/data/maps/events/AbandonedShip_Underwater2.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapWarps: @ 8536AB0 - warp_def 3, 1, 3, 0, ABANDONED_SHIP_UNDERWATER_1 + warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 AbandonedShip_Underwater2_MapEvents:: @ 8536AB8 map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AlteringCave.inc b/data/maps/events/AlteringCave.inc index 296076932..898038715 100644 --- a/data/maps/events/AlteringCave.inc +++ b/data/maps/events/AlteringCave.inc @@ -1,5 +1,5 @@ AlteringCave_MapWarps: @ 8537894 - warp_def 18, 22, 0, 0, ROUTE_103 + warp_def 18, 22, 0, 0, MAP_ROUTE103 AlteringCave_MapEvents:: @ 853789C map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index a0bde74e3..31d31ccbc 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -2,9 +2,9 @@ AncientTomb_EventObjects: @ 8536CDC object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 AncientTomb_MapWarps: @ 8536CF4 - warp_def 8, 29, 3, 0, ROUTE_120 - warp_def 8, 20, 0, 2, ANCIENT_TOMB - warp_def 8, 11, 3, 1, ANCIENT_TOMB + warp_def 8, 29, 3, 0, MAP_ROUTE120 + warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB + warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents: @ 8536D0C bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index d5b9f17d6..6e4ef5068 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -4,9 +4,9 @@ AquaHideout_1F_EventObjects: @ 8535304 object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 AquaHideout_1F_MapWarps: @ 853534C - warp_def 13, 27, 1, 6, LILYCOVE_CITY - warp_def 14, 27, 1, 6, LILYCOVE_CITY - warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F + warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 8535364 map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index c1b2f36b7..1ad010c28 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -10,31 +10,31 @@ AquaHideout_B1F_EventObjects: @ 8535378 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 AquaHideout_B1F_MapWarps: @ 8535450 - warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F - warp_def 18, 1, 3, 0, AQUA_HIDEOUT_B2F - warp_def 12, 1, 3, 1, AQUA_HIDEOUT_B2F - warp_def 3, 3, 3, 2, AQUA_HIDEOUT_B2F - warp_def 31, 4, 3, 7, AQUA_HIDEOUT_B1F - warp_def 27, 4, 3, 8, AQUA_HIDEOUT_B1F - warp_def 20, 4, 3, 10, AQUA_HIDEOUT_B1F - warp_def 27, 12, 3, 4, AQUA_HIDEOUT_B1F - warp_def 3, 15, 3, 5, AQUA_HIDEOUT_B1F - warp_def 3, 20, 3, 12, AQUA_HIDEOUT_B1F - warp_def 32, 19, 3, 6, AQUA_HIDEOUT_B1F - warp_def 23, 10, 3, 22, AQUA_HIDEOUT_B1F - warp_def 45, 3, 3, 9, AQUA_HIDEOUT_B1F - warp_def 42, 5, 3, 18, AQUA_HIDEOUT_B1F - warp_def 45, 5, 3, 12, AQUA_HIDEOUT_B1F - warp_def 48, 5, 3, 16, AQUA_HIDEOUT_B1F - warp_def 42, 9, 3, 15, AQUA_HIDEOUT_B1F - warp_def 45, 9, 3, 20, AQUA_HIDEOUT_B1F - warp_def 48, 9, 3, 13, AQUA_HIDEOUT_B1F - warp_def 42, 13, 3, 24, AQUA_HIDEOUT_B1F - warp_def 45, 13, 3, 17, AQUA_HIDEOUT_B1F - warp_def 48, 13, 3, 12, AQUA_HIDEOUT_B1F - warp_def 42, 17, 3, 11, AQUA_HIDEOUT_B1F - warp_def 45, 17, 3, 17, AQUA_HIDEOUT_B1F - warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F + warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F + warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F + warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F + warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F + warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 8535518 map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 54ef390fd..9cfd51a10 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -7,16 +7,16 @@ AquaHideout_B2F_EventObjects: @ 853552C object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 AquaHideout_B2F_MapWarps: @ 85355BC - warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F - warp_def 12, 1, 3, 2, AQUA_HIDEOUT_B1F - warp_def 3, 3, 3, 3, AQUA_HIDEOUT_B1F - warp_def 31, 8, 3, 5, AQUA_HIDEOUT_B2F - warp_def 8, 8, 3, 8, AQUA_HIDEOUT_B2F - warp_def 5, 8, 3, 3, AQUA_HIDEOUT_B2F - warp_def 18, 13, 3, 7, AQUA_HIDEOUT_B2F - warp_def 12, 13, 3, 6, AQUA_HIDEOUT_B2F - warp_def 31, 17, 3, 4, AQUA_HIDEOUT_B2F - warp_def 32, 20, 3, 4, AQUA_HIDEOUT_B1F + warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F + warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F + warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F + warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F + warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F + warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents: @ 853560C coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc index e5899ef05..e6752fc3a 100644 --- a/data/maps/events/ArtisanCave_1F.inc +++ b/data/maps/events/ArtisanCave_1F.inc @@ -2,8 +2,8 @@ ArtisanCave_1F_EventObjects: @ 8537774 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 ArtisanCave_1F_MapWarps: @ 853778C - warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F + warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F ArtisanCave_1F_MapEvents:: @ 853779C map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc index af24f4b4a..e91c3211f 100644 --- a/data/maps/events/ArtisanCave_B1F.inc +++ b/data/maps/events/ArtisanCave_B1F.inc @@ -2,8 +2,8 @@ ArtisanCave_B1F_EventObjects: @ 8537708 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 ArtisanCave_B1F_MapWarps: @ 8537720 - warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 38, 5, 0, 1, ARTISAN_CAVE_1F + warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F ArtisanCave_B1F_MapBGEvents: @ 8537730 bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0 diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc index 3add19881..9c7d333a0 100644 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C - warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092 diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc index 9b3f387b1..34f39fa0e 100644 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc @@ -2,8 +2,8 @@ BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 - warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc index 59605010f..c91db7429 100644 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc @@ -7,8 +7,8 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 - warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 12, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52 diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc index 82da39a63..be18e491a 100644 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc @@ -2,8 +2,8 @@ BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 - warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc index 8d514f8a0..322a2e66e 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc @@ -7,8 +7,8 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 - warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 10, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc index b5fc13838..520f92838 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc @@ -6,8 +6,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 - warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR + warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR + warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc index 2b6f7f251..a605a89ea 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc @@ -8,10 +8,10 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 - warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 9, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 6, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY + warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY + warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc index 318ac3c49..a333fa100 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc @@ -7,9 +7,9 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 - warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 5, 4, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR + warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc index 6def28528..e9aa08917 100644 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc @@ -5,9 +5,9 @@ BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 - warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 6, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80 diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc index 63e7f2acd..8dce267b4 100644 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -10,9 +10,9 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 - warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc index fccb4abff..0fc086feb 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 - warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc index af9677524..bea8a6484 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc @@ -4,8 +4,8 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 - warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY + warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY + warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc index 2faa6a413..34c808268 100644 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc @@ -10,9 +10,9 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 - warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 1, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM + warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc index b00838290..a026f1734 100644 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ b/data/maps/events/BattleFrontier_Lounge1.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge1_EventObjects: @ 853CFB4 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC - warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge1_MapEvents:: @ 853D004 map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc index 0370b2a18..a04ee9bec 100644 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ b/data/maps/events/BattleFrontier_Lounge2.inc @@ -6,8 +6,8 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 - warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc index 6349cd381..529e42c66 100644 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ b/data/maps/events/BattleFrontier_Lounge3.inc @@ -6,7 +6,7 @@ BattleFrontier_Lounge3_EventObjects: @ 853D1B8 object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 - warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge3_MapEvents:: @ 853D238 map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc index 2076facee..5bdfa4e12 100644 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ b/data/maps/events/BattleFrontier_Lounge4.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge4_EventObjects: @ 853D24C object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 - warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge4_MapEvents:: @ 853D29C map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc index a8e5f97f5..1d68986cc 100644 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ b/data/maps/events/BattleFrontier_Lounge5.inc @@ -5,8 +5,8 @@ BattleFrontier_Lounge5_EventObjects: @ 853D2EC object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C - warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge5_MapEvents:: @ 853D35C map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc index be0db4f08..12853012e 100644 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ b/data/maps/events/BattleFrontier_Lounge6.inc @@ -2,7 +2,7 @@ BattleFrontier_Lounge6_EventObjects: @ 853D370 object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 - warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge6_MapEvents:: @ 853D390 map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc index b4e6cc5eb..bfe0ae7e8 100644 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ b/data/maps/events/BattleFrontier_Lounge7.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge7_EventObjects: @ 853D3A4 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 - warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge7_MapEvents:: @ 853D40C map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc index 99aa3333c..be16a6107 100644 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ b/data/maps/events/BattleFrontier_Lounge8.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge8_EventObjects: @ 853D4BC object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 - warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge8_MapEvents:: @ 853D50C map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc index 7c478fabe..5e294b384 100644 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ b/data/maps/events/BattleFrontier_Lounge9.inc @@ -2,8 +2,8 @@ BattleFrontier_Lounge9_EventObjects: @ 853D520 object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 - warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge9_MapEvents:: @ 853D548 map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc index 969b54855..495be5f63 100644 --- a/data/maps/events/BattleFrontier_Mart.inc +++ b/data/maps/events/BattleFrontier_Mart.inc @@ -5,8 +5,8 @@ BattleFrontier_Mart_EventObjects: @ 853D68C object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC - warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Mart_MapEvents:: @ 853D6FC map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc index 3d7c53493..62423b9c1 100644 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ b/data/maps/events/BattleFrontier_OutsideEast.inc @@ -27,20 +27,20 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 - warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 39, 29, 0, 0, BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - warp_def 45, 56, 0, 0, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 58, 14, 0, 0, BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - warp_def 35, 12, 3, 0, BATTLE_FRONTIER_RANKING_HALL - warp_def 4, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_1 - warp_def 10, 28, 0, 0, BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - warp_def 22, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_5 - warp_def 5, 8, 0, 0, BATTLE_FRONTIER_LOUNGE_6 - warp_def 65, 31, 0, 0, BATTLE_FRONTIER_LOUNGE_3 - warp_def 14, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_8 - warp_def 21, 45, 0, 0, BATTLE_FRONTIER_LOUNGE_9 - warp_def 3, 51, 0, 0, BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 28, 7, 0, 0, ARTISAN_CAVE_1F + warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY + warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY + warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY + warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY + warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL + warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1 + warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER + warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5 + warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6 + warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3 + warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8 + warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9 + warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F + warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43 diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc index 7923af813..60f10c8b5 100644 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ b/data/maps/events/BattleFrontier_OutsideWest.inc @@ -25,17 +25,17 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 - warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - warp_def 19, 17, 0, 0, BATTLE_FRONTIER_BATTLE_DOME_LOBBY - warp_def 11, 38, 0, 0, BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - warp_def 45, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_2 - warp_def 51, 51, 0, 0, BATTLE_FRONTIER_MART - warp_def 44, 5, 0, 0, BATTLE_FRONTIER_SCOTTS_HOUSE - warp_def 53, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_4 - warp_def 5, 20, 0, 0, BATTLE_FRONTIER_LOUNGE_7 - warp_def 26, 65, 0, 0, BATTLE_FRONTIER_RECEPTION_GATE - warp_def 26, 61, 0, 1, BATTLE_FRONTIER_RECEPTION_GATE - warp_def 39, 55, 0, 0, ARTISAN_CAVE_B1F + warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY + warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY + warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY + warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2 + warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART + warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE + warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4 + warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7 + warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE + warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE + warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2 diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc index 262744ce1..79b37aead 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 - warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F + warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc index f9d9d408a..f94c24b00 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 - warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc index 81058b042..bfe61cda1 100644 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ b/data/maps/events/BattleFrontier_RankingHall.inc @@ -4,8 +4,8 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 - warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 27, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST + warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc index 8984c44a0..aca73394c 100644 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ b/data/maps/events/BattleFrontier_ReceptionGate.inc @@ -6,8 +6,8 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 - warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc index 4ea329ab9..5e9ff1912 100644 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ b/data/maps/events/BattleFrontier_ScottsHouse.inc @@ -2,8 +2,8 @@ BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 - warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST + warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc index 1d6238e8f..e61935ebe 100644 --- a/data/maps/events/BirthIsland_Exterior.inc +++ b/data/maps/events/BirthIsland_Exterior.inc @@ -3,7 +3,7 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 BirthIsland_Exterior_MapWarps: @ 853D80C - warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR + warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR BirthIsland_Exterior_MapEvents:: @ 853D814 map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc index bb2d6036d..fe4a55b25 100644 --- a/data/maps/events/BirthIsland_Harbor.inc +++ b/data/maps/events/BirthIsland_Harbor.inc @@ -3,7 +3,7 @@ BirthIsland_Harbor_EventObjects: @ 853D828 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 - warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR + warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR BirthIsland_Harbor_MapEvents:: @ 853D860 map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 8dfdb78d0..bdc629846 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_1F_MapWarps: @ 8535D40 - warp_def 11, 17, 3, 1, CAVE_OF_ORIGIN_ENTRANCE - warp_def 14, 5, 3, 0, CAVE_OF_ORIGIN_B1F + warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapEvents:: @ 8535D50 map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 148bb22a6..1c951f240 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -2,7 +2,7 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 - warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F + warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc index 96946936b..5a5ad59f7 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ b/data/maps/events/CaveOfOrigin_Entrance.inc @@ -1,6 +1,6 @@ CaveOfOrigin_Entrance_MapWarps: @ 8535D1C - warp_def 9, 20, 3, 3, SOOTOPOLIS_CITY - warp_def 9, 5, 3, 0, CAVE_OF_ORIGIN_1F + warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY + warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc index f60a5e1a2..c9eeaff22 100644 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc +++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 - warp_def 13, 5, 3, 1, CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc index 256b6179e..c8e9bbeeb 100644 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc +++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 - warp_def 5, 10, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1 - warp_def 8, 14, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3 + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc index 87a99e5d2..953eef558 100644 --- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc +++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC - warp_def 7, 14, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 - warp_def 12, 6, 3, 0, CAVE_OF_ORIGIN_B1F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 2253dec67..510a18998 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -2,9 +2,9 @@ DesertRuins_EventObjects: @ 8534354 object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 DesertRuins_MapWarps: @ 853436C - warp_def 8, 29, 3, 1, ROUTE_111 - warp_def 8, 20, 0, 2, DESERT_RUINS - warp_def 8, 11, 3, 1, DESERT_RUINS + warp_def 8, 29, 3, 1, MAP_ROUTE111 + warp_def 8, 20, 0, 2, MAP_DESERT_RUINS + warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents: @ 8534384 bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc index deb440ff9..ea53189ad 100644 --- a/data/maps/events/DesertUnderpass.inc +++ b/data/maps/events/DesertUnderpass.inc @@ -2,7 +2,7 @@ DesertUnderpass_EventObjects: @ 85376D4 object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 DesertUnderpass_MapWarps: @ 85376EC - warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL + warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL DesertUnderpass_MapEvents:: @ 85376F4 map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 8bb897125..9d2c34dc9 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -6,11 +6,11 @@ DewfordTown_EventObjects: @ 8527964 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 DewfordTown_MapWarps: @ 85279DC - warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL - warp_def 2, 10, 0, 0, DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 8, 17, 0, 0, DEWFORD_TOWN_GYM - warp_def 17, 14, 0, 0, DEWFORD_TOWN_HOUSE_1 - warp_def 8, 8, 0, 0, DEWFORD_TOWN_HOUSE_2 + warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL + warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM + warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 + warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents: @ 8527A04 bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index 8d7a8e460..f5a4452bb 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -9,8 +9,8 @@ DewfordTown_Gym_EventObjects: @ 852DB34 object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 - warp_def 5, 27, 0, 2, DEWFORD_TOWN - warp_def 6, 27, 0, 2, DEWFORD_TOWN + warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN + warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents: @ 852DC04 bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2 diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index c4b6600ec..39f4fad75 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -10,8 +10,8 @@ DewfordTown_Hall_EventObjects: @ 852DC48 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 DewfordTown_Hall_MapWarps: @ 852DD20 - warp_def 5, 8, 0, 0, DEWFORD_TOWN - warp_def 6, 8, 0, 0, DEWFORD_TOWN + warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN + warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents: @ 852DD30 bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590 diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 72b63dff3..887165b82 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -4,8 +4,8 @@ DewfordTown_House1_EventObjects: @ 852D9C8 object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 DewfordTown_House1_MapWarps: @ 852DA10 - warp_def 3, 7, 0, 3, DEWFORD_TOWN - warp_def 4, 7, 0, 3, DEWFORD_TOWN + warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN + warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 852DA20 map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index 901046cbc..9cacd146d 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -3,8 +3,8 @@ DewfordTown_House2_EventObjects: @ 852DD5C object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 DewfordTown_House2_MapWarps: @ 852DD8C - warp_def 3, 8, 0, 4, DEWFORD_TOWN - warp_def 4, 8, 0, 4, DEWFORD_TOWN + warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN + warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 852DD9C map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index f61966b88..ab2f8c74a 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C - warp_def 7, 8, 3, 1, DEWFORD_TOWN - warp_def 6, 8, 3, 1, DEWFORD_TOWN - warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 7098e6ed8..b2147e4f0 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 - warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index d1d4f0fef..f28e9e3e1 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps: @ 8539E88 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE - warp_def 8, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE + warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index fb471b4ff..b8ca9eea4 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapWarps: @ 8527588 - warp_def 18, 5, 0, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 27, 48, 0, 0, EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 18, 41, 0, 0, VICTORY_ROAD_1F - warp_def 18, 27, 0, 1, VICTORY_ROAD_1F + warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F + warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents: @ 85275A8 coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 269645dc6..6318c7bb7 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -4,8 +4,8 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index 761e321d6..823965d78 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index a8632b8c1..dd2e33d52 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/events/EverGrandeCity_Hall1.inc index 8f9e791a8..3351b42e0 100644 --- a/data/maps/events/EverGrandeCity_Hall1.inc +++ b/data/maps/events/EverGrandeCity_Hall1.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall1_MapWarps: @ 853376C - warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM EverGrandeCity_Hall1_MapEvents:: @ 853378C map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/events/EverGrandeCity_Hall2.inc index c9426ceea..e3eacab10 100644 --- a/data/maps/events/EverGrandeCity_Hall2.inc +++ b/data/maps/events/EverGrandeCity_Hall2.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall2_MapWarps: @ 85337A0 - warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM EverGrandeCity_Hall2_MapEvents:: @ 85337C0 map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/events/EverGrandeCity_Hall3.inc index 68f506d00..e44182b4f 100644 --- a/data/maps/events/EverGrandeCity_Hall3.inc +++ b/data/maps/events/EverGrandeCity_Hall3.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall3_MapWarps: @ 85337D4 - warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM EverGrandeCity_Hall3_MapEvents:: @ 85337F4 map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/events/EverGrandeCity_Hall4.inc index 4e7c4f7e6..b2d011234 100644 --- a/data/maps/events/EverGrandeCity_Hall4.inc +++ b/data/maps/events/EverGrandeCity_Hall4.inc @@ -1,6 +1,6 @@ EverGrandeCity_Hall4_MapWarps: @ 8533808 - warp_def 5, 33, 3, 1, EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_CHAMPIONS_ROOM + warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_Hall4_MapEvents:: @ 8533818 map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/events/EverGrandeCity_Hall5.inc index 69fa9a629..687920b71 100644 --- a/data/maps/events/EverGrandeCity_Hall5.inc +++ b/data/maps/events/EverGrandeCity_Hall5.inc @@ -1,8 +1,8 @@ EverGrandeCity_Hall5_MapWarps: @ 853382C - warp_def 5, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 4, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 6, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F EverGrandeCity_Hall5_MapEvents:: @ 853384C map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 0d75ef553..671c31224 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -2,7 +2,7 @@ EverGrandeCity_HallOfFame_EventObjects: @ 85338FC object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 - warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM + warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 853391C map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index dd09ad4a1..0a8d48d29 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index a758c4d73..745c23309 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 - warp_def 7, 8, 3, 1, EVER_GRANDE_CITY - warp_def 6, 8, 3, 1, EVER_GRANDE_CITY - warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index bbedf59d2..19741159a 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C - warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc index a19984ea2..129de15cc 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc @@ -5,11 +5,11 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 - warp_def 9, 11, 3, 0, EVER_GRANDE_CITY - warp_def 10, 11, 3, 0, EVER_GRANDE_CITY - warp_def 9, 1, 3, 0, EVER_GRANDE_CITY_HALL_5 - warp_def 10, 1, 3, 0, EVER_GRANDE_CITY_HALL_5 - warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F + warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc index 6b85a2fb0..3e453781a 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc @@ -5,9 +5,9 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 - warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index 93d9a879e..295633242 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 - warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5 - warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index e9fb7579c..abe98828c 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -5,11 +5,11 @@ FallarborTown_EventObjects: @ 8527BE0 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 FallarborTown_MapWarps: @ 8527C40 - warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART - warp_def 8, 7, 0, 0, FALLARBOR_TOWN_BATTLE_TENT_LOBBY - warp_def 14, 7, 0, 0, FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 6, 17, 0, 0, FALLARBOR_TOWN_HOUSE_1 - warp_def 1, 6, 0, 0, FALLARBOR_TOWN_HOUSE_2 + warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART + warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY + warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 + warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents: @ 8527C68 bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc index e261f185f..cdc525c0a 100644 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ b/data/maps/events/FallarborTown_BattleTentLobby.inc @@ -6,8 +6,8 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 - warp_def 6, 9, 0, 1, FALLARBOR_TOWN - warp_def 7, 9, 0, 1, FALLARBOR_TOWN + warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN + warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index b3975685c..42f5e1950 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -3,8 +3,8 @@ FallarborTown_House1_EventObjects: @ 852E5B8 object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 FallarborTown_House1_MapWarps: @ 852E5E8 - warp_def 3, 8, 0, 3, FALLARBOR_TOWN - warp_def 4, 8, 0, 3, FALLARBOR_TOWN + warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN + warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 852E5F8 map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index d809bf493..853aa5d2b 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -2,8 +2,8 @@ FallarborTown_House2_EventObjects: @ 852E60C object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 FallarborTown_House2_MapWarps: @ 852E624 - warp_def 3, 7, 0, 4, FALLARBOR_TOWN - warp_def 4, 7, 0, 4, FALLARBOR_TOWN + warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 852E634 map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index 762db16f9..fee24d963 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -6,8 +6,8 @@ FallarborTown_Mart_EventObjects: @ 852E2D4 object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 FallarborTown_Mart_MapWarps: @ 852E34C - warp_def 3, 7, 0, 0, FALLARBOR_TOWN - warp_def 4, 7, 0, 0, FALLARBOR_TOWN + warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 852E35C map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index e6c91a736..1be0bd783 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 - warp_def 7, 8, 3, 2, FALLARBOR_TOWN - warp_def 6, 8, 3, 2, FALLARBOR_TOWN - warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 6ddb7e9c9..c72ccf88a 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C - warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc index 27d98189e..2c6a007bf 100644 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ b/data/maps/events/FarawayIsland_Entrance.inc @@ -3,8 +3,8 @@ FarawayIsland_Entrance_EventObjects: @ 853D710 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 - warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR - warp_def 23, 7, 3, 1, FARAWAY_ISLAND_INTERIOR + warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR + warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR FarawayIsland_Entrance_MapCoordEvents: @ 853D750 coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98 diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc index d74eb9d8f..5d41d11d1 100644 --- a/data/maps/events/FarawayIsland_Interior.inc +++ b/data/maps/events/FarawayIsland_Interior.inc @@ -2,8 +2,8 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 FarawayIsland_Interior_MapWarps: @ 853D7B8 - warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE - warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE + warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE + warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE FarawayIsland_Interior_MapEvents:: @ 853D7C8 map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 3b68b1292..6979786aa 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -9,8 +9,8 @@ FieryPath_EventObjects: @ 8534C80 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 FieryPath_MapWarps: @ 8534D40 - warp_def 26, 36, 3, 4, ROUTE_112 - warp_def 26, 4, 3, 5, ROUTE_112 + warp_def 26, 36, 3, 4, MAP_ROUTE112 + warp_def 26, 4, 3, 5, MAP_ROUTE112 FieryPath_MapEvents:: @ 8534D50 map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 517d32d53..cb9e70e07 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -8,15 +8,15 @@ FortreeCity_EventObjects: @ 8526B9C object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 FortreeCity_MapWarps: @ 8526C44 - warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F - warp_def 10, 3, 0, 0, FORTREE_CITY_HOUSE_1 - warp_def 22, 11, 0, 0, FORTREE_CITY_GYM - warp_def 4, 14, 0, 0, FORTREE_CITY_MART - warp_def 17, 3, 0, 0, FORTREE_CITY_HOUSE_2 - warp_def 25, 3, 0, 0, FORTREE_CITY_HOUSE_3 - warp_def 32, 2, 0, 0, FORTREE_CITY_HOUSE_4 - warp_def 12, 13, 0, 0, FORTREE_CITY_HOUSE_5 - warp_def 37, 13, 0, 0, FORTREE_CITY_DECORATION_SHOP + warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 + warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM + warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART + warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 + warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 + warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 + warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 + warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602 diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index 6b7e0f39d..7abb73fed 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -5,8 +5,8 @@ FortreeCity_DecorationShop_EventObjects: @ 85310B0 object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 - warp_def 3, 5, 0, 8, FORTREE_CITY - warp_def 4, 5, 0, 8, FORTREE_CITY + warp_def 3, 5, 0, 8, MAP_FORTREE_CITY + warp_def 4, 5, 0, 8, MAP_FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8531120 map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index a06882772..3f8e8d634 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -9,8 +9,8 @@ FortreeCity_Gym_EventObjects: @ 8530C98 object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 FortreeCity_Gym_MapWarps: @ 8530D58 - warp_def 15, 24, 0, 2, FORTREE_CITY - warp_def 16, 24, 0, 2, FORTREE_CITY + warp_def 15, 24, 0, 2, MAP_FORTREE_CITY + warp_def 16, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents: @ 8530D68 bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751 diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index abaae2d40..754758c5c 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -4,8 +4,8 @@ FortreeCity_House1_EventObjects: @ 8530C2C object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 FortreeCity_House1_MapWarps: @ 8530C74 - warp_def 3, 5, 0, 1, FORTREE_CITY - warp_def 4, 5, 0, 1, FORTREE_CITY + warp_def 3, 5, 0, 1, MAP_FORTREE_CITY + warp_def 4, 5, 0, 1, MAP_FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8530C84 map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 513097503..742688c1d 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -3,8 +3,8 @@ FortreeCity_House2_EventObjects: @ 8530F30 object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 FortreeCity_House2_MapWarps: @ 8530F60 - warp_def 3, 5, 0, 4, FORTREE_CITY - warp_def 4, 5, 0, 4, FORTREE_CITY + warp_def 3, 5, 0, 4, MAP_FORTREE_CITY + warp_def 4, 5, 0, 4, MAP_FORTREE_CITY FortreeCity_House2_MapEvents:: @ 8530F70 map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index 1b788cbe2..13d1e079e 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -3,8 +3,8 @@ FortreeCity_House3_EventObjects: @ 8530F84 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 FortreeCity_House3_MapWarps: @ 8530FB4 - warp_def 3, 5, 0, 5, FORTREE_CITY - warp_def 4, 5, 0, 5, FORTREE_CITY + warp_def 3, 5, 0, 5, MAP_FORTREE_CITY + warp_def 4, 5, 0, 5, MAP_FORTREE_CITY FortreeCity_House3_MapEvents:: @ 8530FC4 map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index a4050a5f6..3c6886e3c 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -4,8 +4,8 @@ FortreeCity_House4_EventObjects: @ 8530FD8 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 FortreeCity_House4_MapWarps: @ 8531020 - warp_def 3, 5, 0, 6, FORTREE_CITY - warp_def 4, 5, 0, 6, FORTREE_CITY + warp_def 3, 5, 0, 6, MAP_FORTREE_CITY + warp_def 4, 5, 0, 6, MAP_FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8531030 map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index b6bf34354..7849df43e 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -4,8 +4,8 @@ FortreeCity_House5_EventObjects: @ 8531044 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 FortreeCity_House5_MapWarps: @ 853108C - warp_def 3, 5, 0, 7, FORTREE_CITY - warp_def 4, 5, 0, 7, FORTREE_CITY + warp_def 3, 5, 0, 7, MAP_FORTREE_CITY + warp_def 4, 5, 0, 7, MAP_FORTREE_CITY FortreeCity_House5_MapEvents:: @ 853109C map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index df4877663..450007097 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -5,8 +5,8 @@ FortreeCity_Mart_EventObjects: @ 8530EAC object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 FortreeCity_Mart_MapWarps: @ 8530F0C - warp_def 3, 7, 0, 3, FORTREE_CITY - warp_def 4, 7, 0, 3, FORTREE_CITY + warp_def 3, 7, 0, 3, MAP_FORTREE_CITY + warp_def 4, 7, 0, 3, MAP_FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8530F1C map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index b6b8cfdce..e2555bd2c 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 - warp_def 7, 8, 3, 0, FORTREE_CITY - warp_def 6, 8, 3, 0, FORTREE_CITY - warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_FORTREE_CITY + warp_def 6, 8, 3, 0, MAP_FORTREE_CITY + warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index c8f2356c4..b03f27efa 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 - warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index ed546c8df..d14cf38ca 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -3,10 +3,10 @@ GraniteCave_1F_EventObjects: @ 85343BC object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 GraniteCave_1F_MapWarps: @ 85343EC - warp_def 37, 12, 3, 0, ROUTE_106 - warp_def 35, 3, 3, 0, GRANITE_CAVE_B1F - warp_def 17, 11, 3, 1, GRANITE_CAVE_B1F - warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM + warp_def 37, 12, 3, 0, MAP_ROUTE106 + warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F + warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F + warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 853440C map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index 7f4e67f33..f393dd720 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -2,13 +2,13 @@ GraniteCave_B1F_EventObjects: @ 8534420 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 GraniteCave_B1F_MapWarps: @ 8534438 - warp_def 25, 13, 3, 1, GRANITE_CAVE_1F - warp_def 4, 21, 3, 2, GRANITE_CAVE_1F - warp_def 29, 13, 3, 0, GRANITE_CAVE_B2F - warp_def 28, 21, 3, 1, GRANITE_CAVE_B2F - warp_def 8, 5, 3, 2, GRANITE_CAVE_B2F - warp_def 12, 3, 3, 3, GRANITE_CAVE_B2F - warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F + warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F + warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F + warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F + warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F + warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F + warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F + warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 8534470 map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 7c484e9a9..776520196 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -10,11 +10,11 @@ GraniteCave_B2F_EventObjects: @ 8534484 object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 GraniteCave_B2F_MapWarps: @ 853455C - warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F - warp_def 28, 21, 3, 3, GRANITE_CAVE_B1F - warp_def 8, 5, 3, 4, GRANITE_CAVE_B1F - warp_def 12, 3, 3, 5, GRANITE_CAVE_B1F - warp_def 29, 2, 3, 6, GRANITE_CAVE_B1F + warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F + warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F + warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F + warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F + warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents: @ 8534584 bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 65b343202..26233c0d7 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -2,7 +2,7 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 GraniteCave_StevensRoom_MapWarps: @ 85345C8 - warp_def 7, 3, 3, 3, GRANITE_CAVE_1F + warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 85345D0 map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 4cf23e63d..60d8fc7bd 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_EventObjects: @ 853A078 object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 InsideOfTruck_MapWarps: @ 853A0C0 - warp_def 4, 1, 0, 127, NONE - warp_def 4, 2, 0, 127, NONE - warp_def 4, 3, 0, 127, NONE + warp_def 4, 1, 0, 127, MAP_NONE + warp_def 4, 2, 0, 127, MAP_NONE + warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents: @ 853A0D8 coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index da1f94173..71d94e0cd 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -2,9 +2,9 @@ IslandCave_EventObjects: @ 8536C74 object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 IslandCave_MapWarps: @ 8536C8C - warp_def 8, 29, 3, 0, ROUTE_105 - warp_def 8, 20, 0, 2, ISLAND_CAVE - warp_def 8, 11, 3, 1, ISLAND_CAVE + warp_def 8, 29, 3, 0, MAP_ROUTE105 + warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE + warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents: @ 8536CA4 bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 5d970924d..fa6dabcff 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -8,11 +8,11 @@ JaggedPass_EventObjects: @ 8534AE4 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 JaggedPass_MapWarps: @ 8534B8C - warp_def 14, 40, 3, 2, ROUTE_112 - warp_def 15, 40, 3, 3, ROUTE_112 - warp_def 13, 5, 3, 2, MT_CHIMNEY - warp_def 14, 5, 3, 3, MT_CHIMNEY - warp_def 16, 18, 0, 0, MAGMA_HIDEOUT_1F + warp_def 14, 40, 3, 2, MAP_ROUTE112 + warp_def 15, 40, 3, 3, MAP_ROUTE112 + warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY + warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY + warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 658056768..7419f67d6 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -10,12 +10,12 @@ LavaridgeTown_EventObjects: @ 8527A54 object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 LavaridgeTown_MapWarps: @ 8527B2C - warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP - warp_def 5, 15, 0, 0, LAVARIDGE_TOWN_GYM_1F - warp_def 15, 5, 0, 0, LAVARIDGE_TOWN_MART - warp_def 9, 6, 0, 0, LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 16, 15, 0, 0, LAVARIDGE_TOWN_HOUSE - warp_def 9, 2, 3, 3, LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP + warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART + warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE + warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents: @ 8527B5C coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index 501cab67f..784b7b857 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -7,32 +7,32 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC - warp_def 13, 18, 3, 1, LAVARIDGE_TOWN - warp_def 14, 18, 3, 1, LAVARIDGE_TOWN - warp_def 10, 18, 3, 0, LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 9, 3, 2, LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 14, 3, 3, LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 17, 3, 1, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 9, 3, 5, LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 15, 3, 6, LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 14, 3, 7, LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 14, 3, 8, LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 10, 3, 9, LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 10, 3, 10, LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 6, 3, 11, LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 6, 3, 12, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 6, 3, 13, LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 3, 3, 14, LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 2, 3, 15, LAVARIDGE_TOWN_GYM_B1F - warp_def 7, 2, 3, 16, LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 6, 3, 17, LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 6, 3, 18, LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 16, 0, 20, LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 3, 3, 19, LAVARIDGE_TOWN_GYM_B1F - warp_def 14, 6, 3, 21, LAVARIDGE_TOWN_GYM_B1F - warp_def 13, 17, 3, 22, LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 12, 3, 23, LAVARIDGE_TOWN_GYM_B1F + warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index af1f166ce..88dae4c5e 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -5,30 +5,30 @@ LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 - warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F - warp_def 0, 17, 3, 6, LAVARIDGE_TOWN_GYM_1F - warp_def 8, 9, 3, 3, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 14, 3, 5, LAVARIDGE_TOWN_GYM_1F - warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 9, 3, 7, LAVARIDGE_TOWN_GYM_1F - warp_def 2, 15, 3, 8, LAVARIDGE_TOWN_GYM_1F - warp_def 3, 14, 3, 9, LAVARIDGE_TOWN_GYM_1F - warp_def 1, 14, 3, 10, LAVARIDGE_TOWN_GYM_1F - warp_def 0, 10, 3, 11, LAVARIDGE_TOWN_GYM_1F - warp_def 3, 10, 3, 12, LAVARIDGE_TOWN_GYM_1F - warp_def 0, 6, 3, 13, LAVARIDGE_TOWN_GYM_1F - warp_def 3, 6, 3, 14, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 6, 3, 15, LAVARIDGE_TOWN_GYM_1F - warp_def 2, 3, 3, 16, LAVARIDGE_TOWN_GYM_1F - warp_def 5, 2, 3, 17, LAVARIDGE_TOWN_GYM_1F - warp_def 7, 2, 3, 18, LAVARIDGE_TOWN_GYM_1F - warp_def 8, 6, 3, 19, LAVARIDGE_TOWN_GYM_1F - warp_def 10, 6, 3, 20, LAVARIDGE_TOWN_GYM_1F - warp_def 12, 3, 3, 22, LAVARIDGE_TOWN_GYM_1F - warp_def 4, 16, 3, 21, LAVARIDGE_TOWN_GYM_1F - warp_def 14, 6, 3, 23, LAVARIDGE_TOWN_GYM_1F - warp_def 13, 17, 3, 24, LAVARIDGE_TOWN_GYM_1F - warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F + warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index 9fa4c6376..939a8752e 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -4,8 +4,8 @@ LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 - warp_def 3, 7, 0, 0, LAVARIDGE_TOWN - warp_def 4, 7, 0, 0, LAVARIDGE_TOWN + warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index 669728b66..c97aea86a 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -4,8 +4,8 @@ LavaridgeTown_House_EventObjects: @ 852E0DC object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 LavaridgeTown_House_MapWarps: @ 852E124 - warp_def 3, 7, 0, 4, LAVARIDGE_TOWN - warp_def 4, 7, 0, 4, LAVARIDGE_TOWN + warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 852E134 map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index 5230cead9..77f372aa2 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -4,8 +4,8 @@ LavaridgeTown_Mart_EventObjects: @ 852E148 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 - warp_def 3, 7, 0, 2, LAVARIDGE_TOWN - warp_def 4, 7, 0, 2, LAVARIDGE_TOWN + warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 852E1A0 map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index 8ebf9f16a..07ca2e7c0 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 - warp_def 7, 8, 3, 3, LAVARIDGE_TOWN - warp_def 6, 8, 3, 3, LAVARIDGE_TOWN - warp_def 1, 6, 4, 0, LAVARIDGE_TOWN_POKEMON_CENTER_2F - warp_def 2, 1, 0, 5, LAVARIDGE_TOWN + warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F + warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 53fc2b2cc..27d0f6fec 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 - warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index c7578bec3..5020993d8 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -23,20 +23,20 @@ LilycoveCity_EventObjects: @ 8526CE8 object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 LilycoveCity_MapWarps: @ 8526EF8 - warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 37, 24, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_1F - warp_def 24, 14, 0, 0, LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 11, 5, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - warp_def 23, 24, 0, 0, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 39, 14, 0, 1, LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - warp_def 70, 5, 1, 0, AQUA_HIDEOUT_1F - warp_def 36, 6, 0, 0, LILYCOVE_CITY_MOVE_DELETERS_HOUSE - warp_def 42, 6, 0, 0, LILYCOVE_CITY_HOUSE_1 - warp_def 55, 15, 0, 0, LILYCOVE_CITY_HOUSE_2 - warp_def 11, 22, 0, 0, LILYCOVE_CITY_HOUSE_3 - warp_def 12, 14, 0, 0, LILYCOVE_CITY_HOUSE_4 - warp_def 12, 32, 0, 0, LILYCOVE_CITY_HARBOR - warp_def 12, 5, 0, 1, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F + warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB + warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F + warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE + warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 + warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 + warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 + warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 + warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR + warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_MapBGEvents: @ 8526F68 bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index c450b0cd3..615f2682c 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -33,10 +33,10 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 - warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 30, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 20, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY - warp_def 31, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY + warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733 diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index c6e900a18..b183b4f16 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -26,10 +26,10 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C - warp_def 14, 11, 0, 4, LILYCOVE_CITY - warp_def 15, 11, 0, 4, LILYCOVE_CITY - warp_def 9, 1, 0, 0, LILYCOVE_CITY_CONTEST_HALL - warp_def 21, 1, 0, 1, LILYCOVE_CITY_CONTEST_HALL + warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL + warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index d3e5374ff..77d075034 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -2,9 +2,9 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C - warp_def 5, 8, 0, 1, LILYCOVE_CITY - warp_def 6, 8, 0, 1, LILYCOVE_CITY - warp_def 2, 1, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_2F + warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 60016ffbf..48aae9c0c 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 - warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F + warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index d9d6b469e..ef97e90c6 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 - warp_def 1, 5, 3, 127, NONE - warp_def 2, 5, 3, 127, NONE + warp_def 1, 5, 3, 127, MAP_NONE + warp_def 2, 5, 3, 127, MAP_NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index 7a234183d..095b201d9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C - warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F + warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index ad7d79ac5..0a8bd70b8 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -7,10 +7,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C - warp_def 8, 7, 0, 0, LILYCOVE_CITY - warp_def 9, 7, 0, 0, LILYCOVE_CITY - warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index 29169a491..9356a7ae0 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 - warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index ff372e132..a26dc39d2 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 - warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index ba97f6a98..dd5a87e99 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C - warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_5F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index 85a6e871a..63ddcdb35 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -8,9 +8,9 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 - warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index d12e31646..0f786ca84 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -6,8 +6,8 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 LilycoveCity_Harbor_MapWarps: @ 8531E94 - warp_def 11, 14, 0, 12, LILYCOVE_CITY - warp_def 12, 14, 0, 12, LILYCOVE_CITY + warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY LilycoveCity_Harbor_MapEvents:: @ 8531EA4 map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index f4bef7d8b..64ad5ea1b 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -3,8 +3,8 @@ LilycoveCity_House1_EventObjects: @ 8531EF4 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 LilycoveCity_House1_MapWarps: @ 8531F24 - warp_def 3, 8, 0, 8, LILYCOVE_CITY - warp_def 4, 8, 0, 8, LILYCOVE_CITY + warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 8531F34 map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 36f9f50b2..037b195ad 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -2,8 +2,8 @@ LilycoveCity_House2_EventObjects: @ 8531F48 object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 LilycoveCity_House2_MapWarps: @ 8531F60 - warp_def 2, 7, 0, 9, LILYCOVE_CITY - warp_def 3, 7, 0, 9, LILYCOVE_CITY + warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY + warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 8531F70 map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index f7b2e561b..25d2cb333 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -7,8 +7,8 @@ LilycoveCity_House3_EventObjects: @ 8531F84 object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 LilycoveCity_House3_MapWarps: @ 8532014 - warp_def 3, 7, 0, 10, LILYCOVE_CITY - warp_def 4, 7, 0, 10, LILYCOVE_CITY + warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 8532024 map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index ebf845f91..7556d0092 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -3,8 +3,8 @@ LilycoveCity_House4_EventObjects: @ 8532038 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 LilycoveCity_House4_MapWarps: @ 8532068 - warp_def 3, 8, 0, 11, LILYCOVE_CITY - warp_def 4, 8, 0, 11, LILYCOVE_CITY + warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 8532078 map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 297db7979..6780d3f18 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C - warp_def 9, 13, 0, 3, LILYCOVE_CITY - warp_def 10, 13, 0, 13, LILYCOVE_CITY - warp_def 16, 1, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_2F + warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY + warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 3e85e20a1..e95ec1075 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 - warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 3f89c8aa9..83fbf0288 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -2,8 +2,8 @@ LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 - warp_def 3, 7, 0, 7, LILYCOVE_CITY - warp_def 4, 7, 0, 7, LILYCOVE_CITY + warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index 741866843..fb2e41948 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 - warp_def 7, 8, 3, 2, LILYCOVE_CITY - warp_def 6, 8, 3, 2, LILYCOVE_CITY - warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index b8bd67368..6522dc799 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 - warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 427d8bc42..476a6ebab 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -10,8 +10,8 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 - warp_def 6, 13, 0, 5, LILYCOVE_CITY - warp_def 5, 13, 0, 5, LILYCOVE_CITY + warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY + warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc index 9affe49bd..0481a1c0b 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ b/data/maps/events/LilycoveCity_UnusedMart.inc @@ -1,6 +1,6 @@ LilycoveCity_UnusedMart_MapWarps: @ 8531CFC - warp_def 3, 7, 0, 0, LILYCOVE_CITY - warp_def 4, 7, 0, 0, LILYCOVE_CITY + warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 7a2ed7c9f..d4388bc33 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -9,9 +9,9 @@ LittlerootTown_EventObjects: @ 85276A8 object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 LittlerootTown_MapWarps: @ 8527768 - warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F - warp_def 5, 8, 0, 1, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - warp_def 7, 16, 0, 0, LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB + warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F + warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents: @ 8527780 coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index f97d49985..e5320f071 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -8,9 +8,9 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 - warp_def 9, 8, 0, 1, LITTLEROOT_TOWN - warp_def 8, 8, 0, 1, LITTLEROOT_TOWN - warp_def 8, 2, 0, 0, LITTLEROOT_TOWN_BRENDANS_HOUSE_2F + warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index d7733b800..0ed661234 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 - warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 bg_event 0, 1, 0, 1, 0, gUnknown_081F860D diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index ccee2d442..2ceb34c8e 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 - warp_def 1, 8, 0, 0, LITTLEROOT_TOWN - warp_def 2, 8, 0, 0, LITTLEROOT_TOWN - warp_def 2, 2, 0, 0, LITTLEROOT_TOWN_MAYS_HOUSE_2F + warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 40d0f45dc..121c6164b 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 - warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F + warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 7930d0f63..bbae39ce8 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -7,8 +7,8 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC - warp_def 6, 12, 0, 2, LITTLEROOT_TOWN - warp_def 7, 12, 0, 2, LITTLEROOT_TOWN + warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN + warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index d590a6c98..8462b4731 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -7,10 +7,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 MagmaHideout_1F_MapWarps: @ 853725C - warp_def 10, 34, 3, 4, JAGGED_PASS - warp_def 25, 34, 3, 1, MAGMA_HIDEOUT_2F_1R - warp_def 31, 3, 0, 1, MAGMA_HIDEOUT_2F_2R - warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R + warp_def 10, 34, 3, 4, MAP_JAGGED_PASS + warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R + warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R + warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R MagmaHideout_1F_MapEvents:: @ 853727C map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc index eb2cca275..1073518f2 100644 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ b/data/maps/events/MagmaHideout_2F_1R.inc @@ -5,9 +5,9 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 MagmaHideout_2F_1R_MapWarps: @ 85372F0 - warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R - warp_def 8, 2, 0, 1, MAGMA_HIDEOUT_1F - warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R + warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R + warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F + warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R MagmaHideout_2F_1R_MapEvents:: @ 8537308 map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc index 7d8fb6808..e27fc5dc1 100644 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ b/data/maps/events/MagmaHideout_2F_2R.inc @@ -7,8 +7,8 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 MagmaHideout_2F_2R_MapWarps: @ 85373AC - warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R - warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F + warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R + warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F MagmaHideout_2F_2R_MapEvents:: @ 85373BC map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/events/MagmaHideout_2F_3R.inc index 3795ef568..ca379a0c7 100644 --- a/data/maps/events/MagmaHideout_2F_3R.inc +++ b/data/maps/events/MagmaHideout_2F_3R.inc @@ -1,6 +1,6 @@ MagmaHideout_2F_3R_MapWarps: @ 85375B0 - warp_def 16, 1, 0, 3, MAGMA_HIDEOUT_1F - warp_def 16, 13, 0, 0, MAGMA_HIDEOUT_3F_3R + warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F + warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R MagmaHideout_2F_3R_MapEvents:: @ 85375C0 map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc index 4d95b38c0..baf535984 100644 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ b/data/maps/events/MagmaHideout_3F_1R.inc @@ -4,9 +4,9 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 MagmaHideout_3F_1R_MapWarps: @ 8537418 - warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F - warp_def 21, 9, 0, 0, MAGMA_HIDEOUT_3F_2R - warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R + warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F + warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R + warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R MagmaHideout_3F_1R_MapEvents:: @ 8537430 map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc index f653cb151..e643a1c3f 100644 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ b/data/maps/events/MagmaHideout_3F_2R.inc @@ -3,7 +3,7 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 MagmaHideout_3F_2R_MapWarps: @ 8537474 - warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R + warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R MagmaHideout_3F_2R_MapEvents:: @ 853747C map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc index b662de7d9..e40619a49 100644 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ b/data/maps/events/MagmaHideout_3F_3R.inc @@ -2,8 +2,8 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 MagmaHideout_3F_3R_MapWarps: @ 853758C - warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R - warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F + warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R + warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F MagmaHideout_3F_3R_MapEvents:: @ 853759C map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc index 221775788..808f1b7da 100644 --- a/data/maps/events/MagmaHideout_4F.inc +++ b/data/maps/events/MagmaHideout_4F.inc @@ -9,8 +9,8 @@ MagmaHideout_4F_EventObjects: @ 8537490 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 MagmaHideout_4F_MapWarps: @ 8537550 - warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R - warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R + warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R + warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R MagmaHideout_4F_MapEvents:: @ 8537560 map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index b9f6bb020..199465a69 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -2,7 +2,7 @@ MarineCave_End_EventObjects: @ 85377E8 object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 MarineCave_End_MapWarps: @ 8537800 - warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE + warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE MarineCave_End_MapCoordEvents: @ 8537808 coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/events/MarineCave_Entrance.inc index e00290acb..4db3e1ddc 100644 --- a/data/maps/events/MarineCave_Entrance.inc +++ b/data/maps/events/MarineCave_Entrance.inc @@ -1,5 +1,5 @@ MarineCave_Entrance_MapWarps: @ 85377CC - warp_def 14, 1, 3, 0, MARINE_CAVE_END + warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END MarineCave_Entrance_MapEvents:: @ 85377D4 map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 6d89267c6..a73145ae2 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -12,13 +12,13 @@ MauvilleCity_EventObjects: @ 852662C object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 MauvilleCity_MapWarps: @ 8526734 - warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM - warp_def 22, 5, 0, 0, MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 35, 5, 0, 0, MAUVILLE_CITY_BIKE_SHOP - warp_def 23, 14, 0, 0, MAUVILLE_CITY_MART - warp_def 32, 14, 0, 0, MAUVILLE_CITY_HOUSE_1 - warp_def 8, 13, 0, 0, MAUVILLE_CITY_GAME_CORNER - warp_def 19, 14, 0, 0, MAUVILLE_CITY_HOUSE_2 + warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM + warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP + warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART + warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 + warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER + warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents: @ 852676C bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73 diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index 0252834f4..cd4f43bb3 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -3,8 +3,8 @@ MauvilleCity_BikeShop_EventObjects: @ 852FE80 object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 - warp_def 3, 8, 0, 2, MAUVILLE_CITY - warp_def 4, 8, 0, 2, MAUVILLE_CITY + warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index 57e34caad..18e12ac65 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -13,8 +13,8 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 - warp_def 11, 10, 3, 5, MAUVILLE_CITY - warp_def 12, 10, 3, 5, MAUVILLE_CITY + warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY + warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index c493d4b8b..0a931723e 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -8,8 +8,8 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 - warp_def 4, 20, 0, 0, MAUVILLE_CITY - warp_def 5, 20, 0, 0, MAUVILLE_CITY + warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY + warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents: @ 852FE14 coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 1a1f241b5..b3ff72929 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -2,8 +2,8 @@ MauvilleCity_House1_EventObjects: @ 852FEEC object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 MauvilleCity_House1_MapWarps: @ 852FF04 - warp_def 3, 7, 0, 4, MAUVILLE_CITY - warp_def 4, 7, 0, 4, MAUVILLE_CITY + warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 852FF14 map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index a51483770..d96a2cd5d 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -2,8 +2,8 @@ MauvilleCity_House2_EventObjects: @ 853018C object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 MauvilleCity_House2_MapWarps: @ 85301A4 - warp_def 3, 8, 0, 6, MAUVILLE_CITY - warp_def 4, 8, 0, 6, MAUVILLE_CITY + warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 85301B4 map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 866c0c311..bc22e5bb0 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -4,8 +4,8 @@ MauvilleCity_Mart_EventObjects: @ 8530310 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 MauvilleCity_Mart_MapWarps: @ 8530358 - warp_def 3, 7, 0, 3, MAUVILLE_CITY - warp_def 4, 7, 0, 3, MAUVILLE_CITY + warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 8530368 map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index b8b7ed7d6..fc76f6b76 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 - warp_def 7, 8, 3, 1, MAUVILLE_CITY - warp_def 6, 8, 3, 1, MAUVILLE_CITY - warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index 9e8de4b75..f22b9f057 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 - warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 76eb4f6dd..2e6195b60 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -11,12 +11,12 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 MeteorFalls_1F_1R_MapWarps: @ 8534064 - warp_def 27, 18, 4, 0, ROUTE_114 - warp_def 6, 39, 3, 0, ROUTE_115 - warp_def 10, 3, 3, 0, METEOR_FALLS_1F_2R - warp_def 5, 4, 3, 4, METEOR_FALLS_B1F_1R - warp_def 26, 28, 3, 5, METEOR_FALLS_B1F_1R - warp_def 4, 2, 0, 0, METEOR_FALLS_STEVENS_CAVE + warp_def 27, 18, 4, 0, MAP_ROUTE114 + warp_def 6, 39, 3, 0, MAP_ROUTE115 + warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R + warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R + warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R + warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 1a85565fa..3561e7c5e 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -4,10 +4,10 @@ MeteorFalls_1F_2R_EventObjects: @ 85340C4 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C - warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R - warp_def 4, 14, 3, 0, METEOR_FALLS_B1F_1R - warp_def 7, 20, 3, 1, METEOR_FALLS_B1F_1R - warp_def 21, 23, 3, 2, METEOR_FALLS_B1F_1R + warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R + warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R + warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R + warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents: @ 853412C bg_event 9, 58, 0, 0, 0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc index 410dd90c0..039f316d9 100644 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ b/data/maps/events/MeteorFalls_B1F_1R.inc @@ -1,10 +1,10 @@ MeteorFalls_B1F_1R_MapWarps: @ 853414C - warp_def 5, 6, 4, 1, METEOR_FALLS_1F_2R - warp_def 7, 11, 5, 2, METEOR_FALLS_1F_2R - warp_def 18, 15, 4, 3, METEOR_FALLS_1F_2R - warp_def 17, 3, 3, 0, METEOR_FALLS_B1F_2R - warp_def 3, 23, 5, 3, METEOR_FALLS_1F_1R - warp_def 20, 36, 3, 4, METEOR_FALLS_1F_1R + warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R + warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R + warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R + warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R + warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R + warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R MeteorFalls_B1F_1R_MapEvents:: @ 853417C map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index 454946506..92d60a60a 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -2,7 +2,7 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 - warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R + warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc index e66dda119..9a2556e8a 100644 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ b/data/maps/events/MeteorFalls_StevensCave.inc @@ -2,7 +2,7 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 - warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R + warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R MeteorFalls_StevensCave_MapEvents:: @ 85378D0 map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/events/MirageTower_1F.inc index 5bf9568bb..f35ce6d2a 100644 --- a/data/maps/events/MirageTower_1F.inc +++ b/data/maps/events/MirageTower_1F.inc @@ -1,6 +1,6 @@ MirageTower_1F_MapWarps: @ 85375D4 - warp_def 10, 14, 3, 3, ROUTE_111 - warp_def 15, 2, 3, 1, MIRAGE_TOWER_2F + warp_def 10, 14, 3, 3, MAP_ROUTE111 + warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F MirageTower_1F_MapEvents:: @ 85375E4 map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/events/MirageTower_2F.inc index 07814433a..fdbafbe06 100644 --- a/data/maps/events/MirageTower_2F.inc +++ b/data/maps/events/MirageTower_2F.inc @@ -1,6 +1,6 @@ MirageTower_2F_MapWarps: @ 85375F8 - warp_def 18, 12, 3, 0, MIRAGE_TOWER_3F - warp_def 15, 2, 3, 1, MIRAGE_TOWER_1F + warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F + warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F MirageTower_2F_MapEvents:: @ 8537608 map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc index fe6a0f73f..062a137fc 100644 --- a/data/maps/events/MirageTower_3F.inc +++ b/data/maps/events/MirageTower_3F.inc @@ -3,8 +3,8 @@ MirageTower_3F_EventObjects: @ 853761C object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 MirageTower_3F_MapWarps: @ 853764C - warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F - warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F + warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F + warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F MirageTower_3F_MapEvents:: @ 853765C map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc index 4d07ff4c3..848eeb88e 100644 --- a/data/maps/events/MirageTower_4F.inc +++ b/data/maps/events/MirageTower_4F.inc @@ -4,7 +4,7 @@ MirageTower_4F_EventObjects: @ 8537670 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 MirageTower_4F_MapWarps: @ 85376B8 - warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F + warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F MirageTower_4F_MapEvents:: @ 85376C0 map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index a5dfb9df9..531fb141b 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -18,16 +18,16 @@ MossdeepCity_EventObjects: @ 8527018 object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 MossdeepCity_MapWarps: @ 85271B0 - warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1 - warp_def 38, 9, 0, 0, MOSSDEEP_CITY_GYM - warp_def 28, 16, 0, 0, MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 67, 25, 0, 0, MOSSDEEP_CITY_HOUSE_2 - warp_def 37, 18, 0, 0, MOSSDEEP_CITY_MART - warp_def 49, 6, 0, 0, MOSSDEEP_CITY_HOUSE_3 - warp_def 19, 10, 0, 0, MOSSDEEP_CITY_STEVENS_HOUSE - warp_def 18, 16, 0, 1, MOSSDEEP_CITY_HOUSE_4 - warp_def 64, 15, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_1F - warp_def 36, 24, 0, 0, MOSSDEEP_CITY_GAME_CORNER_1F + warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 + warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM + warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 67, 25, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 + warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART + warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 + warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE + warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 + warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents: @ 8527200 coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index cbcb8b76f..a271897b7 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -3,9 +3,9 @@ MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 - warp_def 5, 9, 0, 9, MOSSDEEP_CITY - warp_def 6, 9, 0, 9, MOSSDEEP_CITY - warp_def 2, 0, 0, 0, MOSSDEEP_CITY_GAME_CORNER_B1F + warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY + warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY + warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index a043926a7..2955da0b0 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -2,7 +2,7 @@ MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 - warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F + warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 2a152d8f6..23951059d 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -37,20 +37,20 @@ MossdeepCity_Gym_EventObjects: @ 85324EC object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_Gym_MapWarps: @ 853284C - warp_def 6, 35, 3, 1, MOSSDEEP_CITY - warp_def 7, 35, 3, 1, MOSSDEEP_CITY - warp_def 3, 28, 0, 3, MOSSDEEP_CITY_GYM - warp_def 1, 23, 3, 2, MOSSDEEP_CITY_GYM - warp_def 7, 18, 0, 5, MOSSDEEP_CITY_GYM - warp_def 8, 12, 0, 4, MOSSDEEP_CITY_GYM - warp_def 9, 18, 0, 7, MOSSDEEP_CITY_GYM - warp_def 23, 20, 0, 6, MOSSDEEP_CITY_GYM - warp_def 1, 33, 3, 9, MOSSDEEP_CITY_GYM - warp_def 20, 24, 0, 8, MOSSDEEP_CITY_GYM - warp_def 11, 3, 0, 11, MOSSDEEP_CITY_GYM - warp_def 11, 35, 3, 10, MOSSDEEP_CITY_GYM - warp_def 13, 32, 0, 13, MOSSDEEP_CITY_GYM - warp_def 21, 10, 0, 12, MOSSDEEP_CITY_GYM + warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY + warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY + warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM + warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM + warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM + warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM + warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM + warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM + warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM + warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM + warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM + warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM + warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM + warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM MossdeepCity_Gym_MapCoordEvents: @ 85328BC coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index bddde5c81..6342bcc55 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -3,8 +3,8 @@ MossdeepCity_House1_EventObjects: @ 8532978 object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 MossdeepCity_House1_MapWarps: @ 85329A8 - warp_def 3, 7, 0, 0, MOSSDEEP_CITY - warp_def 4, 7, 0, 0, MOSSDEEP_CITY + warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 85329B8 map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index e8e120c77..9596aa7bd 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -4,8 +4,8 @@ MossdeepCity_House2_EventObjects: @ 85329CC object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 MossdeepCity_House2_MapWarps: @ 8532A14 - warp_def 3, 8, 0, 3, MOSSDEEP_CITY - warp_def 4, 8, 0, 3, MOSSDEEP_CITY + warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY + warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 8532A24 map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index 5fec469e8..19933fb6a 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -2,8 +2,8 @@ MossdeepCity_House3_EventObjects: @ 8532BD4 object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 MossdeepCity_House3_MapWarps: @ 8532BEC - warp_def 3, 7, 0, 5, MOSSDEEP_CITY - warp_def 4, 7, 0, 5, MOSSDEEP_CITY + warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 8532BFC map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index 923bbe86d..fc7203950 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -4,8 +4,8 @@ MossdeepCity_House4_EventObjects: @ 8532CAC object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 - warp_def 4, 7, 0, 7, MOSSDEEP_CITY - warp_def 3, 7, 0, 7, MOSSDEEP_CITY + warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY + warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 8532D04 map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index c8bbd0a41..91811e9e9 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -5,8 +5,8 @@ MossdeepCity_Mart_EventObjects: @ 8532B50 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 - warp_def 3, 7, 0, 4, MOSSDEEP_CITY - warp_def 4, 7, 0, 4, MOSSDEEP_CITY + warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 8532BC0 map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index 17052105d..7c8b8b702 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 - warp_def 7, 8, 3, 2, MOSSDEEP_CITY - warp_def 6, 8, 3, 2, MOSSDEEP_CITY - warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 13a189b51..4fa7dff99 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -6,9 +6,9 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 - warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index 8352fe02c..d3b27947a 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -12,9 +12,9 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 - warp_def 7, 9, 0, 8, MOSSDEEP_CITY - warp_def 8, 9, 0, 8, MOSSDEEP_CITY - warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F + warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index ac3bc8c7a..e2f778bec 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -10,7 +10,7 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 - warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 4d9658312..2b0562d34 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -4,8 +4,8 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 - warp_def 3, 7, 0, 6, MOSSDEEP_CITY - warp_def 4, 7, 0, 6, MOSSDEEP_CITY + warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index e4eeb764d..a26025830 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -31,10 +31,10 @@ MtChimney_EventObjects: @ 85347C8 object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 MtChimney_MapWarps: @ 8534A98 - warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION - warp_def 18, 36, 0, 1, MT_CHIMNEY_CABLE_CAR_STATION - warp_def 20, 41, 3, 2, JAGGED_PASS - warp_def 21, 41, 3, 3, JAGGED_PASS + warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 20, 41, 3, 2, MAP_JAGGED_PASS + warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents: @ 8534AB8 bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4 diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index 1c791072c..e519d5281 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -3,8 +3,8 @@ MtChimney_CableCarStation_EventObjects: @ 8533CA8 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 - warp_def 6, 11, 0, 0, MT_CHIMNEY - warp_def 7, 11, 0, 1, MT_CHIMNEY + warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY + warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 8533CE8 map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index aedb94c2f..99e6e88d2 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -4,12 +4,12 @@ MtPyre_1F_EventObjects: @ 8534D64 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 MtPyre_1F_MapWarps: @ 8534DAC - warp_def 17, 18, 3, 0, ROUTE_122 - warp_def 3, 6, 3, 0, MT_PYRE_EXTERIOR - warp_def 18, 18, 3, 0, ROUTE_122 - warp_def 4, 6, 3, 0, MT_PYRE_EXTERIOR - warp_def 11, 1, 3, 0, MT_PYRE_2F - warp_def 20, 9, 3, 4, MT_PYRE_2F + warp_def 17, 18, 3, 0, MAP_ROUTE122 + warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 18, 18, 3, 0, MAP_ROUTE122 + warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F + warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F MtPyre_1F_MapEvents:: @ 8534DDC map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index d75442cd6..89e8dd553 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -9,11 +9,11 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 MtPyre_2F_MapWarps: @ 8534EB0 - warp_def 2, 1, 3, 4, MT_PYRE_1F - warp_def 10, 1, 3, 0, MT_PYRE_3F - warp_def 10, 12, 3, 4, MT_PYRE_3F - warp_def 6, 12, 3, 5, MT_PYRE_3F - warp_def 11, 9, 3, 5, MT_PYRE_1F + warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F + warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F + warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F + warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F + warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F MtPyre_2F_MapEvents:: @ 8534ED8 map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index e52cd546b..a60b1cec0 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -5,12 +5,12 @@ MtPyre_3F_EventObjects: @ 8534EEC object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 MtPyre_3F_MapWarps: @ 8534F4C - warp_def 10, 1, 3, 1, MT_PYRE_2F - warp_def 2, 1, 3, 1, MT_PYRE_4F - warp_def 9, 10, 3, 4, MT_PYRE_4F - warp_def 1, 12, 3, 5, MT_PYRE_4F - warp_def 10, 12, 3, 2, MT_PYRE_2F - warp_def 6, 12, 3, 3, MT_PYRE_2F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F + warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F + warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F + warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F + warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F + warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F MtPyre_3F_MapEvents:: @ 8534F7C map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index 1804f4615..4cb8ccd6f 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -3,12 +3,12 @@ MtPyre_4F_EventObjects: @ 8534F90 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 MtPyre_4F_MapWarps: @ 8534FC0 - warp_def 10, 1, 3, 1, MT_PYRE_5F - warp_def 2, 5, 3, 1, MT_PYRE_3F - warp_def 12, 10, 3, 3, MT_PYRE_5F - warp_def 12, 12, 3, 4, MT_PYRE_5F - warp_def 9, 10, 3, 2, MT_PYRE_3F - warp_def 2, 12, 3, 3, MT_PYRE_3F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F + warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F + warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F + warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F + warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F + warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F MtPyre_4F_MapEvents:: @ 8534FF0 map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index ce7851f62..4bd96526e 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -3,11 +3,11 @@ MtPyre_5F_EventObjects: @ 8535004 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 MtPyre_5F_MapWarps: @ 8535034 - warp_def 2, 1, 3, 0, MT_PYRE_6F - warp_def 10, 5, 3, 0, MT_PYRE_4F - warp_def 1, 10, 3, 1, MT_PYRE_6F - warp_def 12, 10, 3, 2, MT_PYRE_4F - warp_def 12, 12, 3, 3, MT_PYRE_4F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F + warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F + warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F + warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F + warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F MtPyre_5F_MapEvents:: @ 853505C map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index b271e116c..b160f4896 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -4,8 +4,8 @@ MtPyre_6F_EventObjects: @ 8535070 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 MtPyre_6F_MapWarps: @ 85350B8 - warp_def 2, 1, 3, 0, MT_PYRE_5F - warp_def 1, 10, 3, 2, MT_PYRE_5F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F + warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F MtPyre_6F_MapEvents:: @ 85350C8 map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index a45d2ec2e..446e04072 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -3,9 +3,9 @@ MtPyre_Exterior_EventObjects: @ 85350DC object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 MtPyre_Exterior_MapWarps: @ 853510C - warp_def 10, 42, 3, 1, MT_PYRE_1F - warp_def 19, 10, 3, 1, MT_PYRE_SUMMIT - warp_def 20, 10, 3, 1, MT_PYRE_SUMMIT + warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F + warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT + warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents: @ 8535124 coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 696d9ead3..e2512c586 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -9,9 +9,9 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 MtPyre_Summit_MapWarps: @ 8535260 - warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR - warp_def 23, 31, 3, 1, MT_PYRE_EXTERIOR - warp_def 24, 31, 3, 1, MT_PYRE_EXTERIOR + warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018 diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/events/NavelRock_B1F.inc index 541b11fca..e83d221dd 100644 --- a/data/maps/events/NavelRock_B1F.inc +++ b/data/maps/events/NavelRock_B1F.inc @@ -1,6 +1,6 @@ NavelRock_B1F_MapWarps: @ 853DA94 - warp_def 4, 3, 3, 0, NAVEL_ROCK_ENTRANCE - warp_def 18, 9, 3, 1, NAVEL_ROCK_FORK + warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE + warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK NavelRock_B1F_MapEvents:: @ 853DAA4 map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc index af7cffea3..ae5c36cf1 100644 --- a/data/maps/events/NavelRock_Bottom.inc +++ b/data/maps/events/NavelRock_Bottom.inc @@ -2,7 +2,7 @@ NavelRock_Bottom_EventObjects: @ 853DD50 object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 NavelRock_Bottom_MapWarps: @ 853DD68 - warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11 + warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 NavelRock_Bottom_MapEvents:: @ 853DD70 map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/events/NavelRock_Down01.inc index b644f47ad..3a6045215 100644 --- a/data/maps/events/NavelRock_Down01.inc +++ b/data/maps/events/NavelRock_Down01.inc @@ -1,6 +1,6 @@ NavelRock_Down01_MapWarps: @ 853DBC4 - warp_def 3, 3, 3, 2, NAVEL_ROCK_FORK - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_02 + warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 NavelRock_Down01_MapEvents:: @ 853DBD4 map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/events/NavelRock_Down02.inc index dfa088f49..7441539c9 100644 --- a/data/maps/events/NavelRock_Down02.inc +++ b/data/maps/events/NavelRock_Down02.inc @@ -1,6 +1,6 @@ NavelRock_Down02_MapWarps: @ 853DBE8 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_01 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_03 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 NavelRock_Down02_MapEvents:: @ 853DBF8 map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/events/NavelRock_Down03.inc index 723bc8934..20dabdfaf 100644 --- a/data/maps/events/NavelRock_Down03.inc +++ b/data/maps/events/NavelRock_Down03.inc @@ -1,6 +1,6 @@ NavelRock_Down03_MapWarps: @ 853DC0C - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_02 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_04 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 NavelRock_Down03_MapEvents:: @ 853DC1C map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/events/NavelRock_Down04.inc index 9f5148611..e50f6fe23 100644 --- a/data/maps/events/NavelRock_Down04.inc +++ b/data/maps/events/NavelRock_Down04.inc @@ -1,6 +1,6 @@ NavelRock_Down04_MapWarps: @ 853DC30 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_03 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_05 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 NavelRock_Down04_MapEvents:: @ 853DC40 map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/events/NavelRock_Down05.inc index df8981e2a..500d38e9b 100644 --- a/data/maps/events/NavelRock_Down05.inc +++ b/data/maps/events/NavelRock_Down05.inc @@ -1,6 +1,6 @@ NavelRock_Down05_MapWarps: @ 853DC54 - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_04 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_06 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 NavelRock_Down05_MapEvents:: @ 853DC64 map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/events/NavelRock_Down06.inc index c32dc9500..077367747 100644 --- a/data/maps/events/NavelRock_Down06.inc +++ b/data/maps/events/NavelRock_Down06.inc @@ -1,6 +1,6 @@ NavelRock_Down06_MapWarps: @ 853DC78 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_05 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_07 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 NavelRock_Down06_MapEvents:: @ 853DC88 map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/events/NavelRock_Down07.inc index 35191f0ba..83f7ce9a6 100644 --- a/data/maps/events/NavelRock_Down07.inc +++ b/data/maps/events/NavelRock_Down07.inc @@ -1,6 +1,6 @@ NavelRock_Down07_MapWarps: @ 853DC9C - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_06 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_08 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 NavelRock_Down07_MapEvents:: @ 853DCAC map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/events/NavelRock_Down08.inc index a55307cfa..38bef10e8 100644 --- a/data/maps/events/NavelRock_Down08.inc +++ b/data/maps/events/NavelRock_Down08.inc @@ -1,6 +1,6 @@ NavelRock_Down08_MapWarps: @ 853DCC0 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_07 - warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_09 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 NavelRock_Down08_MapEvents:: @ 853DCD0 map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/events/NavelRock_Down09.inc index 7816eb358..e3843e759 100644 --- a/data/maps/events/NavelRock_Down09.inc +++ b/data/maps/events/NavelRock_Down09.inc @@ -1,6 +1,6 @@ NavelRock_Down09_MapWarps: @ 853DCE4 - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_08 - warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_10 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 NavelRock_Down09_MapEvents:: @ 853DCF4 map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/events/NavelRock_Down10.inc index 20e7ac6cd..805e399b4 100644 --- a/data/maps/events/NavelRock_Down10.inc +++ b/data/maps/events/NavelRock_Down10.inc @@ -1,6 +1,6 @@ NavelRock_Down10_MapWarps: @ 853DD08 - warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_09 - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_11 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 NavelRock_Down10_MapEvents:: @ 853DD18 map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/events/NavelRock_Down11.inc index eea34db90..505a6ed6d 100644 --- a/data/maps/events/NavelRock_Down11.inc +++ b/data/maps/events/NavelRock_Down11.inc @@ -1,6 +1,6 @@ NavelRock_Down11_MapWarps: @ 853DD2C - warp_def 5, 5, 3, 0, NAVEL_ROCK_BOTTOM - warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_10 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 NavelRock_Down11_MapEvents:: @ 853DD3C map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/events/NavelRock_Entrance.inc index 9d470a864..ee45485a7 100644 --- a/data/maps/events/NavelRock_Entrance.inc +++ b/data/maps/events/NavelRock_Entrance.inc @@ -1,6 +1,6 @@ NavelRock_Entrance_MapWarps: @ 853DA70 - warp_def 10, 5, 3, 0, NAVEL_ROCK_B1F - warp_def 10, 26, 3, 1, NAVEL_ROCK_EXTERIOR + warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F + warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR NavelRock_Entrance_MapEvents:: @ 853DA80 map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/events/NavelRock_Exterior.inc index 57a6d5a6e..66bbf376f 100644 --- a/data/maps/events/NavelRock_Exterior.inc +++ b/data/maps/events/NavelRock_Exterior.inc @@ -1,6 +1,6 @@ NavelRock_Exterior_MapWarps: @ 853DA00 - warp_def 10, 18, 0, 0, NAVEL_ROCK_HARBOR - warp_def 10, 10, 0, 1, NAVEL_ROCK_ENTRANCE + warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR + warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE NavelRock_Exterior_MapEvents:: @ 853DA10 map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/events/NavelRock_Fork.inc index 4e3f5a801..869dc0f08 100644 --- a/data/maps/events/NavelRock_Fork.inc +++ b/data/maps/events/NavelRock_Fork.inc @@ -1,7 +1,7 @@ NavelRock_Fork_MapWarps: @ 853DAB8 - warp_def 4, 6, 3, 0, NAVEL_ROCK_UP_1 - warp_def 11, 79, 3, 1, NAVEL_ROCK_B1F - warp_def 22, 6, 3, 0, NAVEL_ROCK_DOWN_01 + warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 + warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F + warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 NavelRock_Fork_MapEvents:: @ 853DAD0 map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc index 21102a474..04b452b4e 100644 --- a/data/maps/events/NavelRock_Harbor.inc +++ b/data/maps/events/NavelRock_Harbor.inc @@ -3,7 +3,7 @@ NavelRock_Harbor_EventObjects: @ 853DA24 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 - warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR + warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR NavelRock_Harbor_MapEvents:: @ 853DA5C map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index 34e93223f..65618f8ea 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -2,7 +2,7 @@ NavelRock_Top_EventObjects: @ 853DB74 object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 NavelRock_Top_MapWarps: @ 853DB8C - warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4 + warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 NavelRock_Top_MapCoordEvents: @ 853DB94 coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/events/NavelRock_Up1.inc index 292278a85..fd0741a6a 100644 --- a/data/maps/events/NavelRock_Up1.inc +++ b/data/maps/events/NavelRock_Up1.inc @@ -1,6 +1,6 @@ NavelRock_Up1_MapWarps: @ 853DAE4 - warp_def 5, 5, 3, 0, NAVEL_ROCK_FORK - warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_2 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 NavelRock_Up1_MapEvents:: @ 853DAF4 map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/events/NavelRock_Up2.inc index 55c4b4315..bd142b997 100644 --- a/data/maps/events/NavelRock_Up2.inc +++ b/data/maps/events/NavelRock_Up2.inc @@ -1,6 +1,6 @@ NavelRock_Up2_MapWarps: @ 853DB08 - warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_1 - warp_def 5, 5, 3, 0, NAVEL_ROCK_UP_3 + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 NavelRock_Up2_MapEvents:: @ 853DB18 map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/events/NavelRock_Up3.inc index c67cc7b17..9491e5dac 100644 --- a/data/maps/events/NavelRock_Up3.inc +++ b/data/maps/events/NavelRock_Up3.inc @@ -1,6 +1,6 @@ NavelRock_Up3_MapWarps: @ 853DB2C - warp_def 5, 5, 3, 1, NAVEL_ROCK_UP_2 - warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_4 + warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 + warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 NavelRock_Up3_MapEvents:: @ 853DB3C map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/events/NavelRock_Up4.inc index c1091ae52..3d81f1523 100644 --- a/data/maps/events/NavelRock_Up4.inc +++ b/data/maps/events/NavelRock_Up4.inc @@ -1,6 +1,6 @@ NavelRock_Up4_MapWarps: @ 853DB50 - warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_3 - warp_def 5, 5, 3, 0, NAVEL_ROCK_TOP + warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 + warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP NavelRock_Up4_MapEvents:: @ 853DB60 map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 876841b6d..29f46af20 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapWarps: @ 8536474 - warp_def 4, 6, 3, 0, ROUTE_110 - warp_def 4, 1, 3, 0, NEW_MAUVILLE_INSIDE + warp_def 4, 6, 3, 0, MAP_ROUTE110 + warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents: @ 8536484 coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 141fd04d4..41ef85fce 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_EventObjects: @ 85364A8 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 NewMauville_Inside_MapWarps: @ 8536568 - warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE + warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents: @ 8536570 coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 6278db428..46fc07609 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -5,10 +5,10 @@ OldaleTown_EventObjects: @ 8527854 object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 OldaleTown_MapWarps: @ 85278B4 - warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1 - warp_def 15, 16, 0, 0, OLDALE_TOWN_HOUSE_2 - warp_def 6, 16, 0, 0, OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 14, 6, 0, 0, OLDALE_TOWN_MART + warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 + warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 + warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents: @ 85278D4 coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 93ffb8d72..6b8cf653b 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -2,8 +2,8 @@ OldaleTown_House1_EventObjects: @ 852D7B4 object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 OldaleTown_House1_MapWarps: @ 852D7CC - warp_def 3, 8, 0, 0, OLDALE_TOWN - warp_def 4, 8, 0, 0, OLDALE_TOWN + warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN + warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 852D7DC map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 474487423..b083217ce 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -3,8 +3,8 @@ OldaleTown_House2_EventObjects: @ 852D7F0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 OldaleTown_House2_MapWarps: @ 852D820 - warp_def 3, 7, 0, 1, OLDALE_TOWN - warp_def 4, 7, 0, 1, OLDALE_TOWN + warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 852D830 map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index 57e963cd5..ac5678a51 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -4,8 +4,8 @@ OldaleTown_Mart_EventObjects: @ 852D95C object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 - warp_def 3, 7, 0, 3, OLDALE_TOWN - warp_def 4, 7, 0, 3, OLDALE_TOWN + warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 852D9B4 map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 65465578b..f8e16522c 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 - warp_def 7, 8, 3, 2, OLDALE_TOWN - warp_def 6, 8, 3, 2, OLDALE_TOWN - warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index cbf3356a0..c71b8608d 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 - warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index b0df30af1..1430294e2 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -4,12 +4,12 @@ PacifidlogTown_EventObjects: @ 8527DE8 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 PacifidlogTown_MapWarps: @ 8527E30 - warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 16, 13, 0, 0, PACIFIDLOG_TOWN_HOUSE_1 - warp_def 3, 22, 0, 0, PACIFIDLOG_TOWN_HOUSE_2 - warp_def 12, 24, 0, 0, PACIFIDLOG_TOWN_HOUSE_3 - warp_def 2, 12, 0, 0, PACIFIDLOG_TOWN_HOUSE_4 - warp_def 17, 21, 0, 0, PACIFIDLOG_TOWN_HOUSE_5 + warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 + warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 + warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 + warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 + warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents: @ 8527E60 bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index a60d8eedc..5734b534a 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -3,8 +3,8 @@ PacifidlogTown_House1_EventObjects: @ 852EBA0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 - warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 852EBE0 map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index 26147f726..1933cc143 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -4,8 +4,8 @@ PacifidlogTown_House2_EventObjects: @ 852EBF4 object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C - warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 852EC4C map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 8f3292936..b8573a434 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -3,8 +3,8 @@ PacifidlogTown_House3_EventObjects: @ 852EC60 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 - warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 852ECA0 map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index 1d88d3be7..8363ff2ae 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -4,8 +4,8 @@ PacifidlogTown_House4_EventObjects: @ 852ECB4 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC - warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 852ED0C map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index 51cbaaa39..9c8ce51fa 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -3,8 +3,8 @@ PacifidlogTown_House5_EventObjects: @ 852ED20 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 - warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN - warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN + warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 852ED60 map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index f67b4269e..6448139c3 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 - warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN - warp_def 6, 8, 3, 0, PACIFIDLOG_TOWN - warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index 26b9cf591..2750b1830 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 - warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 171790f56..b8baf4437 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -10,12 +10,12 @@ PetalburgCity_EventObjects: @ 8525FD0 object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 PetalburgCity_MapWarps: @ 85260A8 - warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1 - warp_def 7, 5, 0, 0, PETALBURG_CITY_WALLYS_HOUSE - warp_def 15, 8, 0, 0, PETALBURG_CITY_GYM - warp_def 20, 16, 0, 0, PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 20, 24, 0, 0, PETALBURG_CITY_HOUSE_2 - warp_def 25, 12, 0, 0, PETALBURG_CITY_MART + warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 + warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE + warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM + warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 + warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents: @ 85260D8 coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index bdd6d2da4..051c82549 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -12,44 +12,44 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 PetalburgCity_Gym_MapWarps: @ 852EED0 - warp_def 4, 111, 3, 2, PETALBURG_CITY - warp_def 5, 111, 3, 2, PETALBURG_CITY - warp_def 1, 105, 3, 3, PETALBURG_CITY_GYM - warp_def 7, 85, 3, 2, PETALBURG_CITY_GYM - warp_def 6, 85, 3, 2, PETALBURG_CITY_GYM - warp_def 7, 105, 3, 6, PETALBURG_CITY_GYM - warp_def 1, 98, 3, 5, PETALBURG_CITY_GYM - warp_def 2, 98, 3, 5, PETALBURG_CITY_GYM - warp_def 1, 79, 3, 10, PETALBURG_CITY_GYM - warp_def 7, 79, 3, 12, PETALBURG_CITY_GYM - warp_def 7, 46, 3, 8, PETALBURG_CITY_GYM - warp_def 6, 46, 3, 8, PETALBURG_CITY_GYM - warp_def 1, 59, 3, 9, PETALBURG_CITY_GYM - warp_def 2, 59, 3, 9, PETALBURG_CITY_GYM - warp_def 1, 92, 3, 16, PETALBURG_CITY_GYM - warp_def 7, 92, 3, 18, PETALBURG_CITY_GYM - warp_def 7, 59, 3, 14, PETALBURG_CITY_GYM - warp_def 6, 59, 3, 14, PETALBURG_CITY_GYM - warp_def 1, 72, 3, 15, PETALBURG_CITY_GYM - warp_def 2, 72, 3, 15, PETALBURG_CITY_GYM - warp_def 7, 40, 3, 24, PETALBURG_CITY_GYM - warp_def 1, 53, 3, 26, PETALBURG_CITY_GYM - warp_def 7, 53, 3, 28, PETALBURG_CITY_GYM - warp_def 1, 66, 3, 30, PETALBURG_CITY_GYM - warp_def 1, 20, 3, 20, PETALBURG_CITY_GYM - warp_def 2, 20, 3, 20, PETALBURG_CITY_GYM - warp_def 7, 20, 3, 21, PETALBURG_CITY_GYM - warp_def 6, 20, 3, 21, PETALBURG_CITY_GYM - warp_def 1, 33, 3, 22, PETALBURG_CITY_GYM - warp_def 2, 33, 3, 22, PETALBURG_CITY_GYM - warp_def 7, 33, 3, 23, PETALBURG_CITY_GYM - warp_def 6, 33, 3, 23, PETALBURG_CITY_GYM - warp_def 7, 14, 3, 34, PETALBURG_CITY_GYM - warp_def 1, 27, 3, 36, PETALBURG_CITY_GYM - warp_def 1, 7, 3, 32, PETALBURG_CITY_GYM - warp_def 2, 7, 3, 32, PETALBURG_CITY_GYM - warp_def 7, 7, 3, 33, PETALBURG_CITY_GYM - warp_def 6, 7, 3, 33, PETALBURG_CITY_GYM + warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM + warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM + warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM + warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM + warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM + warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM + warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM + warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM + warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM + warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM + warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM + warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM + warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM + warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137 diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index c078d6876..2727161ff 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -3,8 +3,8 @@ PetalburgCity_House1_EventObjects: @ 852F0BC object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 PetalburgCity_House1_MapWarps: @ 852F0EC - warp_def 3, 8, 0, 0, PETALBURG_CITY - warp_def 4, 8, 0, 0, PETALBURG_CITY + warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY + warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 852F0FC map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index b6570b5e9..26cc07568 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -3,8 +3,8 @@ PetalburgCity_House2_EventObjects: @ 852F110 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 PetalburgCity_House2_MapWarps: @ 852F140 - warp_def 3, 7, 0, 4, PETALBURG_CITY - warp_def 4, 7, 0, 4, PETALBURG_CITY + warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 852F150 map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 0413f795a..d717f14d1 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -5,8 +5,8 @@ PetalburgCity_Mart_EventObjects: @ 852F294 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 - warp_def 3, 7, 0, 5, PETALBURG_CITY - warp_def 4, 7, 0, 5, PETALBURG_CITY + warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 852F304 map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 5c940de5a..fcb50b871 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC - warp_def 7, 8, 3, 3, PETALBURG_CITY - warp_def 6, 8, 3, 3, PETALBURG_CITY - warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index 99312ac96..3bdcdfb12 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 - warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index e7107f07a..7516e89e1 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -3,8 +3,8 @@ PetalburgCity_WallysHouse_EventObjects: @ 852ED74 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 - warp_def 3, 7, 0, 1, PETALBURG_CITY - warp_def 4, 7, 0, 1, PETALBURG_CITY + warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index bb9b69f35..70153850c 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -14,12 +14,12 @@ PetalburgWoods_EventObjects: @ 85345E4 object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 PetalburgWoods_MapWarps: @ 853471C - warp_def 14, 5, 0, 2, ROUTE_104 - warp_def 15, 5, 0, 3, ROUTE_104 - warp_def 16, 38, 0, 4, ROUTE_104 - warp_def 17, 38, 0, 5, ROUTE_104 - warp_def 36, 38, 0, 6, ROUTE_104 - warp_def 37, 38, 0, 7, ROUTE_104 + warp_def 14, 5, 0, 2, MAP_ROUTE104 + warp_def 15, 5, 0, 3, MAP_ROUTE104 + warp_def 16, 38, 0, 4, MAP_ROUTE104 + warp_def 17, 38, 0, 5, MAP_ROUTE104 + warp_def 36, 38, 0, 6, MAP_ROUTE104 + warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents: @ 853474C coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index ad9f6625d..f10ac533e 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_EventObjects: @ 8539DFC object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 RecordCorner_MapWarps: @ 8539E14 - warp_def 8, 9, 3, 127, NONE - warp_def 9, 9, 3, 127, NONE - warp_def 11, 9, 3, 127, NONE - warp_def 10, 9, 3, 127, NONE + warp_def 8, 9, 3, 127, MAP_NONE + warp_def 9, 9, 3, 127, MAP_NONE + warp_def 11, 9, 3, 127, MAP_NONE + warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents: @ 8539E34 coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index cdd07bab1..6d8ab1306 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -21,7 +21,7 @@ Route103_EventObjects: @ 85280DC object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 Route103_MapWarps: @ 85282BC - warp_def 45, 6, 0, 0, ALTERING_CAVE + warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE Route103_MapBGEvents: @ 85282C4 bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 66a9e0edb..d4dd12b70 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -35,14 +35,14 @@ Route104_EventObjects: @ 85282E4 object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 Route104_MapWarps: @ 8528614 - warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE - warp_def 5, 18, 0, 0, ROUTE_104_PRETTY_PETAL_FLOWER_SHOP - warp_def 10, 30, 3, 0, PETALBURG_WOODS - warp_def 11, 30, 3, 1, PETALBURG_WOODS - warp_def 10, 38, 3, 2, PETALBURG_WOODS - warp_def 11, 38, 3, 3, PETALBURG_WOODS - warp_def 32, 42, 3, 4, PETALBURG_WOODS - warp_def 33, 42, 3, 5, PETALBURG_WOODS + warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE + warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP + warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS + warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS + warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS + warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS + warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS + warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapCoordEvents: @ 8528654 coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index 2088faf16..a1240dba4 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -3,8 +3,8 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 Route104_MrBrineysHouse_MapWarps: @ 8533B04 - warp_def 5, 8, 0, 0, ROUTE_104 - warp_def 6, 8, 0, 0, ROUTE_104 + warp_def 5, 8, 0, 0, MAP_ROUTE104 + warp_def 6, 8, 0, 0, MAP_ROUTE104 Route104_MrBrineysHouse_MapEvents:: @ 8533B14 map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 2d6d7fe37..8464ada1d 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -4,8 +4,8 @@ Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 - warp_def 2, 8, 0, 1, ROUTE_104 - warp_def 3, 8, 0, 1, ROUTE_104 + warp_def 2, 8, 0, 1, MAP_ROUTE104 + warp_def 3, 8, 0, 1, MAP_ROUTE104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index b7583aabd..67a1c72bb 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -9,7 +9,7 @@ Route105_EventObjects: @ 85286F0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 Route105_MapWarps: @ 85287B0 - warp_def 9, 20, 0, 0, ISLAND_CAVE + warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents: @ 85287B8 bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 866a894fa..aac793811 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -6,7 +6,7 @@ Route106_EventObjects: @ 85287E4 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 Route106_MapWarps: @ 852885C - warp_def 48, 16, 0, 0, GRANITE_CAVE_1F + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 61a4b521a..81c1fb79c 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -8,7 +8,7 @@ Route108_EventObjects: @ 8528964 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 Route108_MapWarps: @ 8528A0C - warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK + warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index d1e85b36c..a5e210b51 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -25,7 +25,7 @@ Route109_EventObjects: @ 8528A34 object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 Route109_MapWarps: @ 8528C74 - warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE + warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents: @ 8528C7C bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 7ded7ed23..d7d9ab49a 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -5,8 +5,8 @@ Route109_SeashoreHouse_EventObjects: @ 853DDE8 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 - warp_def 6, 9, 0, 0, ROUTE_109 - warp_def 7, 9, 0, 0, ROUTE_109 + warp_def 6, 9, 0, 0, MAP_ROUTE109 + warp_def 7, 9, 0, 0, MAP_ROUTE109 Route109_SeashoreHouse_MapEvents:: @ 853DE58 map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 9dd5649fb..5ba048482 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -37,12 +37,12 @@ Route110_EventObjects: @ 8528CF0 object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 Route110_MapWarps: @ 8529050 - warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE - warp_def 11, 66, 0, 0, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 15, 16, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 - warp_def 18, 16, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 - warp_def 16, 88, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 - warp_def 19, 88, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 + warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE + warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index 23f896e4b..86f8883a3 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 - warp_def 1, 5, 0, 4, ROUTE_110 - warp_def 2, 5, 0, 4, ROUTE_110 - warp_def 12, 5, 0, 5, ROUTE_110 - warp_def 13, 5, 0, 5, ROUTE_110 + warp_def 1, 5, 0, 4, MAP_ROUTE110 + warp_def 2, 5, 0, 4, MAP_ROUTE110 + warp_def 12, 5, 0, 5, MAP_ROUTE110 + warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index f988f9751..245dc0eaf 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 - warp_def 1, 5, 0, 2, ROUTE_110 - warp_def 2, 5, 0, 2, ROUTE_110 - warp_def 12, 5, 0, 3, ROUTE_110 - warp_def 13, 5, 0, 3, ROUTE_110 + warp_def 1, 5, 0, 2, MAP_ROUTE110 + warp_def 2, 5, 0, 2, MAP_ROUTE110 + warp_def 12, 5, 0, 3, MAP_ROUTE110 + warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0 diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc index eaef9c9a2..e9d84d56b 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ b/data/maps/events/Route110_TrickHouseCorridor.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapWarps: @ 853DF54 - warp_def 13, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END - warp_def 14, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END - warp_def 4, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 5, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE + warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE Route110_TrickHouseCorridor_MapEvents:: @ 853DF74 map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 62640ab29..5acd3d9fb 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -2,8 +2,8 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 Route110_TrickHouseEnd_MapWarps: @ 853DF14 - warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1 - warp_def 2, 1, 3, 0, ROUTE_110_TRICK_HOUSE_CORRIDOR + warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 + warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index c6a31119f..ff7c2182e 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -2,9 +2,9 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 - warp_def 5, 7, 3, 1, ROUTE_110 - warp_def 6, 7, 3, 1, ROUTE_110 - warp_def 5, 2, 3, 0, ROUTE_110_TRICK_HOUSE_PUZZLE_1 + warp_def 5, 7, 3, 1, MAP_ROUTE110 + warp_def 6, 7, 3, 1, MAP_ROUTE110 + warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 40da83bb8..56ec5beaa 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -16,9 +16,9 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index ed03f5d79..dcc1f5efe 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 0097717fa..3fb140aa7 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -8,9 +8,9 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index b6e4b2f07..652974cf7 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -15,9 +15,9 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861 diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 7ae53cdad..004c71506 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index a36e7cd72..0da7ac619 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4 diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 39ee27853..fd5748a76 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -10,19 +10,19 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END - warp_def 13, 4, 0, 4, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 7, 3, 0, 3, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 13, 11, 0, 6, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 4, 3, 0, 5, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 1, 17, 0, 8, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 0, 11, 0, 7, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 2, 3, 0, 10, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 4, 13, 0, 9, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 1, 3, 0, 12, ROUTE_110_TRICK_HOUSE_PUZZLE_7 - warp_def 8, 12, 0, 11, ROUTE_110_TRICK_HOUSE_PUZZLE_7 + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 + warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 2e44e5b74..821801eac 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 - warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 0, 0, ROUTE_110_TRICK_HOUSE_END + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index bfd09e58e..e259215de 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -47,11 +47,11 @@ Route111_EventObjects: @ 85291F0 object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 Route111_MapWarps: @ 8529640 - warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE - warp_def 29, 87, 0, 0, DESERT_RUINS - warp_def 26, 18, 0, 0, ROUTE_111_OLD_LADYS_REST_STOP - warp_def 19, 58, 0, 0, MIRAGE_TOWER_1F - warp_def 31, 113, 0, 0, TRAINER_HILL_ENTRANCE + warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE + warp_def 29, 87, 0, 0, MAP_DESERT_RUINS + warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP + warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F + warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE Route111_MapCoordEvents: @ 8529668 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index 3cb500bdc..ecb54bda3 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -2,8 +2,8 @@ Route111_OldLadysRestStop_EventObjects: @ 8533C18 object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 - warp_def 3, 7, 0, 2, ROUTE_111 - warp_def 4, 7, 0, 2, ROUTE_111 + warp_def 3, 7, 0, 2, MAP_ROUTE111 + warp_def 4, 7, 0, 2, MAP_ROUTE111 Route111_OldLadysRestStop_MapEvents:: @ 8533C40 map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index bd7567d81..62961b46c 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -5,8 +5,8 @@ Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 - warp_def 3, 7, 0, 0, ROUTE_111 - warp_def 4, 7, 0, 0, ROUTE_111 + warp_def 3, 7, 0, 0, MAP_ROUTE111 + warp_def 4, 7, 0, 0, MAP_ROUTE111 Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index e2b26846e..e063a1283 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -15,12 +15,12 @@ Route112_EventObjects: @ 8529974 object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 Route112_MapWarps: @ 8529AC4 - warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION - warp_def 29, 27, 0, 1, ROUTE_112_CABLE_CAR_STATION - warp_def 6, 46, 3, 0, JAGGED_PASS - warp_def 7, 46, 3, 1, JAGGED_PASS - warp_def 11, 36, 0, 0, FIERY_PATH - warp_def 22, 10, 0, 1, FIERY_PATH + warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 6, 46, 3, 0, MAP_JAGGED_PASS + warp_def 7, 46, 3, 1, MAP_JAGGED_PASS + warp_def 11, 36, 0, 0, MAP_FIERY_PATH + warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents: @ 8529AF4 bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index e33f6cb77..15df206a0 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -3,8 +3,8 @@ Route112_CableCarStation_EventObjects: @ 8533C54 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 - warp_def 6, 11, 0, 0, ROUTE_112 - warp_def 7, 11, 0, 1, ROUTE_112 + warp_def 6, 11, 0, 0, MAP_ROUTE112 + warp_def 7, 11, 0, 1, MAP_ROUTE112 Route112_CableCarStation_MapEvents:: @ 8533C94 map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 4d5376cce..269aeac3e 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -17,9 +17,9 @@ Route113_EventObjects: @ 8529B2C object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 Route113_MapWarps: @ 8529CAC - warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP - warp_def 41, 12, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 88, 5, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP + warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route113_MapCoordEvents: @ 8529CC4 coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 85d84324c..7701918e3 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -3,8 +3,8 @@ Route113_GlassWorkshop_EventObjects: @ 853EA78 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 - warp_def 3, 8, 0, 0, ROUTE_113 - warp_def 4, 8, 0, 0, ROUTE_113 + warp_def 3, 8, 0, 0, MAP_ROUTE113 + warp_def 4, 8, 0, 0, MAP_ROUTE113 Route113_GlassWorkshop_MapEvents:: @ 853EAB8 map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 1a7b58289..b785fd55a 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -28,11 +28,11 @@ Route114_EventObjects: @ 8529E68 object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 Route114_MapWarps: @ 852A0F0 - warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R - warp_def 29, 5, 0, 0, ROUTE_114_FOSSIL_MANIACS_HOUSE - warp_def 27, 36, 0, 0, ROUTE_114_LANETTES_HOUSE - warp_def 6, 46, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 7, 4, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R + warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE + warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route114_MapBGEvents: @ 852A118 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625 diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index ef9ad911a..87f2e8a51 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsHouse_EventObjects: @ 8533CFC object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 - warp_def 4, 7, 0, 1, ROUTE_114 - warp_def 5, 7, 0, 1, ROUTE_114 - warp_def 4, 1, 0, 0, ROUTE_114_FOSSIL_MANIACS_TUNNEL + warp_def 4, 7, 0, 1, MAP_ROUTE114 + warp_def 5, 7, 0, 1, MAP_ROUTE114 + warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73 diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 5521303f7..f14e6cd65 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 - warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE - warp_def 7, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE - warp_def 6, 2, 0, 0, DESERT_UNDERPASS + warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index 1182d95f2..c7b2fdfef 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -2,8 +2,8 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 Route114_LanettesHouse_MapWarps: @ 8533DEC - warp_def 5, 7, 0, 2, ROUTE_114 - warp_def 6, 7, 0, 2, ROUTE_114 + warp_def 5, 7, 0, 2, MAP_ROUTE114 + warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents: @ 8533DFC bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 63924166c..5ff749096 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -24,9 +24,9 @@ Route115_EventObjects: @ 852A1BC object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 Route115_MapWarps: @ 852A3E4 - warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R - warp_def 21, 6, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 36, 10, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R + warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route115_MapBGEvents: @ 852A3FC bg_event 32, 6, 0, 8, 0, 72, 0, 0 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 25bc3891c..a1c706e45 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -29,11 +29,11 @@ Route116_EventObjects: @ 852A4B8 object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 Route116_MapWarps: @ 852A758 - warp_def 47, 8, 0, 0, RUSTURF_TUNNEL - warp_def 38, 8, 0, 0, ROUTE_116_TUNNELERS_REST_HOUSE - warp_def 65, 10, 0, 2, RUSTURF_TUNNEL - warp_def 59, 13, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 79, 6, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL + warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE + warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL + warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route116_MapCoordEvents: @ 852A780 coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95 diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index da8f9c1a0..d84600bf6 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -4,8 +4,8 @@ Route116_TunnelersRestHouse_EventObjects: @ 8533E34 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C - warp_def 4, 8, 0, 1, ROUTE_116 - warp_def 5, 8, 0, 1, ROUTE_116 + warp_def 4, 8, 0, 1, MAP_ROUTE116 + warp_def 5, 8, 0, 1, MAP_ROUTE116 Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 4478507ae..628ac7aab 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -25,7 +25,7 @@ Route117_EventObjects: @ 852A828 object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 Route117_MapWarps: @ 852AA68 - warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents: @ 852AA70 bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5 diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index 363c2132f..b5b1a1960 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -2,8 +2,8 @@ Route117_PokemonDayCare_EventObjects: @ 8533EA0 object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 - warp_def 2, 8, 0, 0, ROUTE_117 - warp_def 3, 8, 0, 0, ROUTE_117 + warp_def 2, 8, 0, 0, MAP_ROUTE117 + warp_def 3, 8, 0, 0, MAP_ROUTE117 Route117_PokemonDayCare_MapEvents:: @ 8533EC8 map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 73ba40dd2..dcd27a75d 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -22,8 +22,8 @@ Route118_EventObjects: @ 852AAB4 object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 Route118_MapWarps: @ 852ACAC - warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE - warp_def 9, 6, 0, 0, TERRA_CAVE_ENTRANCE + warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE + warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route118_MapCoordEvents: @ 852ACBC coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 96db2d944..c057150a4 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -44,8 +44,8 @@ Route119_EventObjects: @ 852AD6C object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 Route119_MapWarps: @ 852B174 - warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F - warp_def 33, 109, 0, 0, ROUTE_119_HOUSE + warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F + warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents: @ 852B184 coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472 diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 38c35b40a..9b5dbb2d8 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -8,8 +8,8 @@ Route119_House_EventObjects: @ 853ECD0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 Route119_House_MapWarps: @ 853ED78 - warp_def 3, 8, 0, 1, ROUTE_119 - warp_def 4, 8, 0, 1, ROUTE_119 + warp_def 3, 8, 0, 1, MAP_ROUTE119 + warp_def 4, 8, 0, 1, MAP_ROUTE119 Route119_House_MapEvents:: @ 853ED88 map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 6fa459ac6..d06f52da9 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -6,9 +6,9 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 - warp_def 9, 12, 0, 0, ROUTE_119 - warp_def 10, 12, 0, 0, ROUTE_119 - warp_def 17, 1, 0, 0, ROUTE_119_WEATHER_INSTITUTE_2F + warp_def 9, 12, 0, 0, MAP_ROUTE119 + warp_def 10, 12, 0, 0, MAP_ROUTE119 + warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index 0f838709c..6a9d375ed 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -9,7 +9,7 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 - warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F + warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 6f227115c..6060c20da 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -45,8 +45,8 @@ Route120_EventObjects: @ 852B3F8 object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 Route120_MapWarps: @ 852B818 - warp_def 7, 55, 0, 0, ANCIENT_TOMB - warp_def 19, 23, 1, 0, SCORCHED_SLAB + warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB + warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents: @ 852B828 coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index ec6ced043..5446772bf 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -30,7 +30,7 @@ Route121_EventObjects: @ 852BA14 object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 Route121_MapWarps: @ 852BCCC - warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE + warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents: @ 852BCD4 coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 39bb6123c..b19240c8d 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -4,10 +4,10 @@ Route121_SafariZoneEntrance_EventObjects: @ 8533EDC object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 - warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH - warp_def 3, 5, 0, 0, SAFARI_ZONE_SOUTH - warp_def 14, 13, 0, 0, ROUTE_121 - warp_def 15, 13, 0, 0, ROUTE_121 + warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH + warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH + warp_def 14, 13, 0, 0, MAP_ROUTE121 + warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18 diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc index 10330d8e3..4c5b9b464 100644 --- a/data/maps/events/Route122.inc +++ b/data/maps/events/Route122.inc @@ -1,5 +1,5 @@ Route122_MapWarps: @ 852BDA0 - warp_def 22, 29, 0, 0, MT_PYRE_1F + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F Route122_MapEvents:: @ 852BDA8 map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 0521a0592..f6d8f986d 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -44,7 +44,7 @@ Route123_EventObjects: @ 852BDBC object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 Route123_MapWarps: @ 852C1C4 - warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE + warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents: @ 852C1CC coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index 719dc55c7..d250f8f39 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -3,8 +3,8 @@ Route123_BerryMastersHouse_EventObjects: @ 853EACC object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC - warp_def 3, 7, 0, 0, ROUTE_123 - warp_def 4, 7, 0, 0, ROUTE_123 + warp_def 3, 7, 0, 0, MAP_ROUTE123 + warp_def 4, 7, 0, 0, MAP_ROUTE123 Route123_BerryMastersHouse_MapEvents:: @ 853EB0C map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 8cd919a63..dc4adebc4 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -13,7 +13,7 @@ Route124_EventObjects: @ 852C3C4 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 Route124_MapWarps: @ 852C4E4 - warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents: @ 852C4EC bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 1916f36b7..d4fb69d74 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -2,8 +2,8 @@ Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 - warp_def 3, 8, 0, 0, ROUTE_124 - warp_def 4, 8, 0, 0, ROUTE_124 + warp_def 3, 8, 0, 0, MAP_ROUTE124 + warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 30fa1f18f..81a9dbcea 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -11,7 +11,7 @@ Route125_EventObjects: @ 852C50C object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 Route125_MapWarps: @ 852C5FC - warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents: @ 852C604 bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index b66f47867..bea728a70 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -9,7 +9,7 @@ Route131_EventObjects: @ 852CAB4 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 Route131_MapWarps: @ 852CB74 - warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE + warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 852CB7C map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 3efb9fac7..355539f00 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -17,18 +17,18 @@ RustboroCity_EventObjects: @ 85267E0 object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 RustboroCity_MapWarps: @ 8526960 - warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM - warp_def 13, 30, 0, 0, RUSTBORO_CITY_FLAT_1_1F - warp_def 16, 45, 0, 0, RUSTBORO_CITY_MART - warp_def 16, 38, 0, 0, RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 27, 34, 0, 0, RUSTBORO_CITY_POKEMON_SCHOOL - warp_def 11, 15, 0, 0, RUSTBORO_CITY_DEVON_CORP_1F - warp_def 12, 15, 0, 1, RUSTBORO_CITY_DEVON_CORP_1F - warp_def 33, 19, 0, 0, RUSTBORO_CITY_HOUSE_1 - warp_def 9, 38, 0, 0, RUSTBORO_CITY_CUTTERS_HOUSE - warp_def 30, 28, 0, 0, RUSTBORO_CITY_HOUSE_2 - warp_def 5, 51, 0, 0, RUSTBORO_CITY_FLAT_2_1F - warp_def 26, 46, 0, 0, RUSTBORO_CITY_HOUSE_3 + warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM + warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F + warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART + warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL + warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 + warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE + warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 + warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents: @ 85269C0 coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index bbed60478..34d6c282d 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -3,8 +3,8 @@ RustboroCity_CuttersHouse_EventObjects: @ 8530A1C object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C - warp_def 5, 8, 0, 8, RUSTBORO_CITY - warp_def 6, 8, 0, 8, RUSTBORO_CITY + warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 034c44aa3..b36e7c1c7 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -4,9 +4,9 @@ RustboroCity_DevonCorp_1F_EventObjects: @ 853037C object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 - warp_def 5, 8, 0, 5, RUSTBORO_CITY - warp_def 6, 8, 0, 6, RUSTBORO_CITY - warp_def 14, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_2F + warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY + warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index f19ab8110..35fb23324 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -7,8 +7,8 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 - warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F - warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F + warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index 8422ef37a..0d4687ad5 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 - warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F + warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index 66786ea5b..f7e7cacdb 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat1_1F_EventObjects: @ 8530890 object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 - warp_def 6, 7, 0, 1, RUSTBORO_CITY - warp_def 7, 7, 0, 1, RUSTBORO_CITY - warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F + warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index e56741b49..c7ed5e558 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -9,7 +9,7 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC - warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F + warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index f31acb8b6..bb5e5b11d 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 - warp_def 2, 8, 0, 10, RUSTBORO_CITY - warp_def 3, 8, 0, 10, RUSTBORO_CITY - warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F + warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index 3bed978e8..e0a4419d3 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -3,8 +3,8 @@ RustboroCity_Flat2_2F_EventObjects: @ 8530B20 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 - warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F - warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F + warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 16f9aa3ea..1b487cb0f 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F_EventObjects: @ 8530B74 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 - warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F + warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index d17c42d67..5285e5b38 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -6,8 +6,8 @@ RustboroCity_Gym_EventObjects: @ 8530538 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 RustboroCity_Gym_MapWarps: @ 85305B0 - warp_def 5, 19, 0, 0, RUSTBORO_CITY - warp_def 6, 19, 0, 0, RUSTBORO_CITY + warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY + warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents: @ 85305C0 bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047 diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index d07456dc9..9702820df 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -3,8 +3,8 @@ RustboroCity_House1_EventObjects: @ 85309C8 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 RustboroCity_House1_MapWarps: @ 85309F8 - warp_def 5, 7, 0, 7, RUSTBORO_CITY - warp_def 6, 7, 0, 7, RUSTBORO_CITY + warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY + warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8530A08 map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 5d45c64d0..2e9cd945b 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -3,8 +3,8 @@ RustboroCity_House2_EventObjects: @ 8530A70 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 RustboroCity_House2_MapWarps: @ 8530AA0 - warp_def 5, 8, 0, 9, RUSTBORO_CITY - warp_def 6, 8, 0, 9, RUSTBORO_CITY + warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8530AB0 map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 61a528cdc..0cbb78d18 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -4,8 +4,8 @@ RustboroCity_House3_EventObjects: @ 8530BC0 object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 RustboroCity_House3_MapWarps: @ 8530C08 - warp_def 5, 8, 0, 11, RUSTBORO_CITY - warp_def 6, 8, 0, 11, RUSTBORO_CITY + warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8530C18 map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index e177ee10a..1780ce501 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -5,8 +5,8 @@ RustboroCity_Mart_EventObjects: @ 853080C object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 RustboroCity_Mart_MapWarps: @ 853086C - warp_def 3, 7, 0, 2, RUSTBORO_CITY - warp_def 4, 7, 0, 2, RUSTBORO_CITY + warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY + warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 853087C map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index 56dd4ef83..f287000ba 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 - warp_def 7, 8, 3, 3, RUSTBORO_CITY - warp_def 6, 8, 3, 3, RUSTBORO_CITY - warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index f9e00e26c..2d3ff8777 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 - warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index ac0160e7b..3a5ab1416 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -8,8 +8,8 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 RustboroCity_PokemonSchool_MapWarps: @ 8530694 - warp_def 5, 10, 0, 4, RUSTBORO_CITY - warp_def 6, 10, 0, 4, RUSTBORO_CITY + warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY + warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 5c2a214b9..38b3885b4 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -11,9 +11,9 @@ RusturfTunnel_EventObjects: @ 85341C4 object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 RusturfTunnel_MapWarps: @ 85342B4 - warp_def 4, 10, 3, 0, ROUTE_116 - warp_def 29, 16, 3, 4, VERDANTURF_TOWN - warp_def 18, 20, 3, 2, ROUTE_116 + warp_def 4, 10, 3, 0, MAP_ROUTE116 + warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN + warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents: @ 85342CC coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 1816412d6..80e65eb94 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -6,15 +6,15 @@ SSTidalCorridor_EventObjects: @ 853A158 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 SSTidalCorridor_MapWarps: @ 853A1D0 - warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS - warp_def 7, 9, 3, 2, SS_TIDAL_ROOMS - warp_def 10, 9, 3, 4, SS_TIDAL_ROOMS - warp_def 13, 9, 3, 6, SS_TIDAL_ROOMS - warp_def 4, 3, 3, 8, SS_TIDAL_ROOMS - warp_def 7, 3, 3, 9, SS_TIDAL_ROOMS - warp_def 10, 3, 3, 10, SS_TIDAL_ROOMS - warp_def 13, 3, 3, 11, SS_TIDAL_ROOMS - warp_def 16, 2, 3, 0, SS_TIDAL_LOWER_DECK + warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS + warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS + warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS + warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS + warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS + warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS + warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS + warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS + warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index e135eceae..3cf22e65f 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck_EventObjects: @ 853A2BC object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC - warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR + warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents: @ 853A2F4 bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 14aadda5f..0eb0017b3 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -9,18 +9,18 @@ SSTidalRooms_EventObjects: @ 853A314 object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 SSTidalRooms_MapWarps: @ 853A3D4 - warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR - warp_def 5, 16, 0, 0, SS_TIDAL_CORRIDOR - warp_def 13, 16, 0, 1, SS_TIDAL_CORRIDOR - warp_def 14, 16, 0, 1, SS_TIDAL_CORRIDOR - warp_def 22, 16, 0, 2, SS_TIDAL_CORRIDOR - warp_def 23, 16, 0, 2, SS_TIDAL_CORRIDOR - warp_def 31, 16, 0, 3, SS_TIDAL_CORRIDOR - warp_def 32, 16, 0, 3, SS_TIDAL_CORRIDOR - warp_def 4, 1, 0, 4, SS_TIDAL_CORRIDOR - warp_def 13, 1, 0, 5, SS_TIDAL_CORRIDOR - warp_def 22, 1, 0, 6, SS_TIDAL_CORRIDOR - warp_def 31, 1, 0, 7, SS_TIDAL_CORRIDOR + warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents: @ 853A434 bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index 1ab278781..7f7e66bf6 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -4,8 +4,8 @@ SafariZone_RestHouse_EventObjects: @ 853B8FC object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 SafariZone_RestHouse_MapWarps: @ 853B944 - warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST - warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST + warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 853B954 map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc index c1e293e6f..1415cf9e6 100644 --- a/data/maps/events/SafariZone_South.inc +++ b/data/maps/events/SafariZone_South.inc @@ -7,7 +7,7 @@ SafariZone_South_EventObjects: @ 853B2A4 object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 SafariZone_South_MapWarps: @ 853B334 - warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE + warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE SafariZone_South_MapEvents:: @ 853B33C map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index eda3552eb..da88db1c3 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -3,7 +3,7 @@ SafariZone_Southwest_EventObjects: @ 853B24C object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 SafariZone_Southwest_MapWarps: @ 853B27C - warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE + warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents: @ 853B284 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270 diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 313423b51..d55facfab 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -2,7 +2,7 @@ ScorchedSlab_EventObjects: @ 8536F88 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 ScorchedSlab_MapWarps: @ 8536FA0 - warp_def 7, 16, 1, 1, ROUTE_120 + warp_def 7, 16, 1, 1, MAP_ROUTE120 ScorchedSlab_MapEvents:: @ 8536FA8 map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index 1118c0ab3..7f2619b0f 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -2,8 +2,8 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 SeafloorCavern_Entrance_MapWarps: @ 85356D4 - warp_def 10, 18, 3, 0, UNDERWATER_4 - warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1 + warp_def 10, 18, 3, 0, MAP_UNDERWATER4 + warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 SeafloorCavern_Entrance_MapEvents:: @ 85356E4 map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 31fbb7d86..b8f21b4de 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -6,9 +6,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 SeafloorCavern_Room1_MapWarps: @ 8535770 - warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE - warp_def 17, 13, 3, 0, SEAFLOOR_CAVERN_ROOM_5 - warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2 + warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE + warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 SeafloorCavern_Room1_MapEvents:: @ 8535788 map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 608b45e50..0c5a8dd48 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -9,10 +9,10 @@ SeafloorCavern_Room2_EventObjects: @ 853579C object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 SeafloorCavern_Room2_MapWarps: @ 853585C - warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1 - warp_def 4, 10, 3, 0, SEAFLOOR_CAVERN_ROOM_4 - warp_def 6, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_6 - warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7 + warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 + warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 SeafloorCavern_Room2_MapEvents:: @ 853587C map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index f7c919131..a49565f4d 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -10,9 +10,9 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 SeafloorCavern_Room3_MapWarps: @ 8535968 - warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8 - warp_def 9, 13, 3, 1, SEAFLOOR_CAVERN_ROOM_7 - warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6 + warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 + warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 + warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 SeafloorCavern_Room3_MapEvents:: @ 8535980 map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 3b7f6f2ee..ca44cc403 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -3,10 +3,10 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 SeafloorCavern_Room4_MapWarps: @ 85359C4 - warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2 - warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_5 - warp_def 9, 10, 3, 2, SEAFLOOR_CAVERN_ROOM_5 - warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE + warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 85359E4 map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 4fd74a9c7..b9fa6997d 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -7,9 +7,9 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 SeafloorCavern_Room5_MapWarps: @ 8535A88 - warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1 - warp_def 15, 12, 3, 1, SEAFLOOR_CAVERN_ROOM_4 - warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 SeafloorCavern_Room5_MapEvents:: @ 8535AA0 map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc index 2293f359d..99c10d87e 100644 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ b/data/maps/events/SeafloorCavern_Room6.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room6_MapWarps: @ 8535AB4 - warp_def 11, 21, 3, 2, SEAFLOOR_CAVERN_ROOM_2 - warp_def 4, 1, 3, 2, SEAFLOOR_CAVERN_ROOM_3 - warp_def 14, 8, 1, 1, SEAFLOOR_CAVERN_ENTRANCE + warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 + warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room6_MapEvents:: @ 8535ACC map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc index 002154473..2d8fca999 100644 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ b/data/maps/events/SeafloorCavern_Room7.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room7_MapWarps: @ 8535AE0 - warp_def 3, 23, 3, 3, SEAFLOOR_CAVERN_ROOM_2 - warp_def 5, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_3 + warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room7_MapEvents:: @ 8535AF0 map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 65a1da014..8049afd96 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -13,8 +13,8 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 SeafloorCavern_Room8_MapWarps: @ 8535C24 - warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9 - warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 + warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room8_MapEvents:: @ 8535C34 map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 8c203021c..ffa9830ed 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 SeafloorCavern_Room9_MapWarps: @ 8535CF0 - warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8 + warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9 diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc index 753d6dbfb..dd331570e 100644 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ b/data/maps/events/SealedChamber_InnerRoom.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom_MapWarps: @ 8536F00 - warp_def 10, 19, 3, 0, SEALED_CHAMBER_OUTER_ROOM + warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc index 21be37675..0181f3193 100644 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ b/data/maps/events/SealedChamber_OuterRoom.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom_MapWarps: @ 8536D88 - warp_def 10, 2, 3, 0, SEALED_CHAMBER_INNER_ROOM + warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 301779af5..c495a2b4c 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave1_MapWarps: @ 8537D54 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BlueCave1_MapEvents:: @ 8537D5C map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index f919cfae0..0c3d9dc29 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave2_MapWarps: @ 853866C - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_BlueCave2_MapEvents:: @ 8538674 map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index ba2b28eb1..fb8018dca 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave3_MapWarps: @ 8538F84 - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave3_MapEvents:: @ 8538F8C map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index cc79f44be..d6da82af5 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave4_MapWarps: @ 853989C - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave4_MapEvents:: @ 85398A4 map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index e937ac1f4..52c7cc504 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave1_MapWarps: @ 8537BD0 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BrownCave1_MapEvents:: @ 8537BD8 map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index d3885cb0d..5849476fe 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave2_MapWarps: @ 85384E8 - warp_def 1, 7, 0, 126, NONE + warp_def 1, 7, 0, 126, MAP_NONE SecretBase_BrownCave2_MapEvents:: @ 85384F0 map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index c0ec35e37..3b0b49552 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave3_MapWarps: @ 8538E00 - warp_def 11, 9, 0, 126, NONE + warp_def 11, 9, 0, 126, MAP_NONE SecretBase_BrownCave3_MapEvents:: @ 8538E08 map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index de9250cbb..d298884a5 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave4_MapWarps: @ 8539718 - warp_def 2, 8, 0, 126, NONE + warp_def 2, 8, 0, 126, MAP_NONE SecretBase_BrownCave4_MapEvents:: @ 8539720 map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index aa664f45c..51ea10312 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave1_MapWarps: @ 8537A4C - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_RedCave1_MapEvents:: @ 8537A54 map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 956e3b03b..eeda14062 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -16,7 +16,7 @@ SecretBase_RedCave2_EventObjects: @ 85381FC object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave2_MapWarps: @ 8538364 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_RedCave2_MapEvents:: @ 853836C map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index dfdbec94c..3b72537b3 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -16,7 +16,7 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave3_MapWarps: @ 8538C7C - warp_def 3, 6, 0, 126, NONE + warp_def 3, 6, 0, 126, MAP_NONE SecretBase_RedCave3_MapEvents:: @ 8538C84 map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index b485d0ad9..e375824e9 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -16,7 +16,7 @@ SecretBase_RedCave4_EventObjects: @ 853942C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave4_MapWarps: @ 8539594 - warp_def 2, 12, 0, 126, NONE + warp_def 2, 12, 0, 126, MAP_NONE SecretBase_RedCave4_MapEvents:: @ 853959C map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 545426eea..133e21afd 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -16,7 +16,7 @@ SecretBase_Shrub1_EventObjects: @ 8538078 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub1_MapWarps: @ 85381E0 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Shrub1_MapEvents:: @ 85381E8 map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 0adb6b76d..12ee64648 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -16,7 +16,7 @@ SecretBase_Shrub2_EventObjects: @ 8538990 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub2_MapWarps: @ 8538AF8 - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_Shrub2_MapEvents:: @ 8538B00 map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index b8f4d4ed4..57d0c07ad 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -16,7 +16,7 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub3_MapWarps: @ 8539410 - warp_def 6, 9, 0, 126, NONE + warp_def 6, 9, 0, 126, MAP_NONE SecretBase_Shrub3_MapEvents:: @ 8539418 map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 679b313d5..234a30943 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -16,7 +16,7 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub4_MapWarps: @ 8539D28 - warp_def 11, 8, 0, 126, NONE + warp_def 11, 8, 0, 126, MAP_NONE SecretBase_Shrub4_MapEvents:: @ 8539D30 map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 402081450..73b572717 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -16,7 +16,7 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree1_MapWarps: @ 853805C - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Tree1_MapEvents:: @ 8538064 map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index ddfbf094c..d45021a2e 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -16,7 +16,7 @@ SecretBase_Tree2_EventObjects: @ 853880C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree2_MapWarps: @ 8538974 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_Tree2_MapEvents:: @ 853897C map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index a13916bc7..c903add8d 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -16,7 +16,7 @@ SecretBase_Tree3_EventObjects: @ 8539124 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree3_MapWarps: @ 853928C - warp_def 8, 6, 0, 126, NONE + warp_def 8, 6, 0, 126, MAP_NONE SecretBase_Tree3_MapEvents:: @ 8539294 map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 4511b236c..45a9182d0 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -16,7 +16,7 @@ SecretBase_Tree4_EventObjects: @ 8539A3C object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree4_MapWarps: @ 8539BA4 - warp_def 7, 12, 0, 126, NONE + warp_def 7, 12, 0, 126, MAP_NONE SecretBase_Tree4_MapEvents:: @ 8539BAC map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 6fc02d447..5f2779b27 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave1_MapWarps: @ 8537ED8 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_YellowCave1_MapEvents:: @ 8537EE0 map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 646176740..2eb1f8660 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave2_MapWarps: @ 85387F0 - warp_def 12, 7, 0, 126, NONE + warp_def 12, 7, 0, 126, MAP_NONE SecretBase_YellowCave2_MapEvents:: @ 85387F8 map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index 32b71c477..ca749ef06 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave3_MapWarps: @ 8539108 - warp_def 5, 9, 0, 126, NONE + warp_def 5, 9, 0, 126, MAP_NONE SecretBase_YellowCave3_MapEvents:: @ 8539110 map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 187d0dff9..ab8a4d010 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave4_MapWarps: @ 8539A20 - warp_def 6, 12, 0, 126, NONE + warp_def 6, 12, 0, 126, MAP_NONE SecretBase_YellowCave4_MapEvents:: @ 8539A28 map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index dda65b0fe..4b5ce0315 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC - warp_def 20, 30, 3, 0, ROUTE_125 - warp_def 19, 5, 3, 0, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 6, 2, 3, 6, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 20, 30, 3, 0, MAP_ROUTE125 + warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 809fb146c..4ecc5efe4 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 - warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 4d48e1aab..4d610e828 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -2,14 +2,14 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 - warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 38, 15, 3, 0, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 42, 4, 3, 1, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 19, 14, 4, 0, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 15, 19, 3, 1, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 30, 25, 3, 2, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 14, 33, 5, 2, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 40, 33, 5, 3, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index d3484961e..752482a7e 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C - warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 2, 6, 3, 4, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 19, 11, 3, 5, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 28, 11, 3, 0, SHOAL_CAVE_LOW_TIDE_ICE_ROOM + warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176 diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 556524f05..6df886e80 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -2,8 +2,8 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC - warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 7, 4, 3, 2, SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 382cafe16..ac59cd8da 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_EventObjects: @ 8539D44 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 SingleBattleColosseum_MapWarps: @ 8539D5C - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents: @ 8539D6C coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc index c9eda68b0..59ac1aac0 100644 --- a/data/maps/events/SkyPillar_1F.inc +++ b/data/maps/events/SkyPillar_1F.inc @@ -1,7 +1,7 @@ SkyPillar_1F_MapWarps: @ 8537058 - warp_def 6, 13, 3, 1, SKY_PILLAR_OUTSIDE - warp_def 7, 13, 3, 1, SKY_PILLAR_OUTSIDE - warp_def 10, 1, 3, 0, SKY_PILLAR_2F + warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F SkyPillar_1F_MapEvents:: @ 8537070 map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc index 1c81f7838..780db9ccc 100644 --- a/data/maps/events/SkyPillar_2F.inc +++ b/data/maps/events/SkyPillar_2F.inc @@ -1,6 +1,6 @@ SkyPillar_2F_MapWarps: @ 8537084 - warp_def 10, 1, 3, 2, SKY_PILLAR_1F - warp_def 3, 1, 3, 0, SKY_PILLAR_3F + warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F SkyPillar_2F_MapEvents:: @ 8537094 map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc index c8a97565b..2e7697395 100644 --- a/data/maps/events/SkyPillar_3F.inc +++ b/data/maps/events/SkyPillar_3F.inc @@ -1,7 +1,7 @@ SkyPillar_3F_MapWarps: @ 85370A8 - warp_def 3, 1, 3, 1, SKY_PILLAR_2F - warp_def 11, 1, 3, 0, SKY_PILLAR_4F - warp_def 7, 1, 3, 1, SKY_PILLAR_4F + warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F + warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F + warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F SkyPillar_3F_MapEvents:: @ 85370C0 map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc index a399d1364..248e36f95 100644 --- a/data/maps/events/SkyPillar_4F.inc +++ b/data/maps/events/SkyPillar_4F.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapWarps: @ 85370D4 - warp_def 11, 1, 3, 1, SKY_PILLAR_3F - warp_def 7, 1, 3, 2, SKY_PILLAR_3F - warp_def 3, 1, 3, 0, SKY_PILLAR_5F + warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F + warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F SkyPillar_4F_MapEvents:: @ 85370EC map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc index d6ce944cb..c0acb14c0 100644 --- a/data/maps/events/SkyPillar_5F.inc +++ b/data/maps/events/SkyPillar_5F.inc @@ -1,6 +1,6 @@ SkyPillar_5F_MapWarps: @ 853714C - warp_def 3, 1, 3, 2, SKY_PILLAR_4F - warp_def 10, 1, 3, 0, SKY_PILLAR_TOP + warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP SkyPillar_5F_MapEvents:: @ 853715C map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc index 5a63e2496..92cf0da9b 100644 --- a/data/maps/events/SkyPillar_Entrance.inc +++ b/data/maps/events/SkyPillar_Entrance.inc @@ -1,6 +1,6 @@ SkyPillar_Entrance_MapWarps: @ 8536FF8 - warp_def 6, 16, 3, 0, ROUTE_131 - warp_def 14, 4, 3, 0, SKY_PILLAR_OUTSIDE + warp_def 6, 16, 3, 0, MAP_ROUTE131 + warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE SkyPillar_Entrance_MapEvents:: @ 8537008 map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 78991499c..f16f577ef 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -2,8 +2,8 @@ SkyPillar_Outside_EventObjects: @ 853701C object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 SkyPillar_Outside_MapWarps: @ 8537034 - warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE - warp_def 14, 5, 0, 0, SKY_PILLAR_1F + warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE + warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 8537044 map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 792f350b8..2634e9dfd 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_EventObjects: @ 8537170 object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 SkyPillar_Top_MapWarps: @ 85371A0 - warp_def 16, 14, 3, 1, SKY_PILLAR_5F + warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapCoordEvents: @ 85371A8 coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index c429ae7f5..c4f629f5b 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -36,17 +36,17 @@ SlateportCity_EventObjects: @ 85261CC object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 SlateportCity_MapWarps: @ 8526514 - warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 13, 26, 0, 0, SLATEPORT_CITY_MART - warp_def 26, 38, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_1F - warp_def 10, 12, 0, 0, SLATEPORT_CITY_BATTLE_TENT_LOBBY - warp_def 4, 26, 0, 0, SLATEPORT_CITY_POKEMON_FAN_CLUB - warp_def 30, 26, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 5, 19, 0, 0, SLATEPORT_CITY_HOUSE_1 - warp_def 31, 26, 0, 1, SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 28, 12, 0, 0, SLATEPORT_CITY_HARBOR - warp_def 40, 7, 0, 2, SLATEPORT_CITY_HARBOR - warp_def 21, 44, 0, 0, SLATEPORT_CITY_HOUSE_2 + warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART + warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F + warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY + warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB + warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 + warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR + warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR + warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapCoordEvents: @ 852656C coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc index 3368d1ba2..bb33b654a 100644 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ b/data/maps/events/SlateportCity_BattleTentLobby.inc @@ -6,8 +6,8 @@ SlateportCity_BattleTentLobby_EventObjects: @ 852F408 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 - warp_def 6, 9, 0, 3, SLATEPORT_CITY - warp_def 7, 9, 0, 3, SLATEPORT_CITY + warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY + warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index b7a767f3c..f501f871d 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -9,10 +9,10 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 SlateportCity_Harbor_MapWarps: @ 852FB28 - warp_def 11, 14, 0, 8, SLATEPORT_CITY - warp_def 12, 14, 0, 8, SLATEPORT_CITY - warp_def 19, 15, 0, 9, SLATEPORT_CITY - warp_def 20, 15, 0, 9, SLATEPORT_CITY + warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY + warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents: @ 852FB48 coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 96bf5fba9..40fc70d01 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -2,8 +2,8 @@ SlateportCity_House1_EventObjects: @ 852F538 object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 SlateportCity_House1_MapWarps: @ 852F550 - warp_def 3, 7, 0, 6, SLATEPORT_CITY - warp_def 4, 7, 0, 6, SLATEPORT_CITY + warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 852F560 map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index 4bd43a5d4..519bc696f 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -3,8 +3,8 @@ SlateportCity_House2_EventObjects: @ 852FB9C object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 SlateportCity_House2_MapWarps: @ 852FBCC - warp_def 3, 7, 0, 10, SLATEPORT_CITY - warp_def 4, 7, 0, 10, SLATEPORT_CITY + warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 852FBDC map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index c952cf34e..88d6132c7 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -4,8 +4,8 @@ SlateportCity_Mart_EventObjects: @ 852FCF0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 SlateportCity_Mart_MapWarps: @ 852FD38 - warp_def 3, 7, 0, 1, SLATEPORT_CITY - warp_def 4, 7, 0, 1, SLATEPORT_CITY + warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 852FD48 map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 9f97d892d..70e05b38a 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -15,9 +15,9 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 - warp_def 9, 8, 0, 5, SLATEPORT_CITY - warp_def 10, 8, 0, 7, SLATEPORT_CITY - warp_def 6, 1, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_2F + warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY + warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY + warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 4bad8a43d..31ed1d3e4 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 - warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index 4a6335695..f59fde2b3 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 - warp_def 7, 8, 3, 0, SLATEPORT_CITY - warp_def 6, 8, 3, 0, SLATEPORT_CITY - warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index 43938e550..02b6e8f64 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 - warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index db5a8b97c..4f4a7eac7 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -10,8 +10,8 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C - warp_def 6, 10, 0, 4, SLATEPORT_CITY - warp_def 7, 10, 0, 4, SLATEPORT_CITY + warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY + warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 6169dad1b..76ead03e7 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -5,9 +5,9 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 - warp_def 2, 14, 0, 2, SLATEPORT_CITY - warp_def 3, 14, 0, 2, SLATEPORT_CITY - warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F + warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index 8224ed8ff..487e38743 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -4,7 +4,7 @@ SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC - warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F + warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index acb70f285..12340b727 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -19,19 +19,19 @@ SootopolisCity_EventObjects: @ 8527314 object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 SootopolisCity_MapWarps: @ 85274C4 - warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 17, 29, 0, 0, SOOTOPOLIS_CITY_MART - warp_def 31, 32, 0, 0, SOOTOPOLIS_CITY_GYM_1F - warp_def 31, 16, 3, 0, CAVE_OF_ORIGIN_ENTRANCE - warp_def 9, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_1 - warp_def 45, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_2 - warp_def 9, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_3 - warp_def 44, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_4 - warp_def 9, 26, 0, 0, SOOTOPOLIS_CITY_HOUSE_5 - warp_def 53, 28, 0, 0, SOOTOPOLIS_CITY_HOUSE_6 - warp_def 8, 35, 0, 0, SOOTOPOLIS_CITY_HOUSE_7 - warp_def 48, 25, 0, 0, SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - warp_def 51, 36, 0, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F + warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART + warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F + warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 + warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 + warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 + warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 + warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 + warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 + warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 + warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE + warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MapBGEvents: @ 852752C bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 60e02f3fb..b7ed20bae 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -3,9 +3,9 @@ SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 - warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY - warp_def 9, 25, 0, 2, SOOTOPOLIS_CITY - warp_def 11, 22, 3, 0, SOOTOPOLIS_CITY_GYM_B1F + warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents: @ 853303C bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 1d490490d..83f87c6f6 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -11,7 +11,7 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 - warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F + warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index eaaf2d334..349891e23 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -3,8 +3,8 @@ SootopolisCity_House1_EventObjects: @ 85332F8 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 SootopolisCity_House1_MapWarps: @ 8533328 - warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 8533338 map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index d00a1fa5f..e22dbabb0 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -2,8 +2,8 @@ SootopolisCity_House2_EventObjects: @ 853334C object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 SootopolisCity_House2_MapWarps: @ 8533364 - warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 8533374 map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index b6407478c..1cddb1569 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -3,8 +3,8 @@ SootopolisCity_House3_EventObjects: @ 8533388 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 SootopolisCity_House3_MapWarps: @ 85333B8 - warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 85333C8 map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 223cc4f0d..7b54379ce 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -4,8 +4,8 @@ SootopolisCity_House4_EventObjects: @ 85333DC object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 SootopolisCity_House4_MapWarps: @ 8533424 - warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 8533434 map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 66a804c1a..7e313bb78 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -3,8 +3,8 @@ SootopolisCity_House5_EventObjects: @ 8533448 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 SootopolisCity_House5_MapWarps: @ 8533478 - warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 8533488 map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 2c27b4ef2..0a5f01936 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -2,8 +2,8 @@ SootopolisCity_House6_EventObjects: @ 853349C object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 SootopolisCity_House6_MapWarps: @ 85334B4 - warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 85334C4 map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index fbbbc5579..ddb32e092 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -3,8 +3,8 @@ SootopolisCity_House7_EventObjects: @ 85334D8 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 SootopolisCity_House7_MapWarps: @ 8533508 - warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 8533518 map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc index ffd6fe203..fe16e6629 100644 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc @@ -3,8 +3,8 @@ SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C - warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY - warp_def 4, 6, 0, 11, SOOTOPOLIS_CITY + warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 30ff85620..263e12a87 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -4,8 +4,8 @@ SootopolisCity_Mart_EventObjects: @ 853328C object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 - warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY - warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY + warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 85332E4 map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc index f6efd8225..3c3742ba0 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc @@ -2,9 +2,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 - warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY - warp_def 4, 7, 0, 12, SOOTOPOLIS_CITY - warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F + warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY + warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc index faec348c2..605343baa 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -2,7 +2,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 - warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F + warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index afb2d586b..3ef5954c5 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 - warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY - warp_def 6, 8, 3, 0, SOOTOPOLIS_CITY - warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F + warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index 21be152fa..af62b1aed 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 - warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 11cc35658..4285b6a0f 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -3,8 +3,8 @@ SouthernIsland_Exterior_EventObjects: @ 853B83C object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C - warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR - warp_def 15, 5, 3, 1, SOUTHERN_ISLAND_INTERIOR + warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR + warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents: @ 853B87C bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 6a89414b2..86b4af816 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -3,8 +3,8 @@ SouthernIsland_Interior_EventObjects: @ 853B89C object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 SouthernIsland_Interior_MapWarps: @ 853B8CC - warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR - warp_def 14, 18, 3, 1, SOUTHERN_ISLAND_EXTERIOR + warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR + warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents: @ 853B8DC bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4 diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index 88dbdf09a..97edc03e4 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -2,7 +2,7 @@ TerraCave_End_EventObjects: @ 8537850 object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 TerraCave_End_MapWarps: @ 8537868 - warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE + warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE TerraCave_End_MapCoordEvents: @ 8537870 coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/events/TerraCave_Entrance.inc index 3cea5a7c6..a176c548d 100644 --- a/data/maps/events/TerraCave_Entrance.inc +++ b/data/maps/events/TerraCave_Entrance.inc @@ -1,6 +1,6 @@ TerraCave_Entrance_MapWarps: @ 853782C - warp_def 8, 18, 0, 127, NONE - warp_def 14, 1, 3, 0, TERRA_CAVE_END + warp_def 8, 18, 0, 127, MAP_NONE + warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END TerraCave_Entrance_MapEvents:: @ 853783C map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 25dbd3139..9595b920c 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_EventObjects: @ 8539DA0 object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 TradeCenter_MapWarps: @ 8539DB8 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents: @ 8539DC8 coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/events/TrainerHill_1F.inc index ae8fecee7..2a2428f57 100644 --- a/data/maps/events/TrainerHill_1F.inc +++ b/data/maps/events/TrainerHill_1F.inc @@ -1,6 +1,6 @@ TrainerHill_1F_MapWarps: @ 853D934 - warp_def 2, 1, 3, 2, TRAINER_HILL_ENTRANCE - warp_def 12, 1, 3, 0, TRAINER_HILL_2F + warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F TrainerHill_1F_MapEvents:: @ 853D944 map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/events/TrainerHill_2F.inc index dc0e071a2..ca50380d5 100644 --- a/data/maps/events/TrainerHill_2F.inc +++ b/data/maps/events/TrainerHill_2F.inc @@ -1,6 +1,6 @@ TrainerHill_2F_MapWarps: @ 853D958 - warp_def 2, 1, 3, 1, TRAINER_HILL_1F - warp_def 12, 1, 3, 0, TRAINER_HILL_3F + warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F TrainerHill_2F_MapEvents:: @ 853D968 map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/events/TrainerHill_3F.inc index c022f16d2..e12394655 100644 --- a/data/maps/events/TrainerHill_3F.inc +++ b/data/maps/events/TrainerHill_3F.inc @@ -1,6 +1,6 @@ TrainerHill_3F_MapWarps: @ 853D97C - warp_def 2, 1, 3, 1, TRAINER_HILL_2F - warp_def 12, 1, 3, 0, TRAINER_HILL_4F + warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F TrainerHill_3F_MapEvents:: @ 853D98C map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/events/TrainerHill_4F.inc index 7007a69a7..e9696de15 100644 --- a/data/maps/events/TrainerHill_4F.inc +++ b/data/maps/events/TrainerHill_4F.inc @@ -1,6 +1,6 @@ TrainerHill_4F_MapWarps: @ 853D9A0 - warp_def 2, 1, 3, 1, TRAINER_HILL_3F - warp_def 12, 1, 3, 0, TRAINER_HILL_ROOF + warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F + warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF TrainerHill_4F_MapEvents:: @ 853D9B0 map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc index 0a84d3b51..fe9af5243 100644 --- a/data/maps/events/TrainerHill_Elevator.inc +++ b/data/maps/events/TrainerHill_Elevator.inc @@ -2,8 +2,8 @@ TrainerHill_Elevator_EventObjects: @ 853DD84 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C - warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF - warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF + warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF + warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF TrainerHill_Elevator_MapEvents:: @ 853DDAC map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc index 832ab5838..3c8c4a82f 100644 --- a/data/maps/events/TrainerHill_Entrance.inc +++ b/data/maps/events/TrainerHill_Entrance.inc @@ -6,9 +6,9 @@ TrainerHill_Entrance_EventObjects: @ 853D874 object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC - warp_def 9, 16, 3, 4, ROUTE_111 - warp_def 10, 16, 3, 4, ROUTE_111 - warp_def 9, 1, 3, 0, TRAINER_HILL_1F + warp_def 9, 16, 3, 4, MAP_ROUTE111 + warp_def 10, 16, 3, 4, MAP_ROUTE111 + warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F TrainerHill_Entrance_MapCoordEvents: @ 853D904 coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229 diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc index 1ae00b9a2..826b774dd 100644 --- a/data/maps/events/TrainerHill_Roof.inc +++ b/data/maps/events/TrainerHill_Roof.inc @@ -2,8 +2,8 @@ TrainerHill_Roof_EventObjects: @ 853D9C4 object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 TrainerHill_Roof_MapWarps: @ 853D9DC - warp_def 9, 5, 3, 1, TRAINER_HILL_4F - warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR + warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F + warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR TrainerHill_Roof_MapEvents:: @ 853D9EC map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc index 097dbdc65..416e9fe86 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/events/Underwater2.inc @@ -1,5 +1,5 @@ Underwater2_MapWarps: @ 852CF1C - warp_def 45, 65, 0, 0, UNDERWATER_SOOTOPOLIS_CITY + warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents: @ 852CF24 bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc index 66b7b8758..ba8ed9508 100644 --- a/data/maps/events/Underwater3.inc +++ b/data/maps/events/Underwater3.inc @@ -1,6 +1,6 @@ Underwater3_MapWarps: @ 852CF98 - warp_def 57, 5, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 67, 38, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater3_MapBGEvents: @ 852CFA8 bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0 diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc index b1846f1aa..5f8b99b64 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/events/Underwater4.inc @@ -1,5 +1,5 @@ Underwater4_MapWarps: @ 852CFEC - warp_def 38, 26, 3, 0, UNDERWATER_SEAFLOOR_CAVERN + warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents: @ 852CFF4 bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 diff --git a/data/maps/events/Underwater5.inc b/data/maps/events/Underwater5.inc index 7f72f3771..4b902cf96 100644 --- a/data/maps/events/Underwater5.inc +++ b/data/maps/events/Underwater5.inc @@ -1,6 +1,6 @@ Underwater5_MapWarps: @ 852D020 - warp_def 26, 3, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 32, 21, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater5_MapEvents:: @ 852D030 map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater6.inc b/data/maps/events/Underwater6.inc index ba5883d7c..a624efba3 100644 --- a/data/maps/events/Underwater6.inc +++ b/data/maps/events/Underwater6.inc @@ -1,6 +1,6 @@ Underwater6_MapWarps: @ 852D044 - warp_def 13, 4, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 17, 66, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater6_MapEvents:: @ 852D054 map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater7.inc b/data/maps/events/Underwater7.inc index 0841a343e..fba9324f6 100644 --- a/data/maps/events/Underwater7.inc +++ b/data/maps/events/Underwater7.inc @@ -1,6 +1,6 @@ Underwater7_MapWarps: @ 852D068 - warp_def 22, 10, 0, 0, UNDERWATER_MARINE_CAVE - warp_def 45, 30, 0, 0, UNDERWATER_MARINE_CAVE + warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE + warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater7_MapEvents:: @ 852D078 map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/events/Underwater_MarineCave.inc index 9266cc5c3..685abaa16 100644 --- a/data/maps/events/Underwater_MarineCave.inc +++ b/data/maps/events/Underwater_MarineCave.inc @@ -1,5 +1,5 @@ Underwater_MarineCave_MapWarps: @ 85377B0 - warp_def 9, 8, 0, 127, NONE + warp_def 9, 8, 0, 127, MAP_NONE Underwater_MarineCave_MapEvents:: @ 85377B8 map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc index 03ed08535..3a5219511 100644 --- a/data/maps/events/Underwater_Route134.inc +++ b/data/maps/events/Underwater_Route134.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapWarps: @ 8536D44 - warp_def 8, 8, 0, 0, UNDERWATER_SEALED_CHAMBER + warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER Underwater_Route134_MapEvents:: @ 8536D4C map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index 0bf82c217..718fe9ebb 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 Underwater_SeafloorCavern_MapWarps: @ 85356A0 - warp_def 6, 7, 0, 0, UNDERWATER_4 + warp_def 6, 7, 0, 0, MAP_UNDERWATER4 Underwater_SeafloorCavern_MapEvents:: @ 85356A8 map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc index 9ef7be29e..350cca5d6 100644 --- a/data/maps/events/Underwater_SealedChamber.inc +++ b/data/maps/events/Underwater_SealedChamber.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapWarps: @ 8536D60 - warp_def 7, 1, 0, 0, UNDERWATER_ROUTE_134 + warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents: @ 8536D68 bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc index 4b0cda4eb..78839e8a1 100644 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ b/data/maps/events/Underwater_SootopolisCity.inc @@ -1,6 +1,6 @@ Underwater_SootopolisCity_MapWarps: @ 8534330 - warp_def 9, 8, 0, 0, UNDERWATER_2 - warp_def 10, 8, 0, 0, UNDERWATER_2 + warp_def 9, 8, 0, 0, MAP_UNDERWATER2 + warp_def 10, 8, 0, 0, MAP_UNDERWATER2 Underwater_SootopolisCity_MapEvents:: @ 8534340 map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc index c79b11f5d..cfa69c7f4 100644 --- a/data/maps/events/UnionRoom.inc +++ b/data/maps/events/UnionRoom.inc @@ -10,8 +10,8 @@ UnionRoom_EventObjects: @ 853B020 object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 UnionRoom_MapWarps: @ 853B0F8 - warp_def 7, 11, 3, 127, NONE - warp_def 8, 11, 3, 127, NONE + warp_def 7, 11, 3, 127, MAP_NONE + warp_def 8, 11, 3, 127, MAP_NONE UnionRoom_MapEvents:: @ 853B108 map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index c30969657..3144323a3 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -5,13 +5,13 @@ VerdanturfTown_EventObjects: @ 8527CDC object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 VerdanturfTown_MapWarps: @ 8527D3C - warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY - warp_def 12, 3, 0, 0, VERDANTURF_TOWN_MART - warp_def 16, 3, 0, 0, VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 10, 14, 0, 0, VERDANTURF_TOWN_WANDAS_HOUSE - warp_def 8, 1, 0, 1, RUSTURF_TUNNEL - warp_def 1, 14, 0, 0, VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE - warp_def 17, 15, 0, 0, VERDANTURF_TOWN_HOUSE + warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY + warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART + warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE + warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL + warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE + warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc index 3f5ea9c68..f32feeb2d 100644 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc @@ -7,8 +7,8 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 - warp_def 6, 9, 0, 0, VERDANTURF_TOWN - warp_def 7, 9, 0, 0, VERDANTURF_TOWN + warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN + warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02 diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 03cf2de7a..9dd15bca9 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -3,8 +3,8 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 - warp_def 3, 7, 0, 5, VERDANTURF_TOWN - warp_def 4, 7, 0, 5, VERDANTURF_TOWN + warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 0f37fe20b..d90d304e1 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -3,8 +3,8 @@ VerdanturfTown_House_EventObjects: @ 852EA1C object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 VerdanturfTown_House_MapWarps: @ 852EA4C - warp_def 3, 8, 0, 6, VERDANTURF_TOWN - warp_def 4, 8, 0, 6, VERDANTURF_TOWN + warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN + warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 852EA5C map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 551126235..c4ffa1369 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -5,8 +5,8 @@ VerdanturfTown_Mart_EventObjects: @ 852E790 object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 - warp_def 3, 7, 0, 1, VERDANTURF_TOWN - warp_def 4, 7, 0, 1, VERDANTURF_TOWN + warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 852E800 map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index d17513fd5..a020bf418 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 - warp_def 7, 8, 3, 2, VERDANTURF_TOWN - warp_def 6, 8, 3, 2, VERDANTURF_TOWN - warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F + warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 4fcbd0e08..76df12cd2 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -5,9 +5,9 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 - warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, UNION_ROOM - warp_def 9, 1, 3, 0, TRADE_CENTER + warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 070092679..a9e0c86b7 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -6,8 +6,8 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 - warp_def 7, 7, 0, 3, VERDANTURF_TOWN - warp_def 8, 7, 0, 3, VERDANTURF_TOWN + warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN + warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 511782688..43c3b5c54 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -10,11 +10,11 @@ VictoryRoad_1F_EventObjects: @ 8535E04 object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 VictoryRoad_1F_MapWarps: @ 8535EDC - warp_def 15, 40, 3, 2, EVER_GRANDE_CITY - warp_def 39, 5, 3, 3, EVER_GRANDE_CITY - warp_def 21, 32, 3, 5, VICTORY_ROAD_B1F - warp_def 42, 38, 4, 2, VICTORY_ROAD_B1F - warp_def 9, 14, 4, 4, VICTORY_ROAD_B1F + warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY + warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY + warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F + warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F + warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents: @ 8535F04 coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index b251959ae..eda774701 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -22,13 +22,13 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 VictoryRoad_B1F_MapWarps: @ 853613C - warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F - warp_def 17, 16, 3, 2, VICTORY_ROAD_B2F - warp_def 42, 25, 3, 3, VICTORY_ROAD_1F - warp_def 42, 2, 4, 1, VICTORY_ROAD_B2F - warp_def 8, 3, 3, 4, VICTORY_ROAD_1F - warp_def 20, 21, 3, 2, VICTORY_ROAD_1F - warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F + warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F + warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F + warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F + warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F + warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F + warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 8536174 map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index 5e702c0c3..080993cfe 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -8,10 +8,10 @@ VictoryRoad_B2F_EventObjects: @ 8536188 object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 VictoryRoad_B2F_MapWarps: @ 8536230 - warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F - warp_def 43, 2, 3, 3, VICTORY_ROAD_B1F - warp_def 19, 12, 3, 1, VICTORY_ROAD_B1F - warp_def 5, 26, 3, 6, VICTORY_ROAD_B1F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F + warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F + warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F + warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents: @ 8536250 bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 523aa67ca..f02ffbe66 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -468,14 +468,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release compare VAR_0x8004, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special sub_809D2BC - warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 + warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 waitstate end @@ -487,7 +487,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036 special sub_809D2BC - warp DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 + warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special sub_80AF948 waitstate end @@ -572,12 +572,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release special sub_809D2BC - setwarp TRADE_CENTER, 255, 5, 8 + setwarp MAP_TRADE_CENTER, 255, 5, 8 special sub_80AF948 waitstate end @@ -647,12 +647,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release special sub_809D2BC - setwarp RECORD_CORNER, 255, 8, 9 + setwarp MAP_RECORD_CORNER, 255, 8, 9 special sub_80AF948 waitstate end @@ -1046,12 +1046,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special sub_8018090 special sub_809D2BC - warpteleport2 UNION_ROOM, 255, 7, 11 + warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate special UnionRoomSpecial waitstate @@ -1385,7 +1385,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1595,7 +1595,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E closemessage applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360 waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY release waitstate end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 3f019f4d8..f19dfe322 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F - setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b1bca85aa..2cd278f91 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 - setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 784d44c2e..d4a5c9233 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD - setdivewarp ABANDONED_SHIP_UNDERWATER_2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index 49971cde7..7e39b1939 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,6 +3,6 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C - setdivewarp ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index 19a786956..17f52c691 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,6 +3,6 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 - setdivewarp ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 27ea23b59..076eeab6e 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -37,7 +37,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC lockall - showobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 waitmovement 0 setvar VAR_0x8004, 1 @@ -113,7 +113,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 @@ -228,7 +228,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870 @@ -533,7 +533,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C .2byte 0 BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 - hideobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index 83b602fc4..a353379c2 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -20,7 +20,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C waitmovement 0 setvar VAR_0x8006, 0 - warp BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 7a0695445..a376bfe22 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -218,7 +218,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 - warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index c46358aed..e853afda0 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -48,7 +48,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 closemessage - showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E compare VAR_TEMP_E, 0 @@ -188,7 +188,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 switch VAR_RESULT case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 setvar VAR_0x8006, 1 - warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 waitstate BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 @@ -547,7 +547,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 .2byte 0 BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B - hideobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 @@ -953,12 +953,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F - warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate end BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F - warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index 6a97382d4..989ebe2f3 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -41,7 +41,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F waitmovement 0 setvar VAR_0x8006, 0 - warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index b08d0ca89..1e50357bc 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -266,7 +266,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty - warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index d19b4b999..024162cee 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -179,7 +179,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D waitmovement 0 closedoor 5, 1 waitdooranim - warp BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index cdfd6edd6..5b6a674fb 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -30,10 +30,10 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 - hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end @@ -133,7 +133,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 switch VAR_RESULT case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 setvar VAR_0x8006, 1 - warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 waitstate BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 @@ -294,12 +294,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA - warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA - warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 4f2dea343..ec2483390 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 - warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 875a3a220..e05c49885 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -60,7 +60,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 - warp BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 07ccbe79d..2ae154927 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B - showobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -233,7 +233,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 setobjectxyperm 2, 15, 1 addobject 2 - hideobjectat 2, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setobjectxy 2, 13, 1 setobjectxyperm 2, 13, 1 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF @@ -354,7 +354,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E - hideobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 @@ -462,12 +462,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 - warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 - warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 89697ff33..c8142a207 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -55,7 +55,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 waitdooranim BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 - warp BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index a5cb11081..91c1abd0f 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -236,7 +236,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC - warp BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 4171da314..23ad26692 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -32,7 +32,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8006, 99 special sub_81A1780 call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 74bdb1d78..5323c4a6b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -212,7 +212,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index fd5fd81e0..509806531 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -46,7 +46,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -128,7 +128,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB playse 268 delay 65 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - showobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 delay 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 delay 4 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 39045c317..4f0d4632b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 closemessage releaseall - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc index d93913df2..9256764e8 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc @@ -20,7 +20,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 6bef7ba12..a4725036b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -27,7 +27,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index 148ea97c1..eacee4cf3 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -91,7 +91,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 setvar VAR_0x8004, 14 special sub_81A8E7C special HealPlayerParty - warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -143,12 +143,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 setvar VAR_0x8006, 0 special sub_81A1780 setvar VAR_RESULT, 0 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 waitstate end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index e92c8d97f..07b9fee47 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -219,7 +219,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special sub_81A1780 setvar VAR_RESULT, 0 special HealPlayerParty - warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 9d83ab4e0..886b3fe01 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -111,7 +111,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 087752d8f..f684e215d 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -491,24 +491,24 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC setvar VAR_0x8004, 13 special sub_8161F74 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 81c2dd563..d1b07451c 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index ef1102175..9ff6bbc59 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -35,7 +35,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 setvar VAR_TEMP_0, 0 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index 39157609e..36cf93ada 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -33,9 +33,9 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - hideobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - hideobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 special sub_8139980 end @@ -51,8 +51,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC opendoor 1, 1 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4002 - showobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - showobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 waitmovement 0 @@ -98,17 +98,17 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 return BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate return BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 waitstate return BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 waitstate return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index 433d8e181..248c1f9ca 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -35,24 +35,24 @@ BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 return BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F checkflag FLAG_0x152 goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C - warp BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 waitstate return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index d899b1cbe..478d61656 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -747,7 +747,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 - warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index c1d3534d3..a2f003b85 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -112,7 +112,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4 closedoor 10, 1 waitdooranim - warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 waitstate releaseall end @@ -198,7 +198,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 - warpsilent BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 waitstate release end diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index fa2ff7e36..bd9d508dd 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -39,7 +39,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA - warp SLATEPORT_CITY_HARBOR, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -50,7 +50,7 @@ BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -66,7 +66,7 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 3, BATTLE_FRONTIER_OUTSIDE_WEST + hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST setvar VAR_0x8004, 2 call BattleFrontier_OutsideWest_EventScript_272250 return diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc index bf82aa6d1..fe939172d 100644 --- a/data/scripts/maps/BirthIsland_Harbor.inc +++ b/data/scripts/maps/BirthIsland_Harbor.inc @@ -12,10 +12,10 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, BIRTH_ISLAND_HARBOR + hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR setvar VAR_0x8004, 2 call BirthIsland_Harbor_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/scripts/maps/CaveOfOrigin_Entrance.inc index a4b96a48f..1a771ae82 100644 --- a/data/scripts/maps/CaveOfOrigin_Entrance.inc +++ b/data/scripts/maps/CaveOfOrigin_Entrance.inc @@ -3,6 +3,6 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F - setescapewarp SOOTOPOLIS_CITY, 255, 31, 17 + setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 1edc1407d..157c1f4d5 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -118,31 +118,31 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 DewfordTown_EventScript_1E9660:: @ 81E9660 call DewfordTown_EventScript_271E95 - setobjectpriority 2, DEWFORD_TOWN, 0 - setobjectpriority 255, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, DEWFORD_TOWN + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E97A2 applymovement 255, DewfordTown_Movement_1E97A2 waitmovement 0 - showobjectat 255, ROUTE_104 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_2720A8 applymovement 255, DewfordTown_Movement_1E9914 waitmovement 0 - showobjectat 255, ROUTE_104 + showobjectat 255, MAP_ROUTE104 clearflag FLAG_0x2E3 clearflag FLAG_0x371 clearflag FLAG_0x2E6 setflag FLAG_0x2E7 - hideobjectat 4, DEWFORD_TOWN + hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_0x408E, 2 - resetobjectpriority 255, DEWFORD_TOWN - warp ROUTE_104_MR_BRINEYS_HOUSE, 255, 5, 4 + resetobjectpriority 255, MAP_DEWFORD_TOWN + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_0x4096, VAR_0x8008 waitstate release @@ -150,40 +150,40 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 DewfordTown_EventScript_1E96E7:: @ 81E96E7 call DewfordTown_EventScript_271E95 - setobjectpriority 2, DEWFORD_TOWN, 0 - setobjectpriority 255, DEWFORD_TOWN, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, DEWFORD_TOWN + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E9865 applymovement 255, DewfordTown_Movement_1E9865 waitmovement 0 call DewfordTown_EventScript_2720A8 - showobjectat 255, ROUTE_109 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_1E9918 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, ROUTE_109, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_1E991F waitmovement 0 clearflag FLAG_0x2E5 addobject 1 clearflag FLAG_0x2E8 setflag FLAG_0x2E7 - hideobjectat 4, DEWFORD_TOWN + hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_0x095 call_if 0, DewfordTown_EventScript_1E9790 checkflag FLAG_0x095 call_if 1, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, DEWFORD_TOWN - resetobjectpriority 2, ROUTE_109 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index bed242a2b..3e68f4fed 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -137,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 waitmovement 0 setflag FLAG_0x30D - warp EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index 48703897e..e373ff5ad 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -32,7 +32,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 lockall - showobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D waitmovement 0 setvar VAR_0x8004, 1 @@ -73,7 +73,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C @@ -158,7 +158,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -260,8 +260,8 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index f1d3024c0..f1a144a14 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -20,7 +20,7 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 closedoor 2, 1 waitdooranim setvar VAR_0x8006, 0 - warp FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 1bde88e7d..00efa5394 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -204,7 +204,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF - warp FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc index ff8af2e9f..08331b33b 100644 --- a/data/scripts/maps/FarawayIsland_Entrance.inc +++ b/data/scripts/maps/FarawayIsland_Entrance.inc @@ -27,10 +27,10 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, FARAWAY_ISLAND_ENTRANCE + hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE setvar VAR_0x8004, 2 call FarawayIsland_Entrance_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index bf5c4297f..360b10a08 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,6 +6,6 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E setstepcallback 7 - setholewarp GRANITE_CAVE_B2F, 255, 0, 0 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 3c4b241ac..963dd196d 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -32,7 +32,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 setflag FLAG_0x2DF setflag FLAG_0x331 setvar VAR_0x408C, 1 - setdynamicwarp LITTLEROOT_TOWN, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end @@ -45,7 +45,7 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 setflag FLAG_0x2E0 setflag FLAG_0x332 setvar VAR_0x4082, 1 - setdynamicwarp LITTLEROOT_TOWN, 255, 12, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1f65b88fd..a4609ab54 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -376,31 +376,31 @@ LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF return LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F - setwarp LINK_CONTEST_ROOM_4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C - setwarp LINK_CONTEST_ROOM_2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649 - setwarp LINK_CONTEST_ROOM_6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656 - setwarp LINK_CONTEST_ROOM_5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663 - setwarp LINK_CONTEST_ROOM_3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_80AFC60 waitstate return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index b7ba17125..234751910 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 4 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -69,7 +69,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 5 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -79,7 +79,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 6 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -89,7 +89,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 7 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -99,7 +99,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 8 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 6357326c1..1dfd9c29a 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 - setescapewarp LILYCOVE_CITY, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F @@ -59,28 +59,28 @@ LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F LilycoveCity_Harbor_EventScript_21E109:: @ 821E109 call LilycoveCity_Harbor_EventScript_21E5CC - warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end LilycoveCity_Harbor_EventScript_21E119:: @ 821E119 call LilycoveCity_Harbor_EventScript_21E5CC - warp NAVEL_ROCK_HARBOR, 255, 8, 4 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end LilycoveCity_Harbor_EventScript_21E129:: @ 821E129 call LilycoveCity_Harbor_EventScript_21E5CC - warp BIRTH_ISLAND_HARBOR, 255, 8, 4 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 call LilycoveCity_Harbor_EventScript_21E5CC - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -91,7 +91,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -101,7 +101,7 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -226,7 +226,7 @@ LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end @@ -243,7 +243,7 @@ LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp BIRTH_ISLAND_HARBOR, 255, 8, 4 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end @@ -284,7 +284,7 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call_if 1, LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -292,7 +292,7 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -309,7 +309,7 @@ LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp NAVEL_ROCK_HARBOR, 255, 8, 4 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end @@ -344,7 +344,7 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 delay 30 applymovement 1, LilycoveCity_Harbor_Movement_2725AA waitmovement 0 - showobjectat 1, LILYCOVE_CITY_HARBOR + showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 msgbox LilycoveCity_Harbor_Text_21E842, 4 release @@ -354,7 +354,7 @@ LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -372,7 +372,7 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return @@ -400,7 +400,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -410,7 +410,7 @@ LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -427,13 +427,13 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 507997416..c2f3be7d6 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -49,7 +49,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 67b1f9381..eb78368af 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -95,7 +95,7 @@ LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 setflag FLAG_0x2F9 - warpsilent LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -106,7 +106,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 setflag FLAG_0x2FA - warpsilent LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end @@ -138,7 +138,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 waitmovement 0 setflag FLAG_0x2F0 setvar VAR_0x4092, 3 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_0x364 @@ -196,7 +196,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 clearflag FLAG_0x31B delay 20 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate releaseall end @@ -649,7 +649,7 @@ LittlerootTown_EventScript_1E84A1:: @ 81E84A1 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -661,7 +661,7 @@ LittlerootTown_EventScript_1E84C7:: @ 81E84C7 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -673,7 +673,7 @@ LittlerootTown_EventScript_1E84ED:: @ 81E84ED waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -685,7 +685,7 @@ LittlerootTown_EventScript_1E8513:: @ 81E8513 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -697,7 +697,7 @@ LittlerootTown_EventScript_1E8539:: @ 81E8539 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -709,7 +709,7 @@ LittlerootTown_EventScript_1E855F:: @ 81E855F waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -721,7 +721,7 @@ LittlerootTown_EventScript_1E8585:: @ 81E8585 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -733,7 +733,7 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -903,7 +903,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim goto LittlerootTown_EventScript_1E8686 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 53825a84c..4c904b001 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A waitmovement 0 - warp LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 9fc2fe53e..99d47f938 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A waitmovement 0 - warp LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/scripts/maps/MarineCave_Entrance.inc index a1f5489fe..24b288050 100644 --- a/data/scripts/maps/MarineCave_Entrance.inc +++ b/data/scripts/maps/MarineCave_Entrance.inc @@ -3,6 +3,6 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 - setdivewarp UNDERWATER_MARINE_CAVE, 255, 9, 6 + setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6 end diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/scripts/maps/MirageTower_2F.inc index c1a1d18d0..79f3cce2a 100644 --- a/data/scripts/maps/MirageTower_2F.inc +++ b/data/scripts/maps/MirageTower_2F.inc @@ -6,6 +6,6 @@ MirageTower_2F_MapScripts:: @ 823AD11 MirageTower_2F_MapScript1_23AD21: @ 823AD21 setstepcallback 7 - setholewarp MIRAGE_TOWER_1F, 255, 0, 0 + setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/scripts/maps/MirageTower_3F.inc index bcf847344..1ec82de55 100644 --- a/data/scripts/maps/MirageTower_3F.inc +++ b/data/scripts/maps/MirageTower_3F.inc @@ -6,6 +6,6 @@ MirageTower_3F_MapScripts:: @ 823AD2C MirageTower_3F_MapScript1_23AD3C: @ 823AD3C setstepcallback 7 - setholewarp MIRAGE_TOWER_2F, 255, 0, 0 + setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 10d465b74..1e079c5d7 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -54,7 +54,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA waitstate setvar VAR_0x40CB, 1 clearflag FLAG_LANDMARK_MIRAGE_TOWER - warp ROUTE_111, 255, 19, 59 + warp MAP_ROUTE111, 255, 19, 59 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index bb6bfd9de..f38fd606d 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -205,7 +205,7 @@ MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 lockall - warp7 MOSSDEEP_CITY_GYM, 255, 7, 30 + warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index 52d01db6c..0052f09aa 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -43,7 +43,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF closemessage applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 - warp MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 + warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate releaseall end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 9a479846f..de8520954 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 82310FB MtPyre_2F_MapScript1_23110B: @ 823110B setstepcallback 7 - setholewarp MT_PYRE_1F, 255, 0, 0 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_231116:: @ 8231116 diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc index c7acaf066..7f5a9e4c7 100644 --- a/data/scripts/maps/NavelRock_Harbor.inc +++ b/data/scripts/maps/NavelRock_Harbor.inc @@ -12,10 +12,10 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, NAVEL_ROCK_HARBOR + hideobjectat 1, MAP_NAVEL_ROCK_HARBOR setvar VAR_0x8004, 2 call NavelRock_Harbor_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 891b5a25a..67a9f83f3 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -39,8 +39,8 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, 4 - applymovement 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY - waitmovement 2, PETALBURG_CITY + applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -49,7 +49,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E clearflag FLAG_SPECIAL_FLAG_0x4001 special LoadPlayerParty setvar VAR_0x4085, 1 - warp PETALBURG_CITY_GYM, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end @@ -68,13 +68,13 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 applymovement 255, PetalburgCity_Movement_1DC418 waitmovement 0 setflag FLAG_0x33E - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4000 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 - warp PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 + warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 663165611..e95e434b5 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -223,7 +223,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x362 setflag FLAG_0x379 special InitBirchState - warp PETALBURG_CITY, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -501,7 +501,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 removeobject 11 setvar VAR_0x4057, 4 clearflag FLAG_0x33E - warp PETALBURG_CITY, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -800,7 +800,7 @@ PetalburgCity_Gym_EventScript_205137:: @ 8205137 PetalburgCity_Gym_EventScript_20516C:: @ 820516C closemessage delay 30 - warpdoor PETALBURG_CITY_GYM, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c2807d50b..9593ae59e 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -242,7 +242,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 call_if 1, Route101_EventScript_1EBE85 compare VAR_RESULT, 1 call_if 1, Route101_EventScript_1EBE89 - warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a432f0d94..83cfe5d92 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -367,14 +367,14 @@ Route104_EventScript_1ED090:: @ 81ED090 end Route104_EventScript_1ED099:: @ 81ED099 - setobjectpriority 8, ROUTE_104, 0 - setobjectpriority 255, ROUTE_104, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_1ED34F waitmovement 0 - hideobjectat 255, ROUTE_104 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_2720A0 checkflag FLAG_0x132 goto_eq Route104_EventScript_1ED0D9 @@ -402,8 +402,8 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF delay 30 setflag FLAG_0x132 applymovement 255, Route104_Movement_1ED22A - applymovement 7, Route104_Movement_1ED22A, ROUTE_104 - waitmovement 7, ROUTE_104 + applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 + waitmovement 7, MAP_ROUTE104 waitmovement 0 goto Route104_EventScript_1ED139 @@ -412,12 +412,12 @@ Route104_EventScript_1ED139:: @ 81ED139 applymovement 255, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 - showobjectat 255, DEWFORD_TOWN + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_0x2E4 applymovement 2, Route104_Movement_1ED35C waitmovement 0 @@ -425,10 +425,10 @@ Route104_EventScript_1ED139:: @ 81ED139 clearflag FLAG_0x2E7 call Route104_EventScript_2720A8 setflag FLAG_0x2E6 - hideobjectat 7, ROUTE_104 + hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, ROUTE_104 - resetobjectpriority 2, DEWFORD_TOWN + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 checkflag FLAG_0x0BD diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index c0c3888e1..1721fa4a0 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -87,7 +87,7 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 setvar VAR_0x4063, 2 setflag FLAG_0x32E setflag FLAG_0x2CF - warp ROUTE_104, 255, 13, 51 + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b1ac87e30..84f7b7c34 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_1EE760:: @ 81EE760 call Route109_EventScript_271E95 - setobjectpriority 2, ROUTE_109, 0 - setobjectpriority 255, ROUTE_109, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_1EE90B waitmovement 0 removeobject 2 @@ -33,31 +33,31 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5 end Route109_EventScript_1EE7D5:: @ 81EE7D5 - hideobjectat 255, ROUTE_109 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F applymovement 255, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 - showobjectat 255, DEWFORD_TOWN + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_1EE900 waitmovement 0 addobject 4 clearflag FLAG_0x2E7 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_1EE90D waitmovement 0 clearflag FLAG_0x2E4 setflag FLAG_0x2E8 - hideobjectat 1, ROUTE_109 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_1E9C1D, 4 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, ROUTE_109 - resetobjectpriority 2, DEWFORD_TOWN + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index a2997a49b..4e15ddbe7 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 addobject 1 - showobjectat 1, ROUTE_110_TRICK_HOUSE_END + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 5e03fa165..859a28d6a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -138,14 +138,14 @@ Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 addobject 1 - showobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 addobject 1 - hideobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch VAR_0x4044 case 0, Route110_TrickHouseEntrance_EventScript_269C8C case 1, Route110_TrickHouseEntrance_EventScript_269C94 @@ -265,7 +265,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 - warpsilent ROUTE_110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 + warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -533,49 +533,49 @@ Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 step_end Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF - warp ROUTE_110_TRICK_HOUSE_PUZZLE_3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA - warp ROUTE_110_TRICK_HOUSE_PUZZLE_4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB - warp ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_8, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 3bdf93b12..5afce1c88 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -458,7 +458,7 @@ Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 closemessage - warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 35e5e1522..fdf734423 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED lockall setvar VAR_0x40B6, 1 - warpteleport ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 094a52895..fcbf32c91 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -111,7 +111,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 - hideobjectat 255, LITTLEROOT_TOWN + hideobjectat 255, MAP_LITTLEROOT_TOWN end Route111_MapScript2_1F0E56: @ 81F0E56 @@ -127,7 +127,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 addobject 45 special sub_81BE7F4 waitstate - showobjectat 255, LITTLEROOT_TOWN + showobjectat 255, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 turnobject 255, 2 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 94e442a48..93e8ea759 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 - setescapewarp ROUTE_112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_0x40A3, 2 call_if 1, Route112_CableCarStation_EventScript_22AADD end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 0e9cf9636..1973b0e9e 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -83,7 +83,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 special EnterSafariMode setvar VAR_0x40A4, 2 clearflag FLAG_0x05D - warp SAFARI_ZONE_SOUTH, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 8ee5b781a..bdec88c42 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81F7644 .byte 0 Route134_MapScript1_1F764A: @ 81F764A - setdivewarp UNDERWATER_ROUTE_134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1F7653:: @ 81F7653 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 5e323211a..6eb8d48bc 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -602,7 +602,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B setflag FLAG_0x2DC setvar VAR_0x405A, 5 delay 30 - warp RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 6d83c8841..2e1b4cfa4 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -127,7 +127,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -137,7 +137,7 @@ SSTidalCorridor_EventScript_23C15A:: @ 823C15A msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 - warp SLATEPORT_CITY_HARBOR, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index 239a2efda..19f51b873 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -93,7 +93,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359 SafariZone_South_EventScript_23D373:: @ 823D373 setvar VAR_0x40A4, 1 special ExitSafariMode - warpdoor ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index b5fdc5e42..9eb71d5e3 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,8 +3,8 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 - setdivewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 - setescapewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index e8f6323c1..cbfbccfe4 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -141,7 +141,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_0x35B setflag FLAG_0x3B2 setflag FLAG_SPECIAL_FLAG_0x4000 - warp ROUTE_128, 255, 38, 22 + warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index b7b55f256..e9e79d1e9 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 - setdivewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44 - setescapewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index b22afaf54..c15f1f8c4 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -16,6 +16,6 @@ SkyPillar_2F_EventScript_23964C:: @ 823964C SkyPillar_2F_MapScript1_239650: @ 8239650 setstepcallback 7 - setholewarp SKY_PILLAR_1F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 15d055f02..3884864d7 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -16,6 +16,6 @@ SkyPillar_4F_EventScript_239692:: @ 8239692 SkyPillar_4F_MapScript1_239696: @ 8239696 setstepcallback 7 - setholewarp SKY_PILLAR_3F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index d860e6e7c..9a5e41b15 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -616,7 +616,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 clearflag FLAG_0x34D clearflag FLAG_0x34E setvar VAR_0x4058, 2 - warp SLATEPORT_CITY_HARBOR, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index d79849a6c..150cc425b 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -30,8 +30,8 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 2, SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 @@ -68,7 +68,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 @@ -84,7 +84,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B @ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B setvar VAR_0x8006, 1 - warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B @@ -94,7 +94,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @ forced stop diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 7446c1002..0a9eb6cf5 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -53,7 +53,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 waitmovement 0 closedoor 2, 1 waitdooranim - warp SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 waitstate end diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 187ed0751..fc66d7387 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -175,7 +175,7 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 - warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ca6ab50b5..e1f373bb2 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 - setescapewarp SLATEPORT_CITY, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_0x40A0, 1 call_if 1, SlateportCity_Harbor_EventScript_20C9A9 @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE, 1 call SlateportCity_Harbor_EventScript_20CBE9 - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -215,7 +215,7 @@ SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -232,13 +232,13 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, SLATEPORT_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_20CC42 compare VAR_FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_20CC37 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_2721E2 return diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6a26ee0ff..5de8c7d12 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -192,7 +192,7 @@ SootopolisCity_EventScript_1E5901:: @ 81E5901 return SootopolisCity_MapScript1_1E590B: @ 81E590B - setdivewarp UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_MapScript2_1E5914: @ 81E5914 @@ -549,7 +549,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E fadenewbgm MUS_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 SOOTOPOLIS_CITY, 255, 43, 32 + warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 waitstate end @@ -602,7 +602,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE fadenewbgm MUS_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 SOOTOPOLIS_CITY, 255, 29, 53 + warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 waitstate end @@ -987,7 +987,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC setflag FLAG_0x133 applymovement 255, SootopolisCity_Movement_1E635A waitmovement 0 - warp CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 + warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate end @@ -1448,7 +1448,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C clearflag FLAG_0x358 clearflag FLAG_0x394 setvar VAR_0x40B9, 2 - warpsilent SOOTOPOLIS_CITY, 255, 31, 34 + warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate releaseall end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 02ac01f2b..af661890f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -77,7 +77,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 waitmovement 0 playse SE_RU_HYUU delay 60 - warphole SOOTOPOLIS_CITY_GYM_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 8d6b4631f..cdcf5866c 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -115,7 +115,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 compare VAR_FACING, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 - warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 142a8e70e..b29ef99a5 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -34,7 +34,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 - warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 waitstate releaseall end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index bf57aa9ce..d303e0614 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,10 +17,10 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, SOUTHERN_ISLAND_EXTERIOR + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, 2 call SouthernIsland_Exterior_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 155c31877..ac2d5c8a7 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -13,7 +13,7 @@ TrainerHill_Elevator_EventScript_269360:: @ 8269360 applymovement 255, TrainerHill_Elevator_Movement_2693EB waitmovement 0 releaseall - warp TRAINER_HILL_ROOF, 255, 15, 5 + warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 waitstate end @@ -35,7 +35,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 delay 25 applymovement 255, TrainerHill_Elevator_Movement_2693E7 waitmovement 0 - warp TRAINER_HILL_ENTRANCE, 255, 17, 8 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate end diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/scripts/maps/Underwater_MarineCave.inc index c18534c61..ac96e3a9b 100644 --- a/data/scripts/maps/Underwater_MarineCave.inc +++ b/data/scripts/maps/Underwater_MarineCave.inc @@ -8,6 +8,6 @@ Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 end Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 - setdivewarp MARINE_CAVE_ENTRANCE, 255, 10, 17 + setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index a06f87b48..786de1757 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,6 +3,6 @@ Underwater_Route134_MapScripts:: @ 82390B5 .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB - setdivewarp ROUTE_134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index d3f0aa5e5..128cb31c0 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 return Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 - setdivewarp SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index f8c7b02af..7ac032c5f 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA goto Underwater_SealedChamber_EventScript_2390F3 Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA - setdivewarp ROUTE_134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 - setdivewarp SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index 3337b72f1..cbeefcb1d 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,6 +3,6 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 - setdivewarp SOOTOPOLIS_CITY, 255, 29, 53 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index e92087ebd..eb6bf8da4 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829 LinkContestRoom1_EventScript_23B834:: @ 823B834 special sub_80F8B94 - hideobjectat 255, LITTLEROOT_TOWN + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_23BB2B end @@ -416,27 +416,27 @@ LinkContestRoom1_EventScript_23BE44:: @ 823BE44 return LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index d7233a3aa..b7f687cdf 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -31,7 +31,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 - showobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 waitmovement 0 setvar VAR_0x8004, 1 @@ -60,7 +60,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 @@ -133,7 +133,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F @@ -154,7 +154,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B - hideobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index 96bd1f114..a4c2e502c 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -20,7 +20,7 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A closedoor 2, 1 waitdooranim setvar VAR_0x8006, 0 - warp VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 waitstate releaseall end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 468a34991..26f0680a0 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -205,7 +205,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 - warp VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index c2d217f93..e4b1fce41 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ EventScript_2A4B4C:: @ 82A4B4C setvar VAR_0x40A4, 1 special ExitSafariMode - setwarp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D setvar VAR_0x40A4, 1 special ExitSafariMode - warp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/include/constants/maps.h b/include/constants/maps.h index fb1cb82a8..f6096e1c5 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -228,21 +228,21 @@ #define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) // Map Group 15 -#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE8 (12 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE9_1F (13 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE9_B1F (14 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) // Map Group 16 #define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) @@ -442,29 +442,29 @@ #define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) #define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) #define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE_16 (59 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) #define MAP_UNION_ROOM (60 | (25 << 8)) // Map Group 26 #define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (1 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) #define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (3 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) #define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) @@ -473,12 +473,12 @@ #define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) #define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) #define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_EM_1 (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_EM_2 (13 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) #define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 (17 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) @@ -498,22 +498,22 @@ #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_1 (41 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_4 (45 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) #define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_7 (49 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE_9 (52 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) #define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) @@ -530,24 +530,24 @@ #define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) #define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) #define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP_4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN_11 (86 | (26 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) #define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) #define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) diff --git a/src/field_door.c b/src/field_door.c index f73c6bb55..fe9de01fd 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -889,7 +889,7 @@ bool8 sub_808A964(void) { if (FlagGet(FLAG_SPECIAL_FLAG_0x4002)) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2)) { return TRUE; } diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 279b6e672..862672e19 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -3437,8 +3437,8 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), .landMonsInfo = &gSafariZone_South_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, @@ -3861,8 +3861,8 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), .landMonsInfo = &gSafariZone_North_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, @@ -4053,16 +4053,16 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_EM_2), - .mapNum = MAP_NUM(SAFARI_ZONE_EM_2), + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, .rockSmashMonsInfo = NULL, .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_EM_1), - .mapNum = MAP_NUM(SAFARI_ZONE_EM_1), + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, |