Rebase Dev onto original repo #58
Merged
Conversation
This file contains 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
Update to ensure links are clearly visible for new visitors.
Fix up ext generation as well by memsetting the found items.
Fix doors locking on SoT reset as well.
Check if the item is a chest before giving blue rupee. This avoids items with the same flags but that are collectible instead of being a chest. Choose not to track Giant's Mask Chest as it's way up there for it's flag.
Removes infinite items and replaces with intended green rupee.
…ples of specific items. (#40)
This allows for better organization and locating patches/hooks instead of trying to find a patch in one large file. Adjust song of time reset for no swords to actually reset the sword on B when resetting a cycle.
This should have less copy-paste code now at least.
* Add patch to ensure 200 bank reward isn't given multiple times. * We should be checking if our rupee count is greater than the 1000 reward.
#57) * Fix children on moon not respecting masks. * Adjust children to let them do hide and seek with correct mask counts. * Format code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should avoid any issues with merging back into the original repo, and avoids any further issues with rebasing if needed.