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/SixIsland_PatternBush | |
| 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/SixIsland_PatternBush')
| -rw-r--r-- | data/maps/SixIsland_PatternBush/map.json | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 893790bd4..d1c655920 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -23,8 +23,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "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": "SixIsland_PatternBush_EventScript_Bethany", "flag": "0" }, @@ -36,8 +36,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "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": "SixIsland_PatternBush_EventScript_Allison", "flag": "0" }, @@ -49,8 +49,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": "SixIsland_PatternBush_EventScript_Garret", "flag": "0" }, @@ -62,8 +62,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_PatternBush_EventScript_Jonah", "flag": "0" }, @@ -75,8 +75,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 2, "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": "SixIsland_PatternBush_EventScript_Vance", "flag": "0" }, @@ -88,8 +88,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": "SixIsland_PatternBush_EventScript_Nash", "flag": "0" }, @@ -101,8 +101,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": "SixIsland_PatternBush_EventScript_Cordell", "flag": "0" }, @@ -114,8 +114,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "SixIsland_PatternBush_EventScript_Dalia", "flag": "0" }, @@ -127,8 +127,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "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": "SixIsland_PatternBush_EventScript_Joana", "flag": "0" }, @@ -140,8 +140,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_PatternBush_EventScript_Riley", "flag": "0" }, @@ -153,8 +153,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 5, "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": "SixIsland_PatternBush_EventScript_Marcy", "flag": "0" }, @@ -166,8 +166,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "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": "SixIsland_PatternBush_EventScript_Layton", "flag": "0" } |