summaryrefslogtreecommitdiff
path: root/data/event_scripts.s
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-21 22:24:25 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-21 22:24:25 -0500
commit399d646e3fb24c8b4532267a4ab7aee4d2aaee92 (patch)
tree4805fda152bee21eb8bfb96f70f33e5f958c06b2 /data/event_scripts.s
parent9e8a841bfa0271a603b5e4895be3067cfa26f8ab (diff)
parentb105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff)
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/event_scripts.s')
-rw-r--r--data/event_scripts.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7ee8e6cf2..1b8807ed7 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -940,7 +940,7 @@ EventScript_27149D:: @ 827149D
setberrytree 82, 36, 5
return
-EventScript_2715DE:: @ 82715DE
+EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_LINK_CONTEST_POKE_BALL
setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE