diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/LinkContestRoom6 | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/LinkContestRoom6')
| -rw-r--r-- | data/maps/LinkContestRoom6/map.json | 18 | ||||
| -rw-r--r-- | data/maps/LinkContestRoom6/scripts.inc | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json deleted file mode 100644 index 38bfcd979..000000000 --- a/data/maps/LinkContestRoom6/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_LINK_CONTEST_ROOM6", - "name": "LinkContestRoom6", - "layout": "LAYOUT_LINK_CONTEST_ROOM6", - "music": "MUS_CONTEST0", - "region_map_section": "MAPSEC_DYNAMIC", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, - "allow_running": false, - "show_map_name": false, - "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom6/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - |