diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 21:21:10 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 21:22:10 -0500 |
commit | eca329f9c500d89f451a4ab88f65da79c112bf71 (patch) | |
tree | 7fd4fa77064398ad1a19354df534f31f8355f839 /data/event_scripts.s | |
parent | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (diff) | |
parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'data/event_scripts.s')
-rw-r--r-- | data/event_scripts.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1d7d08808..3975fd361 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 |