Give proper names to underwater maps

2 files changed, 0 insertions, 49 deletions

diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json
deleted file mode 100644
index 5155fc6ba..000000000
--- a/data/maps/Underwater7/map.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "id": "MAP_UNDERWATER7",
-  "name": "Underwater7",
-  "layout": "LAYOUT_UNDERWATER7",
-  "music": "MUS_UNDERWATER",
-  "region_map_section": "MAPSEC_UNDERWATER_UNK1",
-  "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_ROUTE125"
-    }
-  ],
-  "object_events": [],
-  "warp_events": [
-    {
-      "x": 22,
-      "y": 10,
-      "elevation": 0,
-      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 45,
-      "y": 30,
-      "elevation": 0,
-      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [],
-  "bg_events": []
-}
diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc
deleted file mode 100644
index 4215dced9..000000000
--- a/data/maps/Underwater7/scripts.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater7_MapScripts:: @ 81F7749
-	map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume
-	.byte 0
-
-Underwater7_OnResume: @ 81F774F
-	call AbnormalWeather_Underwater_SetupEscapeWarp
-	end
-