Merge pull request #2139 from ghoulslash/be/wildmon

prevent overwriting wild mon held items
This commit is contained in:
Eduardo Quezada D'Ottone 2022-05-13 21:07:46 -04:00 committed by GitHub
commit 671323c3e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6459,6 +6459,9 @@ void SetWildMonHeldItem(void)
for (i = 0; i < count; i++)
{
if (GetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, NULL) != ITEM_NONE)
continue; // prevent ovewriting previously set item
rnd = Random() % 100;
species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, 0);
if (gMapHeader.mapLayoutId == LAYOUT_ALTERING_CAVE)