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

@@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E
faceplayer
msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -332,9 +332,9 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT
giveitem_std ITEM_SOFT_SAND
compare VAR_RESULT, 0
goto_if_eq Route109_EventScript_272054
goto_if_eq Common_EventScript_ShowBagIsFull
closemessage
applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag FLAG_RECEIVED_SOFT_SAND
release
@@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
Route109_EventScript_1EE9F2:: @ 81EE9F2
msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Route109_Movement_2725A2
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end