diff options
| author | Made-s <made111@gmx.de> | 2018-01-06 19:20:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 19:20:14 +0100 |
| commit | cc2c226d2d598bb65376b53f6828e69bdf43245d (patch) | |
| tree | efc9b28d5c846371fb38e2984f4e71a3a5d03efe /data/scripts/maps/Route114.inc | |
| parent | 8906ac68e7c5caf7c62597abf16affafc2bb05a3 (diff) | |
| parent | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'data/scripts/maps/Route114.inc')
| -rw-r--r-- | data/scripts/maps/Route114.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index f6bb6d8ba..30ab8c572 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,8 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 - goto_if_eq Route114_EventScript_150778 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 @@ -27,8 +26,7 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag FLAG_RECEIVED_TM05 - goto_if_eq Route114_EventScript_1507B9 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem_std ITEM_TM05 compare RESULT, 0 |