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

1 files changed, 53 insertions, 53 deletions

diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index 7d09f0cdc..d43f7c33b 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -38,8 +38,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": "RustboroCity_EventScript_1E088A",
       "flag": "0"
     },
@@ -51,8 +51,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": "RustboroCity_EventScript_1E085F",
       "flag": "0"
     },
@@ -64,8 +64,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_UP",
       "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": "RustboroCity_EventScript_1E08DA",
       "flag": "0"
     },
@@ -77,8 +77,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": "RustboroCity_EventScript_1E08D1",
       "flag": "0"
     },
@@ -90,8 +90,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": "RustboroCity_EventScript_1E08B2",
       "flag": "0"
     },
@@ -103,8 +103,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": "RustboroCity_EventScript_1E0893",
       "flag": "0"
     },
@@ -116,8 +116,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": "RustboroCity_EventScript_1E0922",
       "flag": "0"
     },
@@ -129,8 +129,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": "RustboroCity_EventScript_1E0938",
       "flag": "0"
     },
@@ -142,8 +142,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
       "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": "RustboroCity_EventScript_1E0ADD",
       "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1"
     },
@@ -155,8 +155,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": "0x0",
       "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT"
     },
@@ -168,8 +168,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": "RustboroCity_EventScript_1E087E",
       "flag": "0"
     },
@@ -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": "RustboroCity_EventScript_2910DB",
       "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
     },
@@ -194,8 +194,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_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": "RustboroCity_EventScript_1E094E",
       "flag": "0"
     },
@@ -207,8 +207,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": "RustboroCity_EventScript_1E0DB8",
       "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL"
     },
@@ -220,8 +220,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": "0x0",
       "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST"
     },
@@ -233,8 +233,8 @@
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "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": "RustboroCity_EventScript_1E1236",
       "flag": "0"
     }
@@ -332,7 +332,7 @@
       "y": 20,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 1,
+      "var_value": "1",
       "script": "RustboroCity_EventScript_1E095A"
     },
     {
@@ -341,7 +341,7 @@
       "y": 21,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 1,
+      "var_value": "1",
       "script": "RustboroCity_EventScript_1E0971"
     },
     {
@@ -350,7 +350,7 @@
       "y": 22,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 1,
+      "var_value": "1",
       "script": "RustboroCity_EventScript_1E0988"
     },
     {
@@ -359,7 +359,7 @@
       "y": 23,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 1,
+      "var_value": "1",
       "script": "RustboroCity_EventScript_1E099F"
     },
     {
@@ -368,7 +368,7 @@
       "y": 24,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 1,
+      "var_value": "1",
       "script": "RustboroCity_EventScript_1E09B6"
     },
     {
@@ -377,7 +377,7 @@
       "y": 9,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 2,
+      "var_value": "2",
       "script": "RustboroCity_EventScript_1E0AFE"
     },
     {
@@ -386,7 +386,7 @@
       "y": 10,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 2,
+      "var_value": "2",
       "script": "RustboroCity_EventScript_1E0B0A"
     },
     {
@@ -395,7 +395,7 @@
       "y": 11,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 2,
+      "var_value": "2",
       "script": "RustboroCity_EventScript_1E0B16"
     },
     {
@@ -404,7 +404,7 @@
       "y": 12,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 2,
+      "var_value": "2",
       "script": "RustboroCity_EventScript_1E0B22"
     },
     {
@@ -413,7 +413,7 @@
       "y": 9,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 4,
+      "var_value": "4",
       "script": "RustboroCity_EventScript_1E0C2B"
     },
     {
@@ -422,7 +422,7 @@
       "y": 10,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 4,
+      "var_value": "4",
       "script": "RustboroCity_EventScript_1E0C37"
     },
     {
@@ -431,7 +431,7 @@
       "y": 11,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 4,
+      "var_value": "4",
       "script": "RustboroCity_EventScript_1E0C43"
     },
     {
@@ -440,7 +440,7 @@
       "y": 12,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 4,
+      "var_value": "4",
       "script": "RustboroCity_EventScript_1E0C4F"
     },
     {
@@ -449,7 +449,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0DF3"
     },
     {
@@ -458,7 +458,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0E33"
     },
     {
@@ -467,7 +467,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0E73"
     },
     {
@@ -476,7 +476,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0EB3"
     },
     {
@@ -485,7 +485,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0EF3"
     },
     {
@@ -494,7 +494,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0F33"
     },
     {
@@ -503,7 +503,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0F73"
     },
     {
@@ -512,7 +512,7 @@
       "y": 53,
       "elevation": 3,
       "var": "VAR_0x405A",
-      "var_value": 7,
+      "var_value": "7",
       "script": "RustboroCity_EventScript_1E0FB3"
     }
   ],