HarbourMasters · unreference · May 7, 2026 · May 7, 2026 · May 7, 2026 · May 7, 2026
diff --git a/OTRExporter b/OTRExporter
diff --git a/ZAPDTR b/ZAPDTR
diff --git a/soh/include/functions.h b/soh/include/functions.h
@@ -1023,6 +1023,10 @@ void ZeldaArena_FreeDebug(void* ptr, const char* file, s32 line);
 void* ZeldaArena_Calloc(size_t num, size_t size);
 void ZeldaArena_Display();
 void ZeldaArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc);
+
+// [SOH] Enhancement - Heap Viewer
+ArenaNode* ZeldaArena_GetHead(void);
+
 void ZeldaArena_Check();
 void ZeldaArena_Init(void* start, size_t size);
 void ZeldaArena_Cleanup();

diff --git a/soh/soh/ActorDB.cpp b/soh/soh/ActorDB.cpp
@@ -17,10 +17,15 @@ ActorDB* ActorDB::Instance;
 struct AddPair {
     const char* name;
     ActorInit& init;
+    // #region SOH [Enhancement] - Hardware Memory Limits
+    AllocType allocType;
+    // #endregion
 };
 
-#define DEFINE_ACTOR_INTERNAL(name, _1, allocType) { #name, name##_InitVars },
-#define DEFINE_ACTOR(name, _1, allocType) { #name, name##_InitVars },
+// #region SOH [Enhancement] - Hardware Memory Limits
+#define DEFINE_ACTOR_INTERNAL(name, _1, allocType) { #name, name##_InitVars, allocType },
+#define DEFINE_ACTOR(name, _1, allocType) { #name, name##_InitVars, allocType },
+// #endregion
 #define DEFINE_ACTOR_UNSET(_0)
 
 static constexpr AddPair initialActorTable[] = {
@@ -470,6 +475,9 @@ ActorDB::ActorDB() {
     db.reserve(ACTOR_NUMBER_MAX); // reserve size for all initial entries so we don't do it for each
     for (const AddPair& pair : initialActorTable) {
         Entry& entry = AddEntry(pair.name, actorDescriptions[pair.init.id], pair.init);
+        // #region SOH [Enhancement] - Hardware Memory Limits
+        entry.entry.allocType = pair.allocType;
+        // #endregion
     }
 }
 

diff --git a/soh/soh/ActorDB.h b/soh/soh/ActorDB.h
@@ -16,6 +16,9 @@ typedef struct {
     ActorFunc draw;
     ActorResetFunc reset;
     s32 numLoaded;
+    // #region SOH [Enhancement] - Hardware Memory Limits
+    AllocType allocType;
+    // #endregion
 } ActorDBEntry;
 
 #ifdef __cplusplus

diff --git a/soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp b/soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp
@@ -9,6 +9,7 @@
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/MenuTypes.h"
 #include "soh/SohGui/SohMenu.h"
+#include "soh/Enhancements/Restorations/HardwareMemoryLimits/HardwareMemoryLimits.hpp"
 
 extern "C" {
 #include <z64.h>
@@ -458,9 +459,19 @@ uint8_t GetRandomizedEnemy(PlayState* play, int16_t* actorId, s16* posX, s16* po
             play->sceneNum + *actorId + (int)*posX + (int)*posY + (int)*posZ + *rotX + *rotY + *rotZ + *params;
         EnemyEntry randomEnemy = GetRandomizedEnemyEntry(seed, play);
 
+        // #region SOH [Enhancement] - Hardware Memory Limits
+        // Save the original actor ID before randomization swap it.  The shadow heap needs the original ID to allocate
+        // the correct overlay and instance sizes.
+        const s16 originalActorId = *actorId;
+        // #endregion
+
         *actorId = randomEnemy.id;
         *params = randomEnemy.params;
 
+        // #region SOH [Enhancement] - Hardware Memory Limits
+        N64Mem_SetOriginalActorId(originalActorId);
+        // #endregion
+
         // Straighten out enemies so they aren't flipped on their sides when the original spawn is.
         *rotX = 0;
 
@@ -986,4 +997,4 @@ void RegisterEnemyRandomizerWidgets() {
 }
 
 static RegisterShipInitFunc initFunc(RegisterEnemyRandomizer, { CVAR_ENEMY_RANDOMIZER_NAME });
-static RegisterMenuInitFunc menuInitFunc(RegisterEnemyRandomizerWidgets);
+static RegisterMenuInitFunc menuInitFunc(RegisterEnemyRandomizerWidgets);
+70 −3		ZAPD/ZRom.cpp
+13 −9		ZAPD/ZRom.h
+43 −5		ZAPD/ZTextMM.cpp