Merged
Conversation
* added TrailType enum * fixed build, moved declaration * added enhancement comment * Apply suggestions from code review --------- Co-authored-by: link5669 <acqmiles@gmail.com>
* Use VB hook to fix Deku Nut upgrade bug * Use constexpr, remove unused extern * Separate IS_RANDO out of value macro * Restore mask check in hook * Call VB hook in SkipMiscInteractions hook * Mask of Truth hook not registered in rando
Assertion failed in CreateChildAltarHints because all 3 stones were placed on fairies/beehives while those were disabled Fix: consolidate on Context building settings dependant location lists. Overworld vs Dungeon should not operate so differently
* Use gamemode enum * update console command for file_select
* Exclude debug file and cutscene map from auto save * Remove ganon's lair from auto save exclusion
…rs#5075) * logic: allow finding big poe in bottle for reward logic only applies when big poe count is set to 1 * Allow multiple big poe bottles for when big poe requirement > 1
* Move boss kill logic into CanKillEnemy Added hammer as being able to defeat Morpha * add hammer vs gohma, king dodongo, & twinrova
* Move adult trade to flags * Move child trade to flags * Fix vanilla * Address review * Rename `trade_shuffle` to `ShuffleTradeItems` * Fix mac build * Update GIVanillaBehavior.h * Update z_kankyo.c * Update z_en_heishi2.c
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
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.
aMannus bump