github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-31 12:00:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exclude nabooru from boss souls (#5152)

Browse source
This commit is contained in:
aMannus 2025-03-19 23:52:33 +01:00 • committed by GitHub
parent 79b53e5920
commit 4243eb67ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -2035,11 +2035,13 @@ void RandomizerOnActorInitHandler(void* actorRef) {
break; break;
} }
//Deletes all actors in the boss category if the soul isn't found. // Deletes all actors in the boss category if the soul isn't found.
//Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual bosses, // Some actors, like Dark Link, Arwings, and Zora's Sapphire...?, are in this category despite not being actual bosses,
//so ignore any "boss" if `currentBossSoulRandInf` doesn't change from RAND_INF_MAX. // so ignore any "boss" if `currentBossSoulRandInf` doesn't change from RAND_INF_MAX.
// Iron Knuckle (Nabooru) in Twinrova's room is a special exception, so exclude knuckles too.
if (currentBossSoulRandInf != RAND_INF_MAX) { if (currentBossSoulRandInf != RAND_INF_MAX) {
if (!Flags_GetRandomizerInf(currentBossSoulRandInf) && actor->category == ACTORCAT_BOSS) { if (!Flags_GetRandomizerInf(currentBossSoulRandInf) && actor->category == ACTORCAT_BOSS &&
actor->id != ACTOR_EN_IK) {
Actor_Delete(&gPlayState->actorCtx, actor, gPlayState); Actor_Delete(&gPlayState->actorCtx, actor, gPlayState);
} }
//Special case for Phantom Ganon's horse (and fake), as they're considered "background actors", //Special case for Phantom Ganon's horse (and fake), as they're considered "background actors",