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

1 files changed, 45 insertions, 45 deletions

diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 135e7eb74..66b7a1789 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -38,8 +38,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": 31,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "31",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -51,8 +51,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": 32,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "32",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -64,8 +64,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": 33,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "33",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -77,8 +77,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": "Route118_EventScript_1F4079",
       "flag": "0"
     },
@@ -90,8 +90,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_28CE16",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
     },
@@ -103,8 +103,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_28CE36",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
     },
@@ -116,8 +116,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": "Route118_EventScript_1F3E73",
       "flag": "0"
     },
@@ -129,8 +129,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_28CED6",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
@@ -142,8 +142,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_28CEF6",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
@@ -155,8 +155,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_28CF16",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
     },
@@ -168,8 +168,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_28CF36",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
     },
@@ -181,8 +181,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": "Route118_EventScript_2906BB",
       "flag": "FLAG_TEMP_11"
     },
@@ -194,8 +194,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": "Route118_EventScript_1F3E14",
       "flag": "0"
     },
@@ -207,8 +207,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_UP",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 4,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "4",
       "script": "Route118_EventScript_1F3F87",
       "flag": "0"
     },
@@ -220,8 +220,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 1,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "1",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "Route118_EventScript_1F4000",
       "flag": "0"
     },
@@ -233,8 +233,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_UP_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": "Route118_EventScript_1F4090",
       "flag": "0"
     },
@@ -246,8 +246,8 @@
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "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": "Route118_EventScript_1F3FE9",
       "flag": "0"
     },
@@ -259,8 +259,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
       "movement_range_x": 1,
       "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": "Route118_EventScript_1F4017",
       "flag": "0"
     },
@@ -272,8 +272,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "0x0",
       "flag": "FLAG_HIDE_ROUTE_118_STEVEN"
     },
@@ -285,8 +285,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": "Route118_EventScript_290ED3",
       "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
     },
@@ -298,8 +298,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
       "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": "Route118_EventScript_1F40A7",
       "flag": "0"
     }
@@ -327,7 +327,7 @@
       "y": 11,
       "elevation": 3,
       "var": "VAR_0x4071",
-      "var_value": 0,
+      "var_value": "0",
       "script": "Route118_EventScript_1F3E8E"
     },
     {
@@ -336,7 +336,7 @@
       "y": 11,
       "elevation": 3,
       "var": "VAR_0x4071",
-      "var_value": 0,
+      "var_value": "0",
       "script": "Route118_EventScript_1F3EAE"
     },
     {
@@ -345,7 +345,7 @@
       "y": 11,
       "elevation": 3,
       "var": "VAR_0x4071",
-      "var_value": 0,
+      "var_value": "0",
       "script": "Route118_EventScript_1F3EC4"
     }
   ],