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/Route101/scripts.inc | |
parent | 87859a655b810aeaad7e7e1f5b066731f7e79ece (diff) | |
parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) |
Merge branch 'master' into event-vars
Diffstat (limited to 'data/maps/Route101/scripts.inc')
-rw-r--r-- | data/maps/Route101/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 06a9cd52e..5053f0fa3 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Route101_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special ChooseStarter waitstate |