summaryrefslogtreecommitdiff
path: root/data/maps/Underwater6
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Underwater6')
-rw-r--r--data/maps/Underwater6/map.json41
-rw-r--r--data/maps/Underwater6/scripts.inc8
2 files changed, 0 insertions, 49 deletions
diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json
deleted file mode 100644
index 2a021f77f..000000000
--- a/data/maps/Underwater6/map.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "id": "MAP_UNDERWATER6",
- "name": "Underwater6",
- "layout": "LAYOUT_UNDERWATER6",
- "music": "MUS_UNDERWATER",
- "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
- "requires_flash": false,
- "weather": "WEATHER_UNDERWATER_BUBBLES",
- "map_type": "MAP_TYPE_UNDERWATER",
- "allow_cycling": true,
- "allow_escaping": false,
- "allow_running": true,
- "show_map_name": true,
- "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
- "connections": [
- {
- "direction": "emerge",
- "offset": 0,
- "map": "MAP_ROUTE105"
- }
- ],
- "object_events": [],
- "warp_events": [
- {
- "x": 13,
- "y": 4,
- "elevation": 0,
- "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
- "dest_warp_id": 0
- },
- {
- "x": 17,
- "y": 66,
- "elevation": 0,
- "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
- "dest_warp_id": 0
- }
- ],
- "coord_events": [],
- "bg_events": []
-}
diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc
deleted file mode 100644
index 21b639cd8..000000000
--- a/data/maps/Underwater6/scripts.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater6_MapScripts:: @ 81F773D
- map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume
- .byte 0
-
-Underwater6_OnResume: @ 81F7743
- call AbnormalWeather_Underwater_SetupEscapeWarp
- end
-