diff options
Diffstat (limited to 'data/scripts')
58 files changed, 97 insertions, 97 deletions
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 |