ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 22:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

MAPSEC_DYNAMIC

Browse Source
This commit is contained in:
PikalaxALT 2017-11-12 21:39:44 -05:00
parent 1ca032c6ff
commit 79609d52c8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/region_map.h
View File

@ -93,7 +93,7 @@ enum {
MAPSEC_INSIDE_OF_TRUCK, MAPSEC_INSIDE_OF_TRUCK,
MAPSEC_SKY_PILLAR, MAPSEC_SKY_PILLAR,
MAPSEC_SECRET_BASE, MAPSEC_SECRET_BASE,
MAPSEC_SS_TIDAL, MAPSEC_DYNAMIC,
MAPSEC_PALLET_TOWN, MAPSEC_PALLET_TOWN,
MAPSEC_VIRIDIAN_CITY, MAPSEC_VIRIDIAN_CITY,
MAPSEC_PEWTER_CITY, MAPSEC_PEWTER_CITY,

4
src/region_map.c
View File

@ -935,7 +935,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
case 8: case 8:
gRegionMap->mapSecId = gMapHeader.regionMapSectionId; gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
if (gRegionMap->mapSecId != MAPSEC_SS_TIDAL) if (gRegionMap->mapSecId != MAPSEC_DYNAMIC)
{ {
storedWarp = &gSaveBlock1Ptr->warp4; storedWarp = &gSaveBlock1Ptr->warp4;
mapHeader = get_mapheader_by_bank_and_number(storedWarp->mapGroup, storedWarp->mapNum); mapHeader = get_mapheader_by_bank_and_number(storedWarp->mapGroup, storedWarp->mapNum);
@ -1516,7 +1516,7 @@ u8 *sub_81245DC(u8 *dest, u16 mapSecId)
{ {
switch (mapSecId) switch (mapSecId)
{ {
case MAPSEC_SS_TIDAL: case MAPSEC_DYNAMIC:
return StringCopy(dest, gText_Ferry); return StringCopy(dest, gText_Ferry);
case MAPSEC_SECRET_BASE: case MAPSEC_SECRET_BASE:
return StringCopy(dest, gText_SecretBase); return StringCopy(dest, gText_SecretBase);

4
src/tv.c
View File

@ -6435,7 +6435,7 @@ void DoTVShowTodaysRivalTrainer(void)
case MAPSEC_SECRET_BASE: case MAPSEC_SECRET_BASE:
sTVShowState = 8; sTVShowState = 8;
break; break;
case MAPSEC_SS_TIDAL: case MAPSEC_DYNAMIC:
switch (show->rivalTrainer.mapDataId) switch (show->rivalTrainer.mapDataId)
{ {
case 0x115 ... 0x117: case 0x115 ... 0x117:
@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
{ {
case 0: case 0:
StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name); 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) switch (show->treasureInvestigators.mapDataId)
{ {