diff options
Diffstat (limited to 'data/maps/SlateportCity/scripts.inc')
| -rw-r--r-- | data/maps/SlateportCity/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 11045361f..a9d10e297 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -56,7 +56,7 @@ SlateportCity_OnFrame: @ 81DCD12 SlateportCity_EventScript_ScottScene:: @ 81DCD1C lockall addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott applymovement 35, SlateportCity_Movement_ScottApproachPlayer waitmovement 0 msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT @@ -572,7 +572,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern applymovement 10, SlateportCity_Movement_GabbyExit applymovement 9, SlateportCity_Movement_TyExit waitmovement 0 @@ -604,7 +604,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_SternEnterHarbor - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor waitmovement 0 removeobject 11 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN @@ -887,19 +887,19 @@ SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown applymovement 35, SlateportCity_Movement_ScottExitBattleTent waitmovement 0 closedoor 10, 12 waitdooranim msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent waitmovement 0 removeobject 35 |