Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 28 insertions, 28 deletions

diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
index bcff99de4..12a7f63d9 100644
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F2193",
+      "script": "Route113_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F218A",
+      "script": "Route113_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21C0",
+      "script": "Route113_EventScript_Jaylen",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21D7",
+      "script": "Route113_EventScript_Dillon",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route113_EventScript_1F21EE",
+      "script": "Route113_EventScript_Madeline",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F2250",
+      "script": "Route113_EventScript_Lao",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22B2",
+      "script": "Route113_EventScript_Lung",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22C9",
+      "script": "Route113_EventScript_Tori",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22E4",
+      "script": "Route113_EventScript_Tia",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route113_EventScript_1F2344",
+      "script": "Route113_EventScript_Wyatt",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F232D",
+      "script": "Route113_EventScript_Lawrence",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F22FF",
+      "script": "Route113_EventScript_Sophie",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F2316",
+      "script": "Route113_EventScript_Coby",
       "flag": "0"
     }
   ],
@@ -268,49 +268,49 @@
       "x": 19,
       "y": 11,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 19,
       "y": 10,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 19,
       "y": 12,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 19,
       "y": 13,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 86,
       "y": 9,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 85,
       "y": 10,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 85,
       "y": 11,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
@@ -373,28 +373,28 @@
       "x": 19,
       "y": 14,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 87,
       "y": 8,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 87,
       "y": 6,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     },
     {
       "type": "weather",
       "x": 87,
       "y": 7,
       "elevation": 3,
-      "weather": "COORD_EVENT_WEATHER_ASH"
+      "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
     }
   ],
   "bg_events": [
@@ -404,7 +404,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F219C"
+      "script": "Route113_EventScript_RouteSign111"
     },
     {
       "type": "sign",
@@ -412,7 +412,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21A5"
+      "script": "Route113_EventScript_RouteSignFallarbor"
     },
     {
       "type": "sign",
@@ -420,7 +420,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21B7"
+      "script": "Route113_EventScript_TrainerTipsRegisterKeyItems"
     },
     {
       "type": "sign",
@@ -428,7 +428,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21AE"
+      "script": "Route113_EventScript_GlassWorkshopSign"
     },
     {
       "type": "secret_base",