Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR authored and GitHub committed 2019-12-06 02:34:54 -05:00
commit c51e0f3bae
106 files changed
+1964 -1417

No files matched your search

+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",