Merge pull request #260 from GriffinRichards/doc-connection

Split connection field from graphics id in object events

11 files changed, 26 insertions, 15 deletions

diff --git a/asm/macros/map.inc b/asm/macros/map.inc
index 0f35bf959..881ffdbb4 100644
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -14,9 +14,10 @@
 	.4byte \address
 	.endm
 
-	.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
+	.macro object_event index:req, gfx:req, in_connection:req x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
 	.byte \index
-	.2byte \gfx
+	.byte \gfx
+	.byte \in_connection
 	.byte 0
 	.2byte \x, \y
 	.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 7753d987f..b9ed79113 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -183,8 +183,9 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65375",
-      "x": 65529,
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
+      "x": -7,
       "y": 21,
       "elevation": 7,
       "movement_type": "MOVEMENT_TYPE_NONE",
diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
index 087f39320..25c2333e0 100644
--- a/data/maps/CeruleanCity/map.json
+++ b/data/maps/CeruleanCity/map.json
@@ -154,7 +154,8 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 50,
       "y": 18,
       "elevation": 10,
diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json
index 46eb15806..ae9611f97 100644
--- a/data/maps/FiveIsland/map.json
+++ b/data/maps/FiveIsland/map.json
@@ -53,7 +53,8 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 32,
       "y": 9,
       "elevation": 4,
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index bc368ca01..fc65f0932 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -196,7 +196,8 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
       "x": 73,
       "y": 7,
       "elevation": 13,
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index 008be4a9f..29563d779 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -105,7 +105,8 @@
       "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL"
     },
     {
-      "graphics_id": "65375",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "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 06767be42..417ae692d 100644
--- a/data/maps/Route21_North/map.json
+++ b/data/maps/Route21_North/map.json
@@ -92,9 +92,10 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65307",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
+      "in_connection": true,
       "x": 13,
-      "y": 65533,
+      "y": -3,
       "elevation": 2,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index 13edbec1b..9728a5ca1 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -105,7 +105,8 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65321",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "in_connection": true,
       "x": 109,
       "y": 3,
       "elevation": 12,
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index e935d2d28..6aaffd6fc 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -27,8 +27,9 @@
   ],
   "object_events": [
     {
-      "graphics_id": "65375",
-      "x": 65528,
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
+      "in_connection": true,
+      "x": -8,
       "y": 12,
       "elevation": 10,
       "movement_type": "MOVEMENT_TYPE_NONE",
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
index f235bf795..3f164568a 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
@@ -105,9 +105,10 @@
       "flag": "0"
     },
     {
-      "graphics_id": "65321",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
+      "in_connection": true,
       "x": 7,
-      "y": 65534,
+      "y": -2,
       "elevation": 1,
       "movement_type": "MOVEMENT_TYPE_NONE",
       "movement_range_x": 0,
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index 753fac11b..563ed6352 100644
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -274,6 +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"].bool_value() ? 255 : 0) << ", "
                  << obj_event["x"].int_value() << ", "
                  << obj_event["y"].int_value() << ", "
                  << obj_event["elevation"].int_value() << ", "