Merge branch 'master' into event_object_movement

1 files changed, 34 insertions, 31 deletions

diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
index 308f98b54..da02ab12c 100644
--- a/data/maps/Route19/map.json
+++ b/data/maps/Route19/map.json
@@ -6,11 +6,13 @@
   "region_map_section": "MAPSEC_ROUTE_19",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
-  "map_type": "MAP_TYPE_3",
-  "unknown_18": 1,
-  "unknown_19": 6,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
     {
       "map": "MAP_FUCHSIA_CITY",
@@ -25,7 +27,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 15,
       "y": 10,
       "elevation": 3,
@@ -34,11 +36,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB44F",
+      "script": "Route19_EventScript_Reece",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -47,11 +49,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB411",
+      "script": "Route19_EventScript_Richard",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 12,
       "y": 17,
       "elevation": 1,
@@ -60,11 +62,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "Route19_EventScript_1AB547",
+      "script": "Route19_EventScript_Tony",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 18,
       "y": 33,
       "elevation": 1,
@@ -73,11 +75,11 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB48D",
+      "script": "Route19_EventScript_Matthew",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 8,
       "y": 27,
       "elevation": 1,
@@ -86,11 +88,11 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB4CB",
+      "script": "Route19_EventScript_Douglas",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 16,
       "y": 22,
       "elevation": 1,
@@ -99,11 +101,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "Route19_EventScript_1AB509",
+      "script": "Route19_EventScript_David",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER",
       "x": 11,
       "y": 47,
       "elevation": 1,
@@ -112,11 +114,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB585",
+      "script": "Route19_EventScript_Axle",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 14,
       "y": 48,
       "elevation": 1,
@@ -125,11 +127,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB601",
+      "script": "Route19_EventScript_Alice",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 12,
       "y": 49,
       "elevation": 1,
@@ -138,11 +140,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB63F",
+      "script": "Route19_EventScript_Connie",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 9,
       "y": 48,
       "elevation": 1,
@@ -151,11 +153,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB5C3",
+      "script": "Route19_EventScript_Anya",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
+      "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER",
       "x": 8,
       "y": 41,
       "elevation": 1,
@@ -164,11 +166,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB67D",
+      "script": "Route19_EventScript_Lia",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
       "x": 9,
       "y": 41,
       "elevation": 1,
@@ -177,7 +179,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route19_EventScript_1AB6C3",
+      "script": "Route19_EventScript_Luc",
       "flag": "0"
     }
   ],
@@ -185,11 +187,12 @@
   "coord_events": [],
   "bg_events": [
     {
-      "type": "bg_event_type_0",
+      "type": "sign",
       "x": 13,
       "y": 12,
       "elevation": 0,
-      "script": "Route19_EventScript_168232"
+      "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+      "script": "Route19_EventScript_RouteSign"
     }
   ]
 }