Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system

1 files changed, 38 insertions, 38 deletions

diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index f68701fc0..4bf9714f9 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -34,8 +34,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": "ThreeIsland_EventScript_AntiBiker1",
       "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
     },
@@ -47,8 +47,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": "ThreeIsland_EventScript_AntiBiker2",
       "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
     },
@@ -60,8 +60,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Biker",
       "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER"
     },
@@ -73,8 +73,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Biker",
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
@@ -86,8 +86,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Biker",
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
@@ -99,8 +99,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Biker",
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
@@ -112,8 +112,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Biker",
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
@@ -125,8 +125,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Biker",
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     },
@@ -138,8 +138,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": "EventScript_CutTree",
       "flag": "FLAG_TEMP_12"
     },
@@ -151,8 +151,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": "ThreeIsland_EventScript_ItemZinc",
       "flag": "FLAG_HIDE_THREE_ISLAND_ZINC"
     },
@@ -164,8 +164,8 @@
       "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_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": "ThreeIsland_EventScript_Woman",
       "flag": "0"
     },
@@ -177,8 +177,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": "ThreeIsland_EventScript_LittleBoy",
       "flag": "0"
     },
@@ -190,8 +190,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "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": "ThreeIsland_EventScript_Doduo",
       "flag": "0"
     },
@@ -203,8 +203,8 @@
       "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_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": "ThreeIsland_EventScript_Biker6",
       "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
     }
@@ -267,7 +267,7 @@
       "y": 27,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 2,
+      "var_value": "2",
       "script": "ThreeIsland_EventScript_BikerBossIntroTrigger"
     },
     {
@@ -276,7 +276,7 @@
       "y": 27,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 2,
+      "var_value": "2",
       "script": "ThreeIsland_EventScript_BikerBossIntroTrigger"
     },
     {
@@ -285,7 +285,7 @@
       "y": 27,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 2,
+      "var_value": "2",
       "script": "ThreeIsland_EventScript_BikerBossIntroTrigger"
     },
     {
@@ -294,7 +294,7 @@
       "y": 27,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 2,
+      "var_value": "2",
       "script": "ThreeIsland_EventScript_BikerBossIntroTrigger"
     },
     {
@@ -303,7 +303,7 @@
       "y": 26,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 3,
+      "var_value": "3",
       "script": "ThreeIsland_EventScript_BattleBikersTriggerLeft"
     },
     {
@@ -312,7 +312,7 @@
       "y": 26,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 3,
+      "var_value": "3",
       "script": "ThreeIsland_EventScript_BattleBikersTriggerMidLeft"
     },
     {
@@ -321,7 +321,7 @@
       "y": 26,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 3,
+      "var_value": "3",
       "script": "ThreeIsland_EventScript_BattleBikersTriggerMid"
     },
     {
@@ -330,7 +330,7 @@
       "y": 27,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 2,
+      "var_value": "2",
       "script": "ThreeIsland_EventScript_BikerBossIntroTrigger"
     },
     {
@@ -339,7 +339,7 @@
       "y": 26,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 3,
+      "var_value": "3",
       "script": "ThreeIsland_EventScript_BattleBikersTriggerMidRight"
     },
     {
@@ -348,7 +348,7 @@
       "y": 26,
       "elevation": 3,
       "var": "VAR_MAP_SCENE_THREE_ISLAND",
-      "var_value": 3,
+      "var_value": "3",
       "script": "ThreeIsland_EventScript_BattleBikersTriggerRight"
     }
   ],