diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 14:08:29 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 14:08:29 -0500 |
commit | 4643330fdd2f458a4f714eb7ae1a586d2d24da37 (patch) | |
tree | b22566d7e54252ffee2d4b8e172ee708c2841559 /tools/mapjson/mapjson.cpp | |
parent | e4d15a2338500e91e1f2a9723c48ecf25ae8111e (diff) |
Name allow_cycling, floor_number header properties
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 f4e7380b9..9f981e3e7 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -105,7 +105,7 @@ string generate_map_header_text(Json map_data, Json layouts_data) { << "\t.byte " << map_data["map_type"].string_value() << "\n"; if (version == "firered") - text << "\t.byte " << map_data["unknown_18"].int_value() << "\n" + text << "\t.byte " << map_data["allow_cycling"].bool_value() << "\n" << "\t.byte " << map_data["unknown_19"].int_value() << "\n"; else text << "\t.2byte 0\n"; @@ -115,13 +115,13 @@ string generate_map_header_text(Json map_data, Json layouts_data) { } else if (version == "emerald") { text << "\tmap_header_flags " - << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " + << "allow_cycling=" << map_data["allow_cycling"].bool_value() << ", " << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " << "allow_run=" << map_data["allow_running"].bool_value() << ", " << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; } else if (version == "firered") { - text << "\t.byte " << map_data["elevator_flag"].int_value() << "\n"; + text << "\t.byte " << map_data["floor_number"].int_value() << "\n"; } text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; |