Merge branch 'master' into doc-inc2

This commit is contained in:
GriffinR
2019-10-14 19:25:10 -04:00
committed by GitHub
144 changed files with 1290 additions and 1106 deletions
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186",
"script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor",
"flag": "0"
}
],