Give proper names to underwater maps

2 files changed, 0 insertions, 49 deletions

diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json
deleted file mode 100644
index 909591f11..000000000
--- a/data/maps/Underwater5/map.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "id": "MAP_UNDERWATER5",
-  "name": "Underwater5",
-  "layout": "LAYOUT_UNDERWATER5",
-  "music": "MUS_UNDERWATER",
-  "region_map_section": "MAPSEC_UNDERWATER_129",
-  "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_ROUTE129"
-    }
-  ],
-  "object_events": [],
-  "warp_events": [
-    {
-      "x": 26,
-      "y": 3,
-      "elevation": 0,
-      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 32,
-      "y": 21,
-      "elevation": 0,
-      "dest_map": "MAP_UNDERWATER_MARINE_CAVE",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [],
-  "bg_events": []
-}
diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc
deleted file mode 100644
index 235d25aba..000000000
--- a/data/maps/Underwater5/scripts.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Underwater5_MapScripts:: @ 81F7731
-	map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume
-	.byte 0
-
-Underwater5_OnResume: @ 81F7737
-	call AbnormalWeather_Underwater_SetupEscapeWarp
-	end
-