Change setting back to zero to ensure the option works properly.

Put some less restrictions on repeatable items on cycle reset.
Z3DR · Feb 22, 2024 · c7fde8c · c7fde8c
1 parent 9c46098
commit c7fde8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/code/source/rnd/chest.cpp b/code/source/rnd/chest.cpp
@@ -6,7 +6,7 @@ namespace rnd {
   game::actors::EnBoxType Chest_OverrideSize(game::actors::En_Box* actor, game::GlobalContext* gctx) {
     // First check to see if setting is enabled.
     // TODO: Create setting
-    if (gSettingsContext.chestSize == 1) {
+    if (gSettingsContext.chestSize == 0) {
       return (game::actors::EnBoxType)0xFF;
     }
     s16 gid = (actor->dyna.params << 0x14) >> 0x19;

diff --git a/code/source/rnd/item_override.cpp b/code/source/rnd/item_override.cpp
@@ -45,8 +45,8 @@ namespace rnd {
     rItemOverrides[0].value.looksLikeItemId = 0x26;
     rItemOverrides[1].key.scene = 0x6F;
     rItemOverrides[1].key.type = ItemOverride_Type::OVR_CHEST;
-    rItemOverrides[1].value.getItemId = 0x02;
-    rItemOverrides[1].value.looksLikeItemId = 0x02;
+    rItemOverrides[1].value.getItemId = 0x0C;
+    rItemOverrides[1].value.looksLikeItemId = 0x0C;
     rItemOverrides[2].key.scene = 0x12;
     rItemOverrides[2].key.type = ItemOverride_Type::OVR_COLLECTABLE;
     rItemOverrides[2].value.getItemId = 0x37;
@@ -592,7 +592,7 @@ namespace rnd {
   bool ItemOverride_IsItemObtained(ItemOverride override) {
     ItemRow* itemToBeGiven = ItemTable_GetItemRow(override.value.getItemId);
     return (game::HasMask((game::ItemId)itemToBeGiven->itemId) || game::HasItem((game::ItemId)itemToBeGiven->itemId) ||
-            (itemToBeGiven->itemId > 0x49 && itemToBeGiven->itemId < 0x9E));
+            (itemToBeGiven->itemId > 0x49 && itemToBeGiven->itemId < 0x81));
   }
 
   extern "C" {