Skip to content

Add ShuffleSongs.cpp & RO_SONG_SHUFFLE_OFF#5534

Merged
Malkierian merged 4 commits intoHarbourMasters:developfrom
Pepe20129:shuffle_songs
May 30, 2025
Merged

Add ShuffleSongs.cpp & RO_SONG_SHUFFLE_OFF#5534
Malkierian merged 4 commits intoHarbourMasters:developfrom
Pepe20129:shuffle_songs

Conversation

@Pepe20129
Copy link
Contributor

@Pepe20129 Pepe20129 commented May 24, 2025

AddItemsToPool(PendingJunkPool, songList);
}
} else {
ctx->PlaceItemInLocation(RC_SHEIK_IN_FOREST, RG_MINUET_OF_FOREST, false, true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I may be misremembering, but I think we've been trying to get away from explicitly placing items in their vanilla locations when their shuffles are off because they get added to the spoiler when they don't need to be. Would appreciate some input from others on this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They don't appear in the spoiler file, iirc it's due to the change in context.cpp.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, maybe it wasn't the spoiler that was the issue then, but I could have sworn there was some problem that was identified with explicitly placing vanilla.

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
Copy link
Contributor

@Malkierian Malkierian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I guess if we need to fully divest from the vanilla placements, it can happen later.

@Malkierian Malkierian merged commit f5d8f1e into HarbourMasters:develop May 30, 2025
6 checks passed
@Pepe20129 Pepe20129 deleted the shuffle_songs branch May 30, 2025 19:52
krazyjakee pushed a commit to krazyjakee/OOT that referenced this pull request Sep 6, 2025
* ShuffleSongs.cpp

* Address review and fix build

* Update soh/soh/Enhancements/randomizer/settings.cpp

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>

* Change back to "Off"

---------

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants