diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
commit | 86f0291f63ff6bc580476dae3c00fc4d6d7b15da (patch) | |
tree | 37d03c82f0b43a4a0b856610c5b36fe96dc3ebed /data/scripts/maps/Route109.inc | |
parent | deac7fd3706ea9de855330881e2555a8c70d72f3 (diff) | |
parent | 680d3fd7b980578024226eccffe2e01072826227 (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'data/scripts/maps/Route109.inc')
-rw-r--r-- | data/scripts/maps/Route109.inc | 6 |
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 |