diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.fieldmap.h | 13 | ||||
| -rw-r--r-- | include/overworld.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 33f562d40..cd553a55a 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -195,20 +195,19 @@ struct MapHeader /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; /* 0x17 */ u8 mapType; - /* 0x18 */ u8 bikingAllowed; - /* 0x19 */ u8 escapeRope; - /* 0x1A */ s8 flags; + /* 0x18 */ bool8 bikingAllowed; + /* 0x19 */ u8 flags; + /* 0x1A */ s8 floorNum; /* 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_ALLOW_ESCAPE_ROPE (1 << 0) +#define MAP_ALLOW_RUN (1 << 1) #define MAP_SHOW_MAP_NAME (1 << 2) #define UNUSED_MAP_FLAGS (1 << 3 | 1 << 4 | 1 << 5 | 1 << 6 | 1 << 7) -#define SHOW_MAP_NAME_ENABLED ((gMapHeader.escapeRope & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME) +#define SHOW_MAP_NAME_ENABLED ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME) struct ObjectEvent { diff --git a/include/overworld.h b/include/overworld.h index d5a05cc6e..5f3728dec 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -59,7 +59,6 @@ extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern MainCallback gFieldCallback; extern struct WarpData gLastUsedWarp; -extern struct WarpData sWarpDestination; extern u8 gUnknown_2031DE0; extern u8 gFieldLinkPlayerCount; |