diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
| commit | 4e5fae008625d236d98d4958594c938bc17f83da (patch) | |
| tree | 38d9d2e8215684ff90f8e50c7dd2efd40a2cbc71 /data/maps/Route118 | |
| parent | 87859a655b810aeaad7e7e1f5b066731f7e79ece (diff) | |
| parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) | |
Merge branch 'master' into event-vars
Diffstat (limited to 'data/maps/Route118')
| -rw-r--r-- | data/maps/Route118/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index fac602f7e..39e2669d6 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 |