diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-12-19 14:41:02 -0600 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-12-19 14:41:02 -0600 |
| commit | 164d4318fb97a50773e1861cd0cb433d6d51bdee (patch) | |
| tree | 1e2289d5d9da586da525bb80e957d447e10b9390 /mm/2s2h/Rando/ConvertItem.cpp | |
| parent | 9fdbd5fe1d4b53de42f75657eaf61bd29ba54708 (diff) | |
Tweak item conversions for progressives
Diffstat (limited to 'mm/2s2h/Rando/ConvertItem.cpp')
| -rw-r--r-- | mm/2s2h/Rando/ConvertItem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/2s2h/Rando/ConvertItem.cpp b/mm/2s2h/Rando/ConvertItem.cpp index ac5ed8af8..d39699e83 100644 --- a/mm/2s2h/Rando/ConvertItem.cpp +++ b/mm/2s2h/Rando/ConvertItem.cpp @@ -116,7 +116,7 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) } else if (CUR_UPG_VALUE(UPG_WALLET) >= 2) { return false; } - break; + return true; case RI_WALLET_ADULT: if (CUR_UPG_VALUE(UPG_WALLET) >= 1) { return false; @@ -134,7 +134,7 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) (STOLEN_ITEM_1 >= ITEM_SWORD_GILDED) || (STOLEN_ITEM_2 >= ITEM_SWORD_GILDED)) { return false; } - break; + return true; case RI_SWORD_KOKIRI: if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) >= EQUIP_VALUE_SWORD_KOKIRI || (STOLEN_ITEM_1 >= ITEM_SWORD_KOKIRI) || (STOLEN_ITEM_2 >= ITEM_SWORD_KOKIRI)) { @@ -159,7 +159,7 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) } else if (CUR_UPG_VALUE(UPG_BOMB_BAG) >= 3) { return false; } - break; + return true; case RI_BOMB_BAG_20: if (CUR_UPG_VALUE(UPG_BOMB_BAG) >= 1) { return false; @@ -204,7 +204,7 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) gSaveContext.save.saveInfo.playerData.isDoubleMagicAcquired) { return false; } - break; + return true; case RI_DOUBLE_MAGIC: return !gSaveContext.save.saveInfo.playerData.isDoubleMagicAcquired; case RI_SINGLE_MAGIC: |