Merge master into ObjEvent rename and prune accidental inclusions

include/global.fieldmap.h

@@ -143,6 +143,16 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
+// Flags for gMapHeader.flags, as defined in the map_header_flags macro
+#define MAP_ALLOW_BIKE         (1 << 0)
+#define MAP_ALLOW_ESCAPE_ROPE  (1 << 1)
+#define MAP_ALLOW_RUN          (1 << 2)
+#define MAP_SHOW_MAP_NAME      (1 << 3)
+#define UNUSED_MAP_FLAGS       (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7)
+
+#define SHOW_MAP_NAME_ENABLED  ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME)
+
+
 struct ObjectEvent
 {
     /*0x00*/ u32 active:1;