From bbf47da879b816167c8f3bed716570effa4b52bb Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 16 Jul 2024 00:37:58 -0400
Subject: Fix start of pilgrimage on sunwarp shuffle

---
 src/tracker_state.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/tracker_state.cpp')

diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp
index fd5ff4b..da8f426 100644
--- a/src/tracker_state.cpp
+++ b/src/tracker_state.cpp
@@ -288,7 +288,17 @@ class StateCalculator {
           }
 
           if (AP_IsPilgrimageEnabled()) {
-            if (room_obj.name == "Hub Room") {
+            int pilgrimage_start_id = GD_GetRoomByName("Hub Room");
+            if (AP_IsSunwarpShuffle()) {
+              for (const auto& [start_index, mapping] :
+                   AP_GetSunwarpMapping()) {
+                if (mapping.dots == 1) {
+                  pilgrimage_start_id = GD_GetRoomForSunwarp(start_index);
+                }
+              }
+            }
+
+            if (room_exit.destination_room == pilgrimage_start_id) {
               new_boundary.push_back(
                   {.destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .type = EntranceType::kPilgrimage});
-- 
cgit 1.4.1