Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix party pool oob (#8581)

Browse Source
This commit is contained in:
hedara90 2025-12-18 22:56:42 +01:00 committed by GitHub
parent cd856cfc40
commit fe6f72ec52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/trainer_pools.c
View File

@ -167,6 +167,10 @@ static u32 PickMonFromPool(const struct Trainer *trainer, u8 *poolIndexArray, u3
// If no mon has been found yet continue looking
if (monIndex == POOL_SLOT_DISABLED)
monIndex = pickFunctions.OtherFunction(trainer, poolIndexArray, partyIndex, monsCount, battleTypeFlags, rules);
// If a mon still hasn't been found, return POOL_SLOT_DISABLED which makes party generation default to regular party generation
if (monIndex == POOL_SLOT_DISABLED)
return monIndex;
u32 chosenTags = trainer->party[monIndex].tags;
u16 chosenSpecies = trainer->party[monIndex].species;
u16 chosenItem = trainer->party[monIndex].heldItem;