Merged
Conversation
4 tasks
Member
Author
|
Just to try and help this along with the review: Here is the section which would allow for equip duping in the original code Shipwright/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c Lines 638 to 650 in 2b0af54 (repeated again for each button later on) This PR just condenses that section back into the code to fit in with the dpad equips without having to have all the repeated statements |
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.
This PR reintroduces equip duping which was removed in https://github.com/HarbourMasters/Shipwright/pull/525 which introduced dpad equips.
In the original game elemental arrows temporarily use different addresses (0xBF to 0xC1) for the equipTargetItem index. The code later checks for these values to correct them while it also does checks to swap items in cases where the equipTargetSlot is the same as items on the cButtonSlots. These extra steps were removed with the introduction of dpad equips. Instead the elemental arrows' equipTargetItem indexes were corrected before these checks. I believe this is what lead to the removal of unnecessary checks that the original would do, including a check that would swap the equips when the equipTargetItem is bow and an elemental arrow is equipped to a different buttonItems slot than the equipTargetCBtn. It is this check which is triggered only when performing equip dupe and as the current swapping only looks for the equipTargetSlots and not the removed bow case. This PR readds this case into the buttonItems swap loop.
Build Artifacts