diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
| commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /data/maps/Route112 | |
| parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'data/maps/Route112')
| -rw-r--r-- | data/maps/Route112/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route112/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 5961e48c2..70e0f2d65 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -10,6 +10,6 @@ Route112: @ 84827AC .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 816e0aab0..995102fe7 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -3,7 +3,7 @@ Route112_MapScripts:: @ 81F1DA8 .byte 0 Route112_MapScript1_1F1DAE: @ 81F1DAE - clearflag FLAG_0x09D + clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE setvar VAR_0x40BD, 0 end |