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/Route114/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/Route114/scripts.inc')
| -rw-r--r-- | data/maps/Route114/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index b66b54910..8f0c1c6ac 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -28,7 +28,7 @@ Route114_EventScript_1F2582:: @ 81F2582 lock faceplayer dodailyevents - goto_if_set FLAG_0x92B, Route114_EventScript_1F25C7 + goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7 msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 @@ -36,7 +36,7 @@ Route114_EventScript_1F2582:: @ 81F2582 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_272054 - setflag FLAG_0x92B + setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release end @@ -49,12 +49,12 @@ Route114_EventScript_1F25C7:: @ 81F25C7 Route114_EventScript_1F25D1:: @ 81F25D1 lock faceplayer - goto_if_set FLAG_0x0E7, Route114_EventScript_1F2608 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_272054 - setflag FLAG_0x0E7 + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end |