convert map data to json

5 files changed, 115 insertions, 33 deletions

diff --git a/data/maps/OneIsland/connections.inc b/data/maps/OneIsland/connections.inc
deleted file mode 100644
index edc8a5047..000000000
--- a/data/maps/OneIsland/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-OneIsland_MapConnectionsList: @ 8352934
-    connection down, 0, MAP_ONE_ISLAND_TREASUREBEACH
-    connection right, -120, MAP_ONE_ISLAND_KINDLEROAD
-
-OneIsland_MapConnections:: @ 835294C
-    .4byte 2
-    .4byte OneIsland_MapConnectionsList
diff --git a/data/maps/OneIsland/events.inc b/data/maps/OneIsland/events.inc
deleted file mode 100644
index 802ec6794..000000000
--- a/data/maps/OneIsland/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-OneIsland_EventObjects:
-	object_event 1, 73, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 113, 0, 0
-	object_event 2, 32, 0, 16, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167517, 0, 0, 0
-	object_event 3, 30, 0, 13, 0, 9, 0, 3, 13, 17, 0, 0, 0, 0, 0, OneIsland_EventScript_167549, 0, 0, 0
-
-OneIsland_MapWarps:
-	warp_def 14, 5, 0, 0, 8192
-	warp_def 19, 9, 0, 0, 8194
-	warp_def 8, 11, 0, 0, 8195
-	warp_def 12, 18, 3, 0, 8196
-
-OneIsland_MapBGEvents:
-	bg_event 14, 13, 0, 0, 0, OneIsland_EventScript_167552
-	bg_event 15, 6, 0, 0, 0, OneIsland_EventScript_16755B
-
-OneIsland_MapEvents::
-	map_events OneIsland_EventObjects, OneIsland_MapWarps, 0x0, OneIsland_MapBGEvents
diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc
deleted file mode 100644
index a2d521727..000000000
--- a/data/maps/OneIsland/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-OneIsland:: @ 8350768
-    .4byte OneIsland_Layout @ 0x8321714
-    .4byte OneIsland_MapEvents @ 0x83B5F44
-    .4byte OneIsland_MapScripts @ 0x8167484
-    .4byte OneIsland_MapConnections @ 0x835294C
-    .2byte BGM_FRLG_ISLAND_ONE
-    .2byte 230
-    .byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
new file mode 100644
index 000000000..fd8c53409
--- /dev/null
+++ b/data/maps/OneIsland/map.json
@@ -0,0 +1,114 @@
+{
+  "id": "MAP_ONE_ISLAND",
+  "name": "OneIsland",
+  "layout": "LAYOUT_ONE_ISLAND",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_ONE_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_2",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ONE_ISLAND_TREASURE_BEACH",
+      "offset": 0,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ONE_ISLAND_KINDLE_ROAD",
+      "offset": -120,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "73",
+      "x": 12,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "113"
+    },
+    {
+      "graphics_id": "32",
+      "x": 16,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_EventScript_167517",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 13,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "OneIsland_EventScript_167549",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 19,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_ONE_ISLAND_HOUSE1",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 8,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_ONE_ISLAND_HOUSE2",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 12,
+      "y": 18,
+      "elevation": 3,
+      "dest_map": "MAP_ONE_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 13,
+      "elevation": 0,
+      "script": "OneIsland_EventScript_167552"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 15,
+      "y": 6,
+      "elevation": 0,
+      "script": "OneIsland_EventScript_16755B"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc
index 2735d7481..70ab4ff03 100644
--- a/data/maps/OneIsland/scripts.inc
+++ b/data/maps/OneIsland/scripts.inc
@@ -31,7 +31,7 @@ EventScript_16749D:: @ 816749D
     waitdooranim
     removeobject 1
     setvar VAR_0x4075, 3
-    warp MAP_ONE_ISLAND_POKEMONCENTER_1F, 255, 9, 9
+    warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 255, 9, 9
     waitstate
     releaseall
     end