summaryrefslogtreecommitdiff
path: root/data/maps/Route114
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-01-03 20:37:25 -0600
committerGitHub <noreply@github.com>2019-01-03 20:37:25 -0600
commitcba2f81bf870734960492b2d586d5a0684d99cf5 (patch)
tree5845c0ad7355d3568637287b19796be4668d1b36 /data/maps/Route114
parentfd201f8395fccaf26349b352d3b0eda98bec8593 (diff)
parent97ebeef1dbe8b4954d234fda067651f63d7e6360 (diff)
Merge pull request #507 from Tetrable/master
Finish off labeling flags
Diffstat (limited to 'data/maps/Route114')
-rw-r--r--data/maps/Route114/scripts.inc8
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