diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-16 07:52:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 07:52:45 -0400 |
| commit | 77c133e6a1165d256f97a94fcad34063b6c3025d (patch) | |
| tree | 6a3fa5c0756b93c6c8d7c1447a978f5f29053b99 /data/maps/Route8/map.json | |
| parent | f44f89a463d7280a95094e8f37a56873a90da843 (diff) | |
| parent | d450d5d406b88cd247803941fab5ce2cfaa3723d (diff) | |
Merge pull request #299 from GriffinRichards/fix-porymapttype
Sync trainer_type/trainer_sight/var_value data type. Please reference this PR when fixing the issues raised above.
Diffstat (limited to 'data/maps/Route8/map.json')
| -rw-r--r-- | data/maps/Route8/map.json | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index ffc181a4d..d278616ef 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -34,8 +34,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route8_EventScript_Julia", "flag": "0" }, @@ -47,8 +47,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "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": "Route8_EventScript_Rich", "flag": "0" }, @@ -60,8 +60,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "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": "Route8_EventScript_Glenn", "flag": "0" }, @@ -73,8 +73,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_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": "Route8_EventScript_Paige", "flag": "0" }, @@ -86,8 +86,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route8_EventScript_Leslie", "flag": "0" }, @@ -99,8 +99,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_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": "Route8_EventScript_Andrea", "flag": "0" }, @@ -112,8 +112,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route8_EventScript_Megan", "flag": "0" }, @@ -125,8 +125,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "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": "Route8_EventScript_Stan", "flag": "0" }, @@ -138,8 +138,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "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": "Route8_EventScript_Aidan", "flag": "0" }, @@ -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": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, @@ -164,8 +164,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": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, @@ -177,8 +177,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": "Route8_EventScript_Eli", "flag": "0" }, @@ -190,8 +190,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": "Route8_EventScript_Anne", "flag": "0" }, @@ -203,8 +203,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Ricardo", "flag": "0" }, @@ -216,8 +216,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT", "movement_range_x": 5, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Jaren", "flag": "0" } |