3 files changed, 55 insertions, 25 deletions
diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
deleted file mode 100644
index 9ab4727f3..000000000
--- a/data/maps/RustboroCity_Flat2_3F/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_Flat2_3F_EventObjects: @ 8530B74
-	object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0
-
-RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
-	warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F
-
-RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC
-	map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
deleted file mode 100644
index 037ca6821..000000000
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_Flat2_3F: @ 84834E8
-	.4byte RustboroCity_Flat2_3F_Layout
-	.4byte RustboroCity_Flat2_3F_MapEvents
-	.4byte RustboroCity_Flat2_3F_MapScripts
-	.4byte 0x0
-	.2byte MUS_GOTOWN
-	.2byte 296
-	.byte MAPSEC_RUSTBORO_CITY
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json
new file mode 100644
index 000000000..8ad260511
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/map.json
@@ -0,0 +1,55 @@
+{
+  "id": "MAP_RUSTBORO_CITY_FLAT2_3F",
+  "name": "RustboroCity_Flat2_3F",
+  "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
+  "music": "MUS_GOTOWN",
+  "region_map_section": "MAPSEC_RUSTBORO_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+      "movement_range_x": 2,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RustboroCity_Flat2_3F_EventScript_216117",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 12,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RustboroCity_Flat2_3F_EventScript_216120",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 1,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
+\ No newline at end of file