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 /tools/mapjson/mapjson.cpp | |
| 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 'tools/mapjson/mapjson.cpp')
| -rw-r--r-- | tools/mapjson/mapjson.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index ad3aa3769..0302ee61a 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -281,8 +281,8 @@ string generate_firered_map_events_text(Json map_data) { << obj_event["movement_type"].string_value() << ", " << obj_event["movement_range_x"].int_value() << ", " << obj_event["movement_range_y"].int_value() << ", " - << obj_event["trainer_type"].int_value() << ", " - << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", " + << obj_event["trainer_type"].string_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " << obj_event["script"].string_value() << ", " << obj_event["flag"].string_value() << "\n"; } @@ -317,7 +317,7 @@ string generate_firered_map_events_text(Json map_data) { << coord_event["y"].int_value() << ", " << coord_event["elevation"].int_value() << ", 0, " << coord_event["var"].string_value() << ", " - << coord_event["var_value"].int_value() << ", 0, " + << coord_event["var_value"].string_value() << ", 0, " << coord_event["script"].string_value() << "\n"; } else if (coord_event["type"] == "weather") { |