Repository navigation
fix: Make Kotake mushroom sale a shop location for the mm3dr hook - #216
Merged
PhlexPlexico merged 2 commits intoOct 5, 2026
Merged
Conversation
Tacoman369
added a commit
that referenced
this pull request
Oct 6, 2026
Building off (#216) - Adjusts the other aspects for Kotake Mushroom Sale needed to ensure the blue potion sample given by trading in a Mushroom is the same item as what is shown on the table
PhlexPlexico
added a commit
that referenced
this pull request
Oct 8, 2026
* feat: Include options to change custom tunic colours. * Update documentation on cosmetics and include greyscale gar. * Mushroom Sale Fix Building off (#216) - Adjusts the other aspects for Kotake Mushroom Sale needed to ensure the blue potion sample given by trading in a Mushroom is the same item as what is shown on the table * Update Z3DR * Random Color + Picker - Implements a color picker instead of having the user enter a hex value. Color Picker works with both Circle Pad + Dpad Up & Down as well as Touch Screen. The Y button while on the Color Picker screen selects a random value * Update patch.cpp - Move tunic gar.lzs files into romfs at generation so tunic colors apply * Update fill.cpp Move SoT/Ocarina early accessibility functionality into its own function call so it is no longer clogging up the Fill function * MultiLocation Logic - Adds MultiLocation function that places items that are obtainable in multiple locations into those locations during the Fill function so that those other locations can be considered into playthrough logic where they used to not be considered at all. - Also reimplements AllLocationsReachable which was inadvertently disabled * Update spoiler_log.cpp Spoiler log now shows alternate location checks if the item in those locations is a Playthrough (WOTH) item * nit: Update Z3DR * nit: Doc updates --------- Co-authored-by: Tacoman369 <90735287+Tacoman369@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Mushroom sale check was giving the player the shelf's disguise item id (0x2B) causing Kotake to give the player the fallback error item. Swapped the check in item_location.cpp from a base item location to a shop location.
Depends on Z3DR/mm3dr#207 which contains the hook.