diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-24 16:09:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 16:09:42 -0600 |
| commit | c2ca57e8ac02324c3c7d18063844b2a7fd7c217f (patch) | |
| tree | 4b65599c31b98ca2bc08dc76d932fa7b0b117ed6 /data/maps/Route109 | |
| parent | ed1961a926b0dad23094fe0aa55a16d825da3efe (diff) | |
| parent | 38293d429335648119a16b31482c53260a23be3f (diff) | |
Merge pull request #477 from melthelesbian/object_script_commands
use player constant in obj script commands
Diffstat (limited to 'data/maps/Route109')
| -rw-r--r-- | data/maps/Route109/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index fd6234387..2e588f813 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_1EE760:: @ 81EE760 call Route109_EventScript_271E95 setobjectpriority 2, MAP_ROUTE109, 0 - setobjectpriority 255, MAP_ROUTE109, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_1EE90B waitmovement 0 removeobject 2 @@ -33,14 +33,14 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5 end Route109_EventScript_1EE7D5:: @ 81EE7D5 - hideobjectat 255, MAP_ROUTE109 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN + showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 waitmovement 0 addobject 4 @@ -56,7 +56,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release |