diff options
63 files changed, 100 insertions, 99 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1bccdbc57..5b15bf090 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -11,6 +11,7 @@ #include "constants/species.h" #include "constants/trainers.h" #include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 2f6b15823..2c53b7ed6 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 3717e2418..35c32c3fa 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index b75c6062a..6cf1c7817 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index c80043792..f8511315b 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 6ee39d5fa..39d729846 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 9018bbb70..21681b70a 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF turnobject 1, 1 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 170d14ad8..56edda8ad 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 7793fcbc2..1155cd67b 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index c2d5c2eb5..70d7f3c6c 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 83031af95..f46760e17 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 setvar VAR_TEMP_4, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 4138eebfd..4beb26724 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 setvar VAR_TEMP_4, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index a92caecfd..cac594516 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 setvar VAR_TEMP_4, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 1ae42279a..686a1bfb2 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 1dc58363e..d04fe23f2 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 compare VAR_TEMP_C, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index d80eda53c..ac3a81cec 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 287ed902a..75282775f 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat EVENT_OBJ_ID_PLAYER, 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 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 79668a939..0479641a7 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index fabae0bf9..29315eff5 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 42694a2a4..99cbbb662 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 .2byte 0 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 7e16bbcec..b08a0e8a3 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -117,29 +117,29 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 DewfordTown_EventScript_1E9660:: @ 81E9660 call DewfordTown_EventScript_271E95 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority 255, MAP_DEWFORD_TOWN, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, MAP_DEWFORD_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E97A2 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 waitmovement 0 - showobjectat 255, MAP_ROUTE104 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call DewfordTown_EventScript_2720A8 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 waitmovement 0 - showobjectat 255, MAP_ROUTE104 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_0x408E, 2 - resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_0x4096, VAR_0x8008 waitstate @@ -149,19 +149,19 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 DewfordTown_EventScript_1E96E7:: @ 81E96E7 call DewfordTown_EventScript_271E95 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority 255, MAP_DEWFORD_TOWN, 1 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, MAP_DEWFORD_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E9865 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 waitmovement 0 call DewfordTown_EventScript_2720A8 - showobjectat 255, MAP_ROUTE109 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 waitmovement 0 setobjectxyperm 2, 21, 26 @@ -178,7 +178,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index d0caaabd9..8da9ae712 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index ac768b6ea..06dd58d26 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC .2byte 0 EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index c369187ad..641c994a5 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index 960918662..a5b7764d7 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F .2byte 0 EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 1d76e3695..565d68168 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 .2byte 0 EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index a100487f5..85d0bb2f6 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 .2byte 0 EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index a7c730594..29f56829a 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE .2byte 0 EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index 9ca9991e4..d492c28d2 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 .2byte 0 EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index f037f247a..9b9bdb5d6 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 .2byte 0 EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 0e170811b..84ead3766 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index ef6b7efa4..8324e19cf 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -30,7 +30,7 @@ EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E .2byte 0 EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index ca9b449e5..a81bf991c 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -260,7 +260,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index e7dda07f9..cfc468994 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 512171b37..8661c4c52 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 end FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 - setweather 1 + setweather WEATHER_CLOUDS doweather end FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D - setweather 0 + setweather WEATHER_NONE doweather end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 0760cc05a..a140093ca 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -26,7 +26,7 @@ JaggedPass_MapScript1_23068B: @ 823068B end JaggedPass_EventScript_230697:: @ 8230697 - setweather 7 + setweather WEATHER_ASH doweather return diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index f7b07d668..62bcc15dd 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -363,7 +363,7 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return @@ -424,7 +424,7 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 78a4d9b71..9f589d2e4 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -137,7 +137,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_0x4092, 3 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b68214ddf..3534047ae 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -48,11 +48,11 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 addobject 2 addobject 3 turnobject 3, 2 diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index 6f078c06c..fe51946dc 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -13,16 +13,16 @@ MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 return MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 - setweather 6 + setweather WEATHER_FOG_1 return MtPyre_Exterior_EventScript_231FED:: @ 8231FED - setweather 6 + setweather WEATHER_FOG_1 doweather end MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2 - setweather 2 + setweather WEATHER_SUNNY doweather end diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 61b046daf..28d55d68f 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -42,7 +42,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230 waitmovement 0 delay 50 - setweather 0 + setweather WEATHER_NONE doweather waitse playmoncry SPECIES_HO_OH, 2 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index c7d125208..137731ae2 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -68,7 +68,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418 waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4000 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index fdc7626f6..f97825624 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -78,7 +78,7 @@ PetalburgCity_Gym_MapScript2_20498B: @ 820498B .2byte 0 PetalburgCity_Gym_EventScript_204995:: @ 8204995 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end PetalburgCity_Gym_MapScript2_20499A: @ 820499A diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index f2c568309..7645828ef 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 .2byte 0 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E - turnobject 255, 4 + turnobject EVENT_OBJ_ID_PLAYER, 4 turnobject 1, 3 end diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 6ebcdd253..deea27e74 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -222,7 +222,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setflag FLAG_0x052 fadescreen 1 removeobject 4 - setobjectxy 255, 6, 13 + setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 waitmovement 0 special ChooseStarter diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 6f1971d89..2dfb42d74 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -357,13 +357,13 @@ Route104_EventScript_1ED090:: @ 81ED090 Route104_EventScript_1ED099:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 - setobjectpriority 255, MAP_ROUTE104, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F waitmovement 0 - hideobjectat 255, MAP_ROUTE104 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Route104_EventScript_2720A0 goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9 goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF @@ -399,7 +399,7 @@ Route104_EventScript_1ED139:: @ 81ED139 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN + showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 @@ -414,7 +414,7 @@ Route104_EventScript_1ED139:: @ 81ED139 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index fd6234387..2e588f813 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_1EE760:: @ 81EE760 call Route109_EventScript_271E95 setobjectpriority 2, MAP_ROUTE109, 0 - setobjectpriority 255, MAP_ROUTE109, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_1EE90B waitmovement 0 removeobject 2 @@ -33,14 +33,14 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5 end Route109_EventScript_1EE7D5:: @ 81EE7D5 - hideobjectat 255, MAP_ROUTE109 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN + showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 waitmovement 0 addobject 4 @@ -56,7 +56,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 91931a713..b2aa22f6c 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -133,7 +133,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 - turnobject 255, 3 + turnobject EVENT_OBJ_ID_PLAYER, 3 end Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 0149299c1..98132b37f 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -81,7 +81,7 @@ Route111_EventScript_1F0DE6:: @ 81F0DE6 goto_if_lt Route111_EventScript_1F0E25 Route111_EventScript_1F0E22:: @ 81F0E22 - setweather 8 + setweather WEATHER_SANDSTORM Route111_EventScript_1F0E25:: @ 81F0E25 return @@ -109,7 +109,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 - hideobjectat 255, MAP_LITTLEROOT_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN end Route111_MapScript2_1F0E56: @ 81F0E56 @@ -125,10 +125,10 @@ Route111_EventScript_1F0E60:: @ 81F0E60 addobject 45 special sub_81BE7F4 waitstate - showobjectat 255, MAP_LITTLEROOT_TOWN + showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 delay 16 special sub_81BEB54 waitstate @@ -259,14 +259,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE step_end Route111_EventScript_1F0FB0:: @ 81F0FB0 - setweather 2 + setweather WEATHER_SUNNY fadenewbgm MUS_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1F0FBD:: @ 81F0FBD - setweather 8 + setweather WEATHER_SANDSTORM fadenewbgm MUS_ASHROAD doweather end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 85aa250ab..7668432ab 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -18,7 +18,7 @@ Route113_EventScript_1F216A:: @ 81F216A goto_if_lt Route113_EventScript_1F2189 compare VAR_TEMP_0, 84 goto_if_gt Route113_EventScript_1F2189 - setweather 7 + setweather WEATHER_ASH return Route113_EventScript_1F2189:: @ 81F2189 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index ccd77b4cc..cde0fbbd3 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -76,11 +76,11 @@ Route120_EventScript_1F54D8:: @ 81F54D8 return Route120_EventScript_1F54FF:: @ 81F54FF - setweather 1 + setweather WEATHER_CLOUDS return Route120_EventScript_1F5503:: @ 81F5503 - setweather 2 + setweather WEATHER_SUNNY return Route120_EventScript_1F5507:: @ 81F5507 @@ -92,7 +92,7 @@ Route120_EventScript_1F5507:: @ 81F5507 end Route120_EventScript_1F5523:: @ 81F5523 - setweather 3 + setweather WEATHER_RAIN_LIGHT return Route120_EventScript_1F5527:: @ 81F5527 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 316252a85..0e21b4c38 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F - turnobject 255, 4 + turnobject EVENT_OBJ_ID_PLAYER, 4 end RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 951f967a3..212496eef 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT - setweather 0 + setweather WEATHER_NONE doweather special sub_80B05B4 waitstate diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 4f5680522..4e7701de6 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL - setweather 15 + setweather WEATHER_15 doweather special WaitWeather waitstate diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 6bc328f76..10eb60cb7 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -30,7 +30,7 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 5ae3a5eb7..4bd28996b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B turnobject 1, 1 SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 42478e2a0..2d00095ba 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index e030036bb..df573aa7a 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -235,7 +235,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 compare VAR_FACING, 4 call_if_eq SlateportCity_Harbor_EventScript_20CC37 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_2721E2 return diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 38b60e430..ceff8f4e4 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -117,7 +117,7 @@ SootopolisCity_EventScript_1E583D:: @ 81E583D return SootopolisCity_EventScript_1E583E:: @ 81E583E - setweather 13 + setweather WEATHER_RAIN_HEAVY return SootopolisCity_EventScript_1E5842:: @ 81E5842 @@ -179,11 +179,11 @@ SootopolisCity_EventScript_1E58E5:: @ 81E58E5 end SootopolisCity_EventScript_1E58FC:: @ 81E58FC - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 return SootopolisCity_EventScript_1E5901:: @ 81E5901 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 setvar VAR_0x40CA, 3 return @@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather 15 + setweather WEATHER_15 doweather setvar VAR_0x8004, 0 special sub_813B7D8 @@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather 15 + setweather WEATHER_15 doweather setvar VAR_0x8004, 0 special sub_813B7D8 @@ -532,7 +532,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special sub_8139560 waitstate waitmoncry - setweather 0 + setweather WEATHER_NONE doweather applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 @@ -585,7 +585,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE special sub_8139560 waitstate waitmoncry - setweather 0 + setweather WEATHER_NONE doweather applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index f62be2f1a..4d315a158 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -22,7 +22,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 special sp194_trainer_tower compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_2680FF - setobjectxy 255, 9, 6 + setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6 applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index 5bb734781..9bfdec2ac 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829 LinkContestRoom1_EventScript_23B834:: @ 823B834 special sub_80F8B94 - hideobjectat 255, MAP_LITTLEROOT_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_23BB2B end diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 842d6fb1c..d526c769a 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 12b63ce05..b73d7e1fa 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -466,7 +466,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD waitdooranim applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -570,7 +570,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitdooranim applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -645,7 +645,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitdooranim applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1043,7 +1043,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitdooranim applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special sub_8018090 @@ -1378,7 +1378,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A waitdooranim applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1587,7 +1587,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E closemessage applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end |