Fixed Z-Moves+Obedience bugged behavior #5245
Merged
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.
Made it so that the Z-Move animation doesn't play when the battler doesn't obey, and doesn't "waste" the Z-Move activation.
Description
Used 3 bits in the
BattleStruct
to store the obedience result.The obedience check is then moved to before the battler has done anything in the turn and the Z-Move activation can then check for obedience.
Z-Move flags for the battler are then cleared in order to not interfere with the next turn.
Images
zObedience.mp4
Issue(s) that this PR fixes
Fixes #3333
Discord contact info
hedara