summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route109.inc
diff options
context:
space:
mode:
authorMade-s <made111@gmx.de>2018-01-06 19:20:14 +0100
committerGitHub <noreply@github.com>2018-01-06 19:20:14 +0100
commitcc2c226d2d598bb65376b53f6828e69bdf43245d (patch)
treeefc9b28d5c846371fb38e2984f4e71a3a5d03efe /data/scripts/maps/Route109.inc
parent8906ac68e7c5caf7c62597abf16affafc2bb05a3 (diff)
parent7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff)
Merge branch 'master' into master
Diffstat (limited to 'data/scripts/maps/Route109.inc')
-rw-r--r--data/scripts/maps/Route109.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index c0344f150..c70365b6a 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -271,8 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D
Route109_EventScript_14F680:: @ 814F680
lock
faceplayer
- checkflag FLAG_DELIVERED_DEVON_GOODS
- goto_if 0, Route109_EventScript_14F691
+ goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691
goto Route109_EventScript_14F6AF
end
@@ -328,8 +327,7 @@ Route109_EventScript_14F725:: @ 814F725
lock
faceplayer
special GetPlayerBigGuyGirlString
- checkflag FLAG_RECEIVED_SOFT_SAND
- goto_if_eq Route109_EventScript_14F762
+ goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762
msgbox Route109_Text_16E433, 4
giveitem_std ITEM_SOFT_SAND
compare RESULT, 0