diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:28:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:28:12 -0600 |
| commit | 680d3fd7b980578024226eccffe2e01072826227 (patch) | |
| tree | 45bd58a6df683e25685a2a6bd9ff2d4c5116dcf5 /data/scripts/maps/Route114.inc | |
| parent | b3551bc2f328c286c6ecc45ea288665d46b44260 (diff) | |
| parent | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
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 |