5 files changed, 89 insertions, 37 deletions

diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc
deleted file mode 100644
index b977d43bc..000000000
--- a/data/maps/Route130/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route130_MapConnectionsList: @ 8486C84
-	connection left, 0, MAP_ROUTE131
-	connection right, 0, MAP_ROUTE129
-
-Route130_MapConnections: @ 8486C9C
-	.4byte 0x2
-	.4byte Route130_MapConnectionsList
-
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
deleted file mode 100644
index 97532e576..000000000
--- a/data/maps/Route130/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route130_EventObjects: @ 852CA40
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0
-
-Route130_MapEvents:: @ 852CAA0
-	map_events Route130_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
deleted file mode 100644
index 4c03656ac..000000000
--- a/data/maps/Route130/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route130: @ 84829A4
-	.4byte Route130_Layout
-	.4byte Route130_MapEvents
-	.4byte Route130_MapScripts
-	.4byte Route130_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 263
-	.byte MAPSEC_ROUTE_130
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
new file mode 100644
index 000000000..18d168b17
--- /dev/null
+++ b/data/maps/Route130/map.json
@@ -0,0 +1,84 @@
+{
+  "id": "MAP_ROUTE130",
+  "name": "Route130",
+  "layout": "LAYOUT_ROUTE130",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_130",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_OCEAN_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE131"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE129"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 70,
+      "y": 21,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+      "movement_range_x": 3,
+      "movement_range_y": 6,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "Route130_EventScript_1F73BF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 7,
+      "y": 21,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route130_EventScript_1F73D6",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+      "x": 52,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "82",
+      "script": "BerryTreeScript",
+      "flag": "FLAG_TEMP_11"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 7,
+      "y": 30,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
+      "script": "Route130_EventScript_1F73ED",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 5c7696eb7..cdcc61550 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -1,9 +1,9 @@
 Route130_MapScripts:: @ 81F735F
-	map_script 3, Route130_MapScript1_1F7365
+	map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365
 	.byte 0
 
 Route130_MapScript1_1F7365: @ 81F7365
-	compare VAR_0x405E, 4
+	compare VAR_RAYQUAZA_STATE, 4
 	call_if_ge Route130_EventScript_1F73B5
 	specialvar VAR_RESULT, IsMirageIslandPresent
 	compare VAR_RESULT, 1
@@ -23,15 +23,15 @@ Route130_MapScript1_1F7365: @ 81F7365
 	setflag FLAG_TEMP_1D
 	setflag FLAG_TEMP_1E
 	setflag FLAG_TEMP_1F
-	setmaplayoutindex 263
+	setmaplayoutindex LAYOUT_ROUTE130
 	end
 
 Route130_EventScript_1F73B1:: @ 81F73B1
-	setmaplayoutindex 46
+	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
 Route130_EventScript_1F73B5:: @ 81F73B5
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	return
 
 Route130_EventScript_1F73BF:: @ 81F73BF