diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-06-27 21:22:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 21:22:53 -0400 |
| commit | 63b93c46116311d0d3d95119ba814b434dd9bd3c (patch) | |
| tree | fdf3927070fe25ec795cd9d867e3327b6e6307fc /src | |
| parent | 827c274979f9d3e8ffaad7fa79054272e44364a2 (diff) | |
| parent | d391c136d81630c1e8a914c3251b528568633eb0 (diff) | |
Merge pull request #1472 from garakmon/hi
fix encounter slot logic to accomodate changes
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 767fbe4e7..8bcb17605 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -162,7 +162,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; @@ -215,7 +215,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; } |