diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-03-06 23:15:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 23:15:51 -0500 |
| commit | ce115272cd26ad65ad67c32e25035b38e105352f (patch) | |
| tree | 71d73e9fa5f221003657cd2b758d38bfd79fa653 /soh/src | |
| parent | 0a67e42f6ceae5c51d23ef1fbf370fb41b1bbd40 (diff) | |
fix equip now enhancement running with non-equipment items (#2590)
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/overlays/actors/ovl_player_actor/z_player.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index cd9d50e00..8196058f1 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -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)); |