use GetBoolValueOnEntry for cloth and stinky

Author: AlexKnauth

HollowKnightComponent.cs

@@ -872,11 +872,12 @@ private SplitterAction CheckSplit(SplitName split, string nextScene, string curr
                 case SplitName.HappyCouplePlayerDataEvent: shouldSplit = mem.PlayerData<bool>(Offset.nailsmithConvoArt); break;
 
                 case SplitName.WhiteDefenderStatueUnlocked:
+                    bool convo = store.GetBoolValueOnEntry(Offset.dungDefenderAwakeConvo);
                     shouldSplit =
                         currScene == "Waterways_15"
                         && mem.PlayerData<bool>(Offset.dungDefenderAwoken)
                         && mem.PlayerData<bool>(Offset.dungDefenderLeft)
-                        && store.DungDefenderAwakeConvoOnEntry
+                        && convo
                         && (mem.GetCameraTarget().X < 29.5);
                     break;
 
@@ -1387,7 +1388,8 @@ private SplitterAction CheckSplit(SplitName split, string nextScene, string curr
                     shouldSplit = store.CheckIncremented(Offset.dreamOrbs) && currScene == "Cliffs_05";
                     break;
                 case SplitName.OnObtainGhostCloth:
-                    shouldSplit = store.CheckIncremented(Offset.dreamOrbs) && currScene == "Fungus3_23" && store.TraitorLordDeadOnEntry;
+                    bool traitorLordBeenDead = store.GetBoolValueOnEntry(Offset.killedTraitorLord);
+                    shouldSplit = store.CheckIncremented(Offset.dreamOrbs) && currScene == "Fungus3_23" && traitorLordBeenDead;
                     break;
                 case SplitName.OnObtainGhostVespa:
                     // UsesSceneTransitionRoutine is true on patches where Hive Knight exists

HollowKnightStoredData.cs

@@ -23,8 +23,6 @@ public void Update(T val) {
         private ConcurrentDictionary<Offset, Tracked<bool>> pdBools = new ConcurrentDictionary<Offset, Tracked<bool>>();
         private ConcurrentDictionary<Offset, int> pdEntryInts = new ConcurrentDictionary<Offset, int>();
         private ConcurrentDictionary<Offset, bool> pdEntryBools = new ConcurrentDictionary<Offset, bool>();
-        public bool TraitorLordDeadOnEntry { get; private set; } = false;
-        public bool DungDefenderAwakeConvoOnEntry { get; private set; } = false;
         public int HealthBeforeFocus { get; private set; } = 0;
         public int MPChargeBeforeFocus { get; private set; } = 0;
         /// <summary>
@@ -46,8 +44,8 @@ public void Update(T val) {
         public void Reset() {
             pdInts.Clear();
             pdBools.Clear();
-            TraitorLordDeadOnEntry = false;
-            DungDefenderAwakeConvoOnEntry = false;
+            pdEntryInts.Clear();
+            pdEntryBools.Clear();
             HealthBeforeFocus = 0;
             MPChargeBeforeFocus = 0;
             SplitThisTransition = false;
@@ -205,8 +203,6 @@ public void Update() {
                 || mem.SceneName() != mem.NextSceneName()) {
                 // In transition
                 PrevScene = mem.SceneName();
-                TraitorLordDeadOnEntry = mem.PlayerData<bool>(Offset.killedTraitorLord);
-                DungDefenderAwakeConvoOnEntry = mem.PlayerData<bool>(Offset.dungDefenderAwakeConvo);
                 pdEntryInts.Clear();
                 pdEntryBools.Clear();
             } else {