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

3 files changed, 20 insertions, 18 deletions

diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc
deleted file mode 100644
index 08976e5a8..000000000
--- a/data/maps/Route104_Prototype/events.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Route104_Prototype_MapEvents:: @ 853DDC0
-	map_events 0x0, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
deleted file mode 100644
index 0de3a4b47..000000000
--- a/data/maps/Route104_Prototype/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route104_Prototype: @ 8485AF8
-	.4byte Route104_Prototype_Layout
-	.4byte Route104_Prototype_MapEvents
-	.4byte Route104_Prototype_MapScripts
-	.4byte 0x0
-	.2byte MUS_NEXTROAD
-	.2byte 287
-	.byte MAPSEC_ROUTE_104
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json
new file mode 100644
index 000000000..168cee142
--- /dev/null
+++ b/data/maps/Route104_Prototype/map.json
@@ -0,0 +1,20 @@
+{
+  "id": "MAP_ROUTE104_PROTOTYPE",
+  "name": "Route104_Prototype",
+  "layout": "LAYOUT_ROUTE104_PROTOTYPE",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_104",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file