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

1 files changed, 40 insertions, 40 deletions

diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 516c4ed8f..6516e99dc 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -33,8 +33,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "Route103_EventScript_1EC5E2",
       "flag": "0"
     },
@@ -46,8 +46,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
       "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": "Route103_EventScript_1EC3C1",
       "flag": "FLAG_HIDE_ROUTE_103_RIVAL"
     },
@@ -59,8 +59,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
       "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": "Route103_EventScript_1EC5F4",
       "flag": "0"
     },
@@ -72,8 +72,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route103_EventScript_1EC66E",
       "flag": "0"
     },
@@ -85,8 +85,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 1,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "1",
       "script": "Route103_EventScript_1EC60B",
       "flag": "0"
     },
@@ -98,8 +98,8 @@
       "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
       "movement_range_x": 0,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 3,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "3",
       "script": "Route103_EventScript_1EC6D1",
       "flag": "0"
     },
@@ -111,8 +111,8 @@
       "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 5,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "5",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -124,8 +124,8 @@
       "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 6,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "6",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -137,8 +137,8 @@
       "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 7,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "7",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -150,8 +150,8 @@
       "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
       "movement_range_x": 1,
       "movement_range_y": 2,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route103_EventScript_1EC5D9",
       "flag": "0"
     },
@@ -163,8 +163,8 @@
       "movement_type": "MOVEMENT_TYPE_WANDER_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": "Route103_EventScript_272141",
       "flag": "FLAG_HIDE_ROUTE_103_BIRCH"
     },
@@ -176,8 +176,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
       "script": "Route103_EventScript_1EC6E8",
       "flag": "0"
     },
@@ -189,8 +189,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": "Route103_EventScript_290CE5",
       "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
     },
@@ -202,8 +202,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": "Route103_EventScript_2906BB",
       "flag": "FLAG_TEMP_12"
     },
@@ -215,8 +215,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": "Route103_EventScript_2906BB",
       "flag": "FLAG_TEMP_13"
     },
@@ -228,8 +228,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
       "script": "Route103_EventScript_1EC761",
       "flag": "0"
     },
@@ -241,8 +241,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_UP",
       "movement_range_x": 1,
       "movement_range_y": 1,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 2,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "2",
       "script": "Route103_EventScript_1EC74A",
       "flag": "0"
     },
@@ -254,8 +254,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": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
       "script": "Route103_EventScript_1EC78F",
       "flag": "0"
     },
@@ -267,8 +267,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": 5,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "5",
       "script": "Route103_EventScript_1EC778",
       "flag": "0"
     },
@@ -280,8 +280,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": "Route103_EventScript_290CF2",
       "flag": "FLAG_ITEM_ROUTE_103_PP_UP"
     }