Merge branch 'master' into doc-routes1

2020-02-16 13:53:31 -05:00
parent a1ea8cc829 13357596b7
commit 058d30fe80
1890 changed files with 20092 additions and 20517 deletions
@@ -13,7 +13,7 @@
  "battle_scene": "BATTLE_SCENE_0",
  "connections": [
    {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
      "offset": -10,
      "direction": "left"
    },