diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-06-25 12:40:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-25 12:40:22 -0400 |
| commit | 827c274979f9d3e8ffaad7fa79054272e44364a2 (patch) | |
| tree | e2d26b8385b79364d12ee58bfb275f2592c74bef /src | |
| parent | e0b58592b229f2db4e1f567f2400849bd035d3fa (diff) | |
| parent | 6d92b466e75164fb025909bdd74d5071d5bf646b (diff) | |
Merge pull request #1470 from GriffinRichards/constants-ftrainerfemale
Add missing use of F_TRAINER_FEMALE
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 001e2ec17..977bcbd9c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1961,10 +1961,10 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir if (gTrainers[trainerNum].doubleBattle == TRUE) personalityValue = 0x80; - else if (gTrainers[trainerNum].encounterMusic_gender & 0x80) - personalityValue = 0x78; + else if (gTrainers[trainerNum].encounterMusic_gender & F_TRAINER_FEMALE) + personalityValue = 0x78; // Use personality more likely to result in a female Pokémon else - personalityValue = 0x88; + personalityValue = 0x88; // Use personality more likely to result in a male Pokémon for (j = 0; gTrainers[trainerNum].trainerName[j] != EOS; j++) nameHash += gTrainers[trainerNum].trainerName[j]; |