Convert map data to JSON

3 files changed, 139 insertions, 35 deletions

diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
deleted file mode 100644
index 7cfccd0ff..000000000
--- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleFactoryLobby_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
-	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
-	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
-	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
-	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
-	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
-
-BattleFrontier_BattleFactoryLobby_MapWarps:
-	warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-	warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
-
-BattleFrontier_BattleFactoryLobby_MapBGEvents:
-	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
-	bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
-	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839
-
-BattleFrontier_BattleFactoryLobby_MapEvents::
-	map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
-
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
deleted file mode 100644
index 30bd38b68..000000000
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattleFactoryLobby:
-	.4byte BattleFrontier_BattleFactoryLobby_Layout
-	.4byte BattleFrontier_BattleFactoryLobby_MapEvents
-	.4byte BattleFrontier_BattleFactoryLobby_MapScripts
-	.4byte 0x0
-	.2byte MUS_B_FACTORY
-	.2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY
-	.byte MAPSEC_BATTLE_FRONTIER
-	.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/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json
new file mode 100644
index 000000000..87ad1077a
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json
@@ -0,0 +1,139 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+  "name": "BattleFrontier_BattleFactoryLobby",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+  "music": "MUS_B_FACTORY",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "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_SCIENTIST_1",
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
+      "x": 3,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+      "x": 14,
+      "y": 11,
+      "elevation": 0,
+      "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": "BattleFrontier_BattleFactoryLobby_EventScript_25881C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PICNICKER",
+      "x": 13,
+      "y": 11,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "x": 6,
+      "y": 10,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "x": 14,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 10,
+      "y": 11,
+      "elevation": 0,
+      "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "sign",
+      "x": 2,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587E1"
+    },
+    {
+      "type": "sign",
+      "x": 11,
+      "y": 7,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587FA"
+    },
+    {
+      "type": "sign",
+      "x": 9,
+      "y": 4,
+      "elevation": 0,
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839"
+    }
+  ]
+}
\ No newline at end of file