From 0a66c94d48bc609cfb73130e133879b0743d7a1f Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Mon, 15 Apr 2024 23:44:51 -0400
Subject: [PATCH] Correctly set final object entries count based on last slot
 index (#206)

---
 mm/2s2h/z_scene_2SH.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mm/2s2h/z_scene_2SH.cpp b/mm/2s2h/z_scene_2SH.cpp
index 11ba1a74d..17d7ed43e 100644
--- a/mm/2s2h/z_scene_2SH.cpp
+++ b/mm/2s2h/z_scene_2SH.cpp
@@ -176,10 +176,12 @@ void Scene_CommandObjectList(PlayState* play, SOH::ISceneCommand* cmd) {
     }
 
     // Continuing from the last index, add the remaining object ids from the command object list
-    for (; k < objList->objects.size(); k++) {
-        play->objectCtx.slots[play->objectCtx.numEntries++].id = -objList->objects[k];
+    for (; k < objList->objects.size(); i++, k++) {
+        play->objectCtx.slots[i].id = -objList->objects[k];
     }
 
+    play->objectCtx.numEntries = i;
+
     // #endregion
 
     // Original Compatible Code Commented