Merge pull request #1713 from DizzyEggg/patch-1

Change GAME_LANGUAGE to LANGUAGE_ENGLISH
This commit is contained in:
GriffinR 2022-07-26 11:08:05 -05:00 committed by GitHub
commit 5366e89258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -206,12 +206,13 @@ void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language)
ConvertInternationalString(dest, language); ConvertInternationalString(dest, language);
} }
// It's impossible to distinguish between Latin languages just from a string alone, so the function defaults to LANGUAGE_ENGLISH. This is the case in all of the versions of the game.
int GetNicknameLanguage(u8 *str) int GetNicknameLanguage(u8 *str)
{ {
if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN) if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN)
return LANGUAGE_JAPANESE; return LANGUAGE_JAPANESE;
else else
return GAME_LANGUAGE; return LANGUAGE_ENGLISH;
} }
// Used by Pokénav's Match Call to erase the previous trainer's flavor text when switching between their info pages. // Used by Pokénav's Match Call to erase the previous trainer's flavor text when switching between their info pages.