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

Fixed Z-Moves+Obedience bugged behavior #5245

Merged
merged 1 commit into from
Aug 25, 2024

Conversation

hedara90
Copy link
Collaborator

@hedara90 hedara90 commented Aug 23, 2024

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

src/battle_util.c Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
@hedara90 hedara90 force-pushed the disobedience-change branch from 4774b2f to 06215bb Compare August 24, 2024 14:34
@hedara90
Copy link
Collaborator Author

Redid the implementation.
Ready again.

@AlexOn1ine
Copy link
Collaborator

Redid the implementation. Ready again.

looks great, thx. will review later

@AlexOn1ine AlexOn1ine self-assigned this Aug 24, 2024
@AlexOn1ine AlexOn1ine added category: move effect Pertains to move effects bugfix Bugfixes labels Aug 24, 2024
@AlexOn1ine AlexOn1ine merged commit 51a127f into rh-hideout:master Aug 25, 2024
1 check passed
@hedara90 hedara90 deleted the disobedience-change branch August 31, 2024 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Bugfixes category: move effect Pertains to move effects
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Z-Moves and Disobedience break battles
2 participants