Revert "Merge branch 'master' into FollowingPokemon_Gen1-3"

This reverts commit 63b2bd9a44, reversing
changes made to a716f522f3.

include/global.fieldmap.h

@@ -66,8 +66,8 @@ struct BackupMapLayout
 struct ObjectEventTemplate
 {
     /*0x00*/ u8 localId;
-    /*0x01*/ u8 graphicsId;
     /*0x02*/ u8 inConnection; // Leftover from FRLG
+             u16 graphicsId;
     /*0x04*/ s16 x;
     /*0x06*/ s16 y;
     /*0x08*/ u8 elevation;
@@ -192,8 +192,9 @@ struct ObjectEvent
              u32 disableJumpLandingGroundEffect:1;
              u32 fixedPriority:1;
              u32 hideReflection:1;
+             int :0;
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 graphicsId;
+    /*0x05*/ u16 graphicsId;
     /*0x06*/ u8 movementType;
     /*0x07*/ u8 trainerType;
     /*0x08*/ u8 localId;