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

Battlemove refactored fixes #3779

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

cfmnephrite
Copy link

Fixed ALWAYS_CRIT oversight in previous Battlemove refactored PR plus a few tweaks

Description

  • Renamed critBoost to criticalHitStage
  • Removed ALWAYS_CRIT define - +3 criticalHitStage no longer assumed to always crit (thanks to previous gen mechanics)
  • Added alwaysCriticalHit flag to replace define
  • Replaced check for critBoost == ALWAYS_CRIT with alwaysCriticalHit == TRUE where necessary
  • Reversed some accidental arbitrary field reordering BattleMove struct - moved criticalHitStage to appropriate location in relevant moves in battle_moves.h

Issue(s) that this PR fixes

Fixed #3771

Discord contact info

Cancer Fairy/thechurchofcage

Replaced ALWAYS_CRIT with an alwaysCriticalHit flag to account for the fact that in earlier generations, there is no crit stage at which crits are guaranteed. Renamed critBoost to criticalHitStage (at Edu's prompting). Reorder .criticalHitStage defines in battle_moves.h to be aligned with struct order.
@Bassoonian Bassoonian merged commit 1708c80 into rh-hideout:upcoming Dec 20, 2023
1 check passed
@cfmnephrite cfmnephrite deleted the battlemove_refactored branch December 21, 2023 00:29
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.

2 participants