Entrance Rando (#1760)

soh/src/code/z_sram.c

@@ -4,6 +4,7 @@
 #include <string.h>
 #include <soh/Enhancements/randomizer/randomizerTypes.h>
 #include <soh/Enhancements/randomizer/randomizer_inf.h>
+#include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/randomizer/adult_trade_shuffle.h"
 
 #define NUM_DUNGEONS 8
@@ -196,6 +197,19 @@ void Sram_OpenSave() {
         }
     }
 
+    // Setup the modified entrance table and entrance shuffle table for rando
+    if (gSaveContext.n64ddFlag) {
+        Entrance_Init();
+        if (!CVar_GetS32("gRememberSaveLocation", 0) || gSaveContext.savedSceneNum == SCENE_YOUSEI_IZUMI_TATE ||
+            gSaveContext.savedSceneNum == SCENE_KAKUSIANA) {
+            Entrance_SetSavewarpEntrance();
+        }
+    } else {
+        // When going from a rando save to a vanilla save within the same game instance
+        // we need to reset the entrance table back to its vanilla state
+        Entrance_ResetEntranceTable();
+    }
+
     osSyncPrintf("scene_no = %d\n", gSaveContext.entranceIndex);
     osSyncPrintf(VT_RST);