From a0f951b09c526bd92c2719ef3e28cccfeb0fc84a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Mar 2020 12:08:08 -0400 Subject: trainer_type and trainer_sight_or_berry_tree_id to string --- tools/mapjson/mapjson.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/mapjson/mapjson.cpp') diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index ad3aa3769..41d8b01f8 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"; } -- cgit v1.2.3 From d450d5d406b88cd247803941fab5ce2cfaa3723d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Mar 2020 01:21:46 -0400 Subject: var_value to string --- tools/mapjson/mapjson.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/mapjson/mapjson.cpp') diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 41d8b01f8..0302ee61a 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -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") { -- cgit v1.2.3