Merge branch 'master' of github.com:pret/pokeemerald

3 files changed, 20 insertions, 18 deletions

diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
deleted file mode 100644
index 6f53de284..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
deleted file mode 100644
index 776465f16..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AquaHideout_UnusedRubyMap2: @ 84846F4
-	.4byte AquaHideout_UnusedRubyMap2_Layout
-	.4byte AquaHideout_UnusedRubyMap2_MapEvents
-	.4byte AquaHideout_UnusedRubyMap2_MapScripts
-	.4byte 0x0
-	.2byte MUS_AJITO
-	.2byte 317
-	.byte MAPSEC_AQUA_HIDEOUT
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_MAGMA
-
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json
new file mode 100644
index 000000000..5bee65158
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
+  "name": "AquaHideout_UnusedRubyMap2",
+  "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
+  "music": "MUS_AJITO",
+  "region_map_section": "MAPSEC_AQUA_HIDEOUT",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_MAGMA",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file