s&q to start area

Dolphin scripts/Entrance Randomizer/__main__.py

@@ -85,8 +85,15 @@ async def main_loop():
     state.visited_levels.add(state.current_area_old)
 
     # Skip both Jaguar fights if configured
-    if CONFIGS.SKIP_JAGUAR:
-        if highjack_transition(LevelCRC.MAIN_MENU, LevelCRC.JAGUAR, starting_area):
+    # And always load save file to starting area
+    if CONFIGS.SKIP_JAGUAR or state.current_area_new != LevelCRC.JAGUAR:
+        # If the starting area is Crash Site, we need to avoid resetting progress
+        # Default entrance otherwise
+        if starting_area != LevelCRC.CRASH_SITE and highjack_transition(
+            LevelCRC.MAIN_MENU,
+            None,
+            starting_area,
+        ):
             return
         if highjack_transition(LevelCRC.GATES_OF_EL_DORADO, LevelCRC.JAGUAR, LevelCRC.PUSCA):
             return

Dolphin scripts/Entrance Randomizer/newsfragments/72.feature.md

@@ -0,0 +1,7 @@
+When loading a save file, spawn the player in their starting area. This has allows the following (only when the starting area isn't Crash Site):
+
+- A manual anti-softlock
+- A form of fast-travel to a specific point (akin to S&Q warps, like in Hollow Knight)
+- Incidentally fixes the issue where S&Q leads to spawning in the level you would've last entered w/o randomization, breaking logic.
+
+-- by @Avasam