diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-06-27 21:41:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 21:41:20 -0400 |
| commit | b564c1e58c5f8bb26bef53f1eb6630d976f0ac9e (patch) | |
| tree | 47f8c1b9776f154ba80f76a0b71fb66c6a8b05eb /src | |
| parent | b9363bf366b5e8124773a77b5718272ed0a8ce39 (diff) | |
| parent | 335e3bab0901994cba316532669268c22cbf879e (diff) | |
Merge pull request #446 from garakmon/hey
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 5c3e59fde..90501e583 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -87,7 +87,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; @@ -147,7 +147,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; } |