diff options
Diffstat (limited to 'src/pokemon_1.c')
| -rw-r--r-- | src/pokemon_1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 3971e08dd..d6f475171 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -200,7 +200,7 @@ void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level, do { personality = Random32(); - actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | personality & 0x3) % 28); + actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 28); } while (nature != GetNatureFromPersonality(personality) || gender != GetGenderFromSpeciesAndPersonality(species, personality) @@ -302,9 +302,9 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src) StringCopy(nickname, src->nickname); if (nickname[0] == 0xFC && nickname[1] == 0x15) - language = 1; + language = LANGUAGE_JAPANESE; else - language = 2; + language = GAME_LANGUAGE; SetMonData(mon, MON_DATA_LANGUAGE, &language); StripExtCtrlCodes(nickname); @@ -422,7 +422,6 @@ void CalculateMonStats(struct Pokemon *mon) u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); s32 level = GetLevelFromMonExp(mon); s32 newMaxHP; - u8 nature; SetMonData(mon, MON_DATA_LEVEL, (u8 *)&level); |