diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-11 23:42:56 +0100 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-12 09:50:41 +0100 |
| commit | 11373fb2d4836083f2a72a9669098a068bba4242 (patch) | |
| tree | 9fd69bfeb0eb1b10325befebf54c2e68a052fb8d /src/pokemon_1.c | |
| parent | c94528567925bd8b33d0fb93beaaa248636fec41 (diff) | |
Fix various warnings
Diffstat (limited to 'src/pokemon_1.c')
| -rw-r--r-- | src/pokemon_1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 3971e08dd..7ee413a18 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) @@ -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); |