From b1d26e10a829a2a1526754b88167485df7e2511f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 10 Mar 2020 23:13:27 -0400 Subject: Sync map header property names with pokefirered --- include/global.fieldmap.h | 6 +++--- include/item_use.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 2e451a368..837d5da00 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -144,9 +144,9 @@ struct MapHeader }; // 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_CYCLING (1 << 0) +#define MAP_ALLOW_ESCAPING (1 << 1) // Escape Rope and Dig +#define MAP_ALLOW_RUNNING (1 << 2) #define MAP_SHOW_MAP_NAME (1 << 3) #define UNUSED_MAP_FLAGS (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7) diff --git a/include/item_use.h b/include/item_use.h index 0cb76e7d4..f577f8d46 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -31,7 +31,7 @@ void ItemUseInBattle_PPRecovery(u8); void ItemUseInBattle_Escape(u8); void ItemUseInBattle_EnigmaBerry(u8); void Task_UseDigEscapeRopeOnField(u8 taskId); -u8 CanUseEscapeRopeOnCurrMap(void); +u8 CanUseDigOrEscapeRopeOnCurMap(void); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); #endif // GUARD_ITEM_USE_H -- cgit v1.2.3