Convert map data to JSON

2019-01-31 15:51:20 -06:00
parent 5c1667b41a
commit 29d6221935
2102 changed files with 72595 additions and 27039 deletions
@@ -1,13 +0,0 @@
-SkyPillar_Top_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2
-	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
-
-SkyPillar_Top_MapWarps:
-	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
-
-SkyPillar_Top_MapCoordEvents:
-	coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A
-
-SkyPillar_Top_MapEvents::
-	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
-
@@ -1,15 +0,0 @@
-SkyPillar_Top:
-	.4byte SkyPillar_Top_Layout
-	.4byte SkyPillar_Top_MapEvents
-	.4byte SkyPillar_Top_MapScripts
-	.4byte 0x0
-	.2byte MUS_TOZAN
-	.2byte LAYOUT_SKY_PILLAR_TOP
-	.byte MAPSEC_SKY_PILLAR
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
@@ -0,0 +1,65 @@
+{
+  "id": "MAP_SKY_PILLAR_TOP",
+  "name": "SkyPillar_Top",
+  "layout": "LAYOUT_SKY_PILLAR_TOP",
+  "music": "MUS_TOZAN",
+  "region_map_section": "MAPSEC_SKY_PILLAR",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "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": "0x0",
+      "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1",
+      "x": 14,
+      "y": 6,
+      "elevation": 3,
+      "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": "SkyPillar_Top_EventScript_239722",
+      "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 16,
+      "y": 14,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_5F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "var": "VAR_0x40D7",
+      "var_value": 0,
+      "script": "SkyPillar_Top_EventScript_23979A"
+    }
+  ],
+  "bg_events": []
+}
@@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6
 	end

 SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex 438
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return