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/Route104 | |
| 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/Route104')
| -rw-r--r-- | data/maps/Route104/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 6f1971d89..2dfb42d74 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -357,13 +357,13 @@ Route104_EventScript_1ED090:: @ 81ED090 Route104_EventScript_1ED099:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 - setobjectpriority 255, MAP_ROUTE104, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F waitmovement 0 - hideobjectat 255, MAP_ROUTE104 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Route104_EventScript_2720A0 goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9 goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF @@ -399,7 +399,7 @@ Route104_EventScript_1ED139:: @ 81ED139 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN + showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 @@ -414,7 +414,7 @@ Route104_EventScript_1ED139:: @ 81ED139 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 |