diff options
Diffstat (limited to 'data/scripts')
104 files changed, 271 insertions, 271 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 523aa67ca..f02ffbe66 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -468,14 +468,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release compare VAR_0x8004, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special sub_809D2BC - warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 + warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 waitstate end @@ -487,7 +487,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036 special sub_809D2BC - warp DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 + warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special sub_80AF948 waitstate end @@ -572,12 +572,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release special sub_809D2BC - setwarp TRADE_CENTER, 255, 5, 8 + setwarp MAP_TRADE_CENTER, 255, 5, 8 special sub_80AF948 waitstate end @@ -647,12 +647,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release special sub_809D2BC - setwarp RECORD_CORNER, 255, 8, 9 + setwarp MAP_RECORD_CORNER, 255, 8, 9 special sub_80AF948 waitstate end @@ -1046,12 +1046,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special sub_8018090 special sub_809D2BC - warpteleport2 UNION_ROOM, 255, 7, 11 + warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate special UnionRoomSpecial waitstate @@ -1385,7 +1385,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1595,7 +1595,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E closemessage applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360 waitmovement 0 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY release waitstate end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 3f019f4d8..f19dfe322 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F - setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b1bca85aa..2cd278f91 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 - setdivewarp ABANDONED_SHIP_UNDERWATER_1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 784d44c2e..d4a5c9233 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD - setdivewarp ABANDONED_SHIP_UNDERWATER_2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index 49971cde7..7e39b1939 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,6 +3,6 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C - setdivewarp ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index 19a786956..17f52c691 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,6 +3,6 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 - setdivewarp ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 27ea23b59..076eeab6e 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -37,7 +37,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC lockall - showobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 waitmovement 0 setvar VAR_0x8004, 1 @@ -113,7 +113,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 @@ -228,7 +228,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257870:: @ 8257870 @@ -533,7 +533,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C .2byte 0 BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 - hideobjectat 8, BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM + hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index 83b602fc4..a353379c2 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -20,7 +20,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C waitmovement 0 setvar VAR_0x8006, 0 - warp BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 7a0695445..a376bfe22 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -218,7 +218,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 - warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index c46358aed..e853afda0 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -48,7 +48,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 closemessage - showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E compare VAR_TEMP_E, 0 @@ -188,7 +188,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 switch VAR_RESULT case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 setvar VAR_0x8006, 1 - warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 waitstate BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 @@ -547,7 +547,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481 .2byte 0 BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B - hideobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM + hideobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 @@ -953,12 +953,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F - warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate end BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F - warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index 6a97382d4..989ebe2f3 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -41,7 +41,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F waitmovement 0 setvar VAR_0x8006, 0 - warp BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index b08d0ca89..1e50357bc 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -266,7 +266,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty - warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index d19b4b999..024162cee 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -179,7 +179,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D waitmovement 0 closedoor 5, 1 waitdooranim - warp BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index cdfd6edd6..5b6a674fb 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -30,10 +30,10 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 - hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end @@ -133,7 +133,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 switch VAR_RESULT case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 setvar VAR_0x8006, 1 - warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 waitstate BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 @@ -294,12 +294,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA - warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA - warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 4f2dea343..ec2483390 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 - warp BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 875a3a220..e05c49885 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -60,7 +60,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 - warp BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 + warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 07ccbe79d..2ae154927 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B - showobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 @@ -233,7 +233,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 setobjectxyperm 2, 15, 1 addobject 2 - hideobjectat 2, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setobjectxy 2, 13, 1 setobjectxyperm 2, 13, 1 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF @@ -354,7 +354,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 .2byte 0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E - hideobjectat 1, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 @@ -462,12 +462,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_0x40CE compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 - warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 - warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 89697ff33..c8142a207 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -55,7 +55,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 waitdooranim BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 - warp BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index a5cb11081..91c1abd0f 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -236,7 +236,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC - warp BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 4171da314..23ad26692 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -32,7 +32,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8006, 99 special sub_81A1780 call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 74bdb1d78..5323c4a6b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -212,7 +212,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 - warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index fd5fd81e0..509806531 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -46,7 +46,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -128,7 +128,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB playse 268 delay 65 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - showobjectat 1, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 delay 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 delay 4 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 39045c317..4f0d4632b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 closemessage releaseall - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc index d93913df2..9256764e8 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc @@ -20,7 +20,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 6bef7ba12..a4725036b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -27,7 +27,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A - warp BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index 148ea97c1..eacee4cf3 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -91,7 +91,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 setvar VAR_0x8004, 14 special sub_81A8E7C special HealPlayerParty - warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -143,12 +143,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 setvar VAR_0x8006, 0 special sub_81A1780 setvar VAR_RESULT, 0 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 waitstate end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index e92c8d97f..07b9fee47 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -219,7 +219,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special sub_81A1780 setvar VAR_RESULT, 0 special HealPlayerParty - warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 9d83ab4e0..886b3fe01 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -111,7 +111,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 special sub_81A1780 - warp BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 + warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 087752d8f..f684e215d 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -491,24 +491,24 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8:: @ 82421E8 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2:: @ 82421F2 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 waitstate end BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC setvar VAR_0x8004, 13 special sub_8161F74 - warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 81c2dd563..d1b07451c 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index ef1102175..9ff6bbc59 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -35,7 +35,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 setvar VAR_TEMP_0, 0 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index 39157609e..36cf93ada 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -33,9 +33,9 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat 255, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - hideobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - hideobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 + hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 special sub_8139980 end @@ -51,8 +51,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC opendoor 1, 1 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4002 - showobjectat 1, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 - showobjectat 4, BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + showobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 applymovement 1, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 applymovement 4, BattleFrontier_BattleTowerCorridor2_Movement_248EE6 waitmovement 0 @@ -98,17 +98,17 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 return BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate return BattleFrontier_BattleTowerCorridor2_EventScript_248EA8:: @ 8248EA8 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 waitstate return BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 - warp BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2, 255, 4, 5 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2, 255, 4, 5 waitstate return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index 433d8e181..248c1f9ca 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -35,24 +35,24 @@ BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 return BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F checkflag FLAG_0x152 goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A72:: @ 8241A72 - warp BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2, 255, 7, 2 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C - warp BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 1 waitstate return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index d899b1cbe..478d61656 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -747,7 +747,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 - warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index c1d3534d3..a2f003b85 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -112,7 +112,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4 closedoor 10, 1 waitdooranim - warp BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 waitstate releaseall end @@ -198,7 +198,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 - warpsilent BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 waitstate release end diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index fa2ff7e36..bd9d508dd 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -39,7 +39,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA - warp SLATEPORT_CITY_HARBOR, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -50,7 +50,7 @@ BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -66,7 +66,7 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 3, BATTLE_FRONTIER_OUTSIDE_WEST + hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST setvar VAR_0x8004, 2 call BattleFrontier_OutsideWest_EventScript_272250 return diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc index bf82aa6d1..fe939172d 100644 --- a/data/scripts/maps/BirthIsland_Harbor.inc +++ b/data/scripts/maps/BirthIsland_Harbor.inc @@ -12,10 +12,10 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, BIRTH_ISLAND_HARBOR + hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR setvar VAR_0x8004, 2 call BirthIsland_Harbor_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/scripts/maps/CaveOfOrigin_Entrance.inc index a4b96a48f..1a771ae82 100644 --- a/data/scripts/maps/CaveOfOrigin_Entrance.inc +++ b/data/scripts/maps/CaveOfOrigin_Entrance.inc @@ -3,6 +3,6 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F - setescapewarp SOOTOPOLIS_CITY, 255, 31, 17 + setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 1edc1407d..157c1f4d5 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -118,31 +118,31 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 DewfordTown_EventScript_1E9660:: @ 81E9660 call DewfordTown_EventScript_271E95 - setobjectpriority 2, DEWFORD_TOWN, 0 - setobjectpriority 255, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, DEWFORD_TOWN + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E97A2 applymovement 255, DewfordTown_Movement_1E97A2 waitmovement 0 - showobjectat 255, ROUTE_104 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_2720A8 applymovement 255, DewfordTown_Movement_1E9914 waitmovement 0 - showobjectat 255, ROUTE_104 + showobjectat 255, MAP_ROUTE104 clearflag FLAG_0x2E3 clearflag FLAG_0x371 clearflag FLAG_0x2E6 setflag FLAG_0x2E7 - hideobjectat 4, DEWFORD_TOWN + hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_0x408E, 2 - resetobjectpriority 255, DEWFORD_TOWN - warp ROUTE_104_MR_BRINEYS_HOUSE, 255, 5, 4 + resetobjectpriority 255, MAP_DEWFORD_TOWN + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_0x4096, VAR_0x8008 waitstate release @@ -150,40 +150,40 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 DewfordTown_EventScript_1E96E7:: @ 81E96E7 call DewfordTown_EventScript_271E95 - setobjectpriority 2, DEWFORD_TOWN, 0 - setobjectpriority 255, DEWFORD_TOWN, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, DEWFORD_TOWN + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E9865 applymovement 255, DewfordTown_Movement_1E9865 waitmovement 0 call DewfordTown_EventScript_2720A8 - showobjectat 255, ROUTE_109 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_1E9918 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, ROUTE_109, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_1E991F waitmovement 0 clearflag FLAG_0x2E5 addobject 1 clearflag FLAG_0x2E8 setflag FLAG_0x2E7 - hideobjectat 4, DEWFORD_TOWN + hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_0x095 call_if 0, DewfordTown_EventScript_1E9790 checkflag FLAG_0x095 call_if 1, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, DEWFORD_TOWN - resetobjectpriority 2, ROUTE_109 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index bed242a2b..3e68f4fed 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -137,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 waitmovement 0 setflag FLAG_0x30D - warp EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index 48703897e..e373ff5ad 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -32,7 +32,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 lockall - showobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D waitmovement 0 setvar VAR_0x8004, 1 @@ -73,7 +73,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C @@ -158,7 +158,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -260,8 +260,8 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 1, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index f1d3024c0..f1a144a14 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -20,7 +20,7 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 closedoor 2, 1 waitdooranim setvar VAR_0x8006, 0 - warp FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 1bde88e7d..00efa5394 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -204,7 +204,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF - warp FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc index ff8af2e9f..08331b33b 100644 --- a/data/scripts/maps/FarawayIsland_Entrance.inc +++ b/data/scripts/maps/FarawayIsland_Entrance.inc @@ -27,10 +27,10 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, FARAWAY_ISLAND_ENTRANCE + hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE setvar VAR_0x8004, 2 call FarawayIsland_Entrance_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index bf5c4297f..360b10a08 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,6 +6,6 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E setstepcallback 7 - setholewarp GRANITE_CAVE_B2F, 255, 0, 0 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 3c4b241ac..963dd196d 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -32,7 +32,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 setflag FLAG_0x2DF setflag FLAG_0x331 setvar VAR_0x408C, 1 - setdynamicwarp LITTLEROOT_TOWN, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end @@ -45,7 +45,7 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 setflag FLAG_0x2E0 setflag FLAG_0x332 setvar VAR_0x4082, 1 - setdynamicwarp LITTLEROOT_TOWN, 255, 12, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1f65b88fd..a4609ab54 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -376,31 +376,31 @@ LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF return LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F - setwarp LINK_CONTEST_ROOM_4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C - setwarp LINK_CONTEST_ROOM_2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649 - setwarp LINK_CONTEST_ROOM_6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656 - setwarp LINK_CONTEST_ROOM_5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_80AFC60 waitstate return LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663 - setwarp LINK_CONTEST_ROOM_3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_80AFC60 waitstate return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index b7ba17125..234751910 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 4 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -69,7 +69,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 5 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -79,7 +79,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 6 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -89,7 +89,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 7 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 @@ -99,7 +99,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 - setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 8 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 6357326c1..1dfd9c29a 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 - setescapewarp LILYCOVE_CITY, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F @@ -59,28 +59,28 @@ LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F LilycoveCity_Harbor_EventScript_21E109:: @ 821E109 call LilycoveCity_Harbor_EventScript_21E5CC - warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end LilycoveCity_Harbor_EventScript_21E119:: @ 821E119 call LilycoveCity_Harbor_EventScript_21E5CC - warp NAVEL_ROCK_HARBOR, 255, 8, 4 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end LilycoveCity_Harbor_EventScript_21E129:: @ 821E129 call LilycoveCity_Harbor_EventScript_21E5CC - warp BIRTH_ISLAND_HARBOR, 255, 8, 4 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 call LilycoveCity_Harbor_EventScript_21E5CC - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -91,7 +91,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -101,7 +101,7 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -226,7 +226,7 @@ LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end @@ -243,7 +243,7 @@ LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp BIRTH_ISLAND_HARBOR, 255, 8, 4 + warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end @@ -284,7 +284,7 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call_if 1, LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -292,7 +292,7 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 + warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end @@ -309,7 +309,7 @@ LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C closemessage call LilycoveCity_Harbor_EventScript_21E514 - warp NAVEL_ROCK_HARBOR, 255, 8, 4 + warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end @@ -344,7 +344,7 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 delay 30 applymovement 1, LilycoveCity_Harbor_Movement_2725AA waitmovement 0 - showobjectat 1, LILYCOVE_CITY_HARBOR + showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 msgbox LilycoveCity_Harbor_Text_21E842, 4 release @@ -354,7 +354,7 @@ LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -372,7 +372,7 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return @@ -400,7 +400,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -410,7 +410,7 @@ LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -427,13 +427,13 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 507997416..c2f3be7d6 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -49,7 +49,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E waitmovement 0 - warp LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 67b1f9381..eb78368af 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -95,7 +95,7 @@ LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 setflag FLAG_0x2F9 - warpsilent LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -106,7 +106,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 setflag FLAG_0x2FA - warpsilent LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end @@ -138,7 +138,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 waitmovement 0 setflag FLAG_0x2F0 setvar VAR_0x4092, 3 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_0x364 @@ -196,7 +196,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 clearflag FLAG_0x31B delay 20 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate releaseall end @@ -649,7 +649,7 @@ LittlerootTown_EventScript_1E84A1:: @ 81E84A1 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -661,7 +661,7 @@ LittlerootTown_EventScript_1E84C7:: @ 81E84C7 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -673,7 +673,7 @@ LittlerootTown_EventScript_1E84ED:: @ 81E84ED waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -685,7 +685,7 @@ LittlerootTown_EventScript_1E8513:: @ 81E8513 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -697,7 +697,7 @@ LittlerootTown_EventScript_1E8539:: @ 81E8539 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -709,7 +709,7 @@ LittlerootTown_EventScript_1E855F:: @ 81E855F waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -721,7 +721,7 @@ LittlerootTown_EventScript_1E8585:: @ 81E8585 waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -733,7 +733,7 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -903,7 +903,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D waitdooranim applymovement 4, LittlerootTown_Movement_1E863B waitmovement 0 - hideobjectat 4, LITTLEROOT_TOWN + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim goto LittlerootTown_EventScript_1E8686 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 53825a84c..4c904b001 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A waitmovement 0 - warp LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 9fc2fe53e..99d47f938 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A waitmovement 0 - warp LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/scripts/maps/MarineCave_Entrance.inc index a1f5489fe..24b288050 100644 --- a/data/scripts/maps/MarineCave_Entrance.inc +++ b/data/scripts/maps/MarineCave_Entrance.inc @@ -3,6 +3,6 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 - setdivewarp UNDERWATER_MARINE_CAVE, 255, 9, 6 + setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6 end diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/scripts/maps/MirageTower_2F.inc index c1a1d18d0..79f3cce2a 100644 --- a/data/scripts/maps/MirageTower_2F.inc +++ b/data/scripts/maps/MirageTower_2F.inc @@ -6,6 +6,6 @@ MirageTower_2F_MapScripts:: @ 823AD11 MirageTower_2F_MapScript1_23AD21: @ 823AD21 setstepcallback 7 - setholewarp MIRAGE_TOWER_1F, 255, 0, 0 + setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/scripts/maps/MirageTower_3F.inc index bcf847344..1ec82de55 100644 --- a/data/scripts/maps/MirageTower_3F.inc +++ b/data/scripts/maps/MirageTower_3F.inc @@ -6,6 +6,6 @@ MirageTower_3F_MapScripts:: @ 823AD2C MirageTower_3F_MapScript1_23AD3C: @ 823AD3C setstepcallback 7 - setholewarp MIRAGE_TOWER_2F, 255, 0, 0 + setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 10d465b74..1e079c5d7 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -54,7 +54,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA waitstate setvar VAR_0x40CB, 1 clearflag FLAG_LANDMARK_MIRAGE_TOWER - warp ROUTE_111, 255, 19, 59 + warp MAP_ROUTE111, 255, 19, 59 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index bb6bfd9de..f38fd606d 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -205,7 +205,7 @@ MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 lockall - warp7 MOSSDEEP_CITY_GYM, 255, 7, 30 + warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index 52d01db6c..0052f09aa 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -43,7 +43,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF closemessage applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 - warp MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 + warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate releaseall end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 9a479846f..de8520954 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 82310FB MtPyre_2F_MapScript1_23110B: @ 823110B setstepcallback 7 - setholewarp MT_PYRE_1F, 255, 0, 0 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_231116:: @ 8231116 diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc index c7acaf066..7f5a9e4c7 100644 --- a/data/scripts/maps/NavelRock_Harbor.inc +++ b/data/scripts/maps/NavelRock_Harbor.inc @@ -12,10 +12,10 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, NAVEL_ROCK_HARBOR + hideobjectat 1, MAP_NAVEL_ROCK_HARBOR setvar VAR_0x8004, 2 call NavelRock_Harbor_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 891b5a25a..67a9f83f3 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -39,8 +39,8 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, 4 - applymovement 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY - waitmovement 2, PETALBURG_CITY + applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -49,7 +49,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E clearflag FLAG_SPECIAL_FLAG_0x4001 special LoadPlayerParty setvar VAR_0x4085, 1 - warp PETALBURG_CITY_GYM, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end @@ -68,13 +68,13 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 applymovement 255, PetalburgCity_Movement_1DC418 waitmovement 0 setflag FLAG_0x33E - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4000 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 - warp PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 + warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 663165611..e95e434b5 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -223,7 +223,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x362 setflag FLAG_0x379 special InitBirchState - warp PETALBURG_CITY, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -501,7 +501,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 removeobject 11 setvar VAR_0x4057, 4 clearflag FLAG_0x33E - warp PETALBURG_CITY, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -800,7 +800,7 @@ PetalburgCity_Gym_EventScript_205137:: @ 8205137 PetalburgCity_Gym_EventScript_20516C:: @ 820516C closemessage delay 30 - warpdoor PETALBURG_CITY_GYM, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c2807d50b..9593ae59e 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -242,7 +242,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 call_if 1, Route101_EventScript_1EBE85 compare VAR_RESULT, 1 call_if 1, Route101_EventScript_1EBE89 - warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a432f0d94..83cfe5d92 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -367,14 +367,14 @@ Route104_EventScript_1ED090:: @ 81ED090 end Route104_EventScript_1ED099:: @ 81ED099 - setobjectpriority 8, ROUTE_104, 0 - setobjectpriority 255, ROUTE_104, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_1ED34F waitmovement 0 - hideobjectat 255, ROUTE_104 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_2720A0 checkflag FLAG_0x132 goto_eq Route104_EventScript_1ED0D9 @@ -402,8 +402,8 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF delay 30 setflag FLAG_0x132 applymovement 255, Route104_Movement_1ED22A - applymovement 7, Route104_Movement_1ED22A, ROUTE_104 - waitmovement 7, ROUTE_104 + applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 + waitmovement 7, MAP_ROUTE104 waitmovement 0 goto Route104_EventScript_1ED139 @@ -412,12 +412,12 @@ Route104_EventScript_1ED139:: @ 81ED139 applymovement 255, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 - showobjectat 255, DEWFORD_TOWN + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_0x2E4 applymovement 2, Route104_Movement_1ED35C waitmovement 0 @@ -425,10 +425,10 @@ Route104_EventScript_1ED139:: @ 81ED139 clearflag FLAG_0x2E7 call Route104_EventScript_2720A8 setflag FLAG_0x2E6 - hideobjectat 7, ROUTE_104 + hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, ROUTE_104 - resetobjectpriority 2, DEWFORD_TOWN + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 checkflag FLAG_0x0BD diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index c0c3888e1..1721fa4a0 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -87,7 +87,7 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 setvar VAR_0x4063, 2 setflag FLAG_0x32E setflag FLAG_0x2CF - warp ROUTE_104, 255, 13, 51 + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b1ac87e30..84f7b7c34 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_1EE760:: @ 81EE760 call Route109_EventScript_271E95 - setobjectpriority 2, ROUTE_109, 0 - setobjectpriority 255, ROUTE_109, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_1EE90B waitmovement 0 removeobject 2 @@ -33,31 +33,31 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5 end Route109_EventScript_1EE7D5:: @ 81EE7D5 - hideobjectat 255, ROUTE_109 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F applymovement 255, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 - showobjectat 255, DEWFORD_TOWN + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_1EE900 waitmovement 0 addobject 4 clearflag FLAG_0x2E7 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, DEWFORD_TOWN, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_1EE90D waitmovement 0 clearflag FLAG_0x2E4 setflag FLAG_0x2E8 - hideobjectat 1, ROUTE_109 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_1E9C1D, 4 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, ROUTE_109 - resetobjectpriority 2, DEWFORD_TOWN + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index a2997a49b..4e15ddbe7 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8 addobject 1 - showobjectat 1, ROUTE_110_TRICK_HOUSE_END + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 5e03fa165..859a28d6a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -138,14 +138,14 @@ Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 addobject 1 - showobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 addobject 1 - hideobjectat 1, ROUTE_110_TRICK_HOUSE_ENTRANCE + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch VAR_0x4044 case 0, Route110_TrickHouseEntrance_EventScript_269C8C case 1, Route110_TrickHouseEntrance_EventScript_269C94 @@ -265,7 +265,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 - warpsilent ROUTE_110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 + warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -533,49 +533,49 @@ Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 step_end Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF - warp ROUTE_110_TRICK_HOUSE_PUZZLE_3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA - warp ROUTE_110_TRICK_HOUSE_PUZZLE_4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB - warp ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 - warp ROUTE_110_TRICK_HOUSE_PUZZLE_8, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 3bdf93b12..5afce1c88 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -458,7 +458,7 @@ Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 closemessage - warp ROUTE_110_TRICK_HOUSE_PUZZLE_5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 35e5e1522..fdf734423 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED lockall setvar VAR_0x40B6, 1 - warpteleport ROUTE_110_TRICK_HOUSE_PUZZLE_7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 094a52895..fcbf32c91 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -111,7 +111,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 - hideobjectat 255, LITTLEROOT_TOWN + hideobjectat 255, MAP_LITTLEROOT_TOWN end Route111_MapScript2_1F0E56: @ 81F0E56 @@ -127,7 +127,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 addobject 45 special sub_81BE7F4 waitstate - showobjectat 255, LITTLEROOT_TOWN + showobjectat 255, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 turnobject 255, 2 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 94e442a48..93e8ea759 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 - setescapewarp ROUTE_112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_0x40A3, 2 call_if 1, Route112_CableCarStation_EventScript_22AADD end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 0e9cf9636..1973b0e9e 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -83,7 +83,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 special EnterSafariMode setvar VAR_0x40A4, 2 clearflag FLAG_0x05D - warp SAFARI_ZONE_SOUTH, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 8ee5b781a..bdec88c42 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81F7644 .byte 0 Route134_MapScript1_1F764A: @ 81F764A - setdivewarp UNDERWATER_ROUTE_134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1F7653:: @ 81F7653 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 5e323211a..6eb8d48bc 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -602,7 +602,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B setflag FLAG_0x2DC setvar VAR_0x405A, 5 delay 30 - warp RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 6d83c8841..2e1b4cfa4 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -127,7 +127,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -137,7 +137,7 @@ SSTidalCorridor_EventScript_23C15A:: @ 823C15A msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 - warp SLATEPORT_CITY_HARBOR, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index 239a2efda..19f51b873 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -93,7 +93,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359 SafariZone_South_EventScript_23D373:: @ 823D373 setvar VAR_0x40A4, 1 special ExitSafariMode - warpdoor ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index b5fdc5e42..9eb71d5e3 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,8 +3,8 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 - setdivewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 - setescapewarp UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index e8f6323c1..cbfbccfe4 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -141,7 +141,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_0x35B setflag FLAG_0x3B2 setflag FLAG_SPECIAL_FLAG_0x4000 - warp ROUTE_128, 255, 38, 22 + warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index b7b55f256..e9e79d1e9 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 - setdivewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44 - setescapewarp UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index b22afaf54..c15f1f8c4 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -16,6 +16,6 @@ SkyPillar_2F_EventScript_23964C:: @ 823964C SkyPillar_2F_MapScript1_239650: @ 8239650 setstepcallback 7 - setholewarp SKY_PILLAR_1F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 15d055f02..3884864d7 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -16,6 +16,6 @@ SkyPillar_4F_EventScript_239692:: @ 8239692 SkyPillar_4F_MapScript1_239696: @ 8239696 setstepcallback 7 - setholewarp SKY_PILLAR_3F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index d860e6e7c..9a5e41b15 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -616,7 +616,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 clearflag FLAG_0x34D clearflag FLAG_0x34E setvar VAR_0x4058, 2 - warp SLATEPORT_CITY_HARBOR, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index d79849a6c..150cc425b 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -30,8 +30,8 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat 255, FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 2, SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM + hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 @@ -68,7 +68,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 @@ -84,7 +84,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B @ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B setvar VAR_0x8006, 1 - warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B @@ -94,7 +94,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @ forced stop diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 7446c1002..0a9eb6cf5 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -53,7 +53,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 waitmovement 0 closedoor 2, 1 waitdooranim - warp SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM, 255, 4, 4 waitstate end diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 187ed0751..fc66d7387 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -175,7 +175,7 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 - warp SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ca6ab50b5..e1f373bb2 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 - setescapewarp SLATEPORT_CITY, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_0x40A0, 1 call_if 1, SlateportCity_Harbor_EventScript_20C9A9 @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE, 1 call SlateportCity_Harbor_EventScript_20CBE9 - warp SS_TIDAL_CORRIDOR, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -215,7 +215,7 @@ SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 - warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 + warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end @@ -232,13 +232,13 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 delay 30 - hideobjectat VAR_LAST_TALKED, SLATEPORT_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_20CC42 compare VAR_FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_20CC37 delay 30 - hideobjectat 255, PETALBURG_CITY + hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_2721E2 return diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6a26ee0ff..5de8c7d12 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -192,7 +192,7 @@ SootopolisCity_EventScript_1E5901:: @ 81E5901 return SootopolisCity_MapScript1_1E590B: @ 81E590B - setdivewarp UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_MapScript2_1E5914: @ 81E5914 @@ -549,7 +549,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E fadenewbgm MUS_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 SOOTOPOLIS_CITY, 255, 43, 32 + warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 waitstate end @@ -602,7 +602,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE fadenewbgm MUS_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 - warp8 SOOTOPOLIS_CITY, 255, 29, 53 + warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 waitstate end @@ -987,7 +987,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC setflag FLAG_0x133 applymovement 255, SootopolisCity_Movement_1E635A waitmovement 0 - warp CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 + warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate end @@ -1448,7 +1448,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C clearflag FLAG_0x358 clearflag FLAG_0x394 setvar VAR_0x40B9, 2 - warpsilent SOOTOPOLIS_CITY, 255, 31, 34 + warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate releaseall end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 02ac01f2b..af661890f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -77,7 +77,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 waitmovement 0 playse SE_RU_HYUU delay 60 - warphole SOOTOPOLIS_CITY_GYM_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 8d6b4631f..cdcf5866c 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -115,7 +115,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 compare VAR_FACING, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 - warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 142a8e70e..b29ef99a5 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -34,7 +34,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 - warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 + warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1 waitstate releaseall end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index bf57aa9ce..d303e0614 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,10 +17,10 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA waitmovement 0 delay 30 - hideobjectat 1, SOUTHERN_ISLAND_EXTERIOR + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, 2 call SouthernIsland_Exterior_EventScript_272250 - warp LILYCOVE_CITY_HARBOR, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 155c31877..ac2d5c8a7 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -13,7 +13,7 @@ TrainerHill_Elevator_EventScript_269360:: @ 8269360 applymovement 255, TrainerHill_Elevator_Movement_2693EB waitmovement 0 releaseall - warp TRAINER_HILL_ROOF, 255, 15, 5 + warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 waitstate end @@ -35,7 +35,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 delay 25 applymovement 255, TrainerHill_Elevator_Movement_2693E7 waitmovement 0 - warp TRAINER_HILL_ENTRANCE, 255, 17, 8 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate end diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/scripts/maps/Underwater_MarineCave.inc index c18534c61..ac96e3a9b 100644 --- a/data/scripts/maps/Underwater_MarineCave.inc +++ b/data/scripts/maps/Underwater_MarineCave.inc @@ -8,6 +8,6 @@ Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 end Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 - setdivewarp MARINE_CAVE_ENTRANCE, 255, 10, 17 + setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index a06f87b48..786de1757 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,6 +3,6 @@ Underwater_Route134_MapScripts:: @ 82390B5 .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB - setdivewarp ROUTE_134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index d3f0aa5e5..128cb31c0 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 return Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 - setdivewarp SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index f8c7b02af..7ac032c5f 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA goto Underwater_SealedChamber_EventScript_2390F3 Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA - setdivewarp ROUTE_134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3 - setdivewarp SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index 3337b72f1..cbeefcb1d 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,6 +3,6 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 - setdivewarp SOOTOPOLIS_CITY, 255, 29, 53 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index e92087ebd..eb6bf8da4 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829 LinkContestRoom1_EventScript_23B834:: @ 823B834 special sub_80F8B94 - hideobjectat 255, LITTLEROOT_TOWN + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_23BB2B end @@ -416,27 +416,27 @@ LinkContestRoom1_EventScript_23BE44:: @ 823BE44 return LinkContestRoom1_EventScript_23BE84:: @ 823BE84 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BE98:: @ 823BE98 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2 - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 waitstate end LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC - warp LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index d7233a3aa..b7f687cdf 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -31,7 +31,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 - showobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 waitmovement 0 setvar VAR_0x8004, 1 @@ -60,7 +60,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA setvar VAR_0x8006, 4 special sub_81A1780 special LoadPlayerParty - warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 @@ -133,7 +133,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 setvar VAR_0x8006, 3 special sub_81A1780 special LoadPlayerParty - warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F @@ -154,7 +154,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 .2byte 0 VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B - hideobjectat 1, VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index 96bd1f114..a4c2e502c 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -20,7 +20,7 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A closedoor 2, 1 waitdooranim setvar VAR_0x8006, 0 - warp VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM, 255, 6, 5 waitstate releaseall end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 468a34991..26f0680a0 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -205,7 +205,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 - warp VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 + warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 setvar VAR_TEMP_0, 0 waitstate end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index c2d217f93..e4b1fce41 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ EventScript_2A4B4C:: @ 82A4B4C setvar VAR_0x40A4, 1 special ExitSafariMode - setwarp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D setvar VAR_0x40A4, 1 special ExitSafariMode - warp ROUTE_121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 + warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end |