From 7c07488053cd9d23f88dea7912393c3e00ac7185 Mon Sep 17 00:00:00 2001
From: toasterparty <toasterparty@derpymail.org>
Date: Wed, 10 Apr 2024 10:20:05 -0700
Subject: [PATCH] Don't add new layers when placing respawning items

---
 src/patches.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/patches.rs b/src/patches.rs
index 2cb7a4f7..f0db4842 100644
--- a/src/patches.rs
+++ b/src/patches.rs
@@ -2157,9 +2157,17 @@ fn patch_add_item<'r>(
         pickup_model_data.actor_params.thermal_cskr = ResId::invalid();
     }
 
-    let name = CString::new(format!("Randomizer - Pickup ({:?})", pickup_model_data.name)).unwrap();
-    area.add_layer(Cow::Owned(name));
-    let new_layer_idx = area.layer_flags.layer_count as usize - 1;
+    let respawn = pickup_config.respawn.unwrap_or(false);
+
+    let new_layer_idx = {
+        if !respawn {
+            let name = CString::new(format!("Randomizer - Pickup ({:?})", pickup_model_data.name)).unwrap();
+            area.add_layer(Cow::Owned(name));
+            area.layer_flags.layer_count as usize - 1
+        } else {
+            0
+        }
+    };
 
     // Add hudmemo string as dependency to room //
     let hudmemo_strg: ResId<res_id::STRG> = {
@@ -2614,7 +2622,7 @@ fn patch_add_item<'r>(
         );
     }
 
-    if !pickup_config.respawn.unwrap_or(false) && new_layer_idx != 0 {
+    if !respawn && new_layer_idx != 0 {
         // Create Special Function to disable layer once item is obtained
         // This is needed because otherwise the item would re-appear every
         // time the room is loaded