Skip to content
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

Fixes Substitute triggering Stamina and Eject Button on crash damage #3669

Merged
merged 2 commits into from
Dec 9, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

@AlexOn1ine AlexOn1ine commented Dec 9, 2023

Fixes #3667
Fixes #3659

@AlexOn1ine AlexOn1ine changed the title Fixes Substitute triggering Stamina Fixes Substitute triggering Stamina and Eject Button on crash damage Dec 9, 2023
@Bassoonian Bassoonian merged commit 57ce852 into rh-hideout:master Dec 9, 2023
1 check passed
&& GetBattlerHoldEffect(battler, TRUE) == HOLD_EFFECT_EJECT_BUTTON
&& !DoesSubstituteBlockMove(gBattlerAttacker, battler, gCurrentMove)
&& (gSpecialStatuses[battler].physicalDmg != 0 || gSpecialStatuses[battler].specialDmg != 0)
&& TARGET_TURN_DAMAGED
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this correct? TARGET_TURN_DAMAGED will check gBattlerTarget and not the batter loop index

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, you are right. sorry 😬

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stamina and Substitute High Jump Kick Crash and Eject Button
3 participants