diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
| commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
| tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /data/maps/Route109/scripts.inc | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'data/maps/Route109/scripts.inc')
| -rw-r--r-- | data/maps/Route109/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 2e588f813..ebf9398d1 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -272,7 +272,7 @@ Route109_Movement_1EE90D: @ 81EE90D Route109_EventScript_1EE910:: @ 81EE910 lock faceplayer - goto_if_unset FLAG_0x095, Route109_EventScript_1EE921 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921 goto Route109_EventScript_1EE93F end @@ -328,7 +328,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - goto_if_set FLAG_0x118, Route109_EventScript_1EE9F2 + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 @@ -336,7 +336,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 - setflag FLAG_0x118 + setflag FLAG_RECEIVED_SOFT_SAND release end |