Merge branch 'master' into main-menu-state-machine

1 files changed, 32 insertions, 32 deletions

diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
index 7dc18e572..1ae33fda7 100644
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -38,8 +38,8 @@
       "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
       "movement_range_x": 1,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route113_EventScript_1F2193",
       "flag": "0"
     },
@@ -51,8 +51,8 @@
       "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route113_EventScript_1F218A",
       "flag": "0"
     },
@@ -64,8 +64,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
       "script": "Route113_EventScript_1F21C0",
       "flag": "0"
     },
@@ -77,8 +77,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
       "script": "Route113_EventScript_1F21D7",
       "flag": "0"
     },
@@ -90,8 +90,8 @@
       "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
       "script": "Route113_EventScript_1F21EE",
       "flag": "0"
     },
@@ -103,8 +103,8 @@
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route113_EventScript_290DDC",
       "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
     },
@@ -116,8 +116,8 @@
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route113_EventScript_290DE9",
       "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
     },
@@ -129,8 +129,8 @@
       "movement_type": "MOVEMENT_TYPE_HIDDEN",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 3,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route113_EventScript_1F2250",
       "flag": "0"
     },
@@ -142,8 +142,8 @@
       "movement_type": "MOVEMENT_TYPE_HIDDEN",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 3,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "3",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route113_EventScript_1F22B2",
       "flag": "0"
     },
@@ -155,8 +155,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route113_EventScript_1F22C9",
       "flag": "0"
     },
@@ -168,8 +168,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route113_EventScript_1F22E4",
       "flag": "0"
     },
@@ -181,8 +181,8 @@
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route113_EventScript_290DF6",
       "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
     },
@@ -194,8 +194,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
       "script": "Route113_EventScript_1F2344",
       "flag": "0"
     },
@@ -207,8 +207,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_UP",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route113_EventScript_1F232D",
       "flag": "0"
     },
@@ -220,8 +220,8 @@
       "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
       "movement_range_x": 1,
       "movement_range_y": 3,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 6,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
       "script": "Route113_EventScript_1F22FF",
       "flag": "0"
     },
@@ -233,8 +233,8 @@
       "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
       "movement_range_x": 1,
       "movement_range_y": 3,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 6,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "6",
       "script": "Route113_EventScript_1F2316",
       "flag": "0"
     }