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

Merge pull request #1324 from GriffinRichards/doc-sb

Browse Source 
Document remainder of secret_base.c
This commit is contained in:
GriffinR
2021-02-15 17:41:55 -05:00
committed by GitHub
parent f8a70fdf24 2e57a00d17
commit ee4af94a36
11 changed files with 343 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tv.c
+4 -4
View File
@@ -1665,7 +1665,7 @@ void PutLilycoveContestLadyShowOnTheAir(void)
{
show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
BufferContestLadyLanguage(&show->contestLiveUpdates2.language);
show->contestLiveUpdates2.pokemonNameLanguage = LANGUAGE_ENGLISH;
show->contestLiveUpdates2.pokemonNameLanguage = GAME_LANGUAGE;
show->contestLiveUpdates2.kind = TVSHOW_CONTEST_LIVE_UPDATES_2;
show->contestLiveUpdates2.active = TRUE;
BufferContestLadyPlayerName(show->contestLiveUpdates2.playerName);
@@ -3144,7 +3144,7 @@ static bool8 IsPartyMonNicknamedOrNotEnglish(u8 monIdx)
pokemon = &gPlayerParty[monIdx];
GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
language = GetMonData(pokemon, MON_DATA_LANGUAGE, &language);
if (language == LANGUAGE_ENGLISH && !StringCompare(gSpeciesNames[GetMonData(pokemon, MON_DATA_SPECIES, NULL)], gStringVar1))
if (language == GAME_LANGUAGE && !StringCompare(gSpeciesNames[GetMonData(pokemon, MON_DATA_SPECIES, NULL)], gStringVar1))
{
return FALSE;
}
@@ -4254,7 +4254,7 @@ static void sub_80F1254(TVShow *shows)
}
else
{
curShow->bravoTrainerTower.pokemonNameLanguage = LANGUAGE_ENGLISH;
curShow->bravoTrainerTower.pokemonNameLanguage = GAME_LANGUAGE;
}
}
}
@@ -4262,7 +4262,7 @@ static void sub_80F1254(TVShow *shows)
u8 TV_GetStringLanguage(u8 *str)
{
return IsStringJapanese(str) ? LANGUAGE_JAPANESE : LANGUAGE_ENGLISH;
return IsStringJapanese(str) ? LANGUAGE_JAPANESE : GAME_LANGUAGE;
}
static void sub_80F12A4(TVShow *shows)