summaryrefslogtreecommitdiff
path: root/src/tv.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-20 17:41:51 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-20 19:54:21 -0500
commited8b006e67cdf5427177108b32c009a217b12b37 (patch)
treec0491ae47e16c10080c9b27d8c256964bcfe09da /src/tv.c
parent135a11e50eba1e12108e5c2025f534e3bd0cc722 (diff)
Rename map-layout-related things
Diffstat (limited to 'src/tv.c')
-rw-r--r--src/tv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tv.c b/src/tv.c
index 2219a720b..d32a8940e 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1958,7 +1958,7 @@ void sub_80EDB44(void)
show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01);
}
show->rivalTrainer.location = gMapHeader.regionMapSectionId;
- show->rivalTrainer.mapDataId = gMapHeader.mapDataId;
+ show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId;
show->rivalTrainer.nSilverSymbols = 0;
show->rivalTrainer.nGoldSymbols = 0;
for (i = 0; i < 7; i ++)
@@ -2010,7 +2010,7 @@ void sub_80EDCE8(void)
show->treasureInvestigators.active = FALSE;
show->treasureInvestigators.item = gSpecialVar_0x8005;
show->treasureInvestigators.location = gMapHeader.regionMapSectionId;
- show->treasureInvestigators.mapDataId = gMapHeader.mapDataId;
+ show->treasureInvestigators.mapLayoutId = gMapHeader.mapLayoutId;
StringCopy(show->treasureInvestigators.playerName, gSaveBlock2Ptr->playerName);
tv_store_id_3x(show);
show->treasureInvestigators.language = gGameLanguage;
@@ -6261,7 +6261,7 @@ static void DoTVShowTodaysRivalTrainer(void)
sTVShowState = 8;
break;
case MAPSEC_DYNAMIC:
- switch (show->rivalTrainer.mapDataId)
+ switch (show->rivalTrainer.mapLayoutId)
{
case 0x115 ... 0x117:
sTVShowState = 10;
@@ -6460,7 +6460,7 @@ static void DoTVShowHoennTreasureInvestigators(void)
StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
if (show->treasureInvestigators.location == MAPSEC_DYNAMIC)
{
- switch (show->treasureInvestigators.mapDataId)
+ switch (show->treasureInvestigators.mapLayoutId)
{
case 0x115 ... 0x117:
sTVShowState = 2;