diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/apprentice.c | 2 | ||||
| -rw-r--r-- | src/contest.c | 2 | ||||
| -rw-r--r-- | src/daycare.c | 2 | ||||
| -rw-r--r-- | src/international_string_util.c | 2 | ||||
| -rw-r--r-- | src/mail.c | 2 | ||||
| -rw-r--r-- | src/trade.c | 2 | ||||
| -rw-r--r-- | src/tv.c | 8 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/apprentice.c b/src/apprentice.c index 20c0cb9e3..8a8de009c 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1083,7 +1083,7 @@ static void ApprenticeBufferString(void) StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data)); break; case APPRENTICE_BUFF_NAME: - TVShowConvertInternationalString(text, GetApprenticeNameInLanguage(PLAYER_APPRENTICE.id, LANGUAGE_ENGLISH), LANGUAGE_ENGLISH); + TVShowConvertInternationalString(text, GetApprenticeNameInLanguage(PLAYER_APPRENTICE.id, GAME_LANGUAGE), GAME_LANGUAGE); StringCopy(stringDst, text); break; case APPRENTICE_BUFF_LEVEL: diff --git a/src/contest.c b/src/contest.c index 36c32683a..8d8bd666c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -5998,7 +5998,7 @@ static u8 GetMonNicknameLanguage(u8 *nickname) u8 ret = GAME_LANGUAGE; if (nickname[0] == EXT_CTRL_CODE_BEGIN && nickname[1] == EXT_CTRL_CODE_JPN) - return LANGUAGE_ENGLISH; + return GAME_LANGUAGE; if (StringLength(nickname) < PLAYER_NAME_LENGTH - 1) { diff --git a/src/daycare.c b/src/daycare.c index 2a1efefcc..e2b5d2deb 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -170,7 +170,7 @@ static void StorePokemonInDaycare(struct Pokemon *mon, struct DaycareMon *daycar StringCopy(daycareMon->mail.OT_name, gSaveBlock2Ptr->playerName); GetMonNickname2(mon, daycareMon->mail.monName); StripExtCtrlCodes(daycareMon->mail.monName); - daycareMon->mail.gameLanguage = LANGUAGE_ENGLISH; + daycareMon->mail.gameLanguage = GAME_LANGUAGE; daycareMon->mail.monLanguage = GetMonData(mon, MON_DATA_LANGUAGE); mailId = GetMonData(mon, MON_DATA_MAIL); daycareMon->mail.message = gSaveBlock1Ptr->mail[mailId]; diff --git a/src/international_string_util.c b/src/international_string_util.c index 23ca6c081..c2b4b43cf 100644 --- a/src/international_string_util.c +++ b/src/international_string_util.c @@ -214,7 +214,7 @@ int sub_81DB604(u8 *str) if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN) return LANGUAGE_JAPANESE; else - return LANGUAGE_ENGLISH; + return GAME_LANGUAGE; } void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows) diff --git a/src/mail.c b/src/mail.c index 71e98b42a..09d5bfc44 100644 --- a/src/mail.c +++ b/src/mail.c @@ -248,7 +248,7 @@ void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) u16 species; sMailRead = calloc(1, sizeof(*sMailRead)); - sMailRead->language = LANGUAGE_ENGLISH; + sMailRead->language = GAME_LANGUAGE; sMailRead->playerIsSender = TRUE; sMailRead->parserSingle = CopyEasyChatWord; sMailRead->parserMultiple = ConvertEasyChatWordsToString; diff --git a/src/trade.c b/src/trade.c index 96099cb74..05c64cb82 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2920,7 +2920,7 @@ static void CB2_InGameTrade(void) StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); GetMonData(&gEnemyParty[0], MON_DATA_OT_NAME, otName); StringCopy(gLinkPlayers[1].name, otName); - gLinkPlayers[0].language = LANGUAGE_ENGLISH; + gLinkPlayers[0].language = GAME_LANGUAGE; gLinkPlayers[1].language = GetMonData(&gEnemyParty[0], MON_DATA_LANGUAGE); sTradeData = AllocZeroed(sizeof(*sTradeData)); AllocateMonSpritesGfx(); @@ -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) |