Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ocarina Buttons Shuffle #719

Merged
merged 3 commits into from
Apr 23, 2024

Conversation

HylianFreddy
Copy link
Collaborator

@HylianFreddy HylianFreddy commented Mar 3, 2024

This feature is the same as OoTR's "Shuffle Individual Ocarina Notes". When enabled, the button icons on the ocarina menu will not appear and pressing the buttons won't play the note. Each button will be unlocked by finding its corresponding item.

I've added a new CMAB to the asset archive containing the 5 button pictures for the new custom item models.

Regarding logic, I changed the song items to use new logic variables and made the existing variables that are used throughout the location access files represent both the song item and the list of buttons required for that song.

I made a submenu in the starting inventory for the Ocarina Buttons. This PR, like my Enemy Souls one, includes adding the "Lock" feature to the Menu class, copied from the Option class.

Preview video

ocarina-buttons.mp4

Preview 3DSX builds

Build for this branch (commit 18ba6b8):
OoT3D_Randomizer_18ba6b80.zip

Build including all my other features, as visible from commit 43063df:
OoT3D_Randomizer_43063df2.zip

Build for this branch (commit 8c3c259):
OoT3D_Randomizer_8c3c2599.zip

Build including all my other features, as visible from commit 39e4665:
OoT3D_Randomizer_39e4665b.zip

@HylianFreddy HylianFreddy marked this pull request as draft March 3, 2024 10:24
@HylianFreddy HylianFreddy marked this pull request as ready for review March 14, 2024 22:38
@gymnast86 gymnast86 merged commit 7ef3233 into gamestabled:main Apr 23, 2024
2 checks passed
@HylianFreddy HylianFreddy deleted the ocarina-buttons-shuffle branch April 23, 2024 19:58
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.

2 participants