Fix merge conflicts

This commit is contained in:
Tetrable committed 2019-01-02 21:25:14 +00:00
commit a3ebca4d81
773 files changed
+11252 -23425

No files matched your search

@@ -10,6 +10,6 @@ RustboroCity_PokemonSchool: @ 84833B4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL