Supersonic merge fixes#2553
Merged
briaguya0 merged 20 commits intoHarbourMasters:developfrom Feb 28, 2023
Merged
Conversation
…per Sonic to Rupee Dash.
Rupee Dash via Hooks
…per Sonic to Rupee Dash.
briaguya0
commented
Feb 28, 2023
Comment on lines
+91
to
+93
| Rupees_ChangeBy(-1); | ||
| } else { | ||
| Health_ChangeBy(gPlayState, -16); |
Contributor
Author
There was a problem hiding this comment.
@dcvz should we use GameInteractor::RawAction here instead?
Contributor
Author
There was a problem hiding this comment.
my guess is no because we want to actually be able to go down to 0 health with it
Contributor
There was a problem hiding this comment.
We actually can! GameInteractor::RawAction::HealOrDamagePlayer takes in a parameter of the number of hearts positive or negative. 1 here is 0x10 which is 16. So it would work.
Contributor
Author
There was a problem hiding this comment.
i looked into that and it seems like there's some extra logic in there with invincibility that i'm not sure we want to have for this
dcvz
approved these changes
Feb 28, 2023
Closed
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
3 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.
something strange happened with #2510, this should have merge conflicts resolved cleanly
Build Artifacts