diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
| commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
| tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /data/maps/MtPyre_1F | |
| parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
| parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) | |
Fix merge conflicts
Diffstat (limited to 'data/maps/MtPyre_1F')
| -rw-r--r-- | data/maps/MtPyre_1F/header.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 241f3dff3..f60532fa2 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -10,6 +10,6 @@ MtPyre_1F: @ 8484064 .byte WEATHER_NONE .byte MAP_TYPE_INDOOR .2byte 0 - .byte 8 + map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL |