diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:54:00 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:54:00 -0400 |
| commit | 923129a948eff063003c30fc6337a009a84653ab (patch) | |
| tree | 1770d5f99f4e9f3c00d240b80cb87a888d6f1f9b /tools/mapjson/mapjson.cpp | |
| parent | 0367cc7d7884ff4100b90832ac000a3e415d2896 (diff) | |
| parent | 77c133e6a1165d256f97a94fcad34063b6c3025d (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
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") { |