fix equip now enhancement running with non-equipment items (#2590)

This commit is contained in:
Adam Bird 2023-03-06 23:15:51 -05:00 committed by GitHub
parent 0a67e42f6c
commit ce115272cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12604,7 +12604,8 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
}
this->unk_84F = 1;
equipItem = giEntry.itemId;
equipNow = CVarGetInteger("gAskToEquip", 0) && equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA &&
equipNow = CVarGetInteger("gAskToEquip", 0) && giEntry.modIndex == MOD_NONE &&
equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA &&
((gItemAgeReqs[equipItem] == 9 || gItemAgeReqs[equipItem] == gSaveContext.linkAge) ||
CVarGetInteger("gTimelessEquipment", 0));