diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 02:34:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 02:34:54 -0500 |
| commit | c51e0f3bae824a4c099bdcb0f938e298ef49fdcb (patch) | |
| tree | 8825791d67d44b905e63ea59311c3d85711ac140 /data/maps/BattlePyramidSquare16 | |
| parent | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (diff) | |
| parent | 7beddd16dd81d79ee886183053037e68910e01d5 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/BattlePyramidSquare16')
| -rw-r--r-- | data/maps/BattlePyramidSquare16/map.json | 1 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare16/scripts.inc | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index 7b8e6fb32..9f8532eb5 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -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_POKEFAN_F", diff --git a/data/maps/BattlePyramidSquare16/scripts.inc b/data/maps/BattlePyramidSquare16/scripts.inc deleted file mode 100644 index 9308930d1..000000000 --- a/data/maps/BattlePyramidSquare16/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -BattlePyramidSquare16_MapScripts:: @ 823D1A5 - .byte 0 - |