diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 22:48:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 22:48:14 -0600 |
| commit | 940ab939959945f9990b50893434648c9547e880 (patch) | |
| tree | f5a51bcaa68227d18eb658b337c764e10f0bf224 | |
| parent | 61e0c62d2d2dbeba13aaeb49b89c9773b25f84b7 (diff) | |
| parent | cbf615ca73cb70e1b5e8649a245685394526212b (diff) | |
Merge pull request #481 from camthesaxman/map_constants
convert data files to use constants/map.h
483 files changed, 1399 insertions, 1888 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index fd417fe9d..9c68e8414 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -1,30 +1,6 @@ - .macro new_map_group - inc cur_map_group - .set cur_map_num, 0 - .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 + .macro map map_id + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num .endm .macro map_script type, address @@ -48,10 +24,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 diff --git a/constants/constants.inc b/constants/constants.inc index 5f6ae547d..1ec25462f 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -5,7 +5,6 @@ .include "constants/item_data_constants.inc" .include "constants/battle_move_constants.inc" .include "constants/trainer_constants.inc" - .include "constants/map_constants.inc" .include "constants/berry_constants.inc" .include "constants/version.inc" .include "constants/battle.inc" diff --git a/constants/map_constants.inc b/constants/map_constants.inc deleted file mode 100644 index 91f5f029c..000000000 --- a/constants/map_constants.inc +++ /dev/null @@ -1,469 +0,0 @@ - .set cur_map_group, -1 - - new_map_group - map_group PetalburgCity @ 0.0 - map_group SlateportCity @ 0.1 - map_group MauvilleCity @ 0.2 - map_group RustboroCity @ 0.3 - map_group FortreeCity @ 0.4 - map_group LilycoveCity @ 0.5 - map_group MossdeepCity @ 0.6 - map_group SootopolisCity @ 0.7 - map_group EverGrandeCity @ 0.8 - map_group LittlerootTown @ 0.9 - map_group OldaleTown @ 0.10 - map_group DewfordTown @ 0.11 - map_group LavaridgeTown @ 0.12 - map_group FallarborTown @ 0.13 - map_group VerdanturfTown @ 0.14 - map_group PacifidlogTown @ 0.15 - map_group Route101 @ 0.16 - map_group Route102 @ 0.17 - map_group Route103 @ 0.18 - map_group Route104 @ 0.19 - map_group Route105 @ 0.20 - map_group Route106 @ 0.21 - map_group Route107 @ 0.22 - map_group Route108 @ 0.23 - map_group Route109 @ 0.24 - map_group Route110 @ 0.25 - map_group Route111 @ 0.26 - map_group Route112 @ 0.27 - map_group Route113 @ 0.28 - map_group Route114 @ 0.29 - map_group Route115 @ 0.30 - map_group Route116 @ 0.31 - map_group Route117 @ 0.32 - map_group Route118 @ 0.33 - map_group Route119 @ 0.34 - map_group Route120 @ 0.35 - map_group Route121 @ 0.36 - map_group Route122 @ 0.37 - map_group Route123 @ 0.38 - map_group Route124 @ 0.39 - map_group Route125 @ 0.40 - map_group Route126 @ 0.41 - map_group Route127 @ 0.42 - map_group Route128 @ 0.43 - map_group Route129 @ 0.44 - map_group Route130 @ 0.45 - map_group Route131 @ 0.46 - map_group Route132 @ 0.47 - map_group Route133 @ 0.48 - map_group Route134 @ 0.49 - map_group Underwater1 @ 0.50 - map_group Underwater2 @ 0.51 - map_group Underwater3 @ 0.52 - map_group Underwater4 @ 0.53 - - new_map_group - map_group LittlerootTown_BrendansHouse_1F @ 1.0 - map_group LittlerootTown_BrendansHouse_2F @ 1.1 - map_group LittlerootTown_MaysHouse_1F @ 1.2 - map_group LittlerootTown_MaysHouse_2F @ 1.3 - map_group LittlerootTown_ProfessorBirchsLab @ 1.4 - - new_map_group - map_group OldaleTown_House1 @ 2.0 - map_group OldaleTown_House2 @ 2.1 - map_group OldaleTown_PokemonCenter_1F @ 2.2 - map_group OldaleTown_PokemonCenter_2F @ 2.3 - map_group OldaleTown_Mart @ 2.4 - - new_map_group - map_group DewfordTown_House1 @ 3.0 - map_group DewfordTown_PokemonCenter_1F @ 3.1 - map_group DewfordTown_PokemonCenter_2F @ 3.2 - map_group DewfordTown_Gym @ 3.3 - map_group DewfordTown_Hall @ 3.4 - map_group DewfordTown_House2 @ 3.5 - - new_map_group - map_group LavaridgeTown_HerbShop @ 4.0 - map_group LavaridgeTown_Gym_1F @ 4.1 - map_group LavaridgeTown_Gym_B1F @ 4.2 - map_group LavaridgeTown_House @ 4.3 - map_group LavaridgeTown_Mart @ 4.4 - map_group LavaridgeTown_PokemonCenter_1F @ 4.5 - map_group LavaridgeTown_PokemonCenter_2F @ 4.6 - - new_map_group - map_group FallarborTown_Mart @ 5.0 - map_group FallarborTown_ContestLobby @ 5.1 - map_group FallarborTown_ContestHall @ 5.2 - map_group FallarborTown_PokemonCenter_1F @ 5.3 - map_group FallarborTown_PokemonCenter_2F @ 5.4 - map_group FallarborTown_House1 @ 5.5 - map_group FallarborTown_House2 @ 5.6 - - new_map_group - map_group VerdanturfTown_ContestLobby @ 6.0 - map_group VerdanturfTown_ContestHall @ 6.1 - map_group VerdanturfTown_Mart @ 6.2 - map_group VerdanturfTown_PokemonCenter_1F @ 6.3 - map_group VerdanturfTown_PokemonCenter_2F @ 6.4 - map_group VerdanturfTown_WandasHouse @ 6.5 - map_group VerdanturfTown_FriendshipRatersHouse @ 6.6 - map_group VerdanturfTown_House @ 6.7 - - new_map_group - map_group PacifidlogTown_PokemonCenter_1F @ 7.0 - map_group PacifidlogTown_PokemonCenter_2F @ 7.1 - map_group PacifidlogTown_House1 @ 7.2 - map_group PacifidlogTown_House2 @ 7.3 - map_group PacifidlogTown_House3 @ 7.4 - map_group PacifidlogTown_House4 @ 7.5 - map_group PacifidlogTown_House5 @ 7.6 - - new_map_group - map_group PetalburgCity_WallysHouse @ 8.0 - map_group PetalburgCity_Gym @ 8.1 - map_group PetalburgCity_House1 @ 8.2 - map_group PetalburgCity_House2 @ 8.3 - map_group PetalburgCity_PokemonCenter_1F @ 8.4 - map_group PetalburgCity_PokemonCenter_2F @ 8.5 - map_group PetalburgCity_Mart @ 8.6 - - new_map_group - map_group SlateportCity_SternsShipyard_1F @ 9.0 - map_group SlateportCity_SternsShipyard_2F @ 9.1 - map_group SlateportCity_ContestLobby @ 9.2 - map_group SlateportCity_ContestHall @ 9.3 - map_group SlateportCity_House1 @ 9.4 - map_group SlateportCity_PokemonFanClub @ 9.5 - map_group SlateportCity_OceanicMuseum_1F @ 9.6 - map_group SlateportCity_OceanicMuseum_2F @ 9.7 - map_group SlateportCity_Harbor @ 9.8 - map_group SlateportCity_House2 @ 9.9 - map_group SlateportCity_PokemonCenter_1F @ 9.10 - map_group SlateportCity_PokemonCenter_2F @ 9.11 - map_group SlateportCity_Mart @ 9.12 - - new_map_group - map_group MauvilleCity_Gym @ 10.0 - map_group MauvilleCity_BikeShop @ 10.1 - map_group MauvilleCity_House1 @ 10.2 - map_group MauvilleCity_GameCorner @ 10.3 - map_group MauvilleCity_House2 @ 10.4 - map_group MauvilleCity_PokemonCenter_1F @ 10.5 - map_group MauvilleCity_PokemonCenter_2F @ 10.6 - map_group MauvilleCity_Mart @ 10.7 - - new_map_group - map_group RustboroCity_DevonCorp_1F @ 11.0 - map_group RustboroCity_DevonCorp_2F @ 11.1 - map_group RustboroCity_DevonCorp_3F @ 11.2 - map_group RustboroCity_Gym @ 11.3 - map_group RustboroCity_PokemonSchool @ 11.4 - map_group RustboroCity_PokemonCenter_1F @ 11.5 - map_group RustboroCity_PokemonCenter_2F @ 11.6 - map_group RustboroCity_Mart @ 11.7 - map_group RustboroCity_Flat1_1F @ 11.8 - map_group RustboroCity_Flat1_2F @ 11.9 - map_group RustboroCity_House1 @ 11.10 - map_group RustboroCity_CuttersHouse @ 11.11 - map_group RustboroCity_House2 @ 11.12 - map_group RustboroCity_Flat2_1F @ 11.13 - map_group RustboroCity_Flat2_2F @ 11.14 - map_group RustboroCity_Flat2_3F @ 11.15 - map_group RustboroCity_House3 @ 11.16 - - new_map_group - map_group FortreeCity_House1 @ 12.0 - map_group FortreeCity_Gym @ 12.1 - map_group FortreeCity_PokemonCenter_1F @ 12.2 - map_group FortreeCity_PokemonCenter_2F @ 12.3 - map_group FortreeCity_Mart @ 12.4 - map_group FortreeCity_House2 @ 12.5 - map_group FortreeCity_House3 @ 12.6 - map_group FortreeCity_House4 @ 12.7 - map_group FortreeCity_House5 @ 12.8 - map_group FortreeCity_DecorationShop @ 12.9 - - new_map_group - map_group LilycoveCity_CoveLilyMotel_1F @ 13.0 - map_group LilycoveCity_CoveLilyMotel_2F @ 13.1 - map_group LilycoveCity_LilycoveMuseum_1F @ 13.2 - map_group LilycoveCity_LilycoveMuseum_2F @ 13.3 - map_group LilycoveCity_ContestLobby @ 13.4 - map_group LilycoveCity_ContestHall @ 13.5 - map_group LilycoveCity_PokemonCenter_1F @ 13.6 - map_group LilycoveCity_PokemonCenter_2F @ 13.7 - map_group LilycoveCity_UnusedMart @ 13.8 - map_group LilycoveCity_PokemonTrainerFanClub @ 13.9 - map_group LilycoveCity_Harbor @ 13.10 - map_group LilycoveCity_EmptyMap @ 13.11 - map_group LilycoveCity_MoveDeletersHouse @ 13.12 - map_group LilycoveCity_House1 @ 13.13 - map_group LilycoveCity_House2 @ 13.14 - map_group LilycoveCity_House3 @ 13.15 - map_group LilycoveCity_House4 @ 13.16 - map_group LilycoveCity_DepartmentStore_1F @ 13.17 - map_group LilycoveCity_DepartmentStore_2F @ 13.18 - map_group LilycoveCity_DepartmentStore_3F @ 13.19 - map_group LilycoveCity_DepartmentStore_4F @ 13.20 - map_group LilycoveCity_DepartmentStore_5F @ 13.21 - map_group LilycoveCity_DepartmentStoreRooftop @ 13.22 - map_group LilycoveCity_DepartmentStoreElevator @ 13.23 - - new_map_group - map_group MossdeepCity_Gym @ 14.0 - map_group MossdeepCity_House1 @ 14.1 - map_group MossdeepCity_House2 @ 14.2 - map_group MossdeepCity_PokemonCenter_1F @ 14.3 - map_group MossdeepCity_PokemonCenter_2F @ 14.4 - map_group MossdeepCity_Mart @ 14.5 - map_group MossdeepCity_House3 @ 14.6 - map_group MossdeepCity_StevensHouse @ 14.7 - map_group MossdeepCity_House4 @ 14.8 - map_group MossdeepCity_SpaceCenter_1F @ 14.9 - map_group MossdeepCity_SpaceCenter_2F @ 14.10 - map_group MossdeepCity_GameCorner_1F @ 14.11 - map_group MossdeepCity_GameCorner_B1F @ 14.12 - - new_map_group - map_group SootopolisCity_Gym_1F @ 15.0 - map_group SootopolisCity_Gym_B1F @ 15.1 - map_group SootopolisCity_PokemonCenter_1F @ 15.2 - map_group SootopolisCity_PokemonCenter_2F @ 15.3 - map_group SootopolisCity_Mart @ 15.4 - map_group SootopolisCity_House1 @ 15.5 - map_group SootopolisCity_House2 @ 15.6 - map_group SootopolisCity_House3 @ 15.7 - map_group SootopolisCity_House4 @ 15.8 - map_group SootopolisCity_House5 @ 15.9 - map_group SootopolisCity_House6 @ 15.10 - map_group SootopolisCity_House7 @ 15.11 - map_group SootopolisCity_House8 @ 15.12 - - new_map_group - map_group EverGrandeCity_SidneysRoom @ 16.0 - map_group EverGrandeCity_PhoebesRoom @ 16.1 - map_group EverGrandeCity_GlaciasRoom @ 16.2 - map_group EverGrandeCity_DrakesRoom @ 16.3 - map_group EverGrandeCity_ChampionsRoom @ 16.4 - map_group EverGrandeCity_Corridor1 @ 16.5 - map_group EverGrandeCity_Corridor2 @ 16.6 - map_group EverGrandeCity_Corridor3 @ 16.7 - map_group EverGrandeCity_Corridor4 @ 16.8 - map_group EverGrandeCity_Corridor5 @ 16.9 - map_group EverGrandeCity_PokemonLeague @ 16.10 - map_group EverGrandeCity_HallOfFame @ 16.11 - map_group EverGrandeCity_PokemonCenter_1F @ 16.12 - map_group EverGrandeCity_PokemonCenter_2F @ 16.13 - - new_map_group - map_group Route104_MrBrineysHouse @ 17.0 - map_group Route104_PrettyPetalFlowerShop @ 17.1 - - new_map_group - map_group Route111_WinstrateFamilysHouse @ 18.0 - map_group Route111_OldLadysRestStop @ 18.1 - - new_map_group - map_group Route112_CableCarStation @ 19.0 - map_group MtChimney_CableCarStation @ 19.1 - - new_map_group - map_group Route114_FossilManiacsHouse @ 20.0 - map_group Route114_FossilManiacsTunnel @ 20.1 - map_group Route114_LanettesHouse @ 20.2 - - new_map_group - map_group Route116_TunnelersRestHouse @ 21.0 - - new_map_group - map_group Route117_PokemonDayCare @ 22.0 - - new_map_group - map_group Route121_SafariZoneEntrance @ 23.0 - - new_map_group - map_group MeteorFalls_1F_1R @ 24.0 - map_group MeteorFalls_1F_2R @ 24.1 - map_group MeteorFalls_B1F_1R @ 24.2 - map_group MeteorFalls_B1F_2R @ 24.3 - map_group RusturfTunnel @ 24.4 - map_group Underwater_SootopolisCity @ 24.5 - map_group DesertRuins @ 24.6 - map_group GraniteCave_1F @ 24.7 - map_group GraniteCave_B1F @ 24.8 - map_group GraniteCave_B2F @ 24.9 - map_group GraniteCave_StevensRoom @ 24.10 - map_group PetalburgWoods @ 24.11 - map_group MtChimney @ 24.12 - map_group JaggedPass @ 24.13 - map_group FieryPath @ 24.14 - map_group MtPyre_1F @ 24.15 - map_group MtPyre_2F @ 24.16 - map_group MtPyre_3F @ 24.17 - map_group MtPyre_4F @ 24.18 - map_group MtPyre_5F @ 24.19 - map_group MtPyre_6F @ 24.20 - map_group MtPyre_Exterior @ 24.21 - map_group MtPyre_Summit @ 24.22 - map_group AquaHideout_1F @ 24.23 - map_group AquaHideout_B1F @ 24.24 - map_group AquaHideout_B2F @ 24.25 - map_group Underwater_SeafloorCavern @ 24.26 - map_group SeafloorCavern_Entrance @ 24.27 - map_group SeafloorCavern_Room1 @ 24.28 - map_group SeafloorCavern_Room2 @ 24.29 - map_group SeafloorCavern_Room3 @ 24.30 - map_group SeafloorCavern_Room4 @ 24.31 - map_group SeafloorCavern_Room5 @ 24.32 - map_group SeafloorCavern_Room6 @ 24.33 - map_group SeafloorCavern_Room7 @ 24.34 - map_group SeafloorCavern_Room8 @ 24.35 - map_group SeafloorCavern_Room9 @ 24.36 - map_group CaveOfOrigin_Entrance @ 24.37 - map_group CaveOfOrigin_1F @ 24.38 - map_group CaveOfOrigin_B1F @ 24.39 - map_group CaveOfOrigin_B2F @ 24.40 - map_group CaveOfOrigin_B3F @ 24.41 - map_group CaveOfOrigin_B4F @ 24.42 - map_group VictoryRoad_1F @ 24.43 - map_group VictoryRoad_B1F @ 24.44 - map_group VictoryRoad_B2F @ 24.45 - map_group ShoalCave_LowTideEntranceRoom @ 24.46 - map_group ShoalCave_LowTideInnerRoom @ 24.47 - map_group ShoalCave_LowTideStairsRoom @ 24.48 - map_group ShoalCave_LowTideLowerRoom @ 24.49 - map_group ShoalCave_HighTideEntranceRoom @ 24.50 - map_group ShoalCave_HighTideInnerRoom @ 24.51 - map_group NewMauville_Entrance @ 24.52 - map_group NewMauville_Inside @ 24.53 - map_group AbandonedShip_Deck @ 24.54 - map_group AbandonedShip_Corridors_1F @ 24.55 - map_group AbandonedShip_Rooms_1F @ 24.56 - map_group AbandonedShip_Corridors_B1F @ 24.57 - map_group AbandonedShip_Rooms_B1F @ 24.58 - map_group AbandonedShip_Rooms2_B1F @ 24.59 - map_group AbandonedShip_Underwater1 @ 24.60 - map_group AbandonedShip_Room_B1F @ 24.61 - map_group AbandonedShip_Rooms2_1F @ 24.62 - map_group AbandonedShip_CaptainsOffice @ 24.63 - map_group AbandonedShip_Underwater2 @ 24.64 - map_group AbandonedShip_HiddenFloorCorridors @ 24.65 - map_group AbandonedShip_HiddenFloorRooms @ 24.66 - map_group IslandCave @ 24.67 - map_group AncientTomb @ 24.68 - map_group Underwater_Route134 @ 24.69 - map_group Underwater_SealedChamber @ 24.70 - map_group SealedChamber_OuterRoom @ 24.71 - map_group SealedChamber_InnerRoom @ 24.72 - map_group ScorchedSlab @ 24.73 - map_group MagmaHideout_1F @ 24.74 - map_group MagmaHideout_B1F @ 24.75 - map_group MagmaHideout_B2F @ 24.76 - map_group SkyPillar_Entrance @ 24.77 - map_group SkyPillar_Outside @ 24.78 - map_group SkyPillar_1F @ 24.79 - map_group SkyPillar_2F @ 24.80 - map_group SkyPillar_3F @ 24.81 - map_group SkyPillar_4F @ 24.82 - map_group ShoalCave_LowTideIceRoom @ 24.83 - map_group SkyPillar_5F @ 24.84 - map_group SkyPillar_Top @ 24.85 - - new_map_group - map_group SecretBase_RedCave1 @ 25.0 - map_group SecretBase_BrownCave1 @ 25.1 - map_group SecretBase_BlueCave1 @ 25.2 - map_group SecretBase_YellowCave1 @ 25.3 - map_group SecretBase_Tree1 @ 25.4 - map_group SecretBase_Shrub1 @ 25.5 - map_group SecretBase_RedCave2 @ 25.6 - map_group SecretBase_BrownCave2 @ 25.7 - map_group SecretBase_BlueCave2 @ 25.8 - map_group SecretBase_YellowCave2 @ 25.9 - map_group SecretBase_Tree2 @ 25.10 - map_group SecretBase_Shrub2 @ 25.11 - map_group SecretBase_RedCave3 @ 25.12 - map_group SecretBase_BrownCave3 @ 25.13 - map_group SecretBase_BlueCave3 @ 25.14 - map_group SecretBase_YellowCave3 @ 25.15 - map_group SecretBase_Tree3 @ 25.16 - map_group SecretBase_Shrub3 @ 25.17 - map_group SecretBase_RedCave4 @ 25.18 - map_group SecretBase_BrownCave4 @ 25.19 - map_group SecretBase_BlueCave4 @ 25.20 - map_group SecretBase_YellowCave4 @ 25.21 - map_group SecretBase_Tree4 @ 25.22 - map_group SecretBase_Shrub4 @ 25.23 - map_group SingleBattleColosseum @ 25.24 - map_group TradeCenter @ 25.25 - map_group RecordCorner @ 25.26 - map_group DoubleBattleColosseum @ 25.27 - map_group LinkContestRoom1 @ 25.28 - map_group UnknownMap_25_29 @ 25.29 - map_group UnknownMap_25_30 @ 25.30 - map_group UnknownMap_25_31 @ 25.31 - map_group UnknownMap_25_32 @ 25.32 - map_group UnknownMap_25_33 @ 25.33 - map_group UnknownMap_25_34 @ 25.34 - map_group LinkContestRoom2 @ 25.35 - map_group LinkContestRoom3 @ 25.36 - map_group LinkContestRoom4 @ 25.37 - map_group LinkContestRoom5 @ 25.38 - map_group LinkContestRoom6 @ 25.39 - map_group InsideOfTruck @ 25.40 - map_group SSTidalCorridor @ 25.41 - map_group SSTidalLowerDeck @ 25.42 - map_group SSTidalRooms @ 25.43 - - new_map_group - map_group SafariZone_Northwest @ 26.0 - map_group SafariZone_Northeast @ 26.1 - map_group SafariZone_Southwest @ 26.2 - map_group SafariZone_Southeast @ 26.3 - map_group BattleTower_Outside @ 26.4 - map_group BattleTower_Lobby @ 26.5 - map_group BattleTower_Elevator @ 26.6 - map_group BattleTower_Corridor @ 26.7 - map_group BattleTower_BattleRoom @ 26.8 - map_group SouthernIsland_Exterior @ 26.9 - map_group SouthernIsland_Interior @ 26.10 - map_group SafariZone_RestHouse @ 26.11 - - new_map_group - map_group Route104_Prototype @ 27.0 - map_group Route104_PrototypePrettyPetalFlowerShop @ 27.1 - - new_map_group - map_group Route109_SeashoreHouse @ 28.0 - - new_map_group - map_group Route110_TrickHouseEntrance @ 29.0 - map_group Route110_TrickHouseEnd @ 29.1 - map_group Route110_TrickHouseCorridor @ 29.2 - map_group Route110_TrickHousePuzzle1 @ 29.3 - map_group Route110_TrickHousePuzzle2 @ 29.4 - map_group Route110_TrickHousePuzzle3 @ 29.5 - map_group Route110_TrickHousePuzzle4 @ 29.6 - map_group Route110_TrickHousePuzzle5 @ 29.7 - map_group Route110_TrickHousePuzzle6 @ 29.8 - map_group Route110_TrickHousePuzzle7 @ 29.9 - map_group Route110_TrickHousePuzzle8 @ 29.10 - map_group Route110_SeasideCyclingRoadSouthEntrance @ 29.11 - map_group Route110_SeasideCyclingRoadNorthEntrance @ 29.12 - - new_map_group - map_group Route113_GlassWorkshop @ 30.0 - - new_map_group - map_group Route123_BerryMastersHouse @ 31.0 - - new_map_group - map_group Route119_WeatherInstitute_1F @ 32.0 - map_group Route119_WeatherInstitute_2F @ 32.1 - map_group Route119_House @ 32.2 - - new_map_group - map_group Route124_DivingTreasureHuntersHouse @ 33.0 - - .set MAP_None, 0x7F - .set GROUP_None, 0x7F - - .set MAP_Undefined, 0xFF - .set GROUP_Undefined, 0xFF diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index c5def2c8d..88634d215 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -2,6 +2,7 @@ #include "constants/game_stat.h" #include "constants/items.h" #include "constants/map_objects.h" +#include "constants/maps.h" #include "constants/moves.h" #include "constants/opponents.h" #include "constants/songs.h" @@ -4915,7 +4916,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole Undefined + warphole MAP_UNDEFINED waitstate end diff --git a/data/event_scripts.s b/data/event_scripts.s index ebc1a0de8..495f78dfc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2,6 +2,7 @@ #include "constants/game_stat.h" #include "constants/items.h" #include "constants/map_objects.h" +#include "constants/maps.h" #include "constants/moves.h" #include "constants/opponents.h" #include "constants/songs.h" @@ -4883,7 +4884,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole Undefined + warphole MAP_UNDEFINED waitstate end diff --git a/data/map_events.s b/data/map_events.s index 57b3adab5..547e6ceb3 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,6 @@ #include "constants/items.h" #include "constants/map_objects.h" +#include "constants/maps.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/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index 4f47ce304..52339411b 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,6 +1,6 @@ DewfordTown_MapConnectionsList:: @ 8308650 - connection up, -60, Route106 - connection right, 0, Route107 + connection up, -60, MAP_ROUTE106 + connection right, 0, MAP_ROUTE107 DewfordTown_MapConnections:: @ 8308668 .4byte 0x2 diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index fd81ce46b..7833824d8 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapConnectionsList:: @ 8308808 - connection left, 40, Route128 + connection left, 40, MAP_ROUTE128 EverGrandeCity_MapConnections:: @ 8308814 .4byte 0x1 diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 259d5adf0..369d244fc 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,6 +1,6 @@ FallarborTown_MapConnectionsList:: @ 8308684 - connection left, 0, Route114 - connection right, 0, Route113 + connection left, 0, MAP_ROUTE114 + connection right, 0, MAP_ROUTE113 FallarborTown_MapConnections:: @ 830869C .4byte 0x2 diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 3012973d8..4243269aa 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,6 +1,6 @@ FortreeCity_MapConnectionsList:: @ 8308794 - connection left, 0, Route119 - connection right, 0, Route120 + connection left, 0, MAP_ROUTE119 + connection right, 0, MAP_ROUTE120 FortreeCity_MapConnections:: @ 83087AC .4byte 0x2 diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index b31155ae3..5adf84bd2 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,5 +1,5 @@ LavaridgeTown_MapConnectionsList:: @ 8308670 - connection right, -40, Route112 + connection right, -40, MAP_ROUTE112 LavaridgeTown_MapConnections:: @ 830867C .4byte 0x1 diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index a476e2de2..4181dbc05 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,6 +1,6 @@ LilycoveCity_MapConnectionsList:: @ 83087B4 - connection left, 10, Route121 - connection right, -10, Route124 + connection left, 10, MAP_ROUTE121 + connection right, -10, MAP_ROUTE124 LilycoveCity_MapConnections:: @ 83087CC .4byte 0x2 diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index d045d04d7..8484aa4b9 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,5 +1,5 @@ LittlerootTown_MapConnectionsList:: @ 8308610 - connection up, 0, Route101 + connection up, 0, MAP_ROUTE101 LittlerootTown_MapConnections:: @ 830861C .4byte 0x1 diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index 07f3649cd..cc06f45e7 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,8 +1,8 @@ MauvilleCity_MapConnectionsList:: @ 8308730 - connection up, 0, Route111 - connection down, 0, Route110 - connection left, 0, Route117 - connection right, 0, Route118 + connection up, 0, MAP_ROUTE111 + connection down, 0, MAP_ROUTE110 + connection left, 0, MAP_ROUTE117 + connection right, 0, MAP_ROUTE118 MauvilleCity_MapConnections:: @ 8308760 .4byte 0x4 diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index 0e654d9cc..5fb40e7f4 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,7 +1,7 @@ MossdeepCity_MapConnectionsList:: @ 83087D4 - connection up, 0, Route125 - connection down, 0, Route127 - connection left, -40, Route124 + connection up, 0, MAP_ROUTE125 + connection down, 0, MAP_ROUTE127 + connection left, -40, MAP_ROUTE124 MossdeepCity_MapConnections:: @ 83087F8 .4byte 0x3 diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index fc5495101..1e4bdeea8 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,7 +1,7 @@ OldaleTown_MapConnectionsList:: @ 8308624 - connection up, 0, Route103 - connection down, 0, Route101 - connection left, 0, Route102 + connection up, 0, MAP_ROUTE103 + connection down, 0, MAP_ROUTE101 + connection left, 0, MAP_ROUTE102 OldaleTown_MapConnections:: @ 8308648 .4byte 0x3 diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index 3c0ae1a62..0a6083d00 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapConnectionsList:: @ 83086C4 - connection left, 0, Route132 - connection right, 0, Route131 + connection left, 0, MAP_ROUTE132 + connection right, 0, MAP_ROUTE131 PacifidlogTown_MapConnections:: @ 83086DC .4byte 0x2 diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index cabded017..b412774bf 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,6 +1,6 @@ PetalburgCity_MapConnectionsList:: @ 83086E4 - connection left, -50, Route104 - connection right, 10, Route102 + connection left, -50, MAP_ROUTE104 + connection right, 10, MAP_ROUTE102 PetalburgCity_MapConnections:: @ 83086FC .4byte 0x2 diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index 78f73238b..2dd103b89 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,6 +1,6 @@ Route101_MapConnectionsList:: @ 830881C - connection up, 0, OldaleTown - connection down, 0, LittlerootTown + connection up, 0, MAP_OLDALE_TOWN + connection down, 0, MAP_LITTLEROOT_TOWN Route101_MapConnections:: @ 8308834 .4byte 0x2 diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index c132f5fa7..56e30d843 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,6 +1,6 @@ Route102_MapConnectionsList:: @ 830883C - connection left, -10, PetalburgCity - connection right, 0, OldaleTown + connection left, -10, MAP_PETALBURG_CITY + connection right, 0, MAP_OLDALE_TOWN Route102_MapConnections:: @ 8308854 .4byte 0x2 diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 1510b33d2..e3ce959f8 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,6 +1,6 @@ Route103_MapConnectionsList:: @ 830885C - connection down, 0, OldaleTown - connection right, -60, Route110 + connection down, 0, MAP_OLDALE_TOWN + connection right, -60, MAP_ROUTE110 Route103_MapConnections:: @ 8308874 .4byte 0x2 diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index 38085d1a8..488af7f8d 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,7 +1,7 @@ Route104_MapConnectionsList:: @ 830887C - connection up, 0, RustboroCity - connection down, 0, Route105 - connection right, 50, PetalburgCity + connection up, 0, MAP_RUSTBORO_CITY + connection down, 0, MAP_ROUTE105 + connection right, 50, MAP_PETALBURG_CITY Route104_MapConnections:: @ 83088A0 .4byte 0x3 diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index 6915b9d08..dc0962e5f 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,6 +1,6 @@ Route105_MapConnectionsList:: @ 83088A8 - connection up, 0, Route104 - connection down, 0, Route106 + connection up, 0, MAP_ROUTE104 + connection down, 0, MAP_ROUTE106 Route105_MapConnections:: @ 83088C0 .4byte 0x2 diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index 4d041e65c..41adbb9d1 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,6 +1,6 @@ Route106_MapConnectionsList:: @ 83088C8 - connection up, 0, Route105 - connection down, 60, DewfordTown + connection up, 0, MAP_ROUTE105 + connection down, 60, MAP_DEWFORD_TOWN Route106_MapConnections:: @ 83088E0 .4byte 0x2 diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index a3da84672..c7c7174c1 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,6 +1,6 @@ Route107_MapConnectionsList:: @ 83088E8 - connection left, 0, DewfordTown - connection right, 0, Route108 + connection left, 0, MAP_DEWFORD_TOWN + connection right, 0, MAP_ROUTE108 Route107_MapConnections:: @ 8308900 .4byte 0x2 diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index aba43d804..f5455457e 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,6 +1,6 @@ Route108_MapConnectionsList:: @ 8308908 - connection left, 0, Route107 - connection right, -40, Route109 + connection left, 0, MAP_ROUTE107 + connection right, -40, MAP_ROUTE109 Route108_MapConnections:: @ 8308920 .4byte 0x2 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 5135e8e8b..44a65da35 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,6 +1,6 @@ Route109_MapConnectionsList:: @ 8308928 - connection up, 0, SlateportCity - connection left, 40, Route108 + connection up, 0, MAP_SLATEPORT_CITY + connection left, 40, MAP_ROUTE108 Route109_MapConnections:: @ 8308940 .4byte 0x2 diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index d0f88deb3..9ba85fdbc 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,7 +1,7 @@ Route110_MapConnectionsList:: @ 8308948 - connection up, 0, MauvilleCity - connection down, 0, SlateportCity - connection left, 60, Route103 + connection up, 0, MAP_MAUVILLE_CITY + connection down, 0, MAP_SLATEPORT_CITY + connection left, 60, MAP_ROUTE103 Route110_MapConnections:: @ 830896C .4byte 0x3 diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 411dea34b..a48035299 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,7 +1,7 @@ Route111_MapConnectionsList:: @ 8308974 - connection down, 0, MauvilleCity - connection left, 0, Route113 - connection left, 20, Route112 + connection down, 0, MAP_MAUVILLE_CITY + connection left, 0, MAP_ROUTE113 + connection left, 20, MAP_ROUTE112 Route111_MapConnections:: @ 8308998 .4byte 0x3 diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index eee04163c..88571a0ea 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,7 +1,7 @@ Route112_MapConnectionsList:: @ 83089A0 - connection up, -60, Route113 - connection left, 40, LavaridgeTown - connection right, -20, Route111 + connection up, -60, MAP_ROUTE113 + connection left, 40, MAP_LAVARIDGE_TOWN + connection right, -20, MAP_ROUTE111 Route112_MapConnections:: @ 83089C4 .4byte 0x3 diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index ffa7b231d..fd6d20812 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,7 +1,7 @@ Route113_MapConnectionsList:: @ 83089CC - connection down, 60, Route112 - connection left, 0, FallarborTown - connection right, 0, Route111 + connection down, 60, MAP_ROUTE112 + connection left, 0, MAP_FALLARBOR_TOWN + connection right, 0, MAP_ROUTE111 Route113_MapConnections:: @ 83089F0 .4byte 0x3 diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 603c5e4b1..1a58d2439 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,6 +1,6 @@ Route114_MapConnectionsList:: @ 83089F8 - connection left, 40, Route115 - connection right, 0, FallarborTown + connection left, 40, MAP_ROUTE115 + connection right, 0, MAP_FALLARBOR_TOWN Route114_MapConnections:: @ 8308A10 .4byte 0x2 diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 3886f114f..80fad1097 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,6 +1,6 @@ Route115_MapConnectionsList:: @ 8308A18 - connection down, 0, RustboroCity - connection right, -40, Route114 + connection down, 0, MAP_RUSTBORO_CITY + connection right, -40, MAP_ROUTE114 Route115_MapConnections:: @ 8308A30 .4byte 0x2 diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index 787314054..f8b3afd72 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,6 +1,6 @@ Route116_MapConnectionsList:: @ 8308A38 - connection down, 80, VerdanturfTown - connection left, 0, RustboroCity + connection down, 80, MAP_VERDANTURF_TOWN + connection left, 0, MAP_RUSTBORO_CITY Route116_MapConnections:: @ 8308A50 .4byte 0x2 diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index 2de505e01..a66a5d6f9 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,6 +1,6 @@ Route117_MapConnectionsList:: @ 8308A58 - connection left, 0, VerdanturfTown - connection right, 0, MauvilleCity + connection left, 0, MAP_VERDANTURF_TOWN + connection right, 0, MAP_MAUVILLE_CITY Route117_MapConnections:: @ 8308A70 .4byte 0x2 diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index 764071baf..9ec5d28b6 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,7 +1,7 @@ Route118_MapConnectionsList:: @ 8308A78 - connection up, 40, Route119 - connection left, 0, MauvilleCity - connection right, 0, Route123 + connection up, 40, MAP_ROUTE119 + connection left, 0, MAP_MAUVILLE_CITY + connection right, 0, MAP_ROUTE123 Route118_MapConnections:: @ 8308A9C .4byte 0x3 diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 26ce12a01..1a499afe5 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,6 +1,6 @@ Route119_MapConnectionsList:: @ 8308AA4 - connection down, -40, Route118 - connection right, 0, FortreeCity + connection down, -40, MAP_ROUTE118 + connection right, 0, MAP_FORTREE_CITY Route119_MapConnections:: @ 8308ABC .4byte 0x2 diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index a0f747c68..714d8294e 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,6 +1,6 @@ Route120_MapConnectionsList:: @ 8308AC4 - connection left, 0, FortreeCity - connection right, 80, Route121 + connection left, 0, MAP_FORTREE_CITY + connection right, 80, MAP_ROUTE121 Route120_MapConnections:: @ 8308ADC .4byte 0x2 diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index a77f1b828..80affb98d 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,7 +1,7 @@ Route121_MapConnectionsList:: @ 8308AE4 - connection down, 20, Route122 - connection left, -80, Route120 - connection right, -10, LilycoveCity + connection down, 20, MAP_ROUTE122 + connection left, -80, MAP_ROUTE120 + connection right, -10, MAP_LILYCOVE_CITY Route121_MapConnections:: @ 8308B08 .4byte 0x3 diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 214826c04..9e70cc5c0 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,6 +1,6 @@ Route122_MapConnectionsList:: @ 8308B10 - connection up, -20, Route121 - connection down, -100, Route123 + connection up, -20, MAP_ROUTE121 + connection down, -100, MAP_ROUTE123 Route122_MapConnections:: @ 8308B28 .4byte 0x2 diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index cc54683f4..b57ce9d3b 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,6 +1,6 @@ Route123_MapConnectionsList:: @ 8308B30 - connection up, 100, Route122 - connection left, 0, Route118 + connection up, 100, MAP_ROUTE122 + connection left, 0, MAP_ROUTE118 Route123_MapConnections:: @ 8308B48 .4byte 0x2 diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index 5384926b0..e8ed0c8df 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,9 +1,9 @@ Route124_MapConnectionsList:: @ 8308B50 - connection down, 0, Route126 - connection left, 10, LilycoveCity - connection right, 0, Route125 - connection right, 40, MossdeepCity - connection dive, 0, Underwater1 + 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:: @ 8308B8C .4byte 0x5 diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 33b7c705c..c573987eb 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,6 +1,6 @@ Route125_MapConnectionsList:: @ 8308B94 - connection down, 0, MossdeepCity - connection left, 0, Route124 + connection down, 0, MAP_MOSSDEEP_CITY + connection left, 0, MAP_ROUTE124 Route125_MapConnections:: @ 8308BAC .4byte 0x2 diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index 9ff9688af..2bcf57ced 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,7 +1,7 @@ Route126_MapConnectionsList:: @ 8308BB4 - connection up, 0, Route124 - connection right, 0, Route127 - connection dive, 0, Underwater2 + connection up, 0, MAP_ROUTE124 + connection right, 0, MAP_ROUTE127 + connection dive, 0, MAP_UNDERWATER2 Route126_MapConnections:: @ 8308BD8 .4byte 0x3 diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 997c98c61..017f7de41 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,8 +1,8 @@ Route127_MapConnectionsList:: @ 8308BE0 - connection up, 0, MossdeepCity - connection down, 0, Route128 - connection left, 0, Route126 - connection dive, 0, Underwater3 + connection up, 0, MAP_MOSSDEEP_CITY + connection down, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE126 + connection dive, 0, MAP_UNDERWATER3 Route127_MapConnections:: @ 8308C10 .4byte 0x4 diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index b187c7f64..e66b44582 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,8 +1,8 @@ Route128_MapConnectionsList:: @ 8308C18 - connection up, 0, Route127 - connection down, 0, Route129 - connection right, -40, EverGrandeCity - connection dive, 0, Underwater4 + connection up, 0, MAP_ROUTE127 + connection down, 0, MAP_ROUTE129 + connection right, -40, MAP_EVER_GRANDE_CITY + connection dive, 0, MAP_UNDERWATER4 Route128_MapConnections:: @ 8308C48 .4byte 0x4 diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index 7a1db2bc7..d1022353e 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,6 +1,6 @@ Route129_MapConnectionsList:: @ 8308C50 - connection up, 0, Route128 - connection left, 0, Route130 + connection up, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE130 Route129_MapConnections:: @ 8308C68 .4byte 0x2 diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index 211eba7f1..535725bb0 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,6 +1,6 @@ Route130_MapConnectionsList:: @ 8308C70 - connection left, 0, Route131 - connection right, 0, Route129 + connection left, 0, MAP_ROUTE131 + connection right, 0, MAP_ROUTE129 Route130_MapConnections:: @ 8308C88 .4byte 0x2 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index a1b1adff7..2ac2b6770 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,6 +1,6 @@ Route131_MapConnectionsList:: @ 8308C90 - connection left, 0, PacifidlogTown - connection right, 0, Route130 + connection left, 0, MAP_PACIFIDLOG_TOWN + connection right, 0, MAP_ROUTE130 Route131_MapConnections:: @ 8308CA8 .4byte 0x2 diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index a0aff0a42..94feb7dec 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,6 +1,6 @@ Route132_MapConnectionsList:: @ 8308CB0 - connection left, 0, Route133 - connection right, 0, PacifidlogTown + connection left, 0, MAP_ROUTE133 + connection right, 0, MAP_PACIFIDLOG_TOWN Route132_MapConnections:: @ 8308CC8 .4byte 0x2 diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index 979b49ee9..28445baca 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,6 +1,6 @@ Route133_MapConnectionsList:: @ 8308CD0 - connection left, 0, Route134 - connection right, 0, Route132 + connection left, 0, MAP_ROUTE134 + connection right, 0, MAP_ROUTE132 Route133_MapConnections:: @ 8308CE8 .4byte 0x2 diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index aba5c2c9a..4b90e83ed 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,6 +1,6 @@ Route134_MapConnectionsList:: @ 8308CF0 - connection left, 0, SlateportCity - connection right, 0, Route133 + connection left, 0, MAP_SLATEPORT_CITY + connection right, 0, MAP_ROUTE133 Route134_MapConnections:: @ 8308D08 .4byte 0x2 diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index fd1fa519c..70e96e5b6 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,7 +1,7 @@ RustboroCity_MapConnectionsList:: @ 8308768 - connection up, 0, Route115 - connection down, 0, Route104 - connection right, 0, Route116 + connection up, 0, MAP_ROUTE115 + connection down, 0, MAP_ROUTE104 + connection right, 0, MAP_ROUTE116 RustboroCity_MapConnections:: @ 830878C .4byte 0x3 diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index 5c9c47793..6093ed2a0 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northeast_MapConnectionsList:: @ 8308DC8 - connection left, 0, SafariZone_Northwest - connection down, 0, SafariZone_Southeast + connection left, 0, MAP_SAFARI_ZONE_NORTHWEST + connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Northeast_MapConnections:: @ 8308DE0 .4byte 0x2 diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index b36d15bad..a7b459df2 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapConnectionsList:: @ 8308DA8 - connection right, 0, SafariZone_Northeast - connection down, 0, SafariZone_Southwest + connection right, 0, MAP_SAFARI_ZONE_NORTHEAST + connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Northwest_MapConnections:: @ 8308DC0 .4byte 0x2 diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index e4782d1aa..c9c6d2143 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southeast_MapConnectionsList:: @ 8308E08 - connection up, 0, SafariZone_Northeast - connection left, 0, SafariZone_Southwest + connection up, 0, MAP_SAFARI_ZONE_NORTHEAST + connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Southeast_MapConnections:: @ 8308E20 .4byte 0x2 diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index a0fea0609..84e103cb4 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_MapConnectionsList:: @ 8308DE8 - connection up, 0, SafariZone_Northwest - connection right, 0, SafariZone_Southeast + connection up, 0, MAP_SAFARI_ZONE_NORTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Southwest_MapConnections:: @ 8308E00 .4byte 0x2 diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index 2d3980a8c..082ed59e0 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,7 +1,7 @@ SlateportCity_MapConnectionsList:: @ 8308704 - connection up, 0, Route110 - connection down, 0, Route109 - connection right, 0, Route134 + connection up, 0, MAP_ROUTE110 + connection down, 0, MAP_ROUTE109 + connection right, 0, MAP_ROUTE134 SlateportCity_MapConnections:: @ 8308728 .4byte 0x3 diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index 65c1db901..7eaebf9da 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,6 +1,6 @@ Underwater1_MapConnectionsList:: @ 8308D10 - connection down, 0, Underwater2 - connection emerge, 0, Route124 + connection down, 0, MAP_UNDERWATER2 + connection emerge, 0, MAP_ROUTE124 Underwater1_MapConnections:: @ 8308D28 .4byte 0x2 diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 58a4db314..e24e6e122 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,7 +1,7 @@ Underwater2_MapConnectionsList:: @ 8308D30 - connection up, 0, Underwater1 - connection right, 0, Underwater3 - connection emerge, 0, Route126 + connection up, 0, MAP_UNDERWATER1 + connection right, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE126 Underwater2_MapConnections:: @ 8308D54 .4byte 0x3 diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index 7d6401826..ef0acd44b 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,7 +1,7 @@ Underwater3_MapConnectionsList:: @ 8308D5C - connection emerge, 0, Route127 - connection left, 0, Underwater2 - connection down, 0, Underwater4 + connection emerge, 0, MAP_ROUTE127 + connection left, 0, MAP_UNDERWATER2 + connection down, 0, MAP_UNDERWATER4 Underwater3_MapConnections:: @ 8308D80 .4byte 0x3 diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 0b9a523ea..f29aba11e 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,6 +1,6 @@ Underwater4_MapConnectionsList:: @ 8308D88 - connection up, 0, Underwater3 - connection emerge, 0, Route128 + connection up, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE128 Underwater4_MapConnections:: @ 8308DA0 .4byte 0x2 diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index e1c9c2418..16b03bc03 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,6 +1,6 @@ VerdanturfTown_MapConnectionsList:: @ 83086A4 - connection up, -80, Route116 - connection right, 0, Route117 + connection up, -80, MAP_ROUTE116 + connection right, 0, MAP_ROUTE117 VerdanturfTown_MapConnections:: @ 83086BC .4byte 0x2 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index e05bee18c..e33de80a9 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -3,8 +3,8 @@ AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, 1100, 0, 0 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C - warp_def 7, 6, 3, 4, AbandonedShip_Deck - warp_def 8, 6, 3, 4, AbandonedShip_Deck + warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index 8a42d3204..661fbdb09 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -3,18 +3,18 @@ AbandonedShip_Corridors_1F_MapObjects:: @ 838E120 object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 - warp_def 9, 11, 3, 2, AbandonedShip_Deck - warp_def 8, 11, 3, 2, AbandonedShip_Deck - warp_def 0, 11, 3, 3, AbandonedShip_Deck - warp_def 1, 11, 3, 3, AbandonedShip_Deck - warp_def 11, 9, 3, 0, AbandonedShip_Rooms_1F - warp_def 14, 9, 3, 3, AbandonedShip_Rooms_1F - warp_def 11, 3, 3, 2, AbandonedShip_Rooms_1F - warp_def 14, 3, 3, 4, AbandonedShip_Rooms_1F - warp_def 3, 9, 3, 0, AbandonedShip_Rooms2_1F - warp_def 16, 2, 3, 7, AbandonedShip_Corridors_B1F - warp_def 5, 2, 3, 6, AbandonedShip_Corridors_B1F - warp_def 3, 3, 3, 2, AbandonedShip_Rooms2_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:: @ 838E1B0 map_events AbandonedShip_Corridors_1F_MapObjects, 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 7b50cf2fe..d889f1ade 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -3,14 +3,14 @@ AbandonedShip_Corridors_B1F_MapObjects:: @ 838E238 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 - warp_def 6, 4, 3, 2, AbandonedShip_Rooms2_B1F - warp_def 3, 4, 3, 0, AbandonedShip_Rooms2_B1F - warp_def 5, 7, 3, 0, AbandonedShip_Rooms_B1F - warp_def 8, 7, 3, 1, AbandonedShip_Rooms_B1F - warp_def 11, 7, 3, 2, AbandonedShip_Rooms_B1F - warp_def 11, 4, 3, 0, AbandonedShip_Room_B1F - warp_def 0, 2, 3, 10, AbandonedShip_Corridors_1F - warp_def 8, 2, 3, 9, AbandonedShip_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:: @ 838E2A8 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc index 6988f8568..15f54114b 100644 --- a/data/maps/events/AbandonedShip_Deck.inc +++ b/data/maps/events/AbandonedShip_Deck.inc @@ -1,9 +1,9 @@ AbandonedShip_Deck_MapWarps:: @ 838E0E4 - warp_def 13, 15, 3, 0, Route108 - warp_def 14, 15, 3, 0, Route108 - warp_def 13, 9, 3, 1, AbandonedShip_Corridors_1F - warp_def 8, 9, 3, 2, AbandonedShip_Corridors_1F - warp_def 12, 5, 3, 0, AbandonedShip_CaptainsOffice + 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:: @ 838E10C 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 e5f17046d..97bdf37c5 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc @@ -1,10 +1,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC - warp_def 3, 8, 3, 0, AbandonedShip_HiddenFloorRooms - warp_def 6, 8, 3, 2, AbandonedShip_HiddenFloorRooms - warp_def 9, 8, 3, 4, AbandonedShip_HiddenFloorRooms - warp_def 3, 3, 3, 6, AbandonedShip_HiddenFloorRooms - warp_def 6, 3, 3, 7, AbandonedShip_HiddenFloorRooms - warp_def 9, 3, 3, 8, AbandonedShip_HiddenFloorRooms + 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:: @ 838E4FC bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index e110e051d..46c8eb47a 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -5,15 +5,15 @@ AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, 1101, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 - warp_def 6, 14, 3, 0, AbandonedShip_HiddenFloorCorridors - warp_def 7, 14, 3, 0, AbandonedShip_HiddenFloorCorridors - warp_def 21, 14, 3, 1, AbandonedShip_HiddenFloorCorridors - warp_def 22, 14, 3, 1, AbandonedShip_HiddenFloorCorridors - warp_def 36, 14, 3, 2, AbandonedShip_HiddenFloorCorridors - warp_def 37, 14, 3, 2, AbandonedShip_HiddenFloorCorridors - warp_def 6, 1, 3, 3, AbandonedShip_HiddenFloorCorridors - warp_def 21, 1, 3, 4, AbandonedShip_HiddenFloorCorridors - warp_def 36, 1, 3, 5, AbandonedShip_HiddenFloorCorridors + 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:: @ 838E5E8 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 9213f3e98..d60f9ec94 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -2,8 +2,8 @@ AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, 1098, 0, 0 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 - warp_def 4, 7, 3, 5, AbandonedShip_Corridors_B1F - warp_def 5, 7, 3, 5, AbandonedShip_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:: @ 838E3D4 map_events AbandonedShip_Room_B1F_MapObjects, 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 842f972fa..34de5e0af 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -4,9 +4,9 @@ AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, 1099, 0, 0 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 - warp_def 4, 16, 3, 8, AbandonedShip_Corridors_1F - warp_def 5, 16, 3, 8, AbandonedShip_Corridors_1F - warp_def 4, 1, 3, 11, AbandonedShip_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:: @ 838E448 map_events AbandonedShip_Rooms2_1F_MapObjects, 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 2ad55a5e9..ece0138dd 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -3,10 +3,10 @@ AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, 1097, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 - warp_def 4, 7, 3, 1, AbandonedShip_Corridors_B1F - warp_def 5, 7, 3, 1, AbandonedShip_Corridors_B1F - warp_def 13, 7, 3, 0, AbandonedShip_Corridors_B1F - warp_def 14, 7, 3, 0, AbandonedShip_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:: @ 838E374 map_events AbandonedShip_Rooms2_B1F_MapObjects, 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 90578df28..e41bce58c 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -3,12 +3,12 @@ AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, 1095, 0, 0 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 - warp_def 4, 16, 3, 4, AbandonedShip_Corridors_1F - warp_def 5, 16, 3, 4, AbandonedShip_Corridors_1F - warp_def 4, 1, 3, 6, AbandonedShip_Corridors_1F - warp_def 13, 16, 3, 5, AbandonedShip_Corridors_1F - warp_def 13, 1, 3, 7, AbandonedShip_Corridors_1F - warp_def 14, 16, 3, 5, AbandonedShip_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:: @ 838E224 map_events AbandonedShip_Rooms_1F_MapObjects, 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 692883bec..455a439cb 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -3,9 +3,9 @@ AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, 1096, 0, 0 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 - warp_def 4, 1, 3, 2, AbandonedShip_Corridors_B1F - warp_def 13, 1, 3, 3, AbandonedShip_Corridors_B1F - warp_def 22, 1, 3, 4, AbandonedShip_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:: @ 838E310 map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc index 9a4634860..17a89c2aa 100644 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ b/data/maps/events/AbandonedShip_Underwater1.inc @@ -1,6 +1,6 @@ AbandonedShip_Underwater1_MapWarps:: @ 838E388 - warp_def 3, 7, 3, 0, AbandonedShip_Underwater2 - warp_def 4, 7, 3, 0, AbandonedShip_Underwater2 + warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 AbandonedShip_Underwater1_MapEvents:: @ 838E398 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 a3a181773..6eb94059c 100644 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ b/data/maps/events/AbandonedShip_Underwater2.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 - warp_def 3, 1, 3, 0, AbandonedShip_Underwater1 + warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 1f527288b..ebe2147b6 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -2,9 +2,9 @@ AncientTomb_MapObjects:: @ 838E6DC object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, 937, 0, 0 AncientTomb_MapWarps:: @ 838E6F4 - warp_def 8, 29, 3, 0, Route120 - warp_def 8, 20, 0, 2, AncientTomb - warp_def 8, 11, 3, 1, AncientTomb + 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:: @ 838E70C bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 5c59bbf12..0c8ed6773 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -4,9 +4,9 @@ AquaHideout_1F_MapObjects:: @ 838CD0C object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 - warp_def 13, 27, 1, 6, LilycoveCity - warp_def 14, 27, 1, 6, LilycoveCity - warp_def 22, 1, 3, 0, AquaHideout_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:: @ 838CD6C map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index 742761833..723586d41 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -9,31 +9,31 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0 AquaHideout_B1F_MapWarps:: @ 838CE40 - warp_def 29, 1, 3, 2, AquaHideout_1F - warp_def 18, 1, 3, 0, AquaHideout_B2F - warp_def 12, 1, 3, 1, AquaHideout_B2F - warp_def 3, 3, 3, 2, AquaHideout_B2F - warp_def 31, 4, 3, 7, AquaHideout_B1F - warp_def 27, 4, 3, 8, AquaHideout_B1F - warp_def 20, 4, 3, 10, AquaHideout_B1F - warp_def 27, 12, 3, 4, AquaHideout_B1F - warp_def 3, 15, 3, 5, AquaHideout_B1F - warp_def 3, 20, 3, 12, AquaHideout_B1F - warp_def 32, 19, 3, 6, AquaHideout_B1F - warp_def 23, 10, 3, 22, AquaHideout_B1F - warp_def 45, 3, 3, 9, AquaHideout_B1F - warp_def 42, 5, 3, 18, AquaHideout_B1F - warp_def 45, 5, 3, 12, AquaHideout_B1F - warp_def 48, 5, 3, 16, AquaHideout_B1F - warp_def 42, 9, 3, 15, AquaHideout_B1F - warp_def 45, 9, 3, 20, AquaHideout_B1F - warp_def 48, 9, 3, 13, AquaHideout_B1F - warp_def 42, 13, 3, 24, AquaHideout_B1F - warp_def 45, 13, 3, 17, AquaHideout_B1F - warp_def 48, 13, 3, 12, AquaHideout_B1F - warp_def 42, 17, 3, 11, AquaHideout_B1F - warp_def 45, 17, 3, 17, AquaHideout_B1F - warp_def 48, 17, 3, 19, AquaHideout_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:: @ 838CF08 map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index d2cce8ab9..570348b57 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -6,16 +6,16 @@ AquaHideout_B2F_MapObjects:: @ 838CF1C object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, 924, 0, 0 AquaHideout_B2F_MapWarps:: @ 838CF94 - warp_def 18, 1, 3, 1, AquaHideout_B1F - warp_def 12, 1, 3, 2, AquaHideout_B1F - warp_def 3, 3, 3, 3, AquaHideout_B1F - warp_def 31, 8, 3, 5, AquaHideout_B2F - warp_def 8, 8, 3, 8, AquaHideout_B2F - warp_def 5, 8, 3, 3, AquaHideout_B2F - warp_def 18, 13, 3, 7, AquaHideout_B2F - warp_def 12, 13, 3, 6, AquaHideout_B2F - warp_def 31, 17, 3, 4, AquaHideout_B2F - warp_def 32, 20, 3, 4, AquaHideout_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:: @ 838CFE4 coord_event 28, 17, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index dda5621b6..2f7a46a05 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -3,8 +3,8 @@ BattleTower_BattleRoom_MapObjects:: @ 8391DAC object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC - warp_def 5, 8, 0, 2, BattleTower_Lobby - warp_def 6, 8, 0, 2, BattleTower_Lobby + warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY + warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY BattleTower_BattleRoom_MapEvents:: @ 8391DEC map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc index 6d4e15f7a..b0a0bf435 100644 --- a/data/maps/events/BattleTower_Lobby.inc +++ b/data/maps/events/BattleTower_Lobby.inc @@ -7,9 +7,9 @@ BattleTower_Lobby_MapObjects:: @ 8391C8C object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, 941, 0, 0 BattleTower_Lobby_MapWarps:: @ 8391D1C - warp_def 6, 8, 0, 0, BattleTower_Outside - warp_def 7, 8, 0, 0, BattleTower_Outside - warp_def 6, 1, 0, 0, BattleTower_BattleRoom + warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM BattleTower_Lobby_MapBGEvents:: @ 8391D34 bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc index 04085c346..902a779f1 100644 --- a/data/maps/events/BattleTower_Outside.inc +++ b/data/maps/events/BattleTower_Outside.inc @@ -6,7 +6,7 @@ BattleTower_Outside_MapObjects:: @ 8391BEC object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0 BattleTower_Outside_MapWarps:: @ 8391C64 - warp_def 14, 8, 0, 0, BattleTower_Lobby + warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY BattleTower_Outside_MapBGEvents:: @ 8391C6C bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 43b0b615d..1e2185e9b 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 - warp_def 11, 17, 3, 1, CaveOfOrigin_Entrance - warp_def 14, 5, 3, 0, CaveOfOrigin_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_MapCoordEvents:: @ 838D728 coord_event 7, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 0a3df0655..905954d9b 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C - warp_def 13, 5, 3, 1, CaveOfOrigin_1F - warp_def 5, 11, 3, 0, CaveOfOrigin_B2F + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C coord_event 12, 15, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/events/CaveOfOrigin_B2F.inc index 9c04629f0..2d98e50ac 100644 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ b/data/maps/events/CaveOfOrigin_B2F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 - warp_def 5, 10, 3, 1, CaveOfOrigin_B1F - warp_def 8, 14, 3, 0, CaveOfOrigin_B3F + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 coord_event 10, 6, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 0d0b44eea..8eb114b74 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -2,8 +2,8 @@ CaveOfOrigin_B3F_MapObjects:: @ 838D814 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, 1059, 0, 0 CaveOfOrigin_B3F_MapWarps:: @ 838D82C - warp_def 7, 14, 3, 1, CaveOfOrigin_B2F - warp_def 12, 6, 3, 0, CaveOfOrigin_B4F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F + warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 3b4beb038..35dc61fe8 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -2,7 +2,7 @@ CaveOfOrigin_B4F_MapObjects:: @ 838D880 object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 - warp_def 12, 5, 3, 1, CaveOfOrigin_B3F + warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc index 4e61e3d82..cab14e4d7 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ b/data/maps/events/CaveOfOrigin_Entrance.inc @@ -1,6 +1,6 @@ CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 - warp_def 9, 20, 3, 3, SootopolisCity - warp_def 9, 5, 3, 0, CaveOfOrigin_1F + warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY + warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_Entrance_MapEvents:: @ 838D704 map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 849c7f729..fed9dd8f2 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -2,9 +2,9 @@ DesertRuins_MapObjects:: @ 838BEBC object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, 935, 0, 0 DesertRuins_MapWarps:: @ 838BED4 - warp_def 8, 29, 3, 1, Route111 - warp_def 8, 20, 0, 2, DesertRuins - warp_def 8, 11, 3, 1, DesertRuins + 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:: @ 838BEEC bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 8a5fc1fed..47a200874 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -6,11 +6,11 @@ DewfordTown_MapObjects:: @ 8380B88 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0 DewfordTown_MapWarps:: @ 8380C00 - warp_def 3, 3, 0, 0, DewfordTown_Hall - warp_def 2, 10, 0, 0, DewfordTown_PokemonCenter_1F - warp_def 8, 17, 0, 0, DewfordTown_Gym - warp_def 17, 14, 0, 0, DewfordTown_House1 - warp_def 8, 8, 0, 0, DewfordTown_House2 + 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:: @ 8380C28 bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index 2e36395c1..10a5f8499 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -6,8 +6,8 @@ DewfordTown_Gym_MapObjects:: @ 8385FBC object_event 5, MAP_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0 DewfordTown_Gym_MapWarps:: @ 8386034 - warp_def 5, 27, 0, 2, DewfordTown - warp_def 6, 27, 0, 2, DewfordTown + warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN + warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents:: @ 8386044 bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index d58fbfbd4..dc05cb15e 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -10,8 +10,8 @@ DewfordTown_Hall_MapObjects:: @ 8386088 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, 940, 0, 0 DewfordTown_Hall_MapWarps:: @ 8386160 - warp_def 5, 8, 0, 0, DewfordTown - warp_def 6, 8, 0, 0, DewfordTown + warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN + warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents:: @ 8386170 bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 9bed6ac7a..daedf3d19 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -4,8 +4,8 @@ DewfordTown_House1_MapObjects:: @ 8385E58 object_event 3, MAP_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0 DewfordTown_House1_MapWarps:: @ 8385EA0 - warp_def 3, 7, 0, 3, DewfordTown - warp_def 4, 7, 0, 3, DewfordTown + warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN + warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 8385EB0 map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index eae9ff28e..0553bc23a 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -3,8 +3,8 @@ DewfordTown_House2_MapObjects:: @ 838619C object_event 2, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0 DewfordTown_House2_MapWarps:: @ 83861CC - warp_def 3, 8, 0, 4, DewfordTown - warp_def 4, 8, 0, 4, DewfordTown + warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN + warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 83861DC map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index a870483b3..b1a13dd8a 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ DewfordTown_PokemonCenter_1F_MapObjects:: @ 8385EC4 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C - warp_def 7, 8, 3, 1, DewfordTown - warp_def 6, 8, 3, 1, DewfordTown - warp_def 1, 6, 4, 0, DewfordTown_PokemonCenter_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:: @ 8385F24 map_events DewfordTown_PokemonCenter_1F_MapObjects, 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 0d17672de..00e066e2f 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ DewfordTown_PokemonCenter_2F_MapObjects:: @ 8385F38 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 - warp_def 1, 5, 4, 2, DewfordTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index a1dd533c1..4c1058845 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 - 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:: @ 8391448 coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index 41fd48f06..a4b62f583 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapWarps:: @ 83807DC - warp_def 18, 5, 0, 0, EverGrandeCity_PokemonLeague - warp_def 27, 48, 0, 0, EverGrandeCity_PokemonCenter_1F - warp_def 18, 41, 0, 0, VictoryRoad_1F - warp_def 18, 27, 0, 1, VictoryRoad_1F + warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + 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:: @ 83807FC coord_event 17, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 5d97fe89c..867456c4f 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -4,8 +4,8 @@ EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334 object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 921, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C - warp_def 6, 12, 3, 1, EverGrandeCity_Corridor4 - warp_def 6, 2, 0, 0, EverGrandeCity_HallOfFame + 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:: @ 838B38C map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/events/EverGrandeCity_Corridor1.inc index df9176426..f3ec6727e 100644 --- a/data/maps/events/EverGrandeCity_Corridor1.inc +++ b/data/maps/events/EverGrandeCity_Corridor1.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 - warp_def 5, 12, 3, 1, EverGrandeCity_SidneysRoom - warp_def 5, 2, 0, 0, EverGrandeCity_PhoebesRoom - warp_def 4, 12, 3, 1, EverGrandeCity_SidneysRoom - warp_def 6, 12, 3, 1, EverGrandeCity_SidneysRoom + 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_Corridor1_MapEvents:: @ 838B3C0 map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/events/EverGrandeCity_Corridor2.inc index 35dfa181c..e9a9cdc4c 100644 --- a/data/maps/events/EverGrandeCity_Corridor2.inc +++ b/data/maps/events/EverGrandeCity_Corridor2.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 - warp_def 5, 12, 3, 1, EverGrandeCity_PhoebesRoom - warp_def 5, 2, 0, 0, EverGrandeCity_GlaciasRoom - warp_def 4, 12, 3, 1, EverGrandeCity_PhoebesRoom - warp_def 6, 12, 3, 1, EverGrandeCity_PhoebesRoom + 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_Corridor2_MapEvents:: @ 838B3F4 map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/events/EverGrandeCity_Corridor3.inc index daf135a5f..98d5f7b81 100644 --- a/data/maps/events/EverGrandeCity_Corridor3.inc +++ b/data/maps/events/EverGrandeCity_Corridor3.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor3_MapWarps:: @ 838B408 - warp_def 5, 12, 3, 1, EverGrandeCity_GlaciasRoom - warp_def 5, 2, 0, 0, EverGrandeCity_DrakesRoom - warp_def 4, 12, 3, 1, EverGrandeCity_GlaciasRoom - warp_def 6, 12, 3, 1, EverGrandeCity_GlaciasRoom + 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_Corridor3_MapEvents:: @ 838B428 map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/events/EverGrandeCity_Corridor4.inc index 55757ea4c..cbcf9f77e 100644 --- a/data/maps/events/EverGrandeCity_Corridor4.inc +++ b/data/maps/events/EverGrandeCity_Corridor4.inc @@ -1,6 +1,6 @@ EverGrandeCity_Corridor4_MapWarps:: @ 838B43C - warp_def 5, 33, 3, 1, EverGrandeCity_DrakesRoom - warp_def 5, 2, 0, 0, EverGrandeCity_ChampionsRoom + 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_Corridor4_MapEvents:: @ 838B44C map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/events/EverGrandeCity_Corridor5.inc index bd07dd7e0..5b77148ca 100644 --- a/data/maps/events/EverGrandeCity_Corridor5.inc +++ b/data/maps/events/EverGrandeCity_Corridor5.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor5_MapWarps:: @ 838B460 - warp_def 5, 12, 3, 2, EverGrandeCity_PokemonLeague - warp_def 5, 2, 0, 0, EverGrandeCity_SidneysRoom - warp_def 4, 12, 3, 2, EverGrandeCity_PokemonLeague - warp_def 6, 12, 3, 2, EverGrandeCity_PokemonLeague + warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE EverGrandeCity_Corridor5_MapEvents:: @ 838B480 map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index a925ffed8..e7ac276aa 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_MapObjects:: @ 838B2F8 object_event 1, MAP_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor3 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor4 + 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:: @ 838B320 map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index 806cfe7e1..f6c6ce97e 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_MapObjects:: @ 838B2BC object_event 1, MAP_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor2 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor3 + 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:: @ 838B2E4 map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 1860ee397..9290c4530 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -2,7 +2,7 @@ EverGrandeCity_HallOfFame_MapObjects:: @ 838B528 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 - warp_def 7, 11, 3, 1, EverGrandeCity_ChampionsRoom + warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index aab61bcf4..a2de097b8 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_MapObjects:: @ 838B280 object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor1 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor2 + 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:: @ 838B2A8 map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index 25aee1300..f0709710d 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ EverGrandeCity_PokemonCenter_1F_MapObjects:: @ 838B55C object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 - warp_def 7, 8, 3, 1, EverGrandeCity - warp_def 6, 8, 3, 1, EverGrandeCity - warp_def 1, 6, 4, 0, EverGrandeCity_PokemonCenter_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:: @ 838B5BC map_events EverGrandeCity_PokemonCenter_1F_MapObjects, 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 2bc94cdcc..e7502055a 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ EverGrandeCity_PokemonCenter_2F_MapObjects:: @ 838B5D0 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 - warp_def 1, 5, 4, 2, EverGrandeCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc index d60761727..77247e665 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc @@ -5,10 +5,10 @@ EverGrandeCity_PokemonLeague_MapObjects:: @ 838B494 object_event 4, MAP_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0 EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 - warp_def 9, 11, 3, 0, EverGrandeCity - warp_def 10, 11, 3, 0, EverGrandeCity - warp_def 9, 1, 3, 0, EverGrandeCity_Corridor5 - warp_def 10, 1, 3, 0, EverGrandeCity_Corridor5 + 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 EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index ff370d4ef..c2a7ce10d 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_MapObjects:: @ 838B244 object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor5 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor1 + 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:: @ 838B26C map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 2d69688e7..57d59dac9 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -5,11 +5,11 @@ FallarborTown_MapObjects:: @ 8380E04 object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, 907, 0, 0 FallarborTown_MapWarps:: @ 8380E64 - warp_def 15, 15, 0, 0, FallarborTown_Mart - warp_def 8, 7, 0, 0, FallarborTown_ContestLobby - warp_def 14, 7, 0, 0, FallarborTown_PokemonCenter_1F - warp_def 6, 17, 0, 0, FallarborTown_House1 - warp_def 1, 6, 0, 0, FallarborTown_House2 + warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART + warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_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:: @ 8380E8C bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc index 93b43eccc..30b602e60 100644 --- a/data/maps/events/FallarborTown_ContestHall.inc +++ b/data/maps/events/FallarborTown_ContestHall.inc @@ -4,8 +4,8 @@ FallarborTown_ContestHall_MapObjects:: @ 83867DC object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0 FallarborTown_ContestHall_MapWarps:: @ 8386824 - warp_def 10, 17, 0, 2, FallarborTown_ContestLobby - warp_def 11, 17, 0, 2, FallarborTown_ContestLobby + warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY FallarborTown_ContestHall_MapBGEvents:: @ 8386834 bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc index af7ca5ed1..d34bc68d1 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/events/FallarborTown_ContestLobby.inc @@ -7,9 +7,9 @@ FallarborTown_ContestLobby_MapObjects:: @ 83866F0 object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 - warp_def 5, 6, 0, 1, FallarborTown - warp_def 6, 6, 0, 1, FallarborTown - warp_def 1, 1, 0, 0, FallarborTown_ContestHall + warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index d4cd3e0c9..256b8a339 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -3,8 +3,8 @@ FallarborTown_House1_MapObjects:: @ 8386970 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0 FallarborTown_House1_MapWarps:: @ 83869A0 - warp_def 3, 8, 0, 3, FallarborTown - warp_def 4, 8, 0, 3, FallarborTown + warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN + warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 83869B0 map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index 0b1c64162..e24fef7a9 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -2,8 +2,8 @@ FallarborTown_House2_MapObjects:: @ 83869C4 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0 FallarborTown_House2_MapWarps:: @ 83869DC - warp_def 3, 7, 0, 4, FallarborTown - warp_def 4, 7, 0, 4, FallarborTown + warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 83869EC map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index 584b70447..c343e017e 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -5,8 +5,8 @@ FallarborTown_Mart_MapObjects:: @ 838666C object_event 4, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0 FallarborTown_Mart_MapWarps:: @ 83866CC - warp_def 3, 7, 0, 0, FallarborTown - warp_def 4, 7, 0, 0, FallarborTown + warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 83866DC map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index 16f90af9d..e537f497d 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860 object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 - warp_def 7, 8, 3, 2, FallarborTown - warp_def 6, 8, 3, 2, FallarborTown - warp_def 1, 6, 4, 0, FallarborTown_PokemonCenter_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:: @ 83868D8 map_events FallarborTown_PokemonCenter_1F_MapObjects, 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 05ea78f75..1ae7bba2a 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ FallarborTown_PokemonCenter_2F_MapObjects:: @ 83868EC object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 - warp_def 1, 5, 4, 2, FallarborTown_PokemonCenter_1F - warp_def 5, 1, 3, 0, SingleBattleColosseum - warp_def 8, 1, 3, 0, TradeCenter - warp_def 11, 1, 3, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 3, 0, MAP_TRADE_CENTER + warp_def 11, 1, 3, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index a4ac688d8..22f2b403e 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -9,8 +9,8 @@ FieryPath_MapObjects:: @ 838C718 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 FieryPath_MapWarps:: @ 838C7D8 - warp_def 26, 36, 3, 4, Route112 - warp_def 26, 4, 3, 5, Route112 + warp_def 26, 36, 3, 4, MAP_ROUTE112 + warp_def 26, 4, 3, 5, MAP_ROUTE112 FieryPath_MapEvents:: @ 838C7E8 map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 437852d25..c25f6f6ed 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -8,15 +8,15 @@ FortreeCity_MapObjects:: @ 8380020 object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, 969, 0, 0 FortreeCity_MapWarps:: @ 83800C8 - warp_def 5, 6, 0, 0, FortreeCity_PokemonCenter_1F - warp_def 10, 3, 0, 0, FortreeCity_House1 - warp_def 22, 11, 0, 0, FortreeCity_Gym - warp_def 4, 14, 0, 0, FortreeCity_Mart - warp_def 17, 3, 0, 0, FortreeCity_House2 - warp_def 25, 3, 0, 0, FortreeCity_House3 - warp_def 32, 2, 0, 0, FortreeCity_House4 - warp_def 12, 13, 0, 0, FortreeCity_House5 - warp_def 37, 13, 0, 0, FortreeCity_DecorationShop + 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:: @ 8380110 bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index cc9894b5c..930a73b55 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -5,8 +5,8 @@ FortreeCity_DecorationShop_MapObjects:: @ 83893E0 object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0 FortreeCity_DecorationShop_MapWarps:: @ 8389440 - warp_def 3, 5, 0, 8, FortreeCity - warp_def 4, 5, 0, 8, FortreeCity + warp_def 3, 5, 0, 8, MAP_FORTREE_CITY + warp_def 4, 5, 0, 8, MAP_FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8389450 map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index ad983f81b..523dd3fdc 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -7,8 +7,8 @@ FortreeCity_Gym_MapObjects:: @ 8389018 object_event 6, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0 FortreeCity_Gym_MapWarps:: @ 83890A8 - warp_def 2, 24, 0, 2, FortreeCity - warp_def 3, 24, 0, 2, FortreeCity + warp_def 2, 24, 0, 2, MAP_FORTREE_CITY + warp_def 3, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents:: @ 83890B8 bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index ff383b464..23cd52fdc 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -4,8 +4,8 @@ FortreeCity_House1_MapObjects:: @ 8388FAC object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0 FortreeCity_House1_MapWarps:: @ 8388FF4 - warp_def 3, 5, 0, 1, FortreeCity - warp_def 4, 5, 0, 1, FortreeCity + warp_def 3, 5, 0, 1, MAP_FORTREE_CITY + warp_def 4, 5, 0, 1, MAP_FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8389004 map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 3b0943b2e..1c7246100 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -2,8 +2,8 @@ FortreeCity_House2_MapObjects:: @ 8389278 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0 FortreeCity_House2_MapWarps:: @ 8389290 - warp_def 3, 5, 0, 4, FortreeCity - warp_def 4, 5, 0, 4, FortreeCity + warp_def 3, 5, 0, 4, MAP_FORTREE_CITY + warp_def 4, 5, 0, 4, MAP_FORTREE_CITY FortreeCity_House2_MapEvents:: @ 83892A0 map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index b0b5a7412..359953246 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -3,8 +3,8 @@ FortreeCity_House3_MapObjects:: @ 83892B4 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0 FortreeCity_House3_MapWarps:: @ 83892E4 - warp_def 3, 5, 0, 5, FortreeCity - warp_def 4, 5, 0, 5, FortreeCity + warp_def 3, 5, 0, 5, MAP_FORTREE_CITY + warp_def 4, 5, 0, 5, MAP_FORTREE_CITY FortreeCity_House3_MapEvents:: @ 83892F4 map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index 8b85660c7..38bdacf44 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -4,8 +4,8 @@ FortreeCity_House4_MapObjects:: @ 8389308 object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, 933, 0, 0 FortreeCity_House4_MapWarps:: @ 8389350 - warp_def 3, 5, 0, 6, FortreeCity - warp_def 4, 5, 0, 6, FortreeCity + warp_def 3, 5, 0, 6, MAP_FORTREE_CITY + warp_def 4, 5, 0, 6, MAP_FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8389360 map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index ffaa59e69..94ff0ebb1 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -4,8 +4,8 @@ FortreeCity_House5_MapObjects:: @ 8389374 object_event 3, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0 FortreeCity_House5_MapWarps:: @ 83893BC - warp_def 3, 5, 0, 7, FortreeCity - warp_def 4, 5, 0, 7, FortreeCity + warp_def 3, 5, 0, 7, MAP_FORTREE_CITY + warp_def 4, 5, 0, 7, MAP_FORTREE_CITY FortreeCity_House5_MapEvents:: @ 83893CC map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index 5d1996fc2..2353c3c1f 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -5,8 +5,8 @@ FortreeCity_Mart_MapObjects:: @ 83891F4 object_event 4, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0 FortreeCity_Mart_MapWarps:: @ 8389254 - warp_def 3, 7, 0, 3, FortreeCity - warp_def 4, 7, 0, 3, FortreeCity + warp_def 3, 7, 0, 3, MAP_FORTREE_CITY + warp_def 4, 7, 0, 3, MAP_FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8389264 map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index bd7877e24..bc06da7ca 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_1F_MapObjects:: @ 83890E4 object_event 4, MAP_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 - warp_def 7, 8, 3, 0, FortreeCity - warp_def 6, 8, 3, 0, FortreeCity - warp_def 1, 6, 4, 0, FortreeCity_PokemonCenter_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:: @ 838915C map_events FortreeCity_PokemonCenter_1F_MapObjects, 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 b6a10428c..f16c59cce 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ FortreeCity_PokemonCenter_2F_MapObjects:: @ 8389170 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 - warp_def 1, 5, 4, 2, FortreeCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index 760c1b0e9..1728858fb 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -3,10 +3,10 @@ GraniteCave_1F_MapObjects:: @ 838BF24 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, 1050, 0, 0 GraniteCave_1F_MapWarps:: @ 838BF54 - warp_def 37, 12, 3, 0, Route106 - warp_def 35, 3, 3, 0, GraniteCave_B1F - warp_def 17, 11, 3, 1, GraniteCave_B1F - warp_def 5, 10, 3, 0, GraniteCave_StevensRoom + 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:: @ 838BF74 map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index 2bfd8257d..bc0cc5dfc 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -2,13 +2,13 @@ GraniteCave_B1F_MapObjects:: @ 838BF88 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, 1051, 0, 0 GraniteCave_B1F_MapWarps:: @ 838BFA0 - warp_def 25, 13, 3, 1, GraniteCave_1F - warp_def 4, 21, 3, 2, GraniteCave_1F - warp_def 29, 13, 3, 0, GraniteCave_B2F - warp_def 28, 21, 3, 1, GraniteCave_B2F - warp_def 8, 5, 3, 2, GraniteCave_B2F - warp_def 12, 3, 3, 3, GraniteCave_B2F - warp_def 29, 2, 3, 4, GraniteCave_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:: @ 838BFD8 map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 158577482..ec4b309a5 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -10,11 +10,11 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 - warp_def 29, 13, 3, 2, GraniteCave_B1F - warp_def 28, 21, 3, 3, GraniteCave_B1F - warp_def 8, 5, 3, 4, GraniteCave_B1F - warp_def 12, 3, 3, 5, GraniteCave_B1F - warp_def 29, 2, 3, 6, GraniteCave_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:: @ 838C0EC 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 2e4d9cd30..121ae31cd 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -2,7 +2,7 @@ GraniteCave_StevensRoom_MapObjects:: @ 838C118 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0 GraniteCave_StevensRoom_MapWarps:: @ 838C130 - warp_def 7, 3, 3, 3, GraniteCave_1F + warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 838C138 map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 7656e2679..3b177129a 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618 object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 InsideOfTruck_MapWarps:: @ 8391660 - 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:: @ 8391678 coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index a3fbc959a..372097a07 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -2,9 +2,9 @@ IslandCave_MapObjects:: @ 838E674 object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, 936, 0, 0 IslandCave_MapWarps:: @ 838E68C - warp_def 8, 29, 3, 0, Route105 - warp_def 8, 20, 0, 2, IslandCave - warp_def 8, 11, 3, 1, IslandCave + 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:: @ 838E6A4 bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 245871e9b..dfcc6cbac 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -5,10 +5,10 @@ JaggedPass_MapObjects:: @ 838C61C object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0 JaggedPass_MapWarps:: @ 838C67C - warp_def 14, 40, 3, 2, Route112 - warp_def 15, 40, 3, 3, Route112 - warp_def 13, 5, 3, 2, MtChimney - warp_def 14, 5, 3, 3, MtChimney + 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 JaggedPass_MapCoordEvents:: @ 838C69C 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 47dd5ab4a..406abd6dc 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -10,12 +10,12 @@ LavaridgeTown_MapObjects:: @ 8380C78 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0 LavaridgeTown_MapWarps:: @ 8380D50 - warp_def 12, 15, 0, 0, LavaridgeTown_HerbShop - warp_def 5, 15, 0, 0, LavaridgeTown_Gym_1F - warp_def 15, 5, 0, 0, LavaridgeTown_Mart - warp_def 9, 6, 0, 0, LavaridgeTown_PokemonCenter_1F - warp_def 16, 15, 0, 0, LavaridgeTown_House - warp_def 9, 2, 3, 3, LavaridgeTown_PokemonCenter_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:: @ 8380D80 coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index add699f5d..0df412932 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -8,28 +8,28 @@ LavaridgeTown_Gym_1F_MapObjects:: @ 838625C object_event 7, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 - warp_def 8, 23, 3, 1, LavaridgeTown - warp_def 9, 23, 3, 1, LavaridgeTown - warp_def 3, 21, 3, 0, LavaridgeTown_Gym_B1F - warp_def 1, 14, 3, 2, LavaridgeTown_Gym_B1F - warp_def 6, 14, 3, 4, LavaridgeTown_Gym_B1F - warp_def 1, 6, 3, 3, LavaridgeTown_Gym_B1F - warp_def 9, 2, 3, 1, LavaridgeTown_Gym_B1F - warp_def 6, 20, 3, 5, LavaridgeTown_Gym_B1F - warp_def 0, 23, 3, 6, LavaridgeTown_Gym_B1F - warp_def 0, 17, 3, 7, LavaridgeTown_Gym_B1F - warp_def 4, 17, 3, 8, LavaridgeTown_Gym_B1F - warp_def 0, 11, 3, 9, LavaridgeTown_Gym_B1F - warp_def 4, 12, 3, 10, LavaridgeTown_Gym_B1F - warp_def 4, 9, 3, 11, LavaridgeTown_Gym_B1F - warp_def 0, 2, 3, 12, LavaridgeTown_Gym_B1F - warp_def 4, 6, 3, 13, LavaridgeTown_Gym_B1F - warp_def 4, 2, 3, 14, LavaridgeTown_Gym_B1F - warp_def 10, 19, 3, 15, LavaridgeTown_Gym_B1F - warp_def 10, 14, 3, 16, LavaridgeTown_Gym_B1F - warp_def 6, 6, 3, 17, LavaridgeTown_Gym_B1F - warp_def 6, 2, 3, 18, LavaridgeTown_Gym_B1F - warp_def 10, 6, 3, 19, LavaridgeTown_Gym_B1F + warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 4cff944bc..9492194a8 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,24 +1,24 @@ LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 - warp_def 3, 21, 3, 2, LavaridgeTown_Gym_1F - warp_def 9, 2, 3, 6, LavaridgeTown_Gym_1F - warp_def 1, 14, 3, 3, LavaridgeTown_Gym_1F - warp_def 1, 6, 3, 5, LavaridgeTown_Gym_1F - warp_def 6, 14, 3, 4, LavaridgeTown_Gym_1F - warp_def 6, 20, 3, 7, LavaridgeTown_Gym_1F - warp_def 0, 23, 3, 8, LavaridgeTown_Gym_1F - warp_def 0, 17, 3, 9, LavaridgeTown_Gym_1F - warp_def 4, 17, 3, 10, LavaridgeTown_Gym_1F - warp_def 0, 11, 3, 11, LavaridgeTown_Gym_1F - warp_def 4, 12, 3, 12, LavaridgeTown_Gym_1F - warp_def 4, 9, 3, 13, LavaridgeTown_Gym_1F - warp_def 0, 2, 3, 14, LavaridgeTown_Gym_1F - warp_def 4, 6, 3, 15, LavaridgeTown_Gym_1F - warp_def 4, 2, 3, 16, LavaridgeTown_Gym_1F - warp_def 10, 18, 3, 17, LavaridgeTown_Gym_1F - warp_def 10, 14, 3, 18, LavaridgeTown_Gym_1F - warp_def 6, 6, 3, 19, LavaridgeTown_Gym_1F - warp_def 6, 2, 3, 20, LavaridgeTown_Gym_1F - warp_def 10, 6, 3, 21, LavaridgeTown_Gym_1F + warp_def 3, 21, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 9, 2, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 6, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 20, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 23, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 17, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 17, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 11, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 12, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 9, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 18, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 14, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 2, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index cb04b19d4..8223a30c3 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -4,8 +4,8 @@ LavaridgeTown_HerbShop_MapObjects:: @ 83861F0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps:: @ 8386238 - warp_def 3, 7, 0, 0, LavaridgeTown - warp_def 4, 7, 0, 0, LavaridgeTown + warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 8386248 map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index feb226cd0..771b9669b 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -3,8 +3,8 @@ LavaridgeTown_House_MapObjects:: @ 8386494 object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0 LavaridgeTown_House_MapWarps:: @ 83864C4 - warp_def 3, 7, 0, 4, LavaridgeTown - warp_def 4, 7, 0, 4, LavaridgeTown + warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 83864D4 map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index 8a07501f7..ff184b78e 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -4,8 +4,8 @@ LavaridgeTown_Mart_MapObjects:: @ 83864E8 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0 LavaridgeTown_Mart_MapWarps:: @ 8386530 - warp_def 3, 7, 0, 2, LavaridgeTown - warp_def 4, 7, 0, 2, LavaridgeTown + warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 8386540 map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index dac3d4a72..5e529bb1e 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_1F_MapObjects:: @ 8386554 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 - warp_def 7, 8, 3, 3, LavaridgeTown - warp_def 6, 8, 3, 3, LavaridgeTown - warp_def 1, 6, 4, 0, LavaridgeTown_PokemonCenter_2F - warp_def 2, 1, 0, 5, LavaridgeTown + 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:: @ 83865D4 map_events LavaridgeTown_PokemonCenter_1F_MapObjects, 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 3ef0517b1..39035ba87 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ LavaridgeTown_PokemonCenter_2F_MapObjects:: @ 83865E8 object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 - warp_def 1, 5, 4, 2, LavaridgeTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index a356e2b9e..5dd100302 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -18,21 +18,21 @@ LilycoveCity_MapObjects:: @ 838016C object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 LilycoveCity_MapWarps:: @ 8380304 - warp_def 27, 6, 0, 0, LilycoveCity_DepartmentStore_1F - warp_def 37, 24, 0, 0, LilycoveCity_CoveLilyMotel_1F - warp_def 24, 14, 0, 0, LilycoveCity_PokemonCenter_1F - warp_def 11, 5, 0, 0, LilycoveCity_LilycoveMuseum_1F - warp_def 23, 24, 0, 0, LilycoveCity_ContestLobby - warp_def 39, 14, 0, 1, LilycoveCity_PokemonTrainerFanClub - warp_def 70, 5, 1, 0, AquaHideout_1F - warp_def 36, 6, 0, 0, LilycoveCity_MoveDeletersHouse - warp_def 42, 6, 0, 0, LilycoveCity_House1 - warp_def 55, 15, 0, 0, LilycoveCity_House2 - warp_def 11, 22, 0, 0, LilycoveCity_House3 - warp_def 12, 14, 0, 0, LilycoveCity_House4 - warp_def 12, 32, 0, 0, LilycoveCity_Harbor - warp_def 12, 5, 0, 1, LilycoveCity_LilycoveMuseum_1F - warp_def 71, 5, 1, 0, MagmaHideout_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 + warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F LilycoveCity_MapBGEvents:: @ 838037C bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 4246afd33..307f23974 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -33,10 +33,10 @@ LilycoveCity_ContestHall_MapObjects:: @ 8389A18 object_event 32, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0 LilycoveCity_ContestHall_MapWarps:: @ 8389D18 - warp_def 19, 32, 0, 2, LilycoveCity_ContestLobby - warp_def 30, 32, 0, 3, LilycoveCity_ContestLobby - warp_def 20, 32, 0, 2, LilycoveCity_ContestLobby - warp_def 31, 32, 0, 3, LilycoveCity_ContestLobby + 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:: @ 8389D38 bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index 2e41e6e49..b0ea1e677 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -15,10 +15,10 @@ LilycoveCity_ContestLobby_MapObjects:: @ 838984C object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps:: @ 838999C - warp_def 6, 11, 0, 4, LilycoveCity - warp_def 7, 11, 0, 4, LilycoveCity - warp_def 1, 1, 0, 0, LilycoveCity_ContestHall - warp_def 13, 1, 0, 1, LilycoveCity_ContestHall + warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index 31bd1c94f..ec57d4ba8 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -2,9 +2,9 @@ LilycoveCity_CoveLilyMotel_1F_MapObjects:: @ 8389464 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C - warp_def 5, 8, 0, 1, LilycoveCity - warp_def 6, 8, 0, 1, LilycoveCity - warp_def 2, 1, 0, 0, LilycoveCity_CoveLilyMotel_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:: @ 8389494 coord_event 10, 2, 3, 0, 0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 2117774f0..5398693c7 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8 object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, 925, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 - warp_def 2, 1, 0, 2, LilycoveCity_CoveLilyMotel_1F + warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index d35f50db9..eea28d624 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624 object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C - 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:: @ 838A64C map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index ac72a87c1..363800ad2 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8 object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, 962, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 - warp_def 13, 3, 0, 2, LilycoveCity_DepartmentStore_5F + warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index 28bc93a75..b9104a1ee 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -7,10 +7,10 @@ LilycoveCity_DepartmentStore_1F_MapObjects:: @ 838A218 object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 - warp_def 8, 7, 0, 0, LilycoveCity - warp_def 9, 7, 0, 0, LilycoveCity - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_2F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + 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:: @ 838A2C8 bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index fc8872103..441c43a4c 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_2F_MapObjects:: @ 838A2E8 object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 - warp_def 16, 1, 0, 2, LilycoveCity_DepartmentStore_1F - warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_3F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + 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:: @ 838A378 map_events LilycoveCity_DepartmentStore_2F_MapObjects, 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 bf3d1647f..920327ab8 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_3F_MapObjects:: @ 838A38C object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 - warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_2F - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_4F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + 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:: @ 838A41C map_events LilycoveCity_DepartmentStore_3F_MapObjects, 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 007cc8bf4..a387cfbf2 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_4F_MapObjects:: @ 838A430 object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 - warp_def 16, 1, 0, 1, LilycoveCity_DepartmentStore_3F - warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_5F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + 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:: @ 838A4C0 map_events LilycoveCity_DepartmentStore_4F_MapObjects, 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 85cf2431f..e794452b9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -8,9 +8,9 @@ LilycoveCity_DepartmentStore_5F_MapObjects:: @ 838A4D4 object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C - warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_4F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop + 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:: @ 838A594 map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/events/LilycoveCity_EmptyMap.inc index 906453882..4ac5c42b8 100644 --- a/data/maps/events/LilycoveCity_EmptyMap.inc +++ b/data/maps/events/LilycoveCity_EmptyMap.inc @@ -1,5 +1,5 @@ LilycoveCity_EmptyMap_MapWarps:: @ 838A028 - warp_def 7, 5, 0, 2, LilycoveCity_Harbor + warp_def 7, 5, 0, 2, MAP_LILYCOVE_CITY_HARBOR LilycoveCity_EmptyMap_MapEvents:: @ 838A030 map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index 5682ada0e..fa651e557 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -5,10 +5,10 @@ LilycoveCity_Harbor_MapObjects:: @ 8389F94 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 LilycoveCity_Harbor_MapWarps:: @ 8389FF4 - warp_def 11, 14, 0, 12, LilycoveCity - warp_def 12, 14, 0, 12, LilycoveCity - warp_def 20, 15, 0, 0, LilycoveCity_EmptyMap - warp_def 21, 15, 0, 0, LilycoveCity_EmptyMap + warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP + warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP LilycoveCity_Harbor_MapEvents:: @ 838A014 map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index cdae83007..8d6e6b8ce 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -3,8 +3,8 @@ LilycoveCity_House1_MapObjects:: @ 838A080 object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0 LilycoveCity_House1_MapWarps:: @ 838A0B0 - warp_def 3, 8, 0, 8, LilycoveCity - warp_def 4, 8, 0, 8, LilycoveCity + warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 838A0C0 map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 50b44e253..8cb92dfa4 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -2,8 +2,8 @@ LilycoveCity_House2_MapObjects:: @ 838A0D4 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0 LilycoveCity_House2_MapWarps:: @ 838A0EC - warp_def 2, 7, 0, 9, LilycoveCity - warp_def 3, 7, 0, 9, LilycoveCity + warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY + warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 838A0FC map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index 43a1068f1..db7113ef1 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -7,8 +7,8 @@ LilycoveCity_House3_MapObjects:: @ 838A110 object_event 6, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0 LilycoveCity_House3_MapWarps:: @ 838A1A0 - warp_def 3, 7, 0, 10, LilycoveCity - warp_def 4, 7, 0, 10, LilycoveCity + warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 838A1B0 map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index 88522497d..376afb431 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -3,8 +3,8 @@ LilycoveCity_House4_MapObjects:: @ 838A1C4 object_event 2, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0 LilycoveCity_House4_MapWarps:: @ 838A1F4 - warp_def 3, 8, 0, 11, LilycoveCity - warp_def 4, 8, 0, 11, LilycoveCity + warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 838A204 map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 983736d73..900cba08f 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564 object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 - warp_def 9, 13, 0, 3, LilycoveCity - warp_def 10, 13, 0, 13, LilycoveCity - warp_def 16, 1, 0, 0, LilycoveCity_LilycoveMuseum_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:: @ 838966C bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 98c1aa9cd..372007d1f 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740 object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 - warp_def 13, 1, 0, 2, LilycoveCity_LilycoveMuseum_1F + warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 563052712..d4969c39e 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -2,8 +2,8 @@ LilycoveCity_MoveDeletersHouse_MapObjects:: @ 838A044 object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C - warp_def 3, 7, 0, 7, LilycoveCity - warp_def 4, 7, 0, 7, LilycoveCity + warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index c33a07b6a..c0f27f6c7 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ LilycoveCity_PokemonCenter_1F_MapObjects:: @ 8389D94 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC - warp_def 7, 8, 3, 2, LilycoveCity - warp_def 6, 8, 3, 2, LilycoveCity - warp_def 1, 6, 4, 0, LilycoveCity_PokemonCenter_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:: @ 8389DF4 map_events LilycoveCity_PokemonCenter_1F_MapObjects, 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 736ef1151..e1723d489 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ LilycoveCity_PokemonCenter_2F_MapObjects:: @ 8389E08 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 - warp_def 1, 5, 4, 2, LilycoveCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 38007b34f..a710e1f5e 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -9,8 +9,8 @@ LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0 object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 - warp_def 6, 13, 0, 5, LilycoveCity - warp_def 5, 13, 0, 5, LilycoveCity + warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY + warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc index 1eefb6a8f..4a0127506 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ b/data/maps/events/LilycoveCity_UnusedMart.inc @@ -1,6 +1,6 @@ LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C - warp_def 3, 7, 0, 0, LilycoveCity - warp_def 4, 7, 0, 0, LilycoveCity + warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 62a564821..b31b06b61 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -7,9 +7,9 @@ LittlerootTown_MapObjects:: @ 83808FC object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0 LittlerootTown_MapWarps:: @ 838098C - warp_def 14, 8, 0, 1, LittlerootTown_MaysHouse_1F - warp_def 5, 8, 0, 1, LittlerootTown_BrendansHouse_1F - warp_def 7, 16, 0, 0, LittlerootTown_ProfessorBirchsLab + 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:: @ 83809A4 coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index f60a59018..cf0d27876 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC - warp_def 9, 8, 0, 1, LittlerootTown - warp_def 8, 8, 0, 1, LittlerootTown - warp_def 8, 2, 0, 0, LittlerootTown_BrendansHouse_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:: @ 8385704 coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index a28a2d0d1..ac77a80f9 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -15,7 +15,7 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 - warp_def 7, 1, 0, 2, LittlerootTown_BrendansHouse_1F + warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index d5874624b..875022b3b 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C - warp_def 1, 8, 0, 0, LittlerootTown - warp_def 2, 8, 0, 0, LittlerootTown - warp_def 2, 2, 0, 0, LittlerootTown_MaysHouse_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:: @ 8385954 coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 3a3656287..ef2ea416a 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -16,7 +16,7 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 - warp_def 1, 1, 0, 2, LittlerootTown_MaysHouse_1F + warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index cbc1e4154..9a69cfafd 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -4,8 +4,8 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 - warp_def 6, 12, 0, 2, LittlerootTown - warp_def 7, 12, 0, 2, LittlerootTown + warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN + warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index b90e53ff8..acd337496 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -4,8 +4,8 @@ MagmaHideout_1F_MapObjects:: @ 838E9BC object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 - warp_def 13, 27, 1, 14, LilycoveCity - warp_def 13, 1, 3, 0, MagmaHideout_B1F + warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY + warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_1F_MapEvents:: @ 838EA14 map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index c9f1101cc..db457bb45 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -9,35 +9,35 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0 MagmaHideout_B1F_MapWarps:: @ 838EAE8 - warp_def 3, 3, 3, 1, MagmaHideout_1F - warp_def 14, 3, 3, 0, MagmaHideout_B2F - warp_def 23, 1, 3, 1, MagmaHideout_B2F - warp_def 29, 1, 3, 2, MagmaHideout_B2F - warp_def 8, 5, 3, 6, MagmaHideout_B1F - warp_def 8, 7, 3, 9, MagmaHideout_B1F - warp_def 14, 8, 3, 4, MagmaHideout_B1F - warp_def 23, 5, 3, 10, MagmaHideout_B1F - warp_def 39, 5, 3, 13, MagmaHideout_B1F - warp_def 16, 16, 3, 5, MagmaHideout_B1F - warp_def 21, 14, 3, 7, MagmaHideout_B1F - warp_def 21, 20, 3, 12, MagmaHideout_B1F - warp_def 38, 11, 3, 11, MagmaHideout_B1F - warp_def 43, 19, 3, 8, MagmaHideout_B1F - warp_def 34, 11, 3, 28, MagmaHideout_B1F - warp_def 41, 11, 3, 16, MagmaHideout_B1F - warp_def 56, 3, 3, 15, MagmaHideout_B1F - warp_def 56, 5, 3, 16, MagmaHideout_B1F - warp_def 53, 5, 3, 22, MagmaHideout_B1F - warp_def 59, 5, 3, 20, MagmaHideout_B1F - warp_def 53, 9, 3, 19, MagmaHideout_B1F - warp_def 56, 9, 3, 24, MagmaHideout_B1F - warp_def 59, 9, 3, 18, MagmaHideout_B1F - warp_def 53, 13, 3, 17, MagmaHideout_B1F - warp_def 56, 13, 3, 21, MagmaHideout_B1F - warp_def 59, 13, 3, 26, MagmaHideout_B1F - warp_def 53, 17, 3, 25, MagmaHideout_B1F - warp_def 56, 17, 3, 21, MagmaHideout_B1F - warp_def 59, 17, 3, 14, MagmaHideout_B1F + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F + warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F + warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F + warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F + warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F + warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F + warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F + warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F + warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F + warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F + warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F + warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F + warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_B1F_MapEvents:: @ 838EBD0 map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 258592732..eb6340758 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -6,14 +6,14 @@ MagmaHideout_B2F_MapObjects:: @ 838EBE4 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C - warp_def 3, 3, 3, 1, MagmaHideout_B1F - warp_def 12, 1, 3, 2, MagmaHideout_B1F - warp_def 18, 1, 3, 3, MagmaHideout_B1F - warp_def 2, 14, 3, 4, MagmaHideout_B1F - warp_def 12, 13, 3, 5, MagmaHideout_B2F - warp_def 17, 13, 3, 4, MagmaHideout_B2F - warp_def 31, 4, 3, 7, MagmaHideout_B2F - warp_def 31, 16, 3, 6, MagmaHideout_B2F + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F + warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F + warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F + warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C coord_event 7, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 4d228a92c..4b5b2f17a 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -10,13 +10,13 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 MauvilleCity_MapWarps:: @ 837FC68 - warp_def 8, 5, 0, 0, MauvilleCity_Gym - warp_def 22, 5, 0, 0, MauvilleCity_PokemonCenter_1F - warp_def 35, 5, 0, 0, MauvilleCity_BikeShop - warp_def 23, 14, 0, 0, MauvilleCity_Mart - warp_def 32, 14, 0, 0, MauvilleCity_House1 - warp_def 8, 13, 0, 0, MauvilleCity_GameCorner - warp_def 19, 14, 0, 0, MauvilleCity_House2 + 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:: @ 837FCA0 bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index 6c064a1f7..c215f96b0 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -3,8 +3,8 @@ MauvilleCity_BikeShop_MapObjects:: @ 8388318 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0 MauvilleCity_BikeShop_MapWarps:: @ 8388348 - warp_def 3, 8, 0, 2, MauvilleCity - warp_def 4, 8, 0, 2, MauvilleCity + warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index ed8549079..bd0b472a2 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -13,8 +13,8 @@ MauvilleCity_GameCorner_MapObjects:: @ 83883C0 object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0 MauvilleCity_GameCorner_MapWarps:: @ 83884E0 - warp_def 11, 10, 3, 5, MauvilleCity - warp_def 12, 10, 3, 5, MauvilleCity + warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY + warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 4a9ee563f..0987f3389 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -7,8 +7,8 @@ MauvilleCity_Gym_MapObjects:: @ 838821C object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0 MauvilleCity_Gym_MapWarps:: @ 83882AC - warp_def 4, 20, 0, 0, MauvilleCity - warp_def 5, 20, 0, 0, MauvilleCity + warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY + warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC coord_event 0, 9, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_15664B diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 12d6d8cc8..86b07e3dd 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -2,8 +2,8 @@ MauvilleCity_House1_MapObjects:: @ 8388384 object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0 MauvilleCity_House1_MapWarps:: @ 838839C - warp_def 3, 7, 0, 4, MauvilleCity - warp_def 4, 7, 0, 4, MauvilleCity + warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 83883AC map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index 9feaafe2c..2e5a39157 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -2,8 +2,8 @@ MauvilleCity_House2_MapObjects:: @ 8388624 object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0 MauvilleCity_House2_MapWarps:: @ 838863C - warp_def 3, 8, 0, 6, MauvilleCity - warp_def 4, 8, 0, 6, MauvilleCity + warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 838864C map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 05951f578..3453c6fce 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -4,8 +4,8 @@ MauvilleCity_Mart_MapObjects:: @ 83887A0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0 MauvilleCity_Mart_MapWarps:: @ 83887E8 - warp_def 3, 7, 0, 3, MauvilleCity - warp_def 4, 7, 0, 3, MauvilleCity + warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 83887F8 map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index 0f8e80d5c..da60ac284 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660 object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 - warp_def 7, 8, 3, 1, MauvilleCity - warp_def 6, 8, 3, 1, MauvilleCity - warp_def 1, 6, 4, 0, MauvilleCity_PokemonCenter_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:: @ 83886F0 map_events MauvilleCity_PokemonCenter_1F_MapObjects, 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 dbd55e499..501c40012 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -5,11 +5,11 @@ MauvilleCity_PokemonCenter_2F_MapObjects:: @ 8388704 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 - warp_def 1, 5, 4, 2, MauvilleCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C map_events MauvilleCity_PokemonCenter_2F_MapObjects, 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 1178bf543..41be1c60b 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -11,11 +11,11 @@ MeteorFalls_1F_1R_MapObjects:: @ 838BACC object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, 942, 0, 0 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC - warp_def 27, 18, 4, 0, Route114 - warp_def 6, 39, 3, 0, Route115 - warp_def 10, 3, 3, 0, MeteorFalls_1F_2R - warp_def 5, 4, 3, 4, MeteorFalls_B1F_1R - warp_def 26, 28, 3, 5, MeteorFalls_B1F_1R + 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 MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 549620aa9..060f9a84d 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -4,10 +4,10 @@ MeteorFalls_1F_2R_MapObjects:: @ 838BC20 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0 MeteorFalls_1F_2R_MapWarps:: @ 838BC68 - warp_def 10, 29, 3, 2, MeteorFalls_1F_1R - warp_def 4, 14, 3, 0, MeteorFalls_B1F_1R - warp_def 7, 20, 3, 1, MeteorFalls_B1F_1R - warp_def 21, 23, 3, 2, MeteorFalls_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:: @ 838BC88 bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc index 796e31cd2..053c932ce 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:: @ 838BCB4 - warp_def 5, 6, 4, 1, MeteorFalls_1F_2R - warp_def 7, 11, 5, 2, MeteorFalls_1F_2R - warp_def 18, 15, 4, 3, MeteorFalls_1F_2R - warp_def 17, 3, 3, 0, MeteorFalls_B1F_2R - warp_def 3, 23, 5, 3, MeteorFalls_1F_1R - warp_def 20, 36, 3, 4, MeteorFalls_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:: @ 838BCE4 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 abdad1f03..d892b1ac0 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -2,7 +2,7 @@ MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, 1080, 0, 0 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 - warp_def 5, 15, 3, 3, MeteorFalls_B1F_1R + warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index b73bc64f3..a8162d215 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -10,16 +10,16 @@ MossdeepCity_MapObjects:: @ 838042C object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0 MossdeepCity_MapWarps:: @ 8380504 - warp_def 28, 9, 0, 0, MossdeepCity_House1 - warp_def 38, 9, 0, 0, MossdeepCity_Gym - warp_def 28, 16, 0, 0, MossdeepCity_PokemonCenter_1F - warp_def 67, 24, 0, 0, MossdeepCity_House2 - warp_def 37, 18, 0, 0, MossdeepCity_Mart - warp_def 49, 6, 0, 0, MossdeepCity_House3 - warp_def 19, 10, 0, 0, MossdeepCity_StevensHouse - warp_def 18, 16, 0, 1, MossdeepCity_House4 - warp_def 64, 13, 0, 0, MossdeepCity_SpaceCenter_1F - warp_def 36, 24, 0, 0, MossdeepCity_GameCorner_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, 24, 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, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 coord_event 25, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index 99350c4b0..f525533b2 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -2,9 +2,9 @@ MossdeepCity_GameCorner_1F_MapObjects:: @ 838AC6C object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 - warp_def 3, 7, 0, 9, MossdeepCity - warp_def 4, 7, 0, 9, MossdeepCity - warp_def 3, 1, 0, 0, MossdeepCity_GameCorner_B1F + warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index 98c843f52..58acb3300 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -2,7 +2,7 @@ MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC object_event 1, 240, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 - warp_def 3, 1, 0, 2, MossdeepCity_GameCorner_1F + warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index d80237a3a..80812cc4d 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -10,8 +10,8 @@ MossdeepCity_Gym_MapObjects:: @ 838A660 object_event 9, MAP_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0 MossdeepCity_Gym_MapWarps:: @ 838A738 - warp_def 9, 29, 0, 1, MossdeepCity - warp_def 10, 29, 0, 1, MossdeepCity + warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY + warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 coord_event 12, 3, 3, 0, 0x4001, 0, 0, MossdeepCity_Gym_EventScript_15A742 diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index 251440343..ec7bbdc58 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -3,8 +3,8 @@ MossdeepCity_House1_MapObjects:: @ 838A7B4 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0 MossdeepCity_House1_MapWarps:: @ 838A7E4 - warp_def 3, 7, 0, 0, MossdeepCity - warp_def 4, 7, 0, 0, MossdeepCity + warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 838A7F4 map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index 31ef3ab7b..a932ce465 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -4,8 +4,8 @@ MossdeepCity_House2_MapObjects:: @ 838A808 object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, 934, 0, 0 MossdeepCity_House2_MapWarps:: @ 838A850 - warp_def 3, 8, 0, 3, MossdeepCity - warp_def 4, 8, 0, 3, MossdeepCity + warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY + warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 838A860 map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index b1503decc..37c96933c 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -2,8 +2,8 @@ MossdeepCity_House3_MapObjects:: @ 838AA08 object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0 MossdeepCity_House3_MapWarps:: @ 838AA20 - warp_def 3, 7, 0, 5, MossdeepCity - warp_def 4, 7, 0, 5, MossdeepCity + warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 838AA30 map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index dc0fdfed8..6c07d0101 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -4,8 +4,8 @@ MossdeepCity_House4_MapObjects:: @ 838AAF8 object_event 3, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0 MossdeepCity_House4_MapWarps:: @ 838AB40 - warp_def 4, 7, 0, 7, MossdeepCity - warp_def 3, 7, 0, 7, MossdeepCity + warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY + warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 838AB50 map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 80514f1f8..74141c0cc 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -5,8 +5,8 @@ MossdeepCity_Mart_MapObjects:: @ 838A984 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0 MossdeepCity_Mart_MapWarps:: @ 838A9E4 - warp_def 3, 7, 0, 4, MossdeepCity - warp_def 4, 7, 0, 4, MossdeepCity + warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 838A9F4 map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index d7cf07f6a..a9555d59b 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ MossdeepCity_PokemonCenter_1F_MapObjects:: @ 838A874 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC - warp_def 7, 8, 3, 2, MossdeepCity - warp_def 6, 8, 3, 2, MossdeepCity - warp_def 1, 6, 4, 0, MossdeepCity_PokemonCenter_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:: @ 838A8D4 map_events MossdeepCity_PokemonCenter_1F_MapObjects, 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 337467351..3f3d05e5a 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -5,11 +5,11 @@ MossdeepCity_PokemonCenter_2F_MapObjects:: @ 838A8E8 object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 - warp_def 1, 5, 4, 2, MossdeepCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 map_events MossdeepCity_PokemonCenter_2F_MapObjects, 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 d79459eb8..ab9872c2f 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -6,9 +6,9 @@ MossdeepCity_SpaceCenter_1F_MapObjects:: @ 838AB64 object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC - warp_def 7, 9, 0, 8, MossdeepCity - warp_def 8, 9, 0, 8, MossdeepCity - warp_def 13, 1, 0, 0, MossdeepCity_SpaceCenter_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:: @ 838ABF4 map_events MossdeepCity_SpaceCenter_1F_MapObjects, 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 2dc4f843a..bcef30b09 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_2F_MapObjects:: @ 838AC08 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 - warp_def 13, 1, 0, 2, MossdeepCity_SpaceCenter_1F + warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index ce240d81f..0aef37766 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -5,8 +5,8 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 - warp_def 3, 7, 0, 6, MossdeepCity - warp_def 4, 7, 0, 6, MossdeepCity + warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index 468edda1d..acab0d36b 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -29,10 +29,10 @@ MtChimney_MapObjects:: @ 838C330 object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0 MtChimney_MapWarps:: @ 838C5D0 - warp_def 17, 36, 0, 0, MtChimney_CableCarStation - warp_def 18, 36, 0, 1, MtChimney_CableCarStation - warp_def 20, 41, 3, 2, JaggedPass - warp_def 21, 41, 3, 3, JaggedPass + 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:: @ 838C5F0 bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index db4eef0fa..971dcda65 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -3,8 +3,8 @@ MtChimney_CableCarStation_MapObjects:: @ 838B828 object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps:: @ 838B858 - warp_def 6, 11, 0, 0, MtChimney - warp_def 7, 11, 0, 1, MtChimney + warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY + warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 838B868 map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 3f4263f9e..480bcdbe9 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -4,12 +4,12 @@ MtPyre_1F_MapObjects:: @ 838C7FC object_event 3, MAP_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0 MtPyre_1F_MapWarps:: @ 838C844 - warp_def 17, 18, 3, 0, Route122 - warp_def 3, 6, 3, 0, MtPyre_Exterior - warp_def 18, 18, 3, 0, Route122 - warp_def 4, 6, 3, 0, MtPyre_Exterior - warp_def 11, 1, 3, 0, MtPyre_2F - warp_def 20, 9, 3, 4, MtPyre_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:: @ 838C874 map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 320be57af..1d776173d 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -7,11 +7,11 @@ MtPyre_2F_MapObjects:: @ 838C888 object_event 6, MAP_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0 MtPyre_2F_MapWarps:: @ 838C918 - warp_def 2, 1, 3, 4, MtPyre_1F - warp_def 10, 1, 3, 0, MtPyre_3F - warp_def 10, 12, 3, 4, MtPyre_3F - warp_def 6, 12, 3, 5, MtPyre_3F - warp_def 11, 9, 3, 5, MtPyre_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:: @ 838C940 map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index ba5428cb2..0cccd1bb2 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -4,12 +4,12 @@ MtPyre_3F_MapObjects:: @ 838C954 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, 1120, 0, 0 MtPyre_3F_MapWarps:: @ 838C99C - warp_def 10, 1, 3, 1, MtPyre_2F - warp_def 2, 1, 3, 1, MtPyre_4F - warp_def 9, 10, 3, 4, MtPyre_4F - warp_def 1, 12, 3, 5, MtPyre_4F - warp_def 10, 12, 3, 2, MtPyre_2F - warp_def 6, 12, 3, 3, MtPyre_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:: @ 838C9CC map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index c54b36645..bc6cc02eb 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -3,12 +3,12 @@ MtPyre_4F_MapObjects:: @ 838C9E0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, 1130, 0, 0 MtPyre_4F_MapWarps:: @ 838CA10 - warp_def 10, 1, 3, 1, MtPyre_5F - warp_def 2, 5, 3, 1, MtPyre_3F - warp_def 12, 10, 3, 3, MtPyre_5F - warp_def 12, 12, 3, 4, MtPyre_5F - warp_def 9, 10, 3, 2, MtPyre_3F - warp_def 2, 12, 3, 3, MtPyre_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:: @ 838CA40 map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 73b97a40d..340274836 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -3,11 +3,11 @@ MtPyre_5F_MapObjects:: @ 838CA54 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, 1052, 0, 0 MtPyre_5F_MapWarps:: @ 838CA84 - warp_def 2, 1, 3, 0, MtPyre_6F - warp_def 10, 5, 3, 0, MtPyre_4F - warp_def 1, 10, 3, 1, MtPyre_6F - warp_def 12, 10, 3, 2, MtPyre_4F - warp_def 12, 12, 3, 3, MtPyre_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:: @ 838CAAC map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index 70228bc42..e0d12d296 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -3,8 +3,8 @@ MtPyre_6F_MapObjects:: @ 838CAC0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, 1089, 0, 0 MtPyre_6F_MapWarps:: @ 838CAF0 - warp_def 2, 1, 3, 0, MtPyre_5F - warp_def 1, 10, 3, 2, MtPyre_5F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F + warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F MtPyre_6F_MapEvents:: @ 838CB00 map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index ac372a2f0..044ff7fb5 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -3,9 +3,9 @@ MtPyre_Exterior_MapObjects:: @ 838CB14 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, 1074, 0, 0 MtPyre_Exterior_MapWarps:: @ 838CB44 - warp_def 10, 42, 3, 1, MtPyre_1F - warp_def 19, 10, 3, 1, MtPyre_Summit - warp_def 20, 10, 3, 1, MtPyre_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:: @ 838CB5C coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 4f5047765..360c0c21e 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -7,9 +7,9 @@ MtPyre_Summit_MapObjects:: @ 838CBD8 object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, 917, 0, 0 MtPyre_Summit_MapWarps:: @ 838CC68 - warp_def 22, 31, 3, 1, MtPyre_Exterior - warp_def 23, 31, 3, 1, MtPyre_Exterior - warp_def 24, 31, 3, 1, MtPyre_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:: @ 838CC80 coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 482ff83ca..65405fbe7 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 - warp_def 4, 6, 3, 0, Route110 - warp_def 4, 1, 3, 0, NewMauville_Inside + warp_def 4, 6, 3, 0, MAP_ROUTE110 + warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a7384520d..826e6a089 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapObjects:: @ 838DF08 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0 NewMauville_Inside_MapWarps:: @ 838DFC8 - warp_def 32, 33, 3, 1, NewMauville_Entrance + warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 30, 38, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index a09a08fe2..3b5fc9150 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -5,10 +5,10 @@ OldaleTown_MapObjects:: @ 8380A78 object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0 OldaleTown_MapWarps:: @ 8380AD8 - warp_def 5, 7, 0, 0, OldaleTown_House1 - warp_def 15, 16, 0, 0, OldaleTown_House2 - warp_def 6, 16, 0, 0, OldaleTown_PokemonCenter_1F - warp_def 14, 6, 0, 0, OldaleTown_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:: @ 8380AF8 coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 16f29b00e..1c2eb5bce 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -2,8 +2,8 @@ OldaleTown_House1_MapObjects:: @ 8385C4C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0 OldaleTown_House1_MapWarps:: @ 8385C64 - warp_def 3, 8, 0, 0, OldaleTown - warp_def 4, 8, 0, 0, OldaleTown + warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN + warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 8385C74 map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 904291576..458ca9420 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -3,8 +3,8 @@ OldaleTown_House2_MapObjects:: @ 8385C88 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0 OldaleTown_House2_MapWarps:: @ 8385CB8 - warp_def 3, 7, 0, 1, OldaleTown - warp_def 4, 7, 0, 1, OldaleTown + warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 8385CC8 map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index a06ece505..839ec3b49 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -4,8 +4,8 @@ OldaleTown_Mart_MapObjects:: @ 8385DEC object_event 3, MAP_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0 OldaleTown_Mart_MapWarps:: @ 8385E34 - warp_def 3, 7, 0, 3, OldaleTown - warp_def 4, 7, 0, 3, OldaleTown + warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 8385E44 map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 161baec86..0c9bdfe8c 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_1F_MapObjects:: @ 8385CDC object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C - warp_def 7, 8, 3, 2, OldaleTown - warp_def 6, 8, 3, 2, OldaleTown - warp_def 1, 6, 4, 0, OldaleTown_PokemonCenter_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:: @ 8385D54 map_events OldaleTown_PokemonCenter_1F_MapObjects, 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 e2675bb14..e94d29970 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ OldaleTown_PokemonCenter_2F_MapObjects:: @ 8385D68 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 - warp_def 1, 5, 4, 2, OldaleTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index 1823e9afd..2161172a5 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -4,12 +4,12 @@ PacifidlogTown_MapObjects:: @ 838100C object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0 PacifidlogTown_MapWarps:: @ 8381054 - warp_def 8, 15, 0, 0, PacifidlogTown_PokemonCenter_1F - warp_def 16, 13, 0, 0, PacifidlogTown_House1 - warp_def 3, 22, 0, 0, PacifidlogTown_House2 - warp_def 12, 24, 0, 0, PacifidlogTown_House3 - warp_def 2, 12, 0, 0, PacifidlogTown_House4 - warp_def 17, 21, 0, 0, PacifidlogTown_House5 + 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:: @ 8381084 bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 233fa7604..3e0e7dc23 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -3,8 +3,8 @@ PacifidlogTown_House1_MapObjects:: @ 8386F40 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0 PacifidlogTown_House1_MapWarps:: @ 8386F70 - warp_def 4, 8, 0, 1, PacifidlogTown - warp_def 5, 8, 0, 1, PacifidlogTown + warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 8386F80 map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index aa1940d29..7c4de826c 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -4,8 +4,8 @@ PacifidlogTown_House2_MapObjects:: @ 8386F94 object_event 3, MAP_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0 PacifidlogTown_House2_MapWarps:: @ 8386FDC - warp_def 4, 8, 0, 2, PacifidlogTown - warp_def 5, 8, 0, 2, PacifidlogTown + warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 8386FEC map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 80ab8d7f5..642613434 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -3,8 +3,8 @@ PacifidlogTown_House3_MapObjects:: @ 8387000 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0 PacifidlogTown_House3_MapWarps:: @ 8387030 - warp_def 4, 8, 0, 3, PacifidlogTown - warp_def 5, 8, 0, 3, PacifidlogTown + warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 8387040 map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index a7dd1469b..bf010eaf3 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -4,8 +4,8 @@ PacifidlogTown_House4_MapObjects:: @ 8387054 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0 PacifidlogTown_House4_MapWarps:: @ 838709C - warp_def 4, 8, 0, 4, PacifidlogTown - warp_def 5, 8, 0, 4, PacifidlogTown + warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 83870AC map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index 963a319cf..cd7c5dae0 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -3,8 +3,8 @@ PacifidlogTown_House5_MapObjects:: @ 83870C0 object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0 PacifidlogTown_House5_MapWarps:: @ 83870F0 - warp_def 4, 8, 0, 5, PacifidlogTown - warp_def 5, 8, 0, 5, PacifidlogTown + warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 8387100 map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index 432ba616d..e0990b224 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ PacifidlogTown_PokemonCenter_1F_MapObjects:: @ 8386E30 object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 - warp_def 7, 8, 3, 0, PacifidlogTown - warp_def 6, 8, 3, 0, PacifidlogTown - warp_def 1, 6, 4, 0, PacifidlogTown_PokemonCenter_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:: @ 8386EA8 map_events PacifidlogTown_PokemonCenter_1F_MapObjects, 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 f4110623f..fb594733e 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ PacifidlogTown_PokemonCenter_2F_MapObjects:: @ 8386EBC object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 - warp_def 1, 5, 4, 2, PacifidlogTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 1, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 4c36c49ab..3b6329587 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -10,12 +10,12 @@ PetalburgCity_MapObjects:: @ 837F5F0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 PetalburgCity_MapWarps:: @ 837F6C8 - warp_def 10, 19, 0, 0, PetalburgCity_House1 - warp_def 7, 5, 0, 0, PetalburgCity_WallysHouse - warp_def 15, 8, 0, 0, PetalburgCity_Gym - warp_def 20, 16, 0, 0, PetalburgCity_PokemonCenter_1F - warp_def 20, 24, 0, 0, PetalburgCity_House2 - warp_def 25, 12, 0, 0, PetalburgCity_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:: @ 837F6F8 coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 47205e253..2b09951ee 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -11,44 +11,44 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0 PetalburgCity_Gym_MapWarps:: @ 8387258 - warp_def 4, 111, 3, 2, PetalburgCity - warp_def 5, 111, 3, 2, PetalburgCity - warp_def 1, 105, 3, 3, PetalburgCity_Gym - warp_def 7, 85, 3, 2, PetalburgCity_Gym - warp_def 6, 85, 3, 2, PetalburgCity_Gym - warp_def 7, 105, 3, 6, PetalburgCity_Gym - warp_def 1, 98, 3, 5, PetalburgCity_Gym - warp_def 2, 98, 3, 5, PetalburgCity_Gym - warp_def 1, 79, 3, 10, PetalburgCity_Gym - warp_def 7, 79, 3, 12, PetalburgCity_Gym - warp_def 7, 46, 3, 8, PetalburgCity_Gym - warp_def 6, 46, 3, 8, PetalburgCity_Gym - warp_def 1, 59, 3, 9, PetalburgCity_Gym - warp_def 2, 59, 3, 9, PetalburgCity_Gym - warp_def 1, 92, 3, 16, PetalburgCity_Gym - warp_def 7, 92, 3, 18, PetalburgCity_Gym - warp_def 7, 59, 3, 14, PetalburgCity_Gym - warp_def 6, 59, 3, 14, PetalburgCity_Gym - warp_def 1, 72, 3, 15, PetalburgCity_Gym - warp_def 2, 72, 3, 15, PetalburgCity_Gym - warp_def 7, 40, 3, 24, PetalburgCity_Gym - warp_def 1, 53, 3, 26, PetalburgCity_Gym - warp_def 7, 53, 3, 28, PetalburgCity_Gym - warp_def 1, 66, 3, 30, PetalburgCity_Gym - warp_def 1, 20, 3, 20, PetalburgCity_Gym - warp_def 2, 20, 3, 20, PetalburgCity_Gym - warp_def 7, 20, 3, 21, PetalburgCity_Gym - warp_def 6, 20, 3, 21, PetalburgCity_Gym - warp_def 1, 33, 3, 22, PetalburgCity_Gym - warp_def 2, 33, 3, 22, PetalburgCity_Gym - warp_def 7, 33, 3, 23, PetalburgCity_Gym - warp_def 6, 33, 3, 23, PetalburgCity_Gym - warp_def 7, 14, 3, 34, PetalburgCity_Gym - warp_def 1, 27, 3, 36, PetalburgCity_Gym - warp_def 1, 7, 3, 32, PetalburgCity_Gym - warp_def 2, 7, 3, 32, PetalburgCity_Gym - warp_def 7, 7, 3, 33, PetalburgCity_Gym - warp_def 6, 7, 3, 33, PetalburgCity_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:: @ 8387388 bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index 2d6a28056..9faa2873a 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -3,8 +3,8 @@ PetalburgCity_House1_MapObjects:: @ 8387444 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0 PetalburgCity_House1_MapWarps:: @ 8387474 - warp_def 3, 8, 0, 0, PetalburgCity - warp_def 4, 8, 0, 0, PetalburgCity + warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY + warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 8387484 map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 0797b9bab..29a2226d1 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -3,8 +3,8 @@ PetalburgCity_House2_MapObjects:: @ 8387498 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0 PetalburgCity_House2_MapWarps:: @ 83874C8 - warp_def 3, 7, 0, 4, PetalburgCity - warp_def 4, 7, 0, 4, PetalburgCity + warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 83874D8 map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 2fbed4b9d..358618d7e 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -5,8 +5,8 @@ PetalburgCity_Mart_MapObjects:: @ 8387614 object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0 PetalburgCity_Mart_MapWarps:: @ 8387674 - warp_def 3, 7, 0, 5, PetalburgCity - warp_def 4, 7, 0, 5, PetalburgCity + warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 8387684 map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 5fb3186e5..8bdc1e1bf 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PetalburgCity_PokemonCenter_1F_MapObjects:: @ 83874EC object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 - warp_def 7, 8, 3, 3, PetalburgCity - warp_def 6, 8, 3, 3, PetalburgCity - warp_def 1, 6, 4, 0, PetalburgCity_PokemonCenter_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:: @ 838757C map_events PetalburgCity_PokemonCenter_1F_MapObjects, 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 eab3d7dd5..cdbefe565 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ PetalburgCity_PokemonCenter_2F_MapObjects:: @ 8387590 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 - warp_def 1, 5, 4, 2, PetalburgCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index 724b84f0f..4485f518d 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -3,8 +3,8 @@ PetalburgCity_WallysHouse_MapObjects:: @ 8387114 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps:: @ 8387144 - warp_def 3, 7, 0, 1, PetalburgCity - warp_def 4, 7, 0, 1, PetalburgCity + warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 8387154 map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index cb0ff7ca1..73a1d4cfb 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -14,12 +14,12 @@ PetalburgWoods_MapObjects:: @ 838C14C object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0 PetalburgWoods_MapWarps:: @ 838C284 - warp_def 14, 5, 0, 2, Route104 - warp_def 15, 5, 0, 3, Route104 - warp_def 16, 38, 0, 4, Route104 - warp_def 17, 38, 0, 5, Route104 - warp_def 36, 38, 0, 6, Route104 - warp_def 37, 38, 0, 7, Route104 + 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:: @ 838C2B4 coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 6ef149ab4..df26386b3 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0 RecordCorner_MapWarps:: @ 83913B4 - 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:: @ 83913D4 coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index b4c8a2834..8ddfab738 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -33,14 +33,14 @@ Route104_MapObjects:: @ 8381488 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 Route104_MapWarps:: @ 8381788 - warp_def 17, 50, 0, 0, Route104_MrBrineysHouse - warp_def 5, 18, 0, 0, Route104_PrettyPetalFlowerShop - warp_def 10, 30, 3, 0, PetalburgWoods - warp_def 11, 30, 3, 1, PetalburgWoods - warp_def 10, 38, 3, 2, PetalburgWoods - warp_def 11, 38, 3, 3, PetalburgWoods - warp_def 32, 42, 3, 4, PetalburgWoods - warp_def 33, 42, 3, 5, PetalburgWoods + 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_MapBGEvents:: @ 83817C8 bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index d8b2ff252..f04195c9b 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -3,8 +3,8 @@ Route104_MrBrineysHouse_MapObjects:: @ 838B654 object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0 Route104_MrBrineysHouse_MapWarps:: @ 838B684 - warp_def 5, 8, 0, 0, Route104 - warp_def 6, 8, 0, 0, Route104 + warp_def 5, 8, 0, 0, MAP_ROUTE104 + warp_def 6, 8, 0, 0, MAP_ROUTE104 Route104_MrBrineysHouse_MapEvents:: @ 838B694 map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 0c540e940..c02950add 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -4,8 +4,8 @@ Route104_PrettyPetalFlowerShop_MapObjects:: @ 838B6A8 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 - warp_def 2, 8, 0, 1, Route104 - warp_def 3, 8, 0, 1, Route104 + warp_def 2, 8, 0, 1, MAP_ROUTE104 + warp_def 3, 8, 0, 1, MAP_ROUTE104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc index 6748fe0ed..80dcf5108 100644 --- a/data/maps/events/Route104_Prototype.inc +++ b/data/maps/events/Route104_Prototype.inc @@ -13,7 +13,7 @@ Route104_Prototype_MapObjects:: @ 8391F2C object_event 12, MAP_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0 Route104_Prototype_MapWarps:: @ 839204C - warp_def 5, 24, 0, 0, Route104_PrototypePrettyPetalFlowerShop + warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP Route104_Prototype_MapBGEvents:: @ 8392054 bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc index 96cac1e71..4ec99895c 100644 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc @@ -2,8 +2,8 @@ Route104_PrototypePrettyPetalFlowerShop_MapObjects:: @ 8392080 object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0 Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 - warp_def 2, 8, 0, 0, Route104_Prototype - warp_def 3, 8, 0, 0, Route104_Prototype + warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE + warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 5f7f6c13d..7cf684e55 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -7,7 +7,7 @@ Route105_MapObjects:: @ 8381854 object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0 Route105_MapWarps:: @ 83818E4 - warp_def 9, 20, 0, 0, IslandCave + warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents:: @ 83818EC 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 51c093fe5..6af8d92fa 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -6,7 +6,7 @@ Route106_MapObjects:: @ 838190C object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, 1004, 0, 0 Route106_MapWarps:: @ 8381984 - warp_def 48, 16, 0, 0, GraniteCave_1F + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents:: @ 838198C 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 1f49a1e0c..ad695e8b9 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -5,7 +5,7 @@ Route108_MapObjects:: @ 8381A74 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0 Route108_MapWarps:: @ 8381AD4 - warp_def 29, 6, 3, 0, AbandonedShip_Deck + warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents:: @ 8381ADC 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 511579650..3156a5cb3 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -21,7 +21,7 @@ Route109_MapObjects:: @ 8381AFC object_event 20, MAP_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0 Route109_MapWarps:: @ 8381CDC - warp_def 12, 5, 0, 0, Route109_SeashoreHouse + warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents:: @ 8381CE4 bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 5036df1e7..abaf7abcc 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -5,8 +5,8 @@ Route109_SeashoreHouse_MapObjects:: @ 83920BC object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0 Route109_SeashoreHouse_MapWarps:: @ 839211C - warp_def 6, 9, 0, 0, Route109 - warp_def 7, 9, 0, 0, Route109 + warp_def 6, 9, 0, 0, MAP_ROUTE109 + warp_def 7, 9, 0, 0, MAP_ROUTE109 Route109_SeashoreHouse_MapEvents:: @ 839212C map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 3db4ce8e8..5c94ac7bc 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -32,12 +32,12 @@ Route110_MapObjects:: @ 8381D58 object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0 Route110_MapWarps:: @ 8382040 - warp_def 35, 24, 3, 0, NewMauville_Entrance - warp_def 11, 66, 0, 0, Route110_TrickHouseEntrance - warp_def 15, 16, 0, 0, Route110_SeasideCyclingRoadNorthEntrance - warp_def 18, 16, 0, 2, Route110_SeasideCyclingRoadNorthEntrance - warp_def 16, 88, 0, 0, Route110_SeasideCyclingRoadSouthEntrance - warp_def 19, 88, 0, 2, Route110_SeasideCyclingRoadSouthEntrance + 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:: @ 8382070 coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc index e1ca6b4de..9051ad929 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadNorthEntrance_MapObjects:: @ 8392CAC object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0 Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 - warp_def 1, 5, 0, 2, Route110 - warp_def 2, 5, 0, 2, Route110 - warp_def 12, 5, 0, 3, Route110 - warp_def 13, 5, 0, 3, Route110 + 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_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc index 24ae3600f..947cc714a 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadSouthEntrance_MapObjects:: @ 8392C40 object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0 Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 - warp_def 1, 5, 0, 4, Route110 - warp_def 2, 5, 0, 4, Route110 - warp_def 12, 5, 0, 5, Route110 - warp_def 13, 5, 0, 5, Route110 + 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_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc index 105701e55..4b7e39efd 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ b/data/maps/events/Route110_TrickHouseCorridor.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapWarps:: @ 8392228 - warp_def 13, 3, 3, 1, Route110_TrickHouseEnd - warp_def 14, 3, 3, 1, Route110_TrickHouseEnd - warp_def 4, 23, 3, 2, Route110_TrickHouseEntrance - warp_def 5, 23, 3, 2, Route110_TrickHouseEntrance + 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:: @ 8392248 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 f050e3270..bedc6357d 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -2,8 +2,8 @@ Route110_TrickHouseEnd_MapObjects:: @ 83921D0 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0 Route110_TrickHouseEnd_MapWarps:: @ 83921E8 - warp_def 10, 1, 3, 2, Route110_TrickHousePuzzle1 - warp_def 2, 1, 3, 0, Route110_TrickHouseCorridor + 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:: @ 83921F8 coord_event 2, 2, 3, 0, 0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index a1f67bd3d..59e329d98 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -2,9 +2,9 @@ Route110_TrickHouseEntrance_MapObjects:: @ 8392140 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0 Route110_TrickHouseEntrance_MapWarps:: @ 8392158 - warp_def 5, 7, 3, 1, Route110 - warp_def 6, 7, 3, 1, Route110 - warp_def 5, 2, 3, 0, Route110_TrickHousePuzzle1 + 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:: @ 8392170 coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 3660e3c3f..8a3bb24a3 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -20,9 +20,9 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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:: @ 839243C bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index d77fd66a1..f92097eec 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle2_MapObjects:: @ 839245C object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, 1061, 0, 0 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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:: @ 83924EC coord_event 14, 21, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index abccae1d4..9a666766f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -12,9 +12,9 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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:: @ 839266C coord_event 5, 20, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index ef450800d..26efce267 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -16,9 +16,9 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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:: @ 839287C bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index be38ef452..ac40ffef4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle5_MapObjects:: @ 839289C object_event 5, MAP_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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:: @ 839292C coord_event 8, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index 1e6c7869b..ad7c26e44 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, 1067, 0, 0 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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:: @ 8392AA4 bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index d5e4f14af..f666b4640 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, 1068, 0, 0 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + 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_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C coord_event 9, 2, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index accb0b3a2..0caa0e68d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, 1069, 0, 0 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 0, 0, Route110_TrickHouseEnd + 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:: @ 8392C20 bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e36cd7e74..6de5deba0 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -37,9 +37,9 @@ Route111_MapObjects:: @ 83821A0 object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0 Route111_MapWarps:: @ 8382500 - warp_def 13, 113, 0, 0, Route111_WinstrateFamilysHouse - warp_def 29, 87, 0, 0, DesertRuins - warp_def 26, 18, 0, 0, Route111_OldLadysRestStop + 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 Route111_MapCoordEvents:: @ 8382518 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index c295aa0c9..fbd9b7ab1 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -2,8 +2,8 @@ Route111_OldLadysRestStop_MapObjects:: @ 838B798 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0 Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 - warp_def 3, 7, 0, 2, Route111 - warp_def 4, 7, 0, 2, Route111 + warp_def 3, 7, 0, 2, MAP_ROUTE111 + warp_def 4, 7, 0, 2, MAP_ROUTE111 Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index 8cb265965..ef2286c97 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -5,8 +5,8 @@ Route111_WinstrateFamilysHouse_MapObjects:: @ 838B714 object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 - warp_def 3, 7, 0, 0, Route111 - warp_def 4, 7, 0, 0, Route111 + warp_def 3, 7, 0, 0, MAP_ROUTE111 + warp_def 4, 7, 0, 0, MAP_ROUTE111 Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index a4991a907..50b300bc9 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -13,12 +13,12 @@ Route112_MapObjects:: @ 8382818 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 Route112_MapWarps:: @ 8382938 - warp_def 28, 27, 0, 0, Route112_CableCarStation - warp_def 29, 27, 0, 1, Route112_CableCarStation - warp_def 6, 46, 3, 0, JaggedPass - warp_def 7, 46, 3, 1, JaggedPass - warp_def 11, 36, 0, 0, FieryPath - warp_def 22, 10, 0, 1, FieryPath + 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:: @ 8382968 bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index 6ca18059b..cc2dfa38a 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -3,8 +3,8 @@ Route112_CableCarStation_MapObjects:: @ 838B7D4 object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps:: @ 838B804 - warp_def 6, 11, 0, 0, Route112 - warp_def 7, 11, 0, 1, Route112 + warp_def 6, 11, 0, 0, MAP_ROUTE112 + warp_def 7, 11, 0, 1, MAP_ROUTE112 Route112_CableCarStation_MapEvents:: @ 838B814 map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index ee145eb76..4e9bd98b5 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -12,7 +12,7 @@ Route113_MapObjects:: @ 83829A0 object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0 Route113_MapWarps:: @ 8382AA8 - warp_def 33, 5, 0, 0, Route113_GlassWorkshop + warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP Route113_MapCoordEvents:: @ 8382AB0 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 68b47709d..74953c4da 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -3,8 +3,8 @@ Route113_GlassWorkshop_MapObjects:: @ 8392D18 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0 Route113_GlassWorkshop_MapWarps:: @ 8392D48 - warp_def 3, 8, 0, 0, Route113 - warp_def 4, 8, 0, 0, Route113 + warp_def 3, 8, 0, 0, MAP_ROUTE113 + warp_def 4, 8, 0, 0, MAP_ROUTE113 Route113_GlassWorkshop_MapEvents:: @ 8392D58 map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 1f4d761e3..4717199da 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -24,9 +24,9 @@ Route114_MapObjects:: @ 8382C48 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 Route114_MapWarps:: @ 8382E70 - warp_def 8, 63, 0, 0, MeteorFalls_1F_1R - warp_def 29, 5, 0, 0, Route114_FossilManiacsHouse - warp_def 27, 36, 0, 0, Route114_LanettesHouse + 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 Route114_MapBGEvents:: @ 8382E88 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index f7bf465e9..01fc6106f 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsHouse_MapObjects:: @ 838B87C object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps:: @ 838B894 - warp_def 4, 7, 0, 1, Route114 - warp_def 5, 7, 0, 1, Route114 - warp_def 4, 1, 0, 0, Route114_FossilManiacsTunnel + 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:: @ 838B8AC bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 89c231d7e..259445d43 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -2,8 +2,8 @@ Route114_FossilManiacsTunnel_MapObjects:: @ 838B8F0 object_event 1, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 - warp_def 6, 25, 3, 2, Route114_FossilManiacsHouse - warp_def 7, 25, 3, 2, Route114_FossilManiacsHouse + warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index e62f6e0ad..40ff30536 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -2,8 +2,8 @@ Route114_LanettesHouse_MapObjects:: @ 838B92C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0 Route114_LanettesHouse_MapWarps:: @ 838B944 - warp_def 5, 7, 0, 2, Route114 - warp_def 6, 7, 0, 2, Route114 + warp_def 5, 7, 0, 2, MAP_ROUTE114 + warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents:: @ 838B954 bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index ddca08fad..23250916c 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -17,7 +17,7 @@ Route115_MapObjects:: @ 8382F2C object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 Route115_MapWarps:: @ 83830AC - warp_def 27, 37, 0, 1, MeteorFalls_1F_1R + warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R Route115_MapBGEvents:: @ 83830B4 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 b5f922524..699ed4616 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -23,9 +23,9 @@ Route116_MapObjects:: @ 8383170 object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0 Route116_MapWarps:: @ 8383380 - warp_def 47, 8, 0, 0, RusturfTunnel - warp_def 38, 8, 0, 0, Route116_TunnelersRestHouse - warp_def 65, 10, 0, 2, RusturfTunnel + 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 Route116_MapCoordEvents:: @ 8383398 coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index 4e4553567..2676d7a68 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -4,8 +4,8 @@ Route116_TunnelersRestHouse_MapObjects:: @ 838B98C object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 - warp_def 4, 8, 0, 1, Route116 - warp_def 5, 8, 0, 1, Route116 + warp_def 4, 8, 0, 1, MAP_ROUTE116 + warp_def 5, 8, 0, 1, MAP_ROUTE116 Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index bf6aeb5d0..67d391044 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -22,7 +22,7 @@ Route117_MapObjects:: @ 8383440 object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0 Route117_MapWarps:: @ 8383638 - warp_def 51, 5, 0, 0, Route117_PokemonDayCare + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents:: @ 8383640 bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index 69ede9610..b1df05d06 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -2,8 +2,8 @@ Route117_PokemonDayCare_MapObjects:: @ 838B9F8 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0 Route117_PokemonDayCare_MapWarps:: @ 838BA10 - warp_def 2, 8, 0, 0, Route117 - warp_def 3, 8, 0, 0, Route117 + warp_def 2, 8, 0, 0, MAP_ROUTE117 + warp_def 3, 8, 0, 0, MAP_ROUTE117 Route117_PokemonDayCare_MapEvents:: @ 838BA20 map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 08e6e3649..491f5b469 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -38,8 +38,8 @@ Route119_MapObjects:: @ 8383914 object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0 Route119_MapWarps:: @ 8383C8C - warp_def 6, 32, 0, 0, Route119_WeatherInstitute_1F - warp_def 33, 109, 0, 0, Route119_House + warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F + warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5 diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 45267ca0e..255913651 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -8,8 +8,8 @@ Route119_House_MapObjects:: @ 8392F40 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 Route119_House_MapWarps:: @ 8392FE8 - warp_def 3, 8, 0, 1, Route119 - warp_def 4, 8, 0, 1, Route119 + warp_def 3, 8, 0, 1, MAP_ROUTE119 + warp_def 4, 8, 0, 1, MAP_ROUTE119 Route119_House_MapEvents:: @ 8392FF8 map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 1472fb569..58c20fc6e 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -6,9 +6,9 @@ Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 - warp_def 9, 12, 0, 0, Route119 - warp_def 10, 12, 0, 0, Route119 - warp_def 17, 1, 0, 0, Route119_WeatherInstitute_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:: @ 8392E50 bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index d2dbce24d..b78eb76d6 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 - warp_def 17, 1, 0, 2, Route119_WeatherInstitute_1F + warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 81fa21c7f..febefb26a 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -42,8 +42,8 @@ Route120_MapObjects:: @ 8383F30 object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0 Route120_MapWarps:: @ 8384308 - warp_def 7, 55, 0, 0, AncientTomb - warp_def 19, 23, 1, 0, ScorchedSlab + warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB + warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents:: @ 8384318 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 9961344a8..94de6ed39 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -23,7 +23,7 @@ Route121_MapObjects:: @ 8384504 object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 Route121_MapWarps:: @ 8384714 - warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance + warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index c3880d4b3..68ee79ca1 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -4,10 +4,10 @@ Route121_SafariZoneEntrance_MapObjects:: @ 838BA34 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C - warp_def 2, 5, 0, 0, SafariZone_Southeast - warp_def 3, 5, 0, 0, SafariZone_Southeast - warp_def 14, 13, 0, 0, Route121 - warp_def 15, 13, 0, 0, Route121 + warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 14, 13, 0, 0, MAP_ROUTE121 + warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C coord_event 8, 4, 3, 0, 0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc index 217c28ee1..3bad2b895 100644 --- a/data/maps/events/Route122.inc +++ b/data/maps/events/Route122.inc @@ -1,5 +1,5 @@ Route122_MapWarps:: @ 83847DC - warp_def 22, 29, 0, 0, MtPyre_1F + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F Route122_MapEvents:: @ 83847E4 map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index dc5ac0fb4..f29d5d242 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -35,7 +35,7 @@ Route123_MapObjects:: @ 83847F8 object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, 1109, 0, 0 Route123_MapWarps:: @ 8384B28 - warp_def 22, 6, 0, 0, Route123_BerryMastersHouse + warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents:: @ 8384B30 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 183e19415..a17a04e19 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -3,8 +3,8 @@ Route123_BerryMastersHouse_MapObjects:: @ 8392D6C object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0 Route123_BerryMastersHouse_MapWarps:: @ 8392D9C - warp_def 3, 7, 0, 0, Route123 - warp_def 4, 7, 0, 0, Route123 + warp_def 3, 7, 0, 0, MAP_ROUTE123 + warp_def 4, 7, 0, 0, MAP_ROUTE123 Route123_BerryMastersHouse_MapEvents:: @ 8392DAC map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 83db7f24b..7001c5928 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -11,7 +11,7 @@ Route124_MapObjects:: @ 8384D10 object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0 Route124_MapWarps:: @ 8384E00 - warp_def 70, 48, 3, 0, Route124_DivingTreasureHuntersHouse + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents:: @ 8384E08 bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 5d60c795e..17ec713de 100755 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -2,8 +2,8 @@ Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 - warp_def 3, 8, 0, 0, Route124 - warp_def 4, 8, 0, 0, Route124 + warp_def 3, 8, 0, 0, MAP_ROUTE124 + warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 0c7d12643..585296ac3 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -8,7 +8,7 @@ Route125_MapObjects:: @ 8384E28 object_event 7, MAP_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0 Route125_MapWarps:: @ 8384ED0 - warp_def 22, 19, 0, 0, ShoalCave_LowTideEntranceRoom + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents:: @ 8384ED8 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 ed1a33768..d387233d2 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -7,7 +7,7 @@ Route131_MapObjects:: @ 8385298 object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0 Route131_MapWarps:: @ 8385328 - warp_def 36, 6, 3, 0, SkyPillar_Entrance + warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 8385330 map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 4bbf0a6a2..f42fd059c 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -15,18 +15,18 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0 RustboroCity_MapWarps:: @ 837FE64 - warp_def 27, 19, 0, 0, RustboroCity_Gym - warp_def 13, 30, 0, 0, RustboroCity_Flat1_1F - warp_def 16, 45, 0, 0, RustboroCity_Mart - warp_def 16, 38, 0, 0, RustboroCity_PokemonCenter_1F - warp_def 27, 34, 0, 0, RustboroCity_PokemonSchool - warp_def 11, 15, 0, 0, RustboroCity_DevonCorp_1F - warp_def 12, 15, 0, 1, RustboroCity_DevonCorp_1F - warp_def 33, 19, 0, 0, RustboroCity_House1 - warp_def 9, 38, 0, 0, RustboroCity_CuttersHouse - warp_def 30, 28, 0, 0, RustboroCity_House2 - warp_def 5, 51, 0, 0, RustboroCity_Flat2_1F - warp_def 26, 46, 0, 0, RustboroCity_House3 + 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:: @ 837FEC4 coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481 diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index b38fc9afe..e26127f38 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -3,8 +3,8 @@ RustboroCity_CuttersHouse_MapObjects:: @ 8388D9C object_event 2, MAP_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC - warp_def 5, 8, 0, 8, RustboroCity - warp_def 6, 8, 0, 8, RustboroCity + warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 72437229c..165089ee7 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -4,9 +4,9 @@ RustboroCity_DevonCorp_1F_MapObjects:: @ 838880C object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 - warp_def 5, 8, 0, 5, RustboroCity - warp_def 6, 8, 0, 6, RustboroCity - warp_def 14, 1, 0, 0, RustboroCity_DevonCorp_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_MapEvents:: @ 838886C map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index 3ca57bf10..93335d22e 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -6,8 +6,8 @@ RustboroCity_DevonCorp_2F_MapObjects:: @ 8388880 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 - warp_def 14, 1, 0, 2, RustboroCity_DevonCorp_1F - warp_def 2, 1, 0, 0, RustboroCity_DevonCorp_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:: @ 8388908 map_events RustboroCity_DevonCorp_2F_MapObjects, 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 f0f8fadec..8e2aef57b 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 - warp_def 2, 1, 0, 1, RustboroCity_DevonCorp_2F + warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index 9c637f0fb..d44df7638 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat1_1F_MapObjects:: @ 8388CB8 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 - warp_def 6, 7, 0, 1, RustboroCity - warp_def 7, 7, 0, 1, RustboroCity - warp_def 2, 1, 0, 0, RustboroCity_Flat1_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:: @ 8388D00 map_events RustboroCity_Flat1_1F_MapObjects, 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 2d1d187e9..91f1d2f20 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -2,7 +2,7 @@ RustboroCity_Flat1_2F_MapObjects:: @ 8388D14 object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C - warp_def 2, 1, 0, 2, RustboroCity_Flat1_1F + warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 map_events RustboroCity_Flat1_2F_MapObjects, 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 bd9f4904e..17c11b21f 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat2_1F_MapObjects:: @ 8388E44 object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 - warp_def 2, 8, 0, 10, RustboroCity - warp_def 3, 8, 0, 10, RustboroCity - warp_def 3, 1, 0, 0, RustboroCity_Flat2_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:: @ 8388E8C map_events RustboroCity_Flat2_1F_MapObjects, 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 988e3797d..b881e1bd2 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -3,8 +3,8 @@ RustboroCity_Flat2_2F_MapObjects:: @ 8388EA0 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 - warp_def 3, 1, 0, 2, RustboroCity_Flat2_1F - warp_def 1, 1, 0, 0, RustboroCity_Flat2_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:: @ 8388EE0 map_events RustboroCity_Flat2_2F_MapObjects, 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 3c09ce553..4a00bb8f4 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F_MapObjects:: @ 8388EF4 object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 - warp_def 1, 1, 0, 1, RustboroCity_Flat2_2F + warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index cfe9f420d..e77b55b7f 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -5,8 +5,8 @@ RustboroCity_Gym_MapObjects:: @ 8388998 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0 RustboroCity_Gym_MapWarps:: @ 83889F8 - warp_def 5, 18, 0, 0, RustboroCity - warp_def 6, 18, 0, 0, RustboroCity + warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY + warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents:: @ 8388A08 bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index 8e1cb1c7e..a6471da2e 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -3,8 +3,8 @@ RustboroCity_House1_MapObjects:: @ 8388D48 object_event 2, MAP_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0 RustboroCity_House1_MapWarps:: @ 8388D78 - warp_def 5, 7, 0, 7, RustboroCity - warp_def 6, 7, 0, 7, RustboroCity + warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY + warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8388D88 map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 33159faa4..5cdb4fc6c 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -3,8 +3,8 @@ RustboroCity_House2_MapObjects:: @ 8388DF0 object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0 RustboroCity_House2_MapWarps:: @ 8388E20 - warp_def 5, 8, 0, 9, RustboroCity - warp_def 6, 8, 0, 9, RustboroCity + warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8388E30 map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 696350f00..96c2f2699 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -4,8 +4,8 @@ RustboroCity_House3_MapObjects:: @ 8388F40 object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0 RustboroCity_House3_MapWarps:: @ 8388F88 - warp_def 5, 8, 0, 11, RustboroCity - warp_def 6, 8, 0, 11, RustboroCity + warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8388F98 map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index 3949dcd2e..b95aa32af 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -5,8 +5,8 @@ RustboroCity_Mart_MapObjects:: @ 8388C34 object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0 RustboroCity_Mart_MapWarps:: @ 8388C94 - warp_def 3, 7, 0, 2, RustboroCity - warp_def 4, 7, 0, 2, RustboroCity + warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY + warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 8388CA4 map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index a0e7a3f76..83655d001 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_1F_MapObjects:: @ 8388B24 object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 - warp_def 7, 8, 3, 3, RustboroCity - warp_def 6, 8, 3, 3, RustboroCity - warp_def 1, 6, 4, 0, RustboroCity_PokemonCenter_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:: @ 8388B9C map_events RustboroCity_PokemonCenter_1F_MapObjects, 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 c75817126..d0c39d80f 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ RustboroCity_PokemonCenter_2F_MapObjects:: @ 8388BB0 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 - warp_def 1, 5, 4, 2, RustboroCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index 5ae481bad..ef873edb8 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -7,8 +7,8 @@ RustboroCity_PokemonSchool_MapObjects:: @ 8388A34 object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0 RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 - warp_def 5, 10, 0, 4, RustboroCity - warp_def 6, 10, 0, 4, RustboroCity + warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY + warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index ef1559687..4779473d8 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -11,9 +11,9 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 RusturfTunnel_MapWarps:: @ 838BE1C - warp_def 4, 10, 3, 0, Route116 - warp_def 29, 16, 3, 4, VerdanturfTown - warp_def 18, 20, 3, 2, Route116 + 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:: @ 838BE34 coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index b7eb1eb8f..94b84a968 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -5,15 +5,15 @@ SSTidalCorridor_MapObjects:: @ 83916F8 object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, 950, 0, 0 SSTidalCorridor_MapWarps:: @ 8391758 - warp_def 4, 9, 3, 0, SSTidalRooms - warp_def 7, 9, 3, 2, SSTidalRooms - warp_def 10, 9, 3, 4, SSTidalRooms - warp_def 13, 9, 3, 6, SSTidalRooms - warp_def 4, 3, 3, 8, SSTidalRooms - warp_def 7, 3, 3, 9, SSTidalRooms - warp_def 10, 3, 3, 10, SSTidalRooms - warp_def 13, 3, 3, 11, SSTidalRooms - warp_def 16, 2, 3, 0, SSTidalLowerDeck + 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:: @ 83917A0 bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 6e8530c36..74c8458ce 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck_MapObjects:: @ 8391844 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0 SSTidalLowerDeck_MapWarps:: @ 8391874 - warp_def 15, 2, 3, 8, SSTidalCorridor + warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents:: @ 839187C 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 0ffe1cbe7..82758cc57 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -9,18 +9,18 @@ SSTidalRooms_MapObjects:: @ 839189C object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, 951, 0, 0 SSTidalRooms_MapWarps:: @ 839195C - warp_def 4, 16, 0, 0, SSTidalCorridor - warp_def 5, 16, 0, 0, SSTidalCorridor - warp_def 13, 16, 0, 1, SSTidalCorridor - warp_def 14, 16, 0, 1, SSTidalCorridor - warp_def 22, 16, 0, 2, SSTidalCorridor - warp_def 23, 16, 0, 2, SSTidalCorridor - warp_def 31, 16, 0, 3, SSTidalCorridor - warp_def 32, 16, 0, 3, SSTidalCorridor - warp_def 4, 1, 0, 4, SSTidalCorridor - warp_def 13, 1, 0, 5, SSTidalCorridor - warp_def 22, 1, 0, 6, SSTidalCorridor - warp_def 31, 1, 0, 7, SSTidalCorridor + 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:: @ 83919BC bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index d6de3f747..f52e734b7 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -4,8 +4,8 @@ SafariZone_RestHouse_MapObjects:: @ 8391EC0 object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0 SafariZone_RestHouse_MapWarps:: @ 8391F08 - warp_def 3, 8, 0, 0, SafariZone_Southwest - warp_def 4, 8, 0, 0, SafariZone_Southwest + warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 8391F18 map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index d67f018ab..c40dc967d 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -5,7 +5,7 @@ SafariZone_Southeast_MapObjects:: @ 8391B70 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0 SafariZone_Southeast_MapWarps:: @ 8391BD0 - warp_def 32, 33, 0, 0, Route121_SafariZoneEntrance + warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE SafariZone_Southeast_MapEvents:: @ 8391BD8 map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index 4f7f21de5..db8420a33 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -3,7 +3,7 @@ SafariZone_Southwest_MapObjects:: @ 8391B18 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, 1131, 0, 0 SafariZone_Southwest_MapWarps:: @ 8391B48 - warp_def 29, 7, 3, 0, SafariZone_RestHouse + warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents:: @ 8391B50 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 4b6625b52..9ba2d3098 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -2,7 +2,7 @@ ScorchedSlab_MapObjects:: @ 838E988 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, 1079, 0, 0 ScorchedSlab_MapWarps:: @ 838E9A0 - warp_def 7, 16, 1, 1, Route120 + warp_def 7, 16, 1, 1, MAP_ROUTE120 ScorchedSlab_MapEvents:: @ 838E9A8 map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index a7f08532c..4f6fa0c07 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,6 +1,6 @@ SeafloorCavern_Entrance_MapWarps:: @ 838D094 - warp_def 10, 18, 3, 0, Underwater4 - warp_def 10, 1, 3, 0, SeafloorCavern_Room1 + warp_def 10, 18, 3, 0, MAP_UNDERWATER4 + warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 093934481..c9d62777f 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -6,9 +6,9 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 SeafloorCavern_Room1_MapWarps:: @ 838D130 - warp_def 5, 18, 3, 1, SeafloorCavern_Entrance - warp_def 17, 13, 3, 0, SeafloorCavern_Room5 - warp_def 6, 2, 3, 0, SeafloorCavern_Room2 + 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:: @ 838D148 map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 86a0354e4..6a276fc3f 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -10,10 +10,10 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 - warp_def 12, 19, 3, 2, SeafloorCavern_Room1 - warp_def 5, 19, 3, 0, SeafloorCavern_Room4 - warp_def 5, 2, 3, 0, SeafloorCavern_Room6 - warp_def 12, 2, 3, 0, SeafloorCavern_Room7 + warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 + warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 SeafloorCavern_Room2_MapEvents:: @ 838D254 map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 5c5c9c219..8c6e2b4a2 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -11,9 +11,9 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 - warp_def 8, 1, 3, 1, SeafloorCavern_Room8 - warp_def 10, 13, 3, 1, SeafloorCavern_Room7 - warp_def 4, 15, 3, 1, SeafloorCavern_Room6 + warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 + warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 + warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 SeafloorCavern_Room3_MapEvents:: @ 838D370 map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 3233123b3..26016edf3 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -2,10 +2,10 @@ SeafloorCavern_Room4_MapObjects:: @ 838D384 object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, 946, 0, 0 SeafloorCavern_Room4_MapWarps:: @ 838D39C - warp_def 13, 1, 3, 1, SeafloorCavern_Room2 - warp_def 4, 1, 3, 1, SeafloorCavern_Room5 - warp_def 9, 10, 3, 2, SeafloorCavern_Room5 - warp_def 10, 15, 3, 1, SeafloorCavern_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:: @ 838D3BC map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 37a501512..c31d31042 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -7,9 +7,9 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 - warp_def 4, 1, 3, 1, SeafloorCavern_Room1 - warp_def 15, 12, 3, 1, SeafloorCavern_Room4 - warp_def 7, 17, 3, 2, SeafloorCavern_Room4 + 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:: @ 838D478 map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc index 9055af75b..adf36455a 100644 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ b/data/maps/events/SeafloorCavern_Room6.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room6_MapWarps:: @ 838D48C - warp_def 11, 21, 3, 2, SeafloorCavern_Room2 - warp_def 4, 1, 3, 2, SeafloorCavern_Room3 - warp_def 14, 8, 1, 1, SeafloorCavern_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:: @ 838D4A4 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 7125027fd..616376e32 100644 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ b/data/maps/events/SeafloorCavern_Room7.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room7_MapWarps:: @ 838D4B8 - warp_def 3, 23, 3, 3, SeafloorCavern_Room2 - warp_def 5, 1, 3, 1, SeafloorCavern_Room3 + warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room7_MapEvents:: @ 838D4C8 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 2d7329aec..93c93e4a0 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -13,8 +13,8 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC - warp_def 5, 2, 3, 0, SeafloorCavern_Room9 - warp_def 5, 12, 3, 0, SeafloorCavern_Room3 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 + warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room8_MapEvents:: @ 838D60C map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 2fccd4fec..414ab7e07 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 - warp_def 5, 4, 3, 0, SeafloorCavern_Room8 + warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc index 260de2dd9..a457a4e03 100644 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ b/data/maps/events/SealedChamber_InnerRoom.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom_MapWarps:: @ 838E900 - warp_def 10, 19, 3, 0, SealedChamber_OuterRoom + warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc index 5251d401a..634f41f60 100644 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ b/data/maps/events/SealedChamber_OuterRoom.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom_MapWarps:: @ 838E788 - warp_def 10, 2, 3, 0, SealedChamber_InnerRoom + warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index dd73f50a8..53d359f53 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BlueCave1_MapEvents:: @ 838F2FC map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index 9b2b6e885..ee1d5ddd0 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C - warp_def 7, 5, 0, 126, None + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_BlueCave2_MapEvents:: @ 838FC14 map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index dd37c2ac5..453937fc6 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 - warp_def 4, 15, 0, 126, None + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave3_MapEvents:: @ 839052C map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 23ec030e7..28cfa89a3 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C - warp_def 4, 15, 0, 126, None + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave4_MapEvents:: @ 8390E44 map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 0fcac5940..10adecc59 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BrownCave1_MapEvents:: @ 838F178 map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index c305485b8..098499878 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 - warp_def 1, 7, 0, 126, None + warp_def 1, 7, 0, 126, MAP_NONE SecretBase_BrownCave2_MapEvents:: @ 838FA90 map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 65b38542f..34167d50b 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 - warp_def 11, 9, 0, 126, None + warp_def 11, 9, 0, 126, MAP_NONE SecretBase_BrownCave3_MapEvents:: @ 83903A8 map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index 782671574..c1e884155 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 - warp_def 2, 8, 0, 126, None + warp_def 2, 8, 0, 126, MAP_NONE SecretBase_BrownCave4_MapEvents:: @ 8390CC0 map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index b30608dbc..b9700b06f 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_RedCave1_MapEvents:: @ 838EFF4 map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index eb247278b..b13f03a74 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -16,7 +16,7 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 - warp_def 3, 14, 0, 126, None + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_RedCave2_MapEvents:: @ 838F90C map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index f71021236..209979af3 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -16,7 +16,7 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C - warp_def 3, 6, 0, 126, None + warp_def 3, 6, 0, 126, MAP_NONE SecretBase_RedCave3_MapEvents:: @ 8390224 map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 2ed7c8af5..93b552df0 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -16,7 +16,7 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 - warp_def 2, 12, 0, 126, None + warp_def 2, 12, 0, 126, MAP_NONE SecretBase_RedCave4_MapEvents:: @ 8390B3C map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 23387eede..4f3fc1011 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -16,7 +16,7 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Shrub1_MapEvents:: @ 838F788 map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 090a9b0d6..43d752db7 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -16,7 +16,7 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 - warp_def 7, 5, 0, 126, None + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_Shrub2_MapEvents:: @ 83900A0 map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 7f4370f2d..80bc2a787 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -16,7 +16,7 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 - warp_def 6, 9, 0, 126, None + warp_def 6, 9, 0, 126, MAP_NONE SecretBase_Shrub3_MapEvents:: @ 83909B8 map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 6aa04277c..1e72213d8 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -16,7 +16,7 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 - warp_def 11, 8, 0, 126, None + warp_def 11, 8, 0, 126, MAP_NONE SecretBase_Shrub4_MapEvents:: @ 83912D0 map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index a5d9e2fad..a7e0ff822 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -16,7 +16,7 @@ SecretBase_Tree1_MapObjects:: @ 838F494 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Tree1_MapEvents:: @ 838F604 map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index 8089c6605..3d58e58a5 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -16,7 +16,7 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 - warp_def 3, 14, 0, 126, None + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_Tree2_MapEvents:: @ 838FF1C map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index a77f56364..18f2e0329 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -16,7 +16,7 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C - warp_def 8, 6, 0, 126, None + warp_def 8, 6, 0, 126, MAP_NONE SecretBase_Tree3_MapEvents:: @ 8390834 map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index c687e3e48..c4e1fc225 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -16,7 +16,7 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 - warp_def 7, 12, 0, 126, None + warp_def 7, 12, 0, 126, MAP_NONE SecretBase_Tree4_MapEvents:: @ 839114C map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 8d8e2bece..5ae83e9a8 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_YellowCave1_MapEvents:: @ 838F480 map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 99cef474a..d2dab3900 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 - warp_def 12, 7, 0, 126, None + warp_def 12, 7, 0, 126, MAP_NONE SecretBase_YellowCave2_MapEvents:: @ 838FD98 map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index 82eef2946..ef6c9a406 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 - warp_def 5, 9, 0, 126, None + warp_def 5, 9, 0, 126, MAP_NONE SecretBase_YellowCave3_MapEvents:: @ 83906B0 map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 545f65e04..9ef977a9a 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 - warp_def 6, 12, 0, 126, None + warp_def 6, 12, 0, 126, MAP_NONE SecretBase_YellowCave4_MapEvents:: @ 8390FC8 map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index a9381d0c4..33e8b8c6c 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C - warp_def 20, 30, 3, 0, Route125 - warp_def 19, 5, 3, 0, ShoalCave_LowTideInnerRoom - warp_def 6, 2, 3, 6, ShoalCave_LowTideInnerRoom - warp_def 27, 2, 3, 7, ShoalCave_LowTideInnerRoom + 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:: @ 838DD2C map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 2d5958a37..7573a7040 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, 1113, 0, 0 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 - warp_def 17, 10, 3, 3, ShoalCave_LowTideLowerRoom + warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 954c4c5e9..43a108e66 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -2,14 +2,14 @@ ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, 1082, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 - warp_def 34, 29, 3, 1, ShoalCave_LowTideEntranceRoom - warp_def 38, 15, 3, 0, ShoalCave_LowTideStairsRoom - warp_def 42, 4, 3, 1, ShoalCave_LowTideStairsRoom - warp_def 19, 14, 4, 0, ShoalCave_LowTideLowerRoom - warp_def 15, 19, 3, 1, ShoalCave_LowTideLowerRoom - warp_def 30, 25, 3, 2, ShoalCave_LowTideLowerRoom - warp_def 14, 33, 5, 2, ShoalCave_LowTideEntranceRoom - warp_def 40, 33, 5, 3, ShoalCave_LowTideEntranceRoom + 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:: @ 838DD98 bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 858f919e0..5549afed7 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C - warp_def 7, 2, 3, 3, ShoalCave_LowTideInnerRoom - warp_def 2, 6, 3, 4, ShoalCave_LowTideInnerRoom - warp_def 19, 11, 3, 5, ShoalCave_LowTideInnerRoom - warp_def 28, 11, 3, 0, ShoalCave_LowTideIceRoom + 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:: @ 838DE8C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 878b1fca0..68f933e2b 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -2,8 +2,8 @@ ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, 1083, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C - warp_def 3, 12, 3, 1, ShoalCave_LowTideInnerRoom - warp_def 7, 4, 3, 2, ShoalCave_LowTideInnerRoom + 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:: @ 838DE1C bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 68615ad3e..181195444 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0 SingleBattleColosseum_MapWarps:: @ 83912FC - 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:: @ 839130C coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc index eaf7fa955..2af7aaa76 100644 --- a/data/maps/events/SkyPillar_1F.inc +++ b/data/maps/events/SkyPillar_1F.inc @@ -1,7 +1,7 @@ SkyPillar_1F_MapWarps:: @ 838ED38 - warp_def 6, 13, 3, 1, SkyPillar_Outside - warp_def 7, 13, 3, 1, SkyPillar_Outside - warp_def 10, 1, 3, 0, SkyPillar_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:: @ 838ED50 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 ffd0d7d25..48fcb9fec 100644 --- a/data/maps/events/SkyPillar_2F.inc +++ b/data/maps/events/SkyPillar_2F.inc @@ -1,6 +1,6 @@ SkyPillar_2F_MapWarps:: @ 838ED64 - warp_def 10, 1, 3, 2, SkyPillar_1F - warp_def 3, 1, 3, 0, SkyPillar_3F + warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F SkyPillar_2F_MapEvents:: @ 838ED74 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 c34440ab7..4aeda3339 100644 --- a/data/maps/events/SkyPillar_3F.inc +++ b/data/maps/events/SkyPillar_3F.inc @@ -1,7 +1,7 @@ SkyPillar_3F_MapWarps:: @ 838ED88 - warp_def 3, 1, 3, 1, SkyPillar_2F - warp_def 11, 1, 3, 0, SkyPillar_4F - warp_def 7, 1, 3, 1, SkyPillar_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:: @ 838EDA0 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 77586a25a..3e908ed74 100644 --- a/data/maps/events/SkyPillar_4F.inc +++ b/data/maps/events/SkyPillar_4F.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapWarps:: @ 838EDB4 - warp_def 11, 1, 3, 1, SkyPillar_3F - warp_def 7, 1, 3, 2, SkyPillar_3F - warp_def 3, 1, 3, 0, SkyPillar_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:: @ 838EDCC 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 7c4ea5a97..badae77af 100644 --- a/data/maps/events/SkyPillar_5F.inc +++ b/data/maps/events/SkyPillar_5F.inc @@ -1,6 +1,6 @@ SkyPillar_5F_MapWarps:: @ 838EE2C - warp_def 3, 1, 3, 2, SkyPillar_4F - warp_def 10, 1, 3, 0, SkyPillar_Top + warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP SkyPillar_5F_MapEvents:: @ 838EE3C 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 d27442989..904b3b9ae 100644 --- a/data/maps/events/SkyPillar_Entrance.inc +++ b/data/maps/events/SkyPillar_Entrance.inc @@ -1,6 +1,6 @@ SkyPillar_Entrance_MapWarps:: @ 838ECF0 - warp_def 6, 16, 3, 0, Route131 - warp_def 14, 4, 3, 0, SkyPillar_Outside + warp_def 6, 16, 3, 0, MAP_ROUTE131 + warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE SkyPillar_Entrance_MapEvents:: @ 838ED00 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 05ffe4df8..120cd982b 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,6 +1,6 @@ SkyPillar_Outside_MapWarps:: @ 838ED14 - warp_def 17, 13, 3, 1, SkyPillar_Entrance - warp_def 14, 5, 3, 0, SkyPillar_1F + warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE + warp_def 14, 5, 3, 0, MAP_SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 838ED24 map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 6c9d8abc6..e7ef67860 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -2,7 +2,7 @@ SkyPillar_Top_MapObjects:: @ 838EE50 object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0 SkyPillar_Top_MapWarps:: @ 838EE68 - warp_def 16, 14, 3, 1, SkyPillar_5F + warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapEvents:: @ 838EE70 map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index bef2bf0d9..35416b72d 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -32,17 +32,17 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0 SlateportCity_MapWarps:: @ 837FA94 - warp_def 19, 19, 0, 0, SlateportCity_PokemonCenter_1F - warp_def 13, 26, 0, 0, SlateportCity_Mart - warp_def 26, 38, 0, 0, SlateportCity_SternsShipyard_1F - warp_def 10, 12, 0, 0, SlateportCity_ContestLobby - warp_def 4, 26, 0, 0, SlateportCity_PokemonFanClub - warp_def 30, 26, 0, 0, SlateportCity_OceanicMuseum_1F - warp_def 5, 19, 0, 0, SlateportCity_House1 - warp_def 31, 26, 0, 1, SlateportCity_OceanicMuseum_1F - warp_def 28, 12, 0, 0, SlateportCity_Harbor - warp_def 40, 7, 0, 2, SlateportCity_Harbor - warp_def 21, 44, 0, 0, SlateportCity_House2 + 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_CONTEST_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_MapBGEvents:: @ 837FAEC bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc index ae3e4ea7b..6bb6a4285 100644 --- a/data/maps/events/SlateportCity_ContestHall.inc +++ b/data/maps/events/SlateportCity_ContestHall.inc @@ -14,8 +14,8 @@ SlateportCity_ContestHall_MapObjects:: @ 83878A4 object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0 SlateportCity_ContestHall_MapWarps:: @ 83879DC - warp_def 10, 17, 0, 2, SlateportCity_ContestLobby - warp_def 11, 17, 0, 2, SlateportCity_ContestLobby + warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY SlateportCity_ContestHall_MapBGEvents:: @ 83879EC bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc index 74a8bc131..09e6c23fb 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/events/SlateportCity_ContestLobby.inc @@ -9,9 +9,9 @@ SlateportCity_ContestLobby_MapObjects:: @ 8387788 object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0 SlateportCity_ContestLobby_MapWarps:: @ 8387848 - warp_def 5, 6, 0, 3, SlateportCity - warp_def 6, 6, 0, 3, SlateportCity - warp_def 1, 1, 0, 0, SlateportCity_ContestHall + warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 3fbbd72c2..c2f2d5afb 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -9,10 +9,10 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 - warp_def 11, 14, 0, 8, SlateportCity - warp_def 12, 14, 0, 8, SlateportCity - warp_def 19, 15, 0, 9, SlateportCity - warp_def 20, 15, 0, 9, SlateportCity + 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:: @ 8388010 coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 3379b7fef..6f5f72944 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -2,8 +2,8 @@ SlateportCity_House1_MapObjects:: @ 8387A18 object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0 SlateportCity_House1_MapWarps:: @ 8387A30 - warp_def 3, 7, 0, 6, SlateportCity - warp_def 4, 7, 0, 6, SlateportCity + warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 8387A40 map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index a147ec7ce..ae3f01900 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -3,8 +3,8 @@ SlateportCity_House2_MapObjects:: @ 8388064 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0 SlateportCity_House2_MapWarps:: @ 8388094 - warp_def 3, 7, 0, 10, SlateportCity - warp_def 4, 7, 0, 10, SlateportCity + warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 83880A4 map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index 54072eccc..ae111b933 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -4,8 +4,8 @@ SlateportCity_Mart_MapObjects:: @ 83881B0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0 SlateportCity_Mart_MapWarps:: @ 83881F8 - warp_def 3, 7, 0, 1, SlateportCity - warp_def 4, 7, 0, 1, SlateportCity + warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 8388208 map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 9756d6745..ede07b801 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -15,9 +15,9 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, 961, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 - warp_def 9, 8, 0, 5, SlateportCity - warp_def 10, 8, 0, 7, SlateportCity - warp_def 6, 1, 0, 0, SlateportCity_OceanicMuseum_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:: @ 8387CA0 coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index a081e15d3..67d7a6b18 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 - warp_def 6, 1, 0, 2, SlateportCity_OceanicMuseum_1F + warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index dfd38dc51..bdfabe5c6 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SlateportCity_PokemonCenter_1F_MapObjects:: @ 83880B8 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 - warp_def 7, 8, 3, 0, SlateportCity - warp_def 6, 8, 3, 0, SlateportCity - warp_def 1, 6, 4, 0, SlateportCity_PokemonCenter_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:: @ 8388118 map_events SlateportCity_PokemonCenter_1F_MapObjects, 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 db723fa33..2ecc48423 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ SlateportCity_PokemonCenter_2F_MapObjects:: @ 838812C object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 - warp_def 1, 5, 4, 2, SlateportCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index 8003a3439..481886da8 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -9,8 +9,8 @@ SlateportCity_PokemonFanClub_MapObjects:: @ 8387A54 object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 - warp_def 6, 10, 0, 4, SlateportCity - warp_def 7, 10, 0, 4, SlateportCity + warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY + warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 38d14fa4e..8999b6887 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -5,9 +5,9 @@ SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698 object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 - warp_def 2, 14, 0, 2, SlateportCity - warp_def 3, 14, 0, 2, SlateportCity - warp_def 3, 1, 0, 0, SlateportCity_SternsShipyard_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:: @ 8387710 map_events SlateportCity_SternsShipyard_1F_MapObjects, 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 cd26ed1cc..e6d3e7636 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -4,7 +4,7 @@ SlateportCity_SternsShipyard_2F_MapObjects:: @ 8387724 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C - warp_def 3, 1, 0, 2, SlateportCity_SternsShipyard_1F + warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index a93db6a93..ed78d9136 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -12,18 +12,18 @@ SootopolisCity_MapObjects:: @ 8380608 object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0 SootopolisCity_MapWarps:: @ 8380710 - warp_def 43, 31, 0, 0, SootopolisCity_PokemonCenter_1F - warp_def 17, 29, 0, 0, SootopolisCity_Mart - warp_def 31, 32, 0, 0, SootopolisCity_Gym_1F - warp_def 31, 16, 3, 0, CaveOfOrigin_Entrance - warp_def 9, 6, 0, 0, SootopolisCity_House1 - warp_def 45, 6, 0, 0, SootopolisCity_House2 - warp_def 9, 17, 0, 0, SootopolisCity_House3 - warp_def 44, 17, 0, 0, SootopolisCity_House4 - warp_def 9, 26, 0, 0, SootopolisCity_House5 - warp_def 53, 28, 0, 0, SootopolisCity_House6 - warp_def 8, 35, 0, 0, SootopolisCity_House7 - warp_def 48, 25, 0, 0, SootopolisCity_House8 + 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_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308 diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 88707692e..6145c4afc 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -3,9 +3,9 @@ SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0 object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 - warp_def 8, 25, 0, 2, SootopolisCity - warp_def 9, 25, 0, 2, SootopolisCity - warp_def 11, 22, 3, 0, SootopolisCity_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:: @ 838AD38 bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 44827aaf5..a1f3c92cb 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -9,7 +9,7 @@ SootopolisCity_Gym_B1F_MapObjects:: @ 838AD64 object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 - warp_def 11, 22, 3, 2, SootopolisCity_Gym_1F + warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index bddda2d88..fc6a57516 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -3,8 +3,8 @@ SootopolisCity_House1_MapObjects:: @ 838AFA4 object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0 SootopolisCity_House1_MapWarps:: @ 838AFD4 - warp_def 3, 6, 0, 4, SootopolisCity - warp_def 4, 6, 0, 4, SootopolisCity + warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 838AFE4 map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index 01cf77ddb..5fac2c45e 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -2,8 +2,8 @@ SootopolisCity_House2_MapObjects:: @ 838AFF8 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0 SootopolisCity_House2_MapWarps:: @ 838B010 - warp_def 3, 6, 0, 5, SootopolisCity - warp_def 4, 6, 0, 5, SootopolisCity + warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 838B020 map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index dfae0f969..343bc0d2b 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -3,8 +3,8 @@ SootopolisCity_House3_MapObjects:: @ 838B034 object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0 SootopolisCity_House3_MapWarps:: @ 838B064 - warp_def 3, 6, 0, 6, SootopolisCity - warp_def 4, 6, 0, 6, SootopolisCity + warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 838B074 map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 766dbc682..f50aa1fe1 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -4,8 +4,8 @@ SootopolisCity_House4_MapObjects:: @ 838B088 object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0 SootopolisCity_House4_MapWarps:: @ 838B0D0 - warp_def 3, 6, 0, 7, SootopolisCity - warp_def 4, 6, 0, 7, SootopolisCity + warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 838B0E0 map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 499bc26de..f574443e8 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -3,8 +3,8 @@ SootopolisCity_House5_MapObjects:: @ 838B0F4 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0 SootopolisCity_House5_MapWarps:: @ 838B124 - warp_def 3, 6, 0, 8, SootopolisCity - warp_def 4, 6, 0, 8, SootopolisCity + warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 838B134 map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 9fcb17f50..a943baf27 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -2,8 +2,8 @@ SootopolisCity_House6_MapObjects:: @ 838B148 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0 SootopolisCity_House6_MapWarps:: @ 838B160 - warp_def 3, 6, 0, 9, SootopolisCity - warp_def 4, 6, 0, 9, SootopolisCity + warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 838B170 map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index d23992a32..f1ac930cc 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -3,8 +3,8 @@ SootopolisCity_House7_MapObjects:: @ 838B184 object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0 SootopolisCity_House7_MapWarps:: @ 838B1B4 - warp_def 3, 6, 0, 10, SootopolisCity - warp_def 4, 6, 0, 10, SootopolisCity + warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 838B1C4 map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc index 4fd384f2b..b6f35a8d0 100644 --- a/data/maps/events/SootopolisCity_House8.inc +++ b/data/maps/events/SootopolisCity_House8.inc @@ -3,8 +3,8 @@ SootopolisCity_House8_MapObjects:: @ 838B1D8 object_event 2, MAP_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0 SootopolisCity_House8_MapWarps:: @ 838B208 - warp_def 3, 6, 0, 11, SootopolisCity - warp_def 4, 6, 0, 11, SootopolisCity + warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_House8_MapBGEvents:: @ 838B218 bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 144a2b79b..0cc9dc532 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -4,8 +4,8 @@ SootopolisCity_Mart_MapObjects:: @ 838AF38 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0 SootopolisCity_Mart_MapWarps:: @ 838AF80 - warp_def 3, 7, 0, 1, SootopolisCity - warp_def 4, 7, 0, 1, SootopolisCity + warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 838AF90 map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index c69ebb84c..94091956e 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SootopolisCity_PokemonCenter_1F_MapObjects:: @ 838AE40 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 - warp_def 7, 8, 3, 0, SootopolisCity - warp_def 6, 8, 3, 0, SootopolisCity - warp_def 1, 6, 4, 0, SootopolisCity_PokemonCenter_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:: @ 838AEA0 map_events SootopolisCity_PokemonCenter_1F_MapObjects, 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 217185c78..4ce8631e8 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ SootopolisCity_PokemonCenter_2F_MapObjects:: @ 838AEB4 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC - warp_def 1, 5, 4, 2, SootopolisCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 062b72d1f..da65af081 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -3,8 +3,8 @@ SouthernIsland_Exterior_MapObjects:: @ 8391E00 object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps:: @ 8391E30 - warp_def 14, 5, 3, 0, SouthernIsland_Interior - warp_def 15, 5, 3, 1, SouthernIsland_Interior + warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR + warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 77073fc85..c2990f0da 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -3,8 +3,8 @@ SouthernIsland_Interior_MapObjects:: @ 8391E60 object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 911, 0, 0 SouthernIsland_Interior_MapWarps:: @ 8391E90 - warp_def 13, 18, 3, 0, SouthernIsland_Exterior - warp_def 14, 18, 3, 1, SouthernIsland_Exterior + warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR + warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index f49e755f3..8ecbb7e09 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0 TradeCenter_MapWarps:: @ 8391358 - 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:: @ 8391368 coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc index a9ecbd465..89b36919b 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/events/Underwater2.inc @@ -1,5 +1,5 @@ Underwater2_MapWarps:: @ 8385580 - warp_def 45, 65, 0, 0, Underwater_SootopolisCity + warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents:: @ 8385588 bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc index 711131621..1d3938031 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/events/Underwater4.inc @@ -1,5 +1,5 @@ Underwater4_MapWarps:: @ 8385640 - warp_def 38, 26, 3, 0, Underwater_SeafloorCavern + warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents:: @ 8385648 bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc index f6c734112..6dc462c80 100644 --- a/data/maps/events/Underwater_Route134.inc +++ b/data/maps/events/Underwater_Route134.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapWarps:: @ 838E744 - warp_def 8, 8, 0, 0, Underwater_SealedChamber + warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER Underwater_Route134_MapEvents:: @ 838E74C 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 e06e0a498..1dff571c3 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapObjects:: @ 838D018 object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 Underwater_SeafloorCavern_MapWarps:: @ 838D078 - warp_def 6, 7, 0, 0, Underwater4 + warp_def 6, 7, 0, 0, MAP_UNDERWATER4 Underwater_SeafloorCavern_MapEvents:: @ 838D080 map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc index 867527aaf..ede501142 100644 --- a/data/maps/events/Underwater_SealedChamber.inc +++ b/data/maps/events/Underwater_SealedChamber.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapWarps:: @ 838E760 - warp_def 7, 1, 0, 0, Underwater_Route134 + warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents:: @ 838E768 bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc index fb48a32fb..f745dc557 100644 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ b/data/maps/events/Underwater_SootopolisCity.inc @@ -1,6 +1,6 @@ Underwater_SootopolisCity_MapWarps:: @ 838BE98 - warp_def 9, 8, 0, 0, Underwater2 - warp_def 10, 8, 0, 0, Underwater2 + warp_def 9, 8, 0, 0, MAP_UNDERWATER2 + warp_def 10, 8, 0, 0, MAP_UNDERWATER2 Underwater_SootopolisCity_MapEvents:: @ 838BEA8 map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index 1d40f7f53..b8f74073e 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -5,13 +5,13 @@ VerdanturfTown_MapObjects:: @ 8380F00 object_event 4, MAP_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0 VerdanturfTown_MapWarps:: @ 8380F60 - warp_def 4, 7, 0, 0, VerdanturfTown_ContestLobby - warp_def 12, 3, 0, 0, VerdanturfTown_Mart - warp_def 16, 3, 0, 0, VerdanturfTown_PokemonCenter_1F - warp_def 10, 14, 0, 0, VerdanturfTown_WandasHouse - warp_def 8, 1, 0, 1, RusturfTunnel - warp_def 1, 14, 0, 0, VerdanturfTown_FriendshipRatersHouse - warp_def 17, 15, 0, 0, VerdanturfTown_House + warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_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:: @ 8380F98 bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc index 36f4d58e4..4e21027c4 100644 --- a/data/maps/events/VerdanturfTown_ContestHall.inc +++ b/data/maps/events/VerdanturfTown_ContestHall.inc @@ -4,8 +4,8 @@ VerdanturfTown_ContestHall_MapObjects:: @ 8386AEC object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0 VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 - warp_def 11, 17, 0, 2, VerdanturfTown_ContestLobby - warp_def 10, 17, 0, 2, VerdanturfTown_ContestLobby + warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc index ec9d88d71..2fe386421 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/events/VerdanturfTown_ContestLobby.inc @@ -7,9 +7,9 @@ VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00 object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 - warp_def 5, 6, 0, 0, VerdanturfTown - warp_def 6, 6, 0, 0, VerdanturfTown - warp_def 1, 1, 0, 1, VerdanturfTown_ContestHall + warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 6ec948511..8a731fab0 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -3,8 +3,8 @@ VerdanturfTown_FriendshipRatersHouse_MapObjects:: @ 8386D88 object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 - warp_def 3, 7, 0, 5, VerdanturfTown - warp_def 4, 7, 0, 5, VerdanturfTown + warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 91a54684b..5bf1c7cae 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -3,8 +3,8 @@ VerdanturfTown_House_MapObjects:: @ 8386DDC object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0 VerdanturfTown_House_MapWarps:: @ 8386E0C - warp_def 3, 8, 0, 6, VerdanturfTown - warp_def 4, 8, 0, 6, VerdanturfTown + warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN + warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 8386E1C map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 90e1cf014..341055a52 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -5,8 +5,8 @@ VerdanturfTown_Mart_MapObjects:: @ 8386B70 object_event 4, MAP_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0 VerdanturfTown_Mart_MapWarps:: @ 8386BD0 - warp_def 3, 7, 0, 1, VerdanturfTown - warp_def 4, 7, 0, 1, VerdanturfTown + warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 8386BE0 map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index 3db30796c..db6d4400b 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ VerdanturfTown_PokemonCenter_1F_MapObjects:: @ 8386BF4 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C - warp_def 7, 8, 3, 2, VerdanturfTown - warp_def 6, 8, 3, 2, VerdanturfTown - warp_def 1, 6, 4, 0, VerdanturfTown_PokemonCenter_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:: @ 8386C54 map_events VerdanturfTown_PokemonCenter_1F_MapObjects, 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 89f02e31f..43cd0dc12 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ VerdanturfTown_PokemonCenter_2F_MapObjects:: @ 8386C68 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 - warp_def 1, 5, 4, 2, VerdanturfTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 5d0f3e572..daa90d499 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -6,8 +6,8 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 - warp_def 7, 7, 0, 3, VerdanturfTown - warp_def 8, 7, 0, 3, VerdanturfTown + warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN + warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index f3f8dcad6..1d64e4f3a 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -8,11 +8,11 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4 object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C - warp_def 15, 40, 3, 2, EverGrandeCity - warp_def 39, 5, 3, 3, EverGrandeCity - warp_def 21, 32, 3, 5, VictoryRoad_B1F - warp_def 42, 38, 4, 2, VictoryRoad_B1F - warp_def 9, 14, 4, 4, VictoryRoad_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:: @ 838D9B4 coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97 diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index b00074990..8c3f6d2ff 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -20,13 +20,13 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 VictoryRoad_B1F_MapWarps:: @ 838DBCC - warp_def 30, 25, 3, 0, VictoryRoad_B2F - warp_def 17, 16, 3, 2, VictoryRoad_B2F - warp_def 42, 25, 3, 3, VictoryRoad_1F - warp_def 42, 2, 4, 1, VictoryRoad_B2F - warp_def 8, 3, 3, 4, VictoryRoad_1F - warp_def 20, 21, 3, 2, VictoryRoad_1F - warp_def 5, 26, 3, 3, VictoryRoad_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:: @ 838DC04 map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index b4aa07e59..9ef5d819b 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -6,10 +6,10 @@ VictoryRoad_B2F_MapObjects:: @ 838DC18 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, 1088, 0, 0 VictoryRoad_B2F_MapWarps:: @ 838DC90 - warp_def 30, 25, 3, 0, VictoryRoad_B1F - warp_def 43, 2, 3, 3, VictoryRoad_B1F - warp_def 19, 12, 3, 1, VictoryRoad_B1F - warp_def 5, 26, 3, 6, VictoryRoad_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:: @ 838DCB0 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 9f44e131b..279fa0451 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -240,14 +240,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E compare 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp - warp SingleBattleColosseum, 255, 6, 8 + warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special DoCableClubWarp waitstate end OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD special SetCableClubWarp - warp DoubleBattleColosseum, 255, 5, 8 + warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special DoCableClubWarp waitstate end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index f3c3c0aa0..de3ba5442 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:: @ 815E98F .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 29a89a620..e6c143091 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 218f1a2ca..4299c7da4 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:: @ 815EA35 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B - setdivewarp AbandonedShip_Underwater2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index afac470ea..52ba61136 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D - setdivewarp AbandonedShip_HiddenFloorCorridors, 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 b8facc4ec..22113661a 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D - setdivewarp AbandonedShip_Rooms_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index c3ff67902..3065c0cbb 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -35,7 +35,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 @@ -101,7 +101,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 9d4fbc844..ac97aa14b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -35,7 +35,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 setvar 0x4000, 0 - warp BattleTower_BattleRoom, 255, 4, 8 + warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index a147a3b5a..c006cdffe 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -19,7 +19,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 setvar 0x4000, 0 - warp BattleTower_Corridor, 255, 8, 1 + warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 75d4f8731..5a0e6105c 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -177,7 +177,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate @@ -254,7 +254,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 95c5a9d77..a37310d16 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -40,7 +40,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -51,7 +51,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index aa3584741..7f8fe6fef 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -142,7 +142,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 hideobject 4, 0, 11 setvar 0x408e, 2 resetobjectpriority 255, 0, 11 - warp Route104_MrBrineysHouse, 255, 5, 4 + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 90df9ab4e..b13c930cf 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -137,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 setflag 781 - warp EverGrandeCity_HallOfFame, 255, 7, 16 + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index c4c590b53..da19b96a7 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -14,7 +14,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 2 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index aa8d705c7..07a95c3f1 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,5 +6,5 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED tileeffect 7 - setholewarp GraniteCave_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 fc2930aa5..737bacf71 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -31,7 +31,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 setflag 784 setflag 760 setvar 0x408c, 1 - setdynamicwarp LittlerootTown, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end @@ -43,7 +43,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 785 setflag 722 setvar 0x4082, 1 - setdynamicwarp LittlerootTown, 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 a8c32a4fe..656516fd6 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -602,31 +602,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 return LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 - setwarp LinkContestRoom4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 - setwarp LinkContestRoom2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F - setwarp LinkContestRoom6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C - setwarp LinkContestRoom5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 - setwarp LinkContestRoom3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_8081334 waitstate return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 9d04d2e33..0e6bdc140 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C end LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 - setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 - setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 - setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B - setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E - setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7e14db994..4dcc1ba71 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 - setescapewarp LilycoveCity, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 @@ -52,7 +52,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -62,7 +62,7 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end @@ -138,7 +138,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E - warp SouthernIsland_Exterior, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 06e82d5f8..5d5b04114 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_1584BD:: @ 81584BD lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_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 220aeead7..3027e1f77 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -81,7 +81,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 761 - warpsilent LittlerootTown_BrendansHouse_1F, 255, 8, 8 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -92,7 +92,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 762 - warpsilent LittlerootTown_MaysHouse_1F, 255, 2, 8 + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 04256cacb..d3694bd22 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_1526FA:: @ 81526FA applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 - warp LittlerootTown_BrendansHouse_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 14c7f5d8a..a4d6f2403 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_152938:: @ 8152938 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 - warp LittlerootTown_MaysHouse_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index cef02df2c..afc02e82c 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -117,7 +117,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 - warp MossdeepCity_GameCorner_B1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 5a526bd60..94f44e311 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -34,7 +34,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E waitmovement 0 special LoadPlayerParty setvar 0x4001, 1 - warp MossdeepCity_GameCorner_1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 944860f2d..19b3c5045 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -172,7 +172,7 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D MossdeepCity_Gym_EventScript_15A742:: @ 815A742 lockall - warpteleport MossdeepCity_Gym, 255, 14, 29 + warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29 waitstate releaseall end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 8d48dac84..90ad1d9cc 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 815D36E MtPyre_2F_MapScript1_15D37E:: @ 815D37E tileeffect 7 - setholewarp MtPyre_1F, 255, 0, 0 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1c2711b83..b4548ddce 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -45,7 +45,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 clearflag 0x4001 special LoadPlayerParty setvar 0x4085, 1 - warp PetalburgCity_Gym, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index b2d104894..6c92316d6 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -212,7 +212,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 clearflag 866 setflag 889 special InitBirchState - warp PetalburgCity, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -606,7 +606,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 closemessage delay 30 - warpdoor PetalburgCity_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 2fe80e098..747b56197 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -236,7 +236,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 - warp LittlerootTown_ProfessorBirchsLab, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index f24e92cd4..a4c360bc0 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -83,7 +83,7 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB clearflag 738 setflag 739 setflag 881 - warp Route104, 255, 13, 51 + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 568ba2af6..7d2c77645 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -266,7 +266,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar 0x40a6, 1 - warp Route110_TrickHouseEntrance, 255, 6, 2 + warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -524,49 +524,49 @@ Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E step_end Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 - warp Route110_TrickHousePuzzle1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B - warp Route110_TrickHousePuzzle2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676 - warp Route110_TrickHousePuzzle3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681 - warp Route110_TrickHousePuzzle4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697 - warp Route110_TrickHousePuzzle6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2 - warp Route110_TrickHousePuzzle7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD - warp Route110_TrickHousePuzzle8, 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 222a71138..4b9031715 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -401,7 +401,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 closemessage msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 closemessage - warp Route110_TrickHousePuzzle5, 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 3361e3e9d..1841b025f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall setvar 0x40b6, 1 - warpteleport Route110_TrickHousePuzzle7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 22534aa77..d414ca8ed 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E - setescapewarp Route112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9649271f4..9f8753b76 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -82,7 +82,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 waitmovement 0 special EnterSafariMode setvar 0x40a4, 2 - warp SafariZone_Southeast, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 6b4d330d1..06b53ce31 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81525B5 .byte 0 Route134_MapScript1_1525BB:: @ 81525BB - setdivewarp Underwater_Route134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1525C4:: @ 81525C4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 916eb8108..3be6be562 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -477,7 +477,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 732 setvar 0x405a, 5 delay 30 - warp RustboroCity_DevonCorp_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 2c55a9443..59ab89112 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -126,7 +126,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -136,7 +136,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 06a400810..6d31cf981 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -94,7 +94,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 special ExitSafariMode - warpdoor Route121_SafariZoneEntrance, 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 7ea46d9b0..9d59279ea 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,6 +3,6 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 - setdivewarp Underwater_SeafloorCavern, 255, 6, 5 - setescapewarp Underwater_SeafloorCavern, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index eb3d108a6..26cb2321a 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -210,7 +210,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setflag 831 setflag 859 setflag 946 - warp Route128, 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 f16a88802..5ff94be19 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 - setdivewarp Underwater_SealedChamber, 255, 12, 44 - setescapewarp Underwater_SealedChamber, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3b3585bf8..3f388127b 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -6,5 +6,5 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 tileeffect 7 - setholewarp SkyPillar_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 3d535a25a..f0b9a6f85 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -6,5 +6,5 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 tileeffect 7 - setholewarp SkyPillar_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 bea1455a7..600cfc959 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -538,7 +538,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC clearflag 845 clearflag 846 setvar 0x4058, 2 - warp SlateportCity_Harbor, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index cb4632d77..85a8fe40e 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -14,7 +14,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB setvar 0x4088, 3 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index f145c4a3d..34d927753 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 - setescapewarp SlateportCity, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 @@ -195,7 +195,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index bddc5965d..994e33197 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -62,7 +62,7 @@ SootopolisCity_EventScript_14D159:: @ 814D159 return SootopolisCity_MapScript1_14D165:: @ 814D165 - setdivewarp Underwater_SootopolisCity, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_EventScript_14D16E:: @ 814D16E diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 51b67ee4b..29b62402f 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_15AFE4:: @ 815AFE4 waitmovement 0 playse 43 delay 60 - warphole SootopolisCity_Gym_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 3c6426024..4ee0d0ec3 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -20,7 +20,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 hideobject 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index bbe7e1ce2..464731b10 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,5 +3,5 @@ Underwater_Route134_MapScripts:: @ 815F071 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 - setdivewarp Route134, 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 3d2fe81b2..ce2de5124 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 - setdivewarp SeafloorCavern_Entrance, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 836ad86e2..733a060c3 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF - setdivewarp SealedChamber_OuterRoom, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index c9405dfd7..bba04eec8 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,5 +3,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA - setdivewarp SootopolisCity, 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 34d0bb70b..213a3609a 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -382,30 +382,30 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64 LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp VerdanturfTown_ContestLobby, 255, 5, 4 + warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD incrementgamestat GAME_STAT_ENTERED_CONTEST - warp FallarborTown_ContestLobby, 255, 5, 4 + warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp SlateportCity_ContestLobby, 255, 5, 4 + warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp LilycoveCity_ContestLobby, 255, 6, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4 waitstate end LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1 - warp LilycoveCity_ContestLobby, 255, 7, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 8462892e6..67554d26b 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -14,7 +14,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 1 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index d0283f072..385f93d22 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ gUnknown_081C340A:: @ 81C340A setvar 0x40a4, 1 special ExitSafariMode - setwarp Route121_SafariZoneEntrance, 255, 2, 5 + setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_1C341B: @ 81C341B setvar 0x40a4, 1 special ExitSafariMode - warp Route121_SafariZoneEntrance, 255, 2, 5 + warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end |