diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
| commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
| tree | 414ed687f836521c1a966531e87122951c070083 /data/maps/Route128/scripts.inc | |
| parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
| parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) | |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'data/maps/Route128/scripts.inc')
| -rw-r--r-- | data/maps/Route128/scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 647d62b6a..84091ac3a 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -73,7 +73,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 15 removeobject 3 waitfieldeffect 30 - clearflag FLAG_SPECIAL_FLAG_0x4000 + clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_ROUTE128_STATE, 2 releaseall end |