Merge branch 'master' into doc-inc2

This commit is contained in:
GriffinR
2019-10-14 19:25:10 -04:00
committed by GitHub
144 changed files with 1290 additions and 1106 deletions
+2 -2
View File
@@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84
Route116_EventScript_1F2D95:: @ 81F2D95
lockall
applymovement 11, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement 11, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
setvar VAR_ROUTE116_STATE, 2