Merge branch 'master' into doc-partymenu

1 files changed, 24 insertions, 24 deletions

diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
index 361467266..4ba9baf9f 100644
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -48,8 +48,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE910",
-      "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY"
+      "script": "Route109_EventScript_MrBriney",
+      "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route109_EventScript_1EEA3D",
+      "script": "Route109_EventScript_David",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route109_EventScript_1EEA54",
+      "script": "Route109_EventScript_Alice",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route109_EventScript_1EEA6B",
+      "script": "Route109_EventScript_Huey",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route109_EventScript_1EEA82",
+      "script": "Route109_EventScript_Edmond",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEA99",
+      "script": "Route109_EventScript_Ricky",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route109_EventScript_1EEAFB",
+      "script": "Route109_EventScript_Lola",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE995",
+      "script": "Route109_EventScript_SeashoreHouseGirl",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEB74",
+      "script": "Route109_EventScript_Gwen",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEB5D",
+      "script": "Route109_EventScript_Austina",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEB8B",
+      "script": "Route109_EventScript_Carter",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE99E",
+      "script": "Route109_EventScript_SandCastleBoy",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EE9B5",
+      "script": "Route109_EventScript_SoftSandGirl",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EEA06",
+      "script": "Route109_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route109_EventScript_1EEBBD",
+      "script": "Route109_EventScript_Mel",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route109_EventScript_1EEBA2",
+      "script": "Route109_EventScript_Paul",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EEA0F",
+      "script": "Route109_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route109_EventScript_1EEA18",
+      "script": "Route109_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route109_EventScript_1EEBEF",
+      "script": "Route109_EventScript_Hailey",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route109_EventScript_1EEBD8",
+      "script": "Route109_EventScript_Chandler",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route109_EventScript_1EEC06",
+      "script": "Route109_EventScript_Elijah",
       "flag": "0"
     }
   ],
@@ -355,7 +355,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route109_EventScript_1EEA2B"
+      "script": "Route109_EventScript_SeashoreHouseSign"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 10,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route109_EventScript_1EEA34"
+      "script": "Route109_EventScript_TrainerTipsSign"
     },
     {
       "type": "hidden_item",