diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 16:58:11 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 17:05:15 -0400 |
| commit | b1c7689dcc47a7b0acce810739342f30970b7340 (patch) | |
| tree | 614de262014a504f78532d4ad01ef50668e076b9 | |
| parent | 625f62139721a7ddc1f2625b8609b415bec419fb (diff) | |
Use OBJ_EVENT_ID_PLAYER
81 files changed, 326 insertions, 323 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 2a112633f..8fe15bfb0 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1574,11 +1574,11 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 EventScript_1A0457: @ unreferenced? delay 30 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - showobjectat 255, MAP_PETALBURG_CITY + showobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY delay 30 - applymovement 255, Movement_1A047A + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A047A waitmovement 0 delay 30 return @@ -1594,7 +1594,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare VAR_FACING, 3 call_if_eq BattleTower_Outside_EventScript_160B3A delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E return @@ -1858,7 +1858,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 - applymovement 255, Common_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, 836, 0 @@ -1880,7 +1880,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 - applymovement 255, Common_Movement_WalkUp6 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 @@ -2759,7 +2759,7 @@ EventScript_1A2DB8: end SecretBase_EventScript_FirstEntrance:: @ 81A2DDE - applymovement 255, SecretBase_RedCave1_Movement_1A2E11 + applymovement OBJ_EVENT_ID_PLAYER, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO @@ -3900,7 +3900,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF S_FallDownHole:: @ 81C6BC5 lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_1C6BF7 + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -3911,7 +3911,7 @@ S_FallDownHole:: @ 81C6BC5 gUnknown_081C6BDE:: @ 81C6BDE lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_1C6BF7 + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/event_scripts.s b/data/event_scripts.s index c0b92f5cd..01a61b904 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1573,11 +1573,11 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 EventScript_1A0457: @ unreferenced? delay 30 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - showobjectat 255, MAP_PETALBURG_CITY + showobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY delay 30 - applymovement 255, Movement_1A047A + applymovement OBJ_EVENT_ID_PLAYER, Movement_1A047A waitmovement 0 delay 30 return @@ -1593,7 +1593,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare VAR_FACING, 3 call_if_eq BattleTower_Outside_EventScript_160B3A delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E return @@ -1857,7 +1857,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 - applymovement 255, Common_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -1879,7 +1879,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 - applymovement 255, Common_Movement_WalkUp6 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 @@ -2743,7 +2743,7 @@ EventScript_1A2DB8: end SecretBase_EventScript_FirstEntrance:: @ 81A2DDE - applymovement 255, SecretBase_RedCave1_Movement_1A2E11 + applymovement OBJ_EVENT_ID_PLAYER, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO @@ -3873,7 +3873,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF S_FallDownHole:: @ 81C6BC5 lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_1C6BF7 + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -3884,7 +3884,7 @@ S_FallDownHole:: @ 81C6BC5 gUnknown_081C6BDE:: @ 81C6BDE lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_1C6BF7 + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 96d43747b..293cc74c5 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -8,7 +8,7 @@ BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB setvar VAR_TEMP_0, 1 - applymovement 255, BattleTower_BattleRoom_Movement_160AB7 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_BattleRoom_Movement_160AB7 waitmovement 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA @@ -48,7 +48,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 removeobject 1 applymovement 2, BattleTower_BattleRoom_Movement_160ACB waitmovement 0 - applymovement 255, BattleTower_BattleRoom_Movement_160ABC + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_BattleRoom_Movement_160ABC waitmovement 0 msgbox BattleTower_BattleRoom_Text_19ACDC, MSGBOX_DEFAULT special LoadPlayerParty @@ -81,7 +81,7 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C closemessage - applymovement 255, BattleTower_BattleRoom_Movement_160ABE + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_BattleRoom_Movement_160ABE waitmovement 0 applymovement 2, BattleTower_BattleRoom_Movement_160AD0 waitmovement 0 diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc index aeb140a45..9f006e6c9 100644 --- a/data/maps/BattleTower_Corridor/scripts.inc +++ b/data/maps/BattleTower_Corridor/scripts.inc @@ -24,13 +24,13 @@ BattleTower_Corridor_EventScript_16088B:: @ 816088B compare VAR_0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 - applymovement 255, BattleTower_Corridor_Movement_1608D4 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Corridor_Movement_1608D4 waitmovement 0 goto BattleTower_Corridor_EventScript_1608C2 BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 applymovement 1, BattleTower_Corridor_Movement_1608D2 - applymovement 255, BattleTower_Corridor_Movement_1608D1 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Corridor_Movement_1608D1 waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc index 4839cf65e..4e5d8b8c1 100644 --- a/data/maps/BattleTower_Elevator/scripts.inc +++ b/data/maps/BattleTower_Elevator/scripts.inc @@ -10,13 +10,13 @@ BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 setvar VAR_TEMP_0, 1 applymovement 1, BattleTower_Elevator_Movement_160835 - applymovement 255, BattleTower_Elevator_Movement_160839 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Elevator_Movement_160839 waitmovement 0 special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D - applymovement 255, BattleTower_Elevator_Movement_160841 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Elevator_Movement_160841 waitmovement 0 setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 @@ -29,7 +29,7 @@ BattleTower_Elevator_MapScript2_160821:: @ 8160821 BattleTower_Elevator_EventScript_16082B:: @ 816082B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end BattleTower_Elevator_Movement_160835:: @ 8160835 diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index 5e8e142ad..a7107c278 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -44,7 +44,7 @@ BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 @@ -292,12 +292,12 @@ BattleTower_Lobby_EventScript_160662:: @ 8160662 BattleTower_Lobby_EventScript_160664:: @ 8160664 applymovement 1, BattleTower_Lobby_Movement_160693 - applymovement 255, BattleTower_Lobby_Movement_160693 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Lobby_Movement_160693 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, BattleTower_Lobby_Movement_160697 - applymovement 255, BattleTower_Lobby_Movement_16069A + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Lobby_Movement_16069A waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index e5feefe7d..66eeb9fa5 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -23,7 +23,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 lockall - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4F03, MSGBOX_DEFAULT diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 96c4f8e07..2cd04bf48 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -121,25 +121,25 @@ DewfordTown_EventScript_14E151:: @ 814E151 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 - applymovement 255, DewfordTown_Movement_14E402 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E402 waitmovement 0 - hideobjectat 255, MAP_DEWFORD_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 - applymovement 255, DewfordTown_Movement_14E293 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E293 waitmovement 0 - showobjectat 255, MAP_ROUTE104 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 call DewfordTown_EventScript_1A02EF - applymovement 255, DewfordTown_Movement_14E405 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E405 waitmovement 0 - showobjectat 255, MAP_ROUTE104 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 - resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate @@ -153,16 +153,16 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 - applymovement 255, DewfordTown_Movement_14E402 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E402 waitmovement 0 - hideobjectat 255, MAP_DEWFORD_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 - applymovement 255, DewfordTown_Movement_14E356 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - showobjectat 255, MAP_ROUTE109 - applymovement 255, DewfordTown_Movement_14E409 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E409 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 @@ -178,7 +178,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index aa20fca9c..40fbd3238 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD DewfordTown_Hall_EventScript_15351E:: @ 815351E compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_153556:: @ 8153556 return DewfordTown_Hall_EventScript_15356D:: @ 815356D - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return DewfordTown_Hall_EventScript_153578:: @ 8153578 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return DewfordTown_Hall_EventScript_153583:: @ 8153583 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index d946850bd..29ba3f2b6 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 @@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE lockall - applymovement 255, Common_Movement_WalkUp4 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmovement 0 setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 @@ -105,7 +105,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_19134D, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_1A03B0 @@ -119,12 +119,12 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B9DD applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 waitmovement 0 delay 20 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, MSGBOX_DEFAULT checkplayergender @@ -134,7 +134,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GUIDE warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4 EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_Corridor1/scripts.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc index 6be683142..0bb59bb07 100644 --- a/data/maps/EverGrandeCity_Corridor1/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor2/scripts.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc index 0179f7010..0ee6a6e3a 100644 --- a/data/maps/EverGrandeCity_Corridor2/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor3/scripts.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc index b67af1585..82592da7d 100644 --- a/data/maps/EverGrandeCity_Corridor3/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor4/scripts.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc index 3983722be..e1a49c7a3 100644 --- a/data/maps/EverGrandeCity_Corridor4/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor5/scripts.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc index 7e823a6cf..f9ecb94ec 100644 --- a/data/maps/EverGrandeCity_Corridor5/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 45f982f28..45e9f9782 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 2f31b4945..1218cf1d0 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 1946a92f1..ca0acd145 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E @@ -18,24 +18,24 @@ EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 lockall applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59 - applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_15BC59 waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_191841, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 - applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_15BC60 waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_1918D7, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index e461ddc1a..ea84a7d81 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index e876ec1b5..eb26844cb 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -73,12 +73,12 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 end EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34 - applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_Movement_15BB76 waitmovement 0 return EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F - applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_Movement_15BB7A waitmovement 0 return diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 62e0ae763..527aefdda 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -24,7 +24,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index 33d03feac..585ff4ab9 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -35,12 +35,12 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 delay 20 applymovement 1, FallarborTown_ContestLobby_Movement_153A8C waitmovement 0 - applymovement 255, FallarborTown_ContestLobby_Movement_153A7A + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_ContestLobby_Movement_153A7A waitmovement 0 msgbox FallarborTown_ContestLobby_Text_1A6832, MSGBOX_DEFAULT closemessage applymovement 1, FallarborTown_ContestLobby_Movement_153A83 - applymovement 255, FallarborTown_ContestLobby_Movement_153A70 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_ContestLobby_Movement_153A70 waitmovement 0 releaseall return diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 74a936c4e..0c119f230 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -37,7 +37,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitdooranim applymovement 8, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement 8, Common_Movement_ExclamationMark waitmovement 0 applymovement 8, Common_Movement_Delay48 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index ba39131a4..54eec2697 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B waitmovement 4 - applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158A4C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, MSGBOX_DEFAULT lockall @@ -196,7 +196,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 waitmovement 11 - applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158B76 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, MSGBOX_DEFAULT lockall @@ -505,14 +505,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158E99 waitmovement 0 messageautoscroll LilycoveCity_ContestLobby_Text_1A6832 waitmessage delay 20 closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4 - applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158E8E waitmovement 0 releaseall return @@ -644,12 +644,12 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_15901C waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_159008 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_159008 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_1A6832, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_159013 - applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158FFE waitmovement 0 releaseall return diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 84fbc2440..04fdafbec 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -44,11 +44,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, MSGBOX_DEFAULT closemessage - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_158395 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index edc833be9..7c1b34e61 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -84,18 +84,18 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE - applymovement 255, LilycoveCity_Harbor_Movement_159A86 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A86 waitmovement 0 return LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 - applymovement 255, LilycoveCity_Harbor_Movement_159A89 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A89 waitmovement 0 return @@ -130,7 +130,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 34638de44..4f14d7711 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -47,7 +47,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158504 waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -55,7 +55,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -63,7 +63,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158501 waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 3974dfc74..b637b3c1a 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -63,17 +63,17 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A lockall applymovement 1, Common_Movement_FacePlayer - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, MSGBOX_SIGN applymovement 1, Common_Movement_FacePlayer waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, MSGBOX_SIGN copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index d87087c89..3f3905177 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -15,12 +15,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C waitmovement 0 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index d8b1ab47e..df95d1e41 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - hideobjectat 255, MAP_LITTLEROOT_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_15F919 end diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 8ea09719b..7b45aa651 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -99,7 +99,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 playse SE_DANSA - applymovement 255, LittlerootTown_Movement_14D6C0 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -114,16 +114,16 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B msgbox LittlerootTown_Text_16A7C9, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_14D6B1 - applymovement 255, LittlerootTown_Movement_14D6B8 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6B8 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 - applymovement 255, LittlerootTown_Movement_14D6BD + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6BD waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT @@ -228,7 +228,7 @@ LittlerootTown_EventScript_14D755:: @ 814D755 msgbox LittlerootTown_Text_16ACEB, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_14D787 - applymovement 255, LittlerootTown_Movement_14D793 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D793 waitmovement 0 msgbox LittlerootTown_Text_16AD3C, MSGBOX_DEFAULT closemessage @@ -310,7 +310,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT closemessage @@ -480,70 +480,70 @@ LittlerootTown_EventScript_14D995:: @ 814D995 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC76 waitmovement 0 return LittlerootTown_EventScript_14D9ED:: @ 814D9ED - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC7D waitmovement 0 return LittlerootTown_EventScript_14DA02:: @ 814DA02 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC84 waitmovement 0 return LittlerootTown_EventScript_14DA17:: @ 814DA17 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC89 waitmovement 0 return LittlerootTown_EventScript_14DA2C:: @ 814DA2C - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC8F waitmovement 0 return LittlerootTown_EventScript_14DA41:: @ 814DA41 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC92 waitmovement 0 return LittlerootTown_EventScript_14DA56:: @ 814DA56 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC96 waitmovement 0 return LittlerootTown_EventScript_14DA6B:: @ 814DA6B - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC9A waitmovement 0 return LittlerootTown_EventScript_14DA80:: @ 814DA80 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC9D waitmovement 0 return LittlerootTown_EventScript_14DA95:: @ 814DA95 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DCA3 waitmovement 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 2548e815c..e3073b374 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -61,7 +61,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA lockall msgbox LittlerootTown_BrendansHouse_1F_Text_172574, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 @@ -94,7 +94,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 waitmovement 0 special GetRivalSonDaughterString diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index a679b6fc3..59add7384 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -61,7 +61,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 lockall msgbox LittlerootTown_MaysHouse_1F_Text_172574, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 waitmovement 0 special GetRivalSonDaughterString diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 40baf0f81..a70ca7e49 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -14,7 +14,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC @@ -67,7 +67,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_152D5B waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA end @@ -119,7 +119,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, MSGBOX_DEFAULT applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, 0 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 52709499a..712785396 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -120,7 +120,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 delay 30 applymovement 7, MauvilleCity_Movement_14C2D8 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT closemessage @@ -139,7 +139,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 delay 30 applymovement 7, MauvilleCity_Movement_14C2DC waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index be33f7821..a77ee6067 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 applymovement 5, Common_Movement_WalkInPlaceFastestDown @@ -29,7 +29,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1932C5, MSGBOX_DEFAULT closemessage - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -45,7 +45,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193320, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_15C64F + applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_15C64F applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC waitmovement 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index a5f676dba..1eb31d636 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -42,12 +42,12 @@ MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 lockall - applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AD3D waitmovement 0 applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F waitmovement 0 moveobjectoffscreen 1 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_GAME_CORNER_STATE, 1 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22 @@ -137,19 +137,19 @@ MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04 applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 - applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AE3A waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16 applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 - applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AE3E waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 - applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AE42 waitmovement 0 return diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc index 3536e8d32..fecf1060f 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -13,7 +13,7 @@ MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall - applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 special PrintEReaderTrainerGreeting msgbox gStringVar4, MSGBOX_DEFAULT @@ -30,7 +30,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE closemessage special ScrSpecial_HealPlayerParty - applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 6e735f408..8126b8cfa 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -79,7 +79,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 2, 7, METATILE_MossdeepGym_Switch_Down, 1 @@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Left, 0 setmetatile 2, 7, METATILE_MossdeepGym_Switch_Up, 1 @@ -105,7 +105,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 8, 10, METATILE_MossdeepGym_Switch_Down, 1 @@ -114,7 +114,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Down, 0 setmetatile 8, 10, METATILE_MossdeepGym_Switch_Up, 1 @@ -125,7 +125,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Left, 0 setmetatile 17, 15, METATILE_MossdeepGym_Switch_Down, 1 @@ -134,7 +134,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 17, 15, METATILE_MossdeepGym_Switch_Up, 1 @@ -145,7 +145,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D setflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Up, 0 setmetatile 5, 24, METATILE_MossdeepGym_Switch_Down, 1 @@ -154,7 +154,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 5, 24, METATILE_MossdeepGym_Switch_Up, 1 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 703c2062e..34ea0520b 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -19,7 +19,7 @@ MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 lockall - applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 + applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_15C1B4 applymovement 1, MtChimney_CableCarStation_Movement_15C1AA waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 @@ -42,7 +42,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C msgbox MtChimney_CableCarStation_Text_1925A9, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 - applymovement 255, MtChimney_CableCarStation_Movement_15C1AF + applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 113d071e8..665291edc 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -25,7 +25,7 @@ MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -93,7 +93,7 @@ MtPyre_Summit_EventScript_15D59F:: @ 815D59F MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA applymovement 3, MtPyre_Summit_Movement_15D5DF waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -105,7 +105,7 @@ MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA applymovement 3, MtPyre_Summit_Movement_15D5E5 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -260,7 +260,7 @@ MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index b1d1a8548..ecc52cfa0 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC lockall - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 9dad90b1f..ab4ba4920 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -49,20 +49,20 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC OldaleTown_EventScript_14DE07:: @ 814DE07 applymovement 2, OldaleTown_Movement_14DE97 - applymovement 255, OldaleTown_Movement_14DEC1 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DEC1 waitmovement 0 goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE1E:: @ 814DE1E applymovement 2, OldaleTown_Movement_14DEA2 - applymovement 255, OldaleTown_Movement_14DECB + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DECB waitmovement 0 goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE35:: @ 814DE35 - applymovement 255, OldaleTown_Movement_14DEB9 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DEB9 applymovement 2, OldaleTown_Movement_14DE8E waitmovement 0 goto OldaleTown_EventScript_14DE4C @@ -200,7 +200,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF OldaleTown_EventScript_14DEFF:: @ 814DEFF lockall - applymovement 255, OldaleTown_Movement_14DFEC + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DFEC applymovement 3, OldaleTown_Movement_14DFEF waitmovement 0 msgbox OldaleTown_Text_16B045, MSGBOX_DEFAULT @@ -226,7 +226,7 @@ OldaleTown_EventScript_14DF41:: @ 814DF41 lockall applymovement 4, OldaleTown_Movement_14DFDE waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -235,7 +235,7 @@ OldaleTown_EventScript_14DF5C:: @ 814DF5C lockall applymovement 4, OldaleTown_Movement_14DFE1 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -244,7 +244,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 lockall applymovement 4, OldaleTown_Movement_14DFE3 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto OldaleTown_EventScript_14DF92 end diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 352910894..4c12ed21e 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -29,7 +29,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_14B7ED - applymovement 255, PetalburgCity_Movement_14B7CC + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14B7CC waitmovement 0 msgbox PetalburgCity_Text_16D361, MSGBOX_DEFAULT special ScrSpecial_StartWallyTutorialBattle @@ -208,7 +208,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 call_if_eq PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, MSGBOX_DEFAULT applymovement 9, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PetalburgCity_Text_164449, MSGBOX_DEFAULT closemessage @@ -221,7 +221,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 PetalburgCity_EventScript_14B91B:: @ 814B91B applymovement 9, PetalburgCity_Movement_14B9B1 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -233,38 +233,38 @@ PetalburgCity_EventScript_14B930:: @ 814B930 PetalburgCity_EventScript_14B93B:: @ 814B93B applymovement 9, PetalburgCity_Movement_14B9B9 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_14B950:: @ 814B950 applymovement 9, PetalburgCity_Movement_14B9BE waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_14B965:: @ 814B965 applymovement 9, PetalburgCity_Movement_14B9C4 - applymovement 255, PetalburgCity_Movement_14BA01 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA01 waitmovement 0 return PetalburgCity_EventScript_14B977:: @ 814B977 applymovement 9, PetalburgCity_Movement_14B9CF - applymovement 255, PetalburgCity_Movement_14BA0B + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA0B waitmovement 0 return PetalburgCity_EventScript_14B989:: @ 814B989 applymovement 9, PetalburgCity_Movement_14B9DD - applymovement 255, PetalburgCity_Movement_14BA18 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA18 waitmovement 0 return PetalburgCity_EventScript_14B99B:: @ 814B99B applymovement 9, PetalburgCity_Movement_14B9E8 - applymovement 255, PetalburgCity_Movement_14BA22 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA22 waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 657d129d8..75b1299b0 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -61,7 +61,7 @@ PetalburgCity_Gym_MapScript2_154553:: @ 8154553 .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 @@ -73,14 +73,14 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C msgbox PetalburgCity_Gym_Text_17A196, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_17A1B0, MSGBOX_DEFAULT closemessage - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 @@ -219,13 +219,13 @@ PetalburgCity_Gym_EventScript_154800:: @ 8154800 applymovement 10, PetalburgCity_Gym_Movement_154B1D waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_15481C:: @ 815481C applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_154B27 waitmovement 0 return @@ -233,25 +233,25 @@ PetalburgCity_Gym_EventScript_15481C:: @ 815481C PetalburgCity_Gym_EventScript_154835:: @ 8154835 applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_154B3E - applymovement 255, PetalburgCity_Gym_Movement_154B4D + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B4D waitmovement 0 return PetalburgCity_Gym_EventScript_15484E:: @ 815484E applymovement 10, PetalburgCity_Gym_Movement_154B2E - applymovement 255, PetalburgCity_Gym_Movement_154B45 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B45 waitmovement 0 return PetalburgCity_Gym_EventScript_154860:: @ 8154860 applymovement 10, PetalburgCity_Gym_Movement_154B3E - applymovement 255, PetalburgCity_Gym_Movement_154B57 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B57 waitmovement 0 return PetalburgCity_Gym_EventScript_154872:: @ 8154872 applymovement 10, PetalburgCity_Gym_Movement_154B36 - applymovement 255, PetalburgCity_Gym_Movement_154B5F + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B5F waitmovement 0 return @@ -262,19 +262,19 @@ PetalburgCity_Gym_EventScript_154884:: @ 8154884 PetalburgCity_Gym_EventScript_15488F:: @ 815488F applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3 applymovement 1, Common_Movement_WalkInPlaceFastestLeft - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 6b2266064..84110b859 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -44,7 +44,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 call PetalburgWoods_EventScript_15CDE6 applymovement 4, PetalburgWoods_Movement_15CE8E waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PetalburgWoods_Text_194D92, MSGBOX_DEFAULT closemessage @@ -62,7 +62,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 4, PetalburgWoods_Movement_15CEA4 waitmovement 0 msgbox PetalburgWoods_Text_194E9A, MSGBOX_DEFAULT - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_194EE8, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83 @@ -87,7 +87,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 removeobject 3 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox PetalburgWoods_Text_19507E, MSGBOX_DEFAULT giveitem ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 3b6152c36..c5084fe7b 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -23,7 +23,7 @@ Route101_EventScript_14E948:: @ 814E948 closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement 255, Route101_Movement_14EA2C + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14EA2C applymovement 2, Route101_Movement_14EA50 applymovement 4, Route101_Movement_14EA1F waitmovement 0 @@ -45,7 +45,7 @@ Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_14E9FA + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FA waitmovement 0 releaseall end @@ -54,7 +54,7 @@ Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_14E9FC + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FC waitmovement 0 releaseall end @@ -63,7 +63,7 @@ Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_14E9FE + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FE waitmovement 0 releaseall end @@ -221,8 +221,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 - setobjectxy 255, 6, 13 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ScrSpecial_ChooseStarter waitstate diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 85b24f59c..b90029c21 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -124,18 +124,18 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 - applymovement 255, Route104_Movement_14F162 + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F162 waitmovement 0 - hideobjectat 255, MAP_ROUTE104 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F - applymovement 255, Route104_Movement_14F09F + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F09F waitmovement 0 - applymovement 255, Route104_Movement_14F166 + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route104_Movement_14F168 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F168 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 @@ -149,7 +149,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 1ed12bbb5..3782a9dcb 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -15,32 +15,32 @@ Route109_EventScript_14F4D3:: @ 814F4D3 end Route109_EventScript_14F518:: @ 814F518 - applymovement 255, Route109_Movement_14F66D + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F66D waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F528:: @ 814F528 - applymovement 255, Route109_Movement_14F675 + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F675 waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F538:: @ 814F538 - applymovement 255, Route109_Movement_14F678 + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F678 waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F548:: @ 814F548 - hideobjectat 255, MAP_ROUTE109 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF - applymovement 255, Route109_Movement_14F5BF + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route109_Movement_14F670 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F670 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD @@ -55,7 +55,7 @@ Route109_EventScript_14F548:: @ 814F548 msgbox Route109_Text_16B4B5, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index 227f7f53d..31d41362f 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -42,7 +42,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @ You don't have a bike! msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 + applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 waitmovement 0 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index e57bb085a..23e2c4599 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -21,7 +21,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB + applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB waitmovement 0 releaseall end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 157f11ffe..2bc94ee14 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -231,11 +231,11 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 playse SE_W153 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEnd_Movement_161CE8 waitmovement 0 delay 4 turnobject 1, 4 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 616049f04..75e2b22ec 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -134,7 +134,7 @@ Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 - turnobject 255, 3 + turnobject OBJ_EVENT_ID_PLAYER, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 @@ -237,9 +237,9 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D playse SE_PIN - applymovement 255, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement 255, Common_Movement_Delay48 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD @@ -497,9 +497,9 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 - applymovement 255, Common_Movement_WalkUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_16165E + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEntrance_Movement_16165E waitmovement 0 switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161660 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 0f8244d8a..dcf0b8f32 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -182,22 +182,22 @@ Route111_EventScript_150151:: @ 8150151 end Route111_EventScript_150188:: @ 8150188 - applymovement 255, Route111_Movement_1501B4 + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501B4 waitmovement 0 return Route111_EventScript_150193:: @ 8150193 - applymovement 255, Route111_Movement_1501B6 + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501B6 waitmovement 0 return Route111_EventScript_15019E:: @ 815019E - applymovement 255, Route111_Movement_1501B8 + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501B8 waitmovement 0 return Route111_EventScript_1501A9:: @ 81501A9 - applymovement 255, Route111_Movement_1501BA + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501BA waitmovement 0 return @@ -253,7 +253,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 removeobject 1 call Route111_EventScript_15034F - applymovement 255, Route111_Movement_15035B + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 addobject 2 @@ -271,7 +271,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 removeobject 2 call Route111_EventScript_15034F - applymovement 255, Route111_Movement_15035B + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 addobject 3 @@ -289,7 +289,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 removeobject 3 call Route111_EventScript_15034F - applymovement 255, Route111_Movement_15035B + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 addobject 4 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 93d45f52f..df265e1a2 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -20,7 +20,7 @@ Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E Route112_CableCarStation_EventScript_15C068:: @ 815C068 lockall - applymovement 255, Route112_CableCarStation_Movement_15C0F5 + applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_15C0F5 applymovement 1, Route112_CableCarStation_Movement_15C0EB waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 @@ -43,7 +43,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD msgbox Route112_CableCarStation_Text_1925A9, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_15C0E6 - applymovement 255, Route112_CableCarStation_Movement_15C0F0 + applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 60e5f247f..3bd2091f7 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -133,7 +133,7 @@ Route116_EventScript_150B5D:: @ 8150B5D Route116_EventScript_150B6E:: @ 8150B6E lockall applymovement 11, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_17032A, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 69b3609dd..be767e166 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall setvar VAR_0x8008, 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 19, Route118_Movement_151069 waitmovement 0 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall setvar VAR_0x8008, 1 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto Route118_EventScript_151004 end @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall setvar VAR_0x8008, 2 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 19, Route118_Movement_15106B waitmovement 0 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index d59624ae5..d5b376d49 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -60,7 +60,7 @@ Route119_EventScript_1511DB:: @ 81511DB call_if_eq Route119_EventScript_1513A6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1513B1 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index bd0b71051..56a0c2930 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -229,7 +229,7 @@ Route120_EventScript_15189D:: @ 815189D Route120_EventScript_151908:: @ 8151908 applymovement 31, Common_Movement_WalkInPlaceFastestDown - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route120_Text_171A40, MSGBOX_DEFAULT giveitem ITEM_DEVON_SCOPE @@ -253,12 +253,12 @@ Route120_EventScript_151908:: @ 8151908 end Route120_EventScript_15197F:: @ 815197F - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return Route120_EventScript_15198A:: @ 815198A - applymovement 255, Route120_Movement_151995 + applymovement OBJ_EVENT_ID_PLAYER, Route120_Movement_151995 waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 5556af87b..6fa9c8d81 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_15C348 waitmovement 0 special ExitSafariMode setvar VAR_SAFARI_ZONE_STATE, 0 @@ -47,7 +47,7 @@ Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379 Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 lockall - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0 nop @@ -78,7 +78,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 msgbox Route121_SafariZoneEntrance_Text_1C392D, MSGBOX_DEFAULT closemessage hidemoneybox 0, 0 - applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 special EnterSafariMode setvar VAR_SAFARI_ZONE_STATE, 2 @@ -113,7 +113,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C closemessage hidemoneybox 0, 0 - applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_15C47C waitmovement 0 releaseall end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 451d3e3e0..d4b661891 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -34,12 +34,12 @@ Route128_EventScript_15213F:: @ 815213F closemessage applymovement 5, Route128_Movement_1522A1 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_172008, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_15227E - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Route128_Movement_152290 waitmovement 0 msgbox Route128_Text_17210B, MSGBOX_DEFAULT @@ -57,12 +57,12 @@ Route128_EventScript_15213F:: @ 815213F addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route128_Text_172181, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_15226D - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 .ifdef SAPPHIRE msgbox Route128_Text_1721A2, MSGBOX_DEFAULT diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 5c6307df6..0dcd74170 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -219,7 +219,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 @ 814C59B applymovement 9, RustboroCity_Movement_14C5F7 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -382,7 +382,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -394,7 +394,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -406,7 +406,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -420,7 +420,7 @@ RustboroCity_EventScript_14C715:: @ 814C715 waitmovement 0 applymovement 9, RustboroCity_Movement_14C74B waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -490,7 +490,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -502,7 +502,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -514,7 +514,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -528,7 +528,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 waitmovement 0 applymovement 9, RustboroCity_Movement_14C74B waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index c25951a04..ccd704108 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_157739:: @ 8157739 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 - turnobject 255, 4 + turnobject OBJ_EVENT_ID_PLAYER, 4 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 @@ -39,13 +39,13 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 closemessage playbgm MUS_TSURETEK, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT giveitem ITEM_LETTER diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 3152d082f..7fd75bcd5 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -86,13 +86,13 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 end RusturfTunnel_EventScript_15C880:: @ 815C880 - applymovement 255, RusturfTunnel_Movement_15C96A + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96A applymovement 1, RusturfTunnel_Movement_15C98F waitmovement 0 return RusturfTunnel_EventScript_15C892:: @ 815C892 - applymovement 255, RusturfTunnel_Movement_15C96D + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96D applymovement 1, RusturfTunnel_Movement_15C994 waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -100,7 +100,7 @@ RusturfTunnel_EventScript_15C892:: @ 815C892 return RusturfTunnel_EventScript_15C8AE:: @ 815C8AE - applymovement 255, RusturfTunnel_Movement_15C96D + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96D applymovement 1, RusturfTunnel_Movement_15C994 waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -110,7 +110,7 @@ RusturfTunnel_EventScript_15C8AE:: @ 815C8AE RusturfTunnel_EventScript_15C8CA:: @ 815C8CA applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -314,7 +314,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_194274, MSGBOX_DEFAULT giveitem ITEM_DEVON_GOODS closemessage - applymovement 255, RusturfTunnel_Movement_15CA99 + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 removeobject 6 @@ -322,7 +322,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA addobject 5 applymovement 5, RusturfTunnel_Movement_15CAAC waitmovement 0 - applymovement 255, RusturfTunnel_Movement_15CA9F + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15CA9F applymovement 5, RusturfTunnel_Movement_15CAC0 waitmovement 0 msgbox RusturfTunnel_Text_19432A, MSGBOX_DEFAULT diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc index 9606023c1..bdc8787c6 100644 --- a/data/maps/SafariZone_Southeast/scripts.inc +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -10,7 +10,7 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall setvar VAR_TEMP_1, 0 - applymovement 255, SafariZone_Southeast_Movement_160087 + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_Southeast_Movement_160087 waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 waitmovement 0 @@ -78,7 +78,7 @@ SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 SafariZone_Southeast_EventScript_160105:: @ 8160105 applymovement 1, SafariZone_Southeast_Movement_160150 waitmovement 0 - applymovement 255, SafariZone_Southeast_Movement_16014B + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_Southeast_Movement_16014B waitmovement 0 goto SafariZone_Southeast_EventScript_160139 end @@ -86,7 +86,7 @@ SafariZone_Southeast_EventScript_160105:: @ 8160105 SafariZone_Southeast_EventScript_16011F:: @ 816011F applymovement 1, SafariZone_Southeast_Movement_160153 waitmovement 0 - applymovement 255, SafariZone_Southeast_Movement_16014D + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_Southeast_Movement_16014D waitmovement 0 goto SafariZone_Southeast_EventScript_160139 end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index bd39cb6b4..e48980e7f 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -18,9 +18,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 255, SeafloorCavern_Room9_Movement_15DD68 + applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_15DD68 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41B8, MSGBOX_DEFAULT @@ -29,7 +29,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .endif closemessage addobject VAR_0x8004 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 @@ -93,7 +93,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playse SE_TAMA special sub_80818A4 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @@ -127,7 +127,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4A89, MSGBOX_DEFAULT .endif playse SE_PC_LOGON - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4443, MSGBOX_DEFAULT diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 4eca5a985..0735ab7ba 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -491,7 +491,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_14C000 - applymovement 255, SlateportCity_Movement_14C00E + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_14C00E applymovement 10, SlateportCity_Movement_14BFDD applymovement 9, SlateportCity_Movement_14BFEA waitmovement 0 @@ -523,7 +523,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC msgbox SlateportCity_Text_16583A, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_14BFFB - applymovement 255, SlateportCity_Movement_14C008 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_14C008 waitmovement 0 removeobject 11 clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index 2d253d91c..1c85cba81 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -35,12 +35,12 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 delay 20 applymovement 1, SlateportCity_ContestLobby_Movement_1554DC waitmovement 0 - applymovement 255, SlateportCity_ContestLobby_Movement_1554CA + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_ContestLobby_Movement_1554CA waitmovement 0 msgbox SlateportCity_ContestLobby_Text_1A6832, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_ContestLobby_Movement_1554D3 - applymovement 255, SlateportCity_ContestLobby_Movement_1554C0 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_ContestLobby_Movement_1554C0 waitmovement 0 releaseall return diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 2c467332c..07df5e087 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall setvar VAR_0x8008, 3 - applymovement 255, SlateportCity_Harbor_Movement_1560C2 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 end @@ -50,7 +50,7 @@ SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Harbor_Text_17FD7D, MSGBOX_DEFAULT closemessage @@ -82,21 +82,21 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 SlateportCity_Harbor_EventScript_15605C:: @ 815605C applymovement 4, SlateportCity_Harbor_Movement_1560B3 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_156071:: @ 8156071 applymovement 4, SlateportCity_Harbor_Movement_1560B9 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_156086:: @ 8156086 applymovement 4, SlateportCity_Harbor_Movement_1560BE waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 compare VAR_FACING, 4 call_if_eq SlateportCity_Harbor_EventScript_1561E4 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -237,12 +237,12 @@ SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA end SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4 - applymovement 255, SlateportCity_Harbor_Movement_1561FA + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1561FA waitmovement 0 return SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF - applymovement 255, SlateportCity_Harbor_Movement_1561FD + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1561FD waitmovement 0 return diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index ed3e8a8c4..575a42e33 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -18,14 +18,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 lockall - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 lockall - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end @@ -38,7 +38,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage hidemoneybox 0, 0 - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 releaseall end @@ -61,7 +61,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, MSGBOX_DEFAULT closemessage hidemoneybox 0, 0 - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 releaseall end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index ab91ca006..a9195b18c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -75,7 +75,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 fadescreen 0 delay 30 setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -94,7 +94,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 end SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -104,12 +104,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D return SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_155E8E waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_155E92 waitmovement 0 return diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index c580876ad..8b13ebefe 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -203,7 +203,7 @@ ClosedSootopolisDoorScript:: @ 814D2FF SootopolisCity_EventScript_14D308:: @ 814D308 lockall applymovement 10, Common_Movement_WalkInPlaceFastestLeft - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN applymovement 10, Common_Movement_ExclamationMark @@ -219,7 +219,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .endif closemessage applymovement 10, SootopolisCity_Movement_14D417 - applymovement 255, SootopolisCity_Movement_14D440 + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_14D440 waitmovement 10 .ifdef SAPPHIRE msgbox SootopolisCity_Text_1699FD, MSGBOX_DEFAULT @@ -240,10 +240,10 @@ SootopolisCity_EventScript_14D308:: @ 814D308 delay 30 applymovement 5, SootopolisCity_Movement_14D46A applymovement 10, SootopolisCity_Movement_14D41D - applymovement 255, SootopolisCity_Movement_14D445 + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_14D445 waitmovement 0 applymovement 5, Common_Movement_WalkInPlaceFastestRight - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -256,7 +256,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 closemessage delay 30 applymovement 5, SootopolisCity_Movement_14D47C - applymovement 255, SootopolisCity_Movement_14D457 + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_14D457 applymovement 10, SootopolisCity_Movement_14D42D waitmovement 0 applymovement 5, Common_Movement_WalkInPlaceFastestLeft @@ -266,7 +266,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_16A06C, MSGBOX_DEFAULT .endif - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169C99, MSGBOX_DEFAULT diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 44dd9425a..f253f45af 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -73,7 +73,7 @@ SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 lockall delay 20 - applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index b161cfb8c..3f0454bbb 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -31,12 +31,12 @@ SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25 end BattleTower_Outside_EventScript_160B2F:: @ 8160B2F - applymovement 255, BattleTower_Outside_Movement_160B45 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B45 waitmovement 0 return BattleTower_Outside_EventScript_160B3A:: @ 8160B3A - applymovement 255, BattleTower_Outside_Movement_160B47 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B47 waitmovement 0 return diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 57ac569ca..5c367f366 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -35,12 +35,12 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 delay 20 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 waitmovement 0 - applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_ContestLobby_Movement_153E23 waitmovement 0 msgbox VerdanturfTown_ContestLobby_Text_1A6832, MSGBOX_DEFAULT closemessage applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C - applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_ContestLobby_Movement_153E19 waitmovement 0 releaseall return diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 4b592d9c0..72debaf09 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -35,7 +35,7 @@ VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF end VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_197943 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 121f33754..036324abb 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -88,7 +88,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 @@ -105,14 +105,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 return @@ -130,7 +130,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 @@ -139,7 +139,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 playse SE_PIN message OldaleTown_PokemonCenter_2F_Text_1A4E79 waitmessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 @@ -226,13 +226,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim release @@ -390,13 +390,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 opendoor 8, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 8, 1 waitdooranim release @@ -487,13 +487,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 opendoor 11, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 11, 1 waitdooranim release diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 5b946fbdb..a5b0c77bf 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -69,7 +69,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if_eq MtChimney_EventScript_1B2D7D compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_1B2D88 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index a74342b7b..473db0e30 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -15,19 +15,19 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172453, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -40,7 +40,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 releaseall end @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage @@ -157,17 +157,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 playbgm MUS_INTER_V, FALSE msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE - applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT @@ -182,17 +182,17 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 playbgm MUS_INTER_V, FALSE msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE - applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE - applymovement 255, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT fadedefaultbgm @@ -433,24 +433,24 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE return LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D:: @ 81B6E1D - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E49 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E49 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E54 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E54 waitmovement 0 return diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 21cb3f7f4..f28f315b5 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -252,4 +252,7 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 +#define OBJ_EVENT_ID_PLAYER 0xFF +#define OBJ_EVENT_ID_CAMERA 0x7F + #endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index a7ec192a9..5d30cf2c6 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -737,7 +737,7 @@ static const struct MenuAction gUnknown_Debug_083C1A9C[] = { static const u8 gUnknown_Debug_083C1AAC[] = {2}; static const u16 gUnknown_Debug_083C1AAE[][9] = { - {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1} + {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08} }; static const u8 gUnknown_Debug_083C1AC0[] = DTR("ジムリーダー", "GYM LEADER"); |