Fix merge conflicts

This commit is contained in:
Tetrable
2019-01-02 21:25:14 +00:00
773 changed files with 11252 additions and 23425 deletions

View File

@@ -10,6 +10,6 @@ GraniteCave_StevensRoom: @ 8483FD8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL