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

Merge branch 'master' into doc-overworld

Browse Source
This commit is contained in:
GriffinR
2020-07-08 15:51:58 -04:00
committed by GitHub
parent c0bc7e8f7b 9ff261ac2a
commit ebb6c4ee66
498 changed files with 8011 additions and 7053 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tv.c
+8 -8
View File
@@ -764,11 +764,11 @@ void ClearTVShowData(void)
for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows); i ++)
{
gSaveBlock1Ptr->tvShows[i].common.kind = 0;
gSaveBlock1Ptr->tvShows[i].common.active = 0;
for (j = 0; j < sizeof(TVShow) - 2; j ++)
gSaveBlock1Ptr->tvShows[i].commonInit.kind = 0;
gSaveBlock1Ptr->tvShows[i].commonInit.active = 0;
for (j = 0; j < ARRAY_COUNT(gSaveBlock1Ptr->tvShows[i].commonInit.pad02); j ++)
{
gSaveBlock1Ptr->tvShows[i].common.pad02[j] = 0;
gSaveBlock1Ptr->tvShows[i].commonInit.pad02[j] = 0;
}
}
ClearPokemonNews();
@@ -3161,11 +3161,11 @@ void DeleteTVShowInArrayByIdx(TVShow *shows, u8 idx)
{
u8 i;
shows[idx].common.kind = TVSHOW_OFF_AIR;
shows[idx].common.active = FALSE;
for (i = 0; i < 34; i ++)
shows[idx].commonInit.kind = TVSHOW_OFF_AIR;
shows[idx].commonInit.active = FALSE;
for (i = 0; i < ARRAY_COUNT(shows[idx].commonInit.pad02); i++)
{
shows[idx].common.pad02[i] = 0;
shows[idx].commonInit.pad02[i] = 0;
}
}