diff options
| author | ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> | 2021-06-13 16:32:00 -0500 |
|---|---|---|
| committer | ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> | 2021-06-13 17:02:06 -0500 |
| commit | b6b0062bd60eb57d66b6c79fc48bdbb55d8a5bf5 (patch) | |
| tree | d88bfad489969bce94fe4db73a8fc1776f606150 /src/overworld.c | |
| parent | f85fb3af8923b7dce601591dede2d3bee0729d1e (diff) | |
Change map header flags to use a bitfield
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index 600333a47..979ebb74c 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -962,7 +962,7 @@ static u16 GetCenterScreenMetatileBehavior(void) bool32 Overworld_IsBikingAllowed(void) { - if (!(gMapHeader.flags & MAP_ALLOW_CYCLING)) + if (!gMapHeader.allowCycling) return FALSE; else return TRUE; @@ -1687,7 +1687,7 @@ void CB2_ReturnToFieldFadeFromBlack(void) static void FieldCB_FadeTryShowMapPopup(void) { - if (SHOW_MAP_NAME_ENABLED && SecretBaseMapPopupEnabled() == TRUE) + if (gMapHeader.showMapName == TRUE && SecretBaseMapPopupEnabled() == TRUE) ShowMapNamePopup(); FieldCB_WarpExitFadeFromBlack(); } @@ -1933,7 +1933,7 @@ static bool32 LoadMapInStepsLocal(u8 *state, bool32 a2) (*state)++; break; case 11: - if (SHOW_MAP_NAME_ENABLED && SecretBaseMapPopupEnabled() == TRUE) + if (gMapHeader.showMapName == TRUE && SecretBaseMapPopupEnabled() == TRUE) ShowMapNamePopup(); (*state)++; break; |