dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Get all map constants from include/ rather than constants/

Browse Source
This commit is contained in:
Marcus Huderle
2018-06-14 22:00:09 -05:00
parent 0c8cfc2297
commit acc1a5d446
621 changed files with 1839 additions and 2454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
asm/macros/map.inc
View File

@@ -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

1
constants/constants.inc
View File

@@ -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"

588
constants/map_constants.inc
View File

@@ -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

41
data/event_scripts.s
View File

@@ -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

3
data/map_events.s
View File

@@ -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"

1
data/maps.s
View File

@@ -1,3 +1,4 @@
#include "constants/maps.h"
#include "constants/songs.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

2
data/maps/BattleFrontier_OutsideEast/connections.inc
View File

@@ -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

2
data/maps/BattleFrontier_OutsideWest/connections.inc
View File

@@ -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

4
data/maps/DewfordTown/connections.inc
View File

@@ -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

2
data/maps/EverGrandeCity/connections.inc
View File

@@ -1,5 +1,5 @@
EverGrandeCity_MapConnectionsList: @ 84867F8
connection left, 40, ROUTE_128, 0
connection left, 40, MAP_ROUTE128
EverGrandeCity_MapConnections: @ 8486804
.4byte 0x1

4
data/maps/FallarborTown/connections.inc
View File

@@ -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

4
data/maps/FortreeCity/connections.inc
View File

@@ -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

2
data/maps/LavaridgeTown/connections.inc
View File

@@ -1,5 +1,5 @@
LavaridgeTown_MapConnectionsList: @ 8486660
connection right, -40, ROUTE_112, 0
connection right, -40, MAP_ROUTE112
LavaridgeTown_MapConnections: @ 848666C
.4byte 0x1

4
data/maps/LilycoveCity/connections.inc
View File

@@ -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

2
data/maps/LittlerootTown/connections.inc
View File

@@ -1,5 +1,5 @@
LittlerootTown_MapConnectionsList: @ 8486600
connection up, 0, ROUTE_101, 0
connection up, 0, MAP_ROUTE101
LittlerootTown_MapConnections: @ 848660C
.4byte 0x1

8
data/maps/MauvilleCity/connections.inc
View File

@@ -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

6
data/maps/MossdeepCity/connections.inc
View File

@@ -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

6
data/maps/OldaleTown/connections.inc
View File

@@ -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

4
data/maps/PacifidlogTown/connections.inc
View File

@@ -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

4
data/maps/PetalburgCity/connections.inc
View File

@@ -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

4
data/maps/Route101/connections.inc
View File

@@ -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

4
data/maps/Route102/connections.inc
View File

@@ -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

4
data/maps/Route103/connections.inc
View File

@@ -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

6
data/maps/Route104/connections.inc
View File

@@ -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

6
data/maps/Route105/connections.inc
View File

@@ -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

4
data/maps/Route106/connections.inc
View File

@@ -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

4
data/maps/Route107/connections.inc
View File

@@ -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

4
data/maps/Route108/connections.inc
View File

@@ -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

4
data/maps/Route109/connections.inc
View File

@@ -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

6
data/maps/Route110/connections.inc
View File

@@ -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

6
data/maps/Route111/connections.inc
View File

@@ -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

6
data/maps/Route112/connections.inc
View File

@@ -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

6
data/maps/Route113/connections.inc
View File

@@ -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

4
data/maps/Route114/connections.inc
View File

@@ -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

4
data/maps/Route115/connections.inc
View File

@@ -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

4
data/maps/Route116/connections.inc
View File

@@ -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

4
data/maps/Route117/connections.inc
View File

@@ -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

6
data/maps/Route118/connections.inc
View File

@@ -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

4
data/maps/Route119/connections.inc
View File

@@ -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

4
data/maps/Route120/connections.inc
View File

@@ -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

6
data/maps/Route121/connections.inc
View File

@@ -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

4
data/maps/Route122/connections.inc
View File

@@ -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

4
data/maps/Route123/connections.inc
View File

@@ -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

10
data/maps/Route124/connections.inc
View File

@@ -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

6
data/maps/Route125/connections.inc
View File

@@ -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

6
data/maps/Route126/connections.inc
View File

@@ -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

8
data/maps/Route127/connections.inc
View File

@@ -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

8
data/maps/Route128/connections.inc
View File

@@ -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

6
data/maps/Route129/connections.inc
View File

@@ -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

4
data/maps/Route130/connections.inc
View File

@@ -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

4
data/maps/Route131/connections.inc
View File

@@ -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

4
data/maps/Route132/connections.inc
View File

@@ -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

4
data/maps/Route133/connections.inc
View File

@@ -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

4
data/maps/Route134/connections.inc
View File

@@ -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

6
data/maps/RustboroCity/connections.inc
View File

@@ -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

6
data/maps/SafariZone_North/connections.inc
View File

@@ -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

4
data/maps/SafariZone_Northeast/connections.inc
View File

@@ -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

4
data/maps/SafariZone_Northwest/connections.inc
View File

@@ -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

6
data/maps/SafariZone_South/connections.inc
View File

@@ -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

4
data/maps/SafariZone_Southeast/connections.inc
View File

@@ -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

4
data/maps/SafariZone_Southwest/connections.inc
View File

@@ -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

6
data/maps/SlateportCity/connections.inc
View File

@@ -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

4
data/maps/Underwater1/connections.inc
View File

@@ -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

6
data/maps/Underwater2/connections.inc
View File

@@ -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

6
data/maps/Underwater3/connections.inc
View File

@@ -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

4
data/maps/Underwater4/connections.inc
View File

@@ -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

2
data/maps/Underwater5/connections.inc
View File

@@ -1,5 +1,5 @@
Underwater5_MapConnectionsList: @ 8486DE4
connection emerge, 0, ROUTE_129, 0
connection emerge, 0, MAP_ROUTE129
Underwater5_MapConnections: @ 8486DF0
.4byte 0x1

2
data/maps/Underwater6/connections.inc
View File

@@ -1,5 +1,5 @@
Underwater6_MapConnectionsList: @ 8486D24
connection emerge, 0, ROUTE_105, 0
connection emerge, 0, MAP_ROUTE105
Underwater6_MapConnections: @ 8486D30
.4byte 0x1

2
data/maps/Underwater7/connections.inc
View File

@@ -1,5 +1,5 @@
Underwater7_MapConnectionsList: @ 8486D58
connection emerge, 0, ROUTE_125, 0
connection emerge, 0, MAP_ROUTE125
Underwater7_MapConnections: @ 8486D64
.4byte 0x1

4
data/maps/VerdanturfTown/connections.inc
View File

@@ -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

4
data/maps/events/AbandonedShip_CaptainsOffice.inc
View File

@@ -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

24
data/maps/events/AbandonedShip_Corridors_1F.inc
View File

@@ -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

16
data/maps/events/AbandonedShip_Corridors_B1F.inc
View File

@@ -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

10
data/maps/events/AbandonedShip_Deck.inc
View File

@@ -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

12
data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
View File

@@ -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

18
data/maps/events/AbandonedShip_HiddenFloorRooms.inc
View File

@@ -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

4
data/maps/events/AbandonedShip_Room_B1F.inc
View File

@@ -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

6
data/maps/events/AbandonedShip_Rooms2_1F.inc
View File

@@ -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

8
data/maps/events/AbandonedShip_Rooms2_B1F.inc
View File

@@ -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

12
data/maps/events/AbandonedShip_Rooms_1F.inc
View File

@@ -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

6
data/maps/events/AbandonedShip_Rooms_B1F.inc
View File

@@ -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

4
data/maps/events/AbandonedShip_Underwater1.inc
View File

@@ -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

2
data/maps/events/AbandonedShip_Underwater2.inc
View File

@@ -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

2
data/maps/events/AlteringCave.inc
View File

@@ -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

6
data/maps/events/AncientTomb.inc
View File

@@ -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

6
data/maps/events/AquaHideout_1F.inc
View File

@@ -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

50
data/maps/events/AquaHideout_B1F.inc
View File

@@ -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

20
data/maps/events/AquaHideout_B2F.inc
View File

@@ -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

4
data/maps/events/ArtisanCave_1F.inc
View File

@@ -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

4
data/maps/events/ArtisanCave_B1F.inc
View File

@@ -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

2
data/maps/events/BattleFrontier_BattleArenaLobby.inc
View File

@@ -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

4
data/maps/events/BattleFrontier_BattleDomeCorridor.inc
View File

@@ -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

4
data/maps/events/BattleFrontier_BattleDomeLobby.inc
View File

@@ -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

4
data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
View File

@@ -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

4
data/maps/events/BattleFrontier_BattleFactoryLobby.inc
View File

@@ -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

4
data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
View File

@@ -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

8
data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
View File

@@ -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

6
data/maps/events/BattleFrontier_BattlePalaceLobby.inc
View File

@@ -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

6
data/maps/events/BattleFrontier_BattlePikeLobby.inc
View File

@@ -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

6
data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More