summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bike.c2
-rw-r--r--src/fldeff_dig.c2
-rwxr-xr-xsrc/item_use.c6
-rw-r--r--src/overworld.c2
-rw-r--r--src/region_map.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/bike.c b/src/bike.c
index e66d6b6e1..cd24d2487 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -1056,7 +1056,7 @@ void Bike_HandleBumpySlopeJump(void)
bool32 IsRunningDisallowed(u8 metatile)
{
- if (!(gMapHeader.flags & MAP_ALLOW_RUN) || IsRunningDisallowedByMetatile(metatile) == TRUE)
+ if (!(gMapHeader.flags & MAP_ALLOW_RUNNING) || IsRunningDisallowedByMetatile(metatile) == TRUE)
return TRUE;
else
return FALSE;
diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c
index 7f10e126e..ee5caa0df 100644
--- a/src/fldeff_dig.c
+++ b/src/fldeff_dig.c
@@ -16,7 +16,7 @@ static void sub_8135780(void);
// text
bool8 SetUpFieldMove_Dig(void)
{
- if (CanUseEscapeRopeOnCurrMap() == TRUE)
+ if (CanUseDigOrEscapeRopeOnCurMap() == TRUE)
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = hm2_dig;
diff --git a/src/item_use.c b/src/item_use.c
index 73d6f6ffe..d359dbcef 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -911,9 +911,9 @@ static void ItemUseOnFieldCB_EscapeRope(u8 taskId)
DisplayItemMessageOnField(taskId, gStringVar4, Task_UseDigEscapeRopeOnField);
}
-bool8 CanUseEscapeRopeOnCurrMap(void)
+bool8 CanUseDigOrEscapeRopeOnCurMap(void)
{
- if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE)
+ if (gMapHeader.flags & MAP_ALLOW_ESCAPING)
return TRUE;
else
return FALSE;
@@ -921,7 +921,7 @@ bool8 CanUseEscapeRopeOnCurrMap(void)
void ItemUseOutOfBattle_EscapeRope(u8 taskId)
{
- if (CanUseEscapeRopeOnCurrMap() == TRUE)
+ if (CanUseDigOrEscapeRopeOnCurMap() == TRUE)
{
sItemUseOnFieldCB = ItemUseOnFieldCB_EscapeRope;
SetUpItemUseOnFieldCallback(taskId);
diff --git a/src/overworld.c b/src/overworld.c
index ec43a3e80..72bc38693 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -978,7 +978,7 @@ static u16 GetCenterScreenMetatileBehavior(void)
bool32 Overworld_IsBikingAllowed(void)
{
- if (!(gMapHeader.flags & MAP_ALLOW_BIKE))
+ if (!(gMapHeader.flags & MAP_ALLOW_CYCLING))
return FALSE;
else
return TRUE;
diff --git a/src/region_map.c b/src/region_map.c
index 8a15ca30d..500e9e383 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1004,7 +1004,7 @@ static void InitMapBasedOnPlayerLocation(void)
break;
case MAP_TYPE_UNDERGROUND:
case MAP_TYPE_UNUSED_2:
- if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE)
+ if (gMapHeader.flags & MAP_ALLOW_ESCAPING)
{
mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum);
gRegionMap->mapSecId = mapHeader->regionMapSectionId;