Merge branch 'main' into fix-bazaar-tod-logic

gymnast86 · Dec 4, 2024 · 7df545f · 7df545f
2 parents 11f344f + 16181df
commit 7df545f
Show file tree

Hide file tree

Showing 10 changed files with 228 additions and 130 deletions.
diff --git a/data/entrance_shuffle_data.yaml b/data/entrance_shuffle_data.yaml
@@ -1164,27 +1164,27 @@
         entrance: 7
 - type: Interior
   forward:
-    connection: Skyloft Past Waterfall Cave -> Waterfall Cave
+    connection: Waterfall Cave -> Skyloft Past Waterfall Cave
     exit_infos:
-      - stage: F000
+      - stage: D000
         room: 0
-        index: 7
+        index: 1
     spawn_info:
-      - stage: D000
+      - stage: F000
         layer: 0
         room: 0
-        entrance: 1
+        entrance: 8
   return:
-    connection: Waterfall Cave -> Skyloft Past Waterfall Cave
+    connection: Skyloft Past Waterfall Cave -> Waterfall Cave
     exit_infos:
-      - stage: D000
+      - stage: F000
         room: 0
-        index: 1
+        index: 7
     spawn_info:
-      - stage: F000
+      - stage: D000
         layer: 0
         room: 0
-        entrance: 8
+        entrance: 1
 - type: Interior
   forward:
     connection: Bamboo Island -> Bamboo Island Interior