-
Notifications
You must be signed in to change notification settings - Fork 465
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Supersonic merge fixes #2553
Supersonic merge fixes #2553
Conversation
…per Sonic to Rupee Dash.
Rupee Dash via Hooks
…per Sonic to Rupee Dash.
Rupees_ChangeBy(-1); | ||
} else { | ||
Health_ChangeBy(gPlayState, -16); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dcvz should we use GameInteractor::RawAction
here instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my guess is no because we want to actually be able to go down to 0 health with it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
something strange happened with #2510, this should have merge conflicts resolved cleanly
Build Artifacts