diff options
| -rw-r--r-- | include/region_map.h | 2 | ||||
| -rw-r--r-- | src/region_map.c | 4 | ||||
| -rw-r--r-- | src/tv.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/region_map.h b/include/region_map.h index 90c81931a..91384d166 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -93,7 +93,7 @@ enum { MAPSEC_INSIDE_OF_TRUCK, MAPSEC_SKY_PILLAR, MAPSEC_SECRET_BASE, - MAPSEC_SS_TIDAL, + MAPSEC_DYNAMIC, MAPSEC_PALLET_TOWN, MAPSEC_VIRIDIAN_CITY, MAPSEC_PEWTER_CITY, diff --git a/src/region_map.c b/src/region_map.c index 1c9c9b8ed..3ca8f4add 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -935,7 +935,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) case 8: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; - if (gRegionMap->mapSecId != MAPSEC_SS_TIDAL) + if (gRegionMap->mapSecId != MAPSEC_DYNAMIC) { storedWarp = &gSaveBlock1Ptr->warp4; mapHeader = get_mapheader_by_bank_and_number(storedWarp->mapGroup, storedWarp->mapNum); @@ -1516,7 +1516,7 @@ u8 *sub_81245DC(u8 *dest, u16 mapSecId) { switch (mapSecId) { - case MAPSEC_SS_TIDAL: + case MAPSEC_DYNAMIC: return StringCopy(dest, gText_Ferry); case MAPSEC_SECRET_BASE: return StringCopy(dest, gText_SecretBase); @@ -6435,7 +6435,7 @@ void DoTVShowTodaysRivalTrainer(void) case MAPSEC_SECRET_BASE: sTVShowState = 8; break; - case MAPSEC_SS_TIDAL: + case MAPSEC_DYNAMIC: switch (show->rivalTrainer.mapDataId) { case 0x115 ... 0x117: @@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void) { case 0: StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name); - if (show->treasureInvestigators.location == MAPSEC_SS_TIDAL) + if (show->treasureInvestigators.location == MAPSEC_DYNAMIC) { switch (show->treasureInvestigators.mapDataId) { |