Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-09 04:13:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 417568db71 into a3c551fe21

Browse Source
This commit is contained in:
FosterProgramming 2026-05-03 20:18:52 +00:00 committed by GitHub
commit db4b253ddb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/global.tv.h
View File

@ -486,7 +486,7 @@ typedef union // size = 0x24
/*0x13*/ u8 probability;
/*0x14*/ u8 level;
/*0x15*/ u8 unused5;
/*0x16*/ u16 daysLeft;
/*0x16*/ u16 daysBeforeOutbreak;
/*0x18*/ u8 language;
/*0x19*/ //u8 padding;
} massOutbreak;

18
src/tv.c
View File

@ -137,7 +137,7 @@ static void TryPutPokemonTodayFailedOnTheAir(void);
static void TryStartRandomMassOutbreak(void);
static void TryPutRandomPokeNewsOnAir(void);
static void SortPurchasesByQuantity(void);
static void UpdateMassOutbreakTimeLeft(u16);
static void UpdateTimeBeforeMassOutbreak(u16);
static void TryEndMassOutbreak(u16);
static void UpdatePokeNewsCountdown(u16);
static void ResolveWorldOfMastersShow(u16);
@ -797,7 +797,7 @@ u8 GetRandomActiveShowIdx(void)
else
{
show = &gSaveBlock1Ptr->tvShows[j];
if (show->massOutbreak.daysLeft == 0 && show->massOutbreak.active == TRUE)
if (show->massOutbreak.daysBeforeOutbreak == 0 && show->massOutbreak.active == TRUE)
return j;
}
@ -1679,7 +1679,7 @@ static void TryStartRandomMassOutbreak(void)
show->massOutbreak.unused4 = 0;
show->massOutbreak.probability = 50;
show->massOutbreak.unused5 = 0;
show->massOutbreak.daysLeft = 1;
show->massOutbreak.daysBeforeOutbreak = 1;
StorePlayerIdInNormalShow(show);
show->massOutbreak.language = gGameLanguage;
}
@ -1706,14 +1706,14 @@ void EndMassOutbreak(void)
void UpdateTVShowsPerDay(u16 days)
{
UpdateMassOutbreakTimeLeft(days);
UpdateTimeBeforeMassOutbreak(days);
TryEndMassOutbreak(days);
UpdatePokeNewsCountdown(days);
ResolveWorldOfMastersShow(days);
ResolveNumberOneShow(days);
}
static void UpdateMassOutbreakTimeLeft(u16 days)
static void UpdateTimeBeforeMassOutbreak(u16 days)
{
u8 i;
TVShow *show;
@ -1725,10 +1725,10 @@ static void UpdateMassOutbreakTimeLeft(u16 days)
if (gSaveBlock1Ptr->tvShows[i].massOutbreak.kind == TVSHOW_MASS_OUTBREAK && gSaveBlock1Ptr->tvShows[i].massOutbreak.active == TRUE)
{
show = &gSaveBlock1Ptr->tvShows[i];
if (show->massOutbreak.daysLeft < days)
show->massOutbreak.daysLeft = 0;
if (show->massOutbreak.daysBeforeOutbreak < days)
show->massOutbreak.daysBeforeOutbreak = 0;
else
show->massOutbreak.daysLeft -= days;
show->massOutbreak.daysBeforeOutbreak -= days;
break;
}
@ -3619,7 +3619,7 @@ static bool8 TryMixOutbreakTVShow(TVShow *dest, TVShow *src, u8 idx)
src->common.srcTrainerIdHi = linkTrainerId >> 8;
*dest = *src;
dest->common.active = TRUE;
dest->massOutbreak.daysLeft = 1;
dest->massOutbreak.daysBeforeOutbreak = 1;
return TRUE;
}