Merge branch 'master' into event-vars

This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
201 changed files with 4075 additions and 7997 deletions

View File

@@ -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