dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename REGION_MAP constants to adopt MAPSEC names from Ruby

Browse Source
This commit is contained in:
PikalaxALT
2017-10-28 22:03:33 -04:00
parent 27cee8bcf1
commit 4049ed7e2c
3 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoration.c
View File

@@ -1603,7 +1603,7 @@ void sub_81289F0(u8 taskId)
ScriptContext1_SetupScript(gUnknown_08275D1F);
}
gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
{
TV_PutSecretBaseVisitOnTheAir();
}
@@ -2222,7 +2222,7 @@ void sub_81298EC(u8 taskId)
{
StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC);
DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64);
if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
{
TV_PutSecretBaseVisitOnTheAir();
}

6
src/tv.c
View File

@@ -6432,10 +6432,10 @@ void DoTVShowTodaysRivalTrainer(void)
default:
sTVShowState = 7;
break;
case REGION_MAP_SECRET_BASE:
case MAPSEC_SECRET_BASE:
sTVShowState = 8;
break;
case REGION_MAP_NONE:
case MAPSEC_NONE:
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 == REGION_MAP_NONE)
if (show->treasureInvestigators.location == MAPSEC_NONE)
{
switch (show->treasureInvestigators.mapDataId)
{