mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-12 21:15:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent despawning shuffled gerudo guard drops (#7183)

Browse Source
This commit is contained in:
Philip Dubé
2026-09-13 00:26:29 +00:00
committed by GitHub
parent f04b570d2a
commit 3cfe4ddffb
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/hook_handlers.cpp
+10
View File
@@ -1188,6 +1188,16 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
}
break;
}
case VB_ITEM00_TIMER_TICK: {
EnItem00* item00 = va_arg(args, EnItem00*);
uint8_t ogType = item00->ogParams & 0xFF;
// Shuffled keys and heart pieces become ITEM00_SOH_DUMMY, no longer matching checks preventing despawning
if (item00->actor.params == ITEM00_SOH_DUMMY &&
(ogType == ITEM00_SMALL_KEY || ogType == ITEM00_HEART_PIECE || ogType == ITEM00_HEART_CONTAINER)) {
*should = false;
}
break;
}
case VB_ITEM_B_HEART_DESPAWN: {
ItemBHeart* itemBHeart = va_arg(args, ItemBHeart*);
RandomizerCheck rc = OTRGlobals::Instance->gRandomizer->GetCheckFromActor(