Merge pull request #1857 from GriffinRichards/sync-mapjson

Sync mapjson

include/constants/event_objects.h

@@ -288,6 +288,9 @@
 
 #define FIRST_DECORATION_SPRITE_GFX OBJ_EVENT_GFX_PICHU_DOLL
 
+#define OBJ_KIND_NORMAL 0
+#define OBJ_KIND_CLONE  255 // Exclusive to FRLG
+
 // Special object event local ids
 #define OBJ_EVENT_ID_PLAYER 0xFF
 #define OBJ_EVENT_ID_CAMERA 0x7F

include/global.fieldmap.h

@@ -67,7 +67,7 @@ struct ObjectEventTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
-    /*0x02*/ u8 inConnection; // Leftover from FRLG
+    /*0x02*/ u8 kind; // Always OBJ_KIND_NORMAL in Emerald.
     /*0x03*/ //u8 padding1;
     /*0x04*/ s16 x;
     /*0x06*/ s16 y;