dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in_connection to bool

Browse Source
This commit is contained in:
GriffinR
2020-02-18 19:52:37 -05:00
parent 2a2db28e57
commit 3e80641915
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity/map.json
+1 -1
View File
@@ -184,7 +184,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255, "in_connection": true,
"x": -7, "x": -7,
"y": 21, "y": 21,
"elevation": 7, "elevation": 7,
data/maps/CeruleanCity/map.json
+1 -1
View File
@@ -155,7 +155,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255, "in_connection": true,
"x": 50, "x": 50,
"y": 18, "y": 18,
"elevation": 10, "elevation": 10,
data/maps/FiveIsland/map.json
+1 -1
View File
@@ -54,7 +54,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255, "in_connection": true,
"x": 32, "x": 32,
"y": 9, "y": 9,
"elevation": 4, "elevation": 4,
data/maps/Route15/map.json
+1 -1
View File
@@ -197,7 +197,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255, "in_connection": true,
"x": 73, "x": 73,
"y": 7, "y": 7,
"elevation": 13, "elevation": 13,
data/maps/Route2/map.json
+1 -1
View File
@@ -106,7 +106,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255, "in_connection": true,
"x": 6, "x": 6,
"y": 85, "y": 85,
"elevation": 8, "elevation": 8,
data/maps/Route21_North/map.json
+1 -1
View File
@@ -93,7 +93,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"in_connection": 255, "in_connection": true,
"x": 13, "x": 13,
"y": -3, "y": -3,
"elevation": 2, "elevation": 2,
data/maps/Route4/map.json
+1 -1
View File
@@ -106,7 +106,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"in_connection": 255, "in_connection": true,
"x": 109, "x": 109,
"y": 3, "y": 3,
"elevation": 12, "elevation": 12,
data/maps/Route7/map.json
+1 -1
View File
@@ -28,7 +28,7 @@
"object_events": [ "object_events": [
{ {
"graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"in_connection": 255, "in_connection": true,
"x": -8, "x": -8,
"y": 12, "y": 12,
"elevation": 10, "elevation": 10,
data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
+1 -1
View File
@@ -106,7 +106,7 @@
}, },
{ {
"graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"in_connection": 255, "in_connection": true,
"x": 7, "x": 7,
"y": -2, "y": -2,
"elevation": 1, "elevation": 1,
tools/mapjson/mapjson.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ string generate_firered_map_events_text(Json map_data) {
auto obj_event = map_data["object_events"].array_items()[i]; auto obj_event = map_data["object_events"].array_items()[i];
text << "\tobject_event " << i + 1 << ", " text << "\tobject_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", " << 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["x"].int_value() << ", "
<< obj_event["y"].int_value() << ", " << obj_event["y"].int_value() << ", "
<< obj_event["elevation"].int_value() << ", " << obj_event["elevation"].int_value() << ", "