Merge branch 'master' into doc-routes1

This commit is contained in:
GriffinR authored and GitHub committed 2020-02-16 13:53:31 -05:00
commit 058d30fe80
1890 files changed
+20092 -20517

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@
"battle_scene": "BATTLE_SCENE_0",
"connections": [
{
"map": "MAP_SAFFRON_CITY_CLASSIC",
"map": "MAP_SAFFRON_CITY_CONNECTION",
"offset": -10,
"direction": "left"
},