diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-28 08:56:40 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-28 08:56:40 -0400 |
| commit | 7ea20f3527bdcb56ac81d6efff4bf64ef4b9c2f1 (patch) | |
| tree | 4ecbde9ca6cf4bc4c44a67278794886eb7f0878d /src | |
| parent | f8bdecb0e1ab13de90ea8f0190710982eb695186 (diff) | |
| parent | 038befb44341f0fc22f522dd454d64cf4ad2df2e (diff) | |
Merge remote-tracking branch 'origin/master' into battle_struct_macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/wild_encounter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 1ad55dbee..3aed641b0 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -163,7 +163,7 @@ static u8 ChooseWildMonIndex_Land(void) return 8; else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_8 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_9) return 9; - else if (rand == ENCOUNTER_CHANCE_LAND_MONS_SLOT_9) + else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_9 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_10) return 10; else return 11; @@ -223,7 +223,7 @@ static u8 ChooseWildMonIndex_Fishing(u8 rod) wildMonIndex = 7; if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_7 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_8) wildMonIndex = 8; - if (rand == ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_8) + if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_8 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_9) wildMonIndex = 9; break; } |