summaryrefslogtreecommitdiff
path: root/src/tv.c
diff options
context:
space:
mode:
authorSewef <elagroum@gmail.com>2019-10-16 19:35:33 +0200
committerGitHub <noreply@github.com>2019-10-16 19:35:33 +0200
commit19fb0fb2205cf719daeb705098c685e2062d3c83 (patch)
treef869cb7ec87f204f236a0d173e54b047adfd97eb /src/tv.c
parented1f5a74556d3a856f868e1b67edd2453122cff6 (diff)
parent60a592a2c32d07d47c892204659a8576017584d1 (diff)
Merge branch 'master' into patch-2
Diffstat (limited to 'src/tv.c')
-rw-r--r--src/tv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tv.c b/src/tv.c
index 4696a25e3..0537807d0 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -42,6 +42,7 @@
#include "constants/layouts.h"
#include "constants/metatile_behaviors.h"
#include "constants/script_menu.h"
+#include "constants/tv.h"
// Static type declarations
@@ -1595,7 +1596,7 @@ void SaveRecordedItemPurchasesForTVShow(void)
show->smartshopperShow.itemIds[i] = gMartPurchaseHistory[i].itemId;
show->smartshopperShow.itemAmounts[i] = gMartPurchaseHistory[i].quantity;
}
- show->smartshopperShow.priceReduced = GetPriceReduction(1);
+ show->smartshopperShow.priceReduced = GetPriceReduction(POKENEWS_SLATEPORT);
StringCopy(show->smartshopperShow.playerName, gSaveBlock2Ptr->playerName);
tv_store_id_3x(show);
show->smartshopperShow.language = gGameLanguage;
@@ -1955,11 +1956,11 @@ void sub_80EDB44(void)
show->rivalTrainer.badgeCount = nBadges;
if (IsNationalPokedexEnabled())
{
- show->rivalTrainer.dexCount = GetNationalPokedexCount(0x01);
+ show->rivalTrainer.dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01);
+ show->rivalTrainer.dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
show->rivalTrainer.location = gMapHeader.regionMapSectionId;
show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId;