diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-06-27 21:41:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 21:41:51 -0400 |
| commit | 038befb44341f0fc22f522dd454d64cf4ad2df2e (patch) | |
| tree | f4453ad28874e5e3b7d8750026198fe6f7287ee0 | |
| parent | ef16617fac2a1a24155b6c6fdf803509fbaa1df5 (diff) | |
| parent | 2a6803f84aa8364de4d716c94afb1398ce716ff8 (diff) | |
Merge pull request #829 from garakmon/oi
fix encounter slot logic to accomodate changes
| -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; } |