summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-10-28 22:03:33 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-10-28 22:03:33 -0400
commit4049ed7e2c6bef50f2551cc846e0b428fdf51bd1 (patch)
treec7b4d6de7522098023f7aab6a0c93adba05bb90a /src
parent27cee8bcf1e0215dd9480a83af752d849e644cf1 (diff)
Rename REGION_MAP constants to adopt MAPSEC names from Ruby
Diffstat (limited to 'src')
-rw-r--r--src/decoration.c4
-rw-r--r--src/tv.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/decoration.c b/src/decoration.c
index 0179d36a1..b435c3db5 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -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();
}
diff --git a/src/tv.c b/src/tv.c
index 3c822b394..305bfeda9 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -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)
{