From 4643330fdd2f458a4f714eb7ae1a586d2d24da37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:08:29 -0500 Subject: Name allow_cycling, floor_number header properties --- tools/mapjson/mapjson.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/mapjson/mapjson.cpp') 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"; -- cgit v1.2.3 From e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:52:42 -0500 Subject: Name allow_escaping, allow_running, show_map_name header properties --- tools/mapjson/mapjson.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tools/mapjson/mapjson.cpp') diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 9f981e3e7..753fac11b 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -104,23 +104,21 @@ string generate_map_header_text(Json map_data, Json layouts_data) { << "\t.byte " << map_data["weather"].string_value() << "\n" << "\t.byte " << map_data["map_type"].string_value() << "\n"; - if (version == "firered") - text << "\t.byte " << map_data["allow_cycling"].bool_value() << "\n" - << "\t.byte " << map_data["unknown_19"].int_value() << "\n"; - else + if (version != "firered") text << "\t.2byte 0\n"; if (version == "ruby") { text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; } - else if (version == "emerald") { + else if (version == "emerald" || version == "firered") { text << "\tmap_header_flags " << "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() << ", " + << "allow_escaping=" << map_data["allow_escaping"].bool_value() << ", " + << "allow_running=" << map_data["allow_running"].bool_value() << ", " << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; } - else if (version == "firered") { + + if (version == "firered") { text << "\t.byte " << map_data["floor_number"].int_value() << "\n"; } -- cgit v1.2.3