Fix merge conflicts
This commit is contained in:
@@ -10,6 +10,6 @@ MossdeepCity: @ 8482560
|
||||
.byte WEATHER_SUNNY
|
||||
.byte MAP_TYPE_CITY
|
||||
.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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user