Fix merge conflicts

2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -10,6 +10,6 @@ SkyPillar_Top: @ 848480C
 	.byte WEATHER_NONE
 	.byte MAP_TYPE_ROUTE
 	.2byte 0
-	.byte 12
+	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
 	.byte MAP_BATTLE_SCENE_NORMAL