diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 19:52:37 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 19:52:37 -0500 |
commit | 3e806419156cd1b57f8c6c1b215f836b467c723a (patch) | |
tree | b563893df89348fcbc07c1fcc0fda8331ffde157 | |
parent | 2a2db28e57e78eb8861997422f998378d91bf9dc (diff) |
in_connection to bool
-rw-r--r-- | data/maps/CeladonCity/map.json | 2 | ||||
-rw-r--r-- | data/maps/CeruleanCity/map.json | 2 | ||||
-rw-r--r-- | data/maps/FiveIsland/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route15/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route2/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route21_North/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route4/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route7/map.json | 2 | ||||
-rw-r--r-- | data/maps/SevenIsland_SevaultCanyon_Entrance/map.json | 2 | ||||
-rw-r--r-- | tools/mapjson/mapjson.cpp | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 70ddb25e8..b9ed79113 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -184,7 +184,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": -7, "y": 21, "elevation": 7, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 30e18ed78..25c2333e0 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -155,7 +155,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 50, "y": 18, "elevation": 10, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 4635c9d88..ae9611f97 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -54,7 +54,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 32, "y": 9, "elevation": 4, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 138e9c47b..fc65f0932 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -197,7 +197,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 73, "y": 7, "elevation": 13, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 2c09a3474..29563d779 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -106,7 +106,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": 6, "y": 85, "elevation": 8, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index b86af1cbf..417ae692d 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -93,7 +93,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", - "in_connection": 255, + "in_connection": true, "x": 13, "y": -3, "elevation": 2, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index cc47f14dc..051a2ca50 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -106,7 +106,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", - "in_connection": 255, + "in_connection": true, "x": 109, "y": 3, "elevation": 12, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index b5bfba23b..1fcf4cc50 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -28,7 +28,7 @@ "object_events": [ { "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", - "in_connection": 255, + "in_connection": true, "x": -8, "y": 12, "elevation": 10, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 8616cc967..3f164568a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -106,7 +106,7 @@ }, { "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", - "in_connection": 255, + "in_connection": true, "x": 7, "y": -2, "elevation": 1, diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index cce690662..563ed6352 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -274,7 +274,7 @@ string generate_firered_map_events_text(Json map_data) { auto obj_event = map_data["object_events"].array_items()[i]; text << "\tobject_event " << i + 1 << ", " << obj_event["graphics_id"].string_value() << ", " - << obj_event["in_connection"].int_value() << ", " + << (obj_event["in_connection"].bool_value() ? 255 : 0) << ", " << obj_event["x"].int_value() << ", " << obj_event["y"].int_value() << ", " << obj_event["elevation"].int_value() << ", " |