Spoiler Log Update #31
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
Creates new spoiler log function that marks all locations for an item as obtained when obtaining an item that can be obtained in multiple spots/ways
Makes code less derpy
add breaks so it stops searching
PhlexPlexico
pushed a commit
that referenced
this pull request
Mar 10, 2024
* Spoiler Log Update Creates new spoiler log function that marks all locations for an item as obtained when obtaining an item that can be obtained in multiple spots/ways * Spoiler Update 1 Makes code less derpy * Update spoiler_data.cpp add breaks so it stops searching
PhlexPlexico
added a commit
that referenced
this pull request
Mar 10, 2024
* Update README.md * Update README.md Update to ensure links are clearly visible for new visitors. * Update README. * Fix razor sword health. * Disable line wrap on Tingle's textboxes * Potential fix for swords on reset. * More adjustments to sword logic. * Fix bombers code to not softlock. * Fix sword not being set for human form when obtaining it. * Use in-game code instead of rewriting maps. * Bring in external table for saving location data for spoiler log. * Update spoiler data to include a different bit check and throw in ext data. * Formatting + remove unused code. Fix up ext generation as well by memsetting the found items. * Fix stray fairies from spawning when collected after SoT. Fix doors locking on SoT reset as well. * Fix Jim in ECT * Fix gold rupee DrawGraphicItemID * Increase chestRewarded second array dimension to larger number. 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. * Format else if statement. * Full fix for extData checks. * Include postbox check. Removes infinite items and replaces with intended green rupee. * Update extdata version. * Fix overrides for Gabora, Ocean Spider House, Gorman, All Night Mask, and Powder keg. * Fix ice traps crashing great fairies. * Fix GID names to be more respective of what they do. * Fix bottles not being able to be refilled over time. * Clang-format changes exist. Committing. * Fix always getting mystery milk on item reset. * Fix pictograph box and powder keg get items. * Adjust powder keg checks for shop and other goron. * Fix pictograph option during patch generation. * Order matters * Possibly fix razor sword issues with not upgrading. * Fix Twinmold And Various Item Checks (#15) * Include nop'ing a mask check for twinmold to hopefully fix boss. Remove portal skip flags as we may not be getting remains. * Fix get item issues that may be plaguing several things, including twinmold. * Possible fix for EnGinkoMan override always giving the second reward after 1k rupees. (#17) * Fix manager to no longer give repeating items. Opt to fishing passes instead. (#18) * Cycle Reset Fixes On Temples (#16) * Temp code to keep testing. * Let temples remain as they are during cycle resets for doors and freestanding fairies. * Fix Oceanside Spider house override (#19) * Fix camera reset the same way restoration does. (#20) * Include fixes for deku trade quest in giving repeat progressive items. (#21) * Include fixes for deku trade quest in giving repeat progressive items. * Include gorman track fix for getting the mask and milk. * Fix for bottle refills and obtaining new bottles. * Bring back blue rupee item give back. * Fix HP fish override (thanks @HylianFreddy!). (#22) Adjust Keaton to ensure he gives fishing pass to avoid mistaken overrides. * Change keaton to be green rupees instead. * Fix Link not spawning back with proper sword if it was stolen. (#23) Fix draw items for progressive swords, wallets, and magic. * Fix Link being given magic on save creation. This should fix all magic check bugs until magic is retrieved. (#24) * Put back the key sets to 0 in savefile to prevent keys from being initialized to 255. (#25) In case that fails, include a check in the item effect of small keys to ensure we initialize them properly. * Adjust powder keg item check to ensure it stays in inventory. (#26) * Set Keaton's get item to an unused rupee 10 item. (#27) * Fix fast arrow and fask masks colliding. (#28) Now whenever the bow is out the user can change arrows, and once put away, the user can use goron mask. * Adjust arrow checks to allow swapping if arrow is just in hand and not Z Targeting. (#29) * Chests with bottle content no longer show animation upon receiving refill. (#30) Hero Shield items will now give you a silver rupee if you already have the mirror shield. Fix Bottle Logic, as well as chest repeat logic. Progressive items will now properly give you fishing passes if retrieved once from trade items. Better passthrough handling with bottle refills and blue rupee chest cases. * Clang-format changes exist. Committing. * Revert fast arrow swap changes as it was interfering with fast masks. (#32) * Bottle Refill Fixes (#33) * Fix bottle logic not applying properly. Remove rnd namespace as that is the namespace we're currently in. * Fix gibdo mask give item in hooks to prevent zora overriding. * Finalize Bottle Override in Chest Contents (#34) * Fix bottle logic not applying properly. Remove rnd namespace as that is the namespace we're currently in. * Fix enGinkoMan override. Finalize fix for bottle overrides in chests as well. * Spoiler Log Update (#31) * Spoiler Log Update Creates new spoiler log function that marks all locations for an item as obtained when obtaining an item that can be obtained in multiple spots/ways * Spoiler Update 1 Makes code less derpy * Update spoiler_data.cpp add breaks so it stops searching * Clang-format changes exist. Committing. * Trade item swaps (#35) * Import GearScreen and identify value of the index update. Need to work on using L to go back in items. * Full L and R rotation of items in the deed slot now working. * Finalize trade item swap logic. TODO: Include ext item collection in itemeffect calls. * Complete work for keeping trade items over cycle and cycling through trade items. Update some fields in common data to match mm decomp. Hopefully fix bottle issues once and for all. * Formatting change. Debug changes as well. * Update bottle logic. Update mask base items to be a mask so they get mask fanfare. Update drawing items for refill items. * Minor decomp work. Find blast mask timer. * WIP: Attempt a new way of giving items from chests. * Update more bottle conditions. Update chest conditions to give items back if the user lacks them. * Bring in rough chest content matching for future purposes. * Attempt at breaking up inventory space and moving it to its own hooks. WIP: removing items if the user gives them away. * Fix item swapping and deletion of items on giving items. * Change chest function to be more reflective of what it does. * Finish adjusting Kafei letter in mail. Last to do it pendant. * Formatting fixes. * Revert mask changes as we cannot override animations on pickup just yet. * More decomp actor work (#36) * More decomp actor work. * Formatting fixes. Fix refill bottle logic to ensure we give a refill when requested. * Finalize bottle logic to not give the refill if user does not have an empty bottle. * Update to get Ingo bros to not give rewards after the first time. Same with medigoron and powder kegs. * Swap fairy GIDs * Temporarily remove chest content patch. Adjust custom spoiler buttons to use pressedButtons instead of newButtons to alleviate a possible bug with the custom button inputs. * Fix chest content matching issues. * Fix Ocean Deed crashing game. (#37) Fix item override for progressive items and trade items. Fix Romani Mask hash string. * Chest fixes (#38) * Fix most chest spawn issues. Temple chests with compasses and maps still run into issues. * Adjust progressive item chest types. * Fix: Nop Key check to ensure chest and compass chests respect the texture. * Diety -> Deity * Change setting back to zero to ensure the option works properly. Put some less restrictions on repeatable items on cycle reset. * Implement blast mask cooldown. (#39) * Include change to ensure all trade items are covered for giving multiples of specific items. (#40) * Check settings before drawing small fancy chests. (#41) * Refactor patches and hooks to be spread across more files. (#42) 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. * Fully adjust chest drawing to ensure large chests draw properly. (#43) * Clang-format changes exist. Committing. * Fix the sword issue that resets sword on b button. (#44) * Clang-format changes exist. Committing. * Adjust removing items to give next trade item if it is not none. (#45) * Potentially fix kaepora not spawning in goron village winter. * Include lens in check for item or magic. * Fix crashing with lens of truth checks * Update Curiosity Shop logic to ensure the right flags are being set for items. (#46) * Clang-format changes exist. Committing. * Fix chest spawns being decorated if they are not supposed to be. (#48) * Clang-format changes exist. Committing. * Adjust bottle fixes to ensure we don't set ext data on default items. (#49) * Include twinmold fixes from project restoration. (#50) * Clang-format changes exist. Committing. * Include option to enable restoration twinmold. (#51) * Clang-format changes exist. Committing. * Fix Kaepora Gabora not spawning in if you obtained lens with no magic. (#52) * Adjust lens item check to remove bad non-returning code. * Adjust extdata to be properly aligned. (#53) * Refactor bottle logic once more. (#54) This should have less copy-paste code now at least. * Update mystery milk logic to ensure we don't give multiple bottles. (#55) * Add patch to ensure 200 bank reward isn't given multiple times. (#56) * 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. * Adjust children to let them do hide and seek with correct mask counts. (#57) * Fix children on moon not respecting masks. * Adjust children to let them do hide and seek with correct mask counts. * Format code. --------- Co-authored-by: Nessy <robert@nesfield.co.uk> Co-authored-by: HylianFreddy <82058772+HylianFreddy@users.noreply.github.com> Co-authored-by: PhlexPlexico <PhlexPlexico@users.noreply.github.com> Co-authored-by: Tacoman369 <90735287+Tacoman369@users.noreply.github.com>
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.
Creates new spoiler log function that marks all locations for an item as obtained when obtaining an item that can be obtained in multiple spots/ways