summaryrefslogtreecommitdiff
path: root/tools/mapjson/mapjson.cpp
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-12-17 23:25:11 -0500
committerGitHub <noreply@github.com>2019-12-17 23:25:11 -0500
commit2f1285e4393deef290790e04cbb8d50b9fd007f5 (patch)
treefa9008354f56ecb3ff48c266dc0474a1c621f6c9 /tools/mapjson/mapjson.cpp
parentebd3a1371757839c260256e2d8101fc6448b2915 (diff)
parentda93247ea805fa5ade9fe2316dee827553d09e43 (diff)
Merge pull request #174 from garakmon/object_event
Dissassemble Event Object Data
Diffstat (limited to 'tools/mapjson/mapjson.cpp')
-rw-r--r--tools/mapjson/mapjson.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index 42bc20a8a..f4e7380b9 100644
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -160,7 +160,7 @@ string generate_map_events_text(Json map_data) {
string objects_label, warps_label, coords_label, bgs_label;
if (map_data["object_events"].array_items().size() > 0) {
- objects_label = map_data["name"].string_value() + "_EventObjects";
+ objects_label = map_data["name"].string_value() + "_ObjectEvents";
text << objects_label << ":\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i];
@@ -270,7 +270,7 @@ string generate_firered_map_events_text(Json map_data) {
string objects_label, warps_label, coords_label, bgs_label;
if (map_data["object_events"].array_items().size() > 0) {
- objects_label = map_data["name"].string_value() + "_EventObjects";
+ objects_label = map_data["name"].string_value() + "_ObjectEvents";
text << objects_label << "::\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i];