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

Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword #3614

Merged
merged 6 commits into from
Dec 11, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

Gen 9 configs:

  • Protean/Libero only work once per switch-in
  • Intrepid Sword boosts attack only once per battle
  • Dauntless Sword boosts defense only once per battle

include/battle.h Outdated Show resolved Hide resolved
@AlexOn1ine
Copy link
Collaborator Author

Ready for re-review.

Also added gen5 configs for Wide Guard and Quick Guard. Fixes #3610

include/battle.h Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
@AlexOn1ine
Copy link
Collaborator Author

Ready for re-review

@AlexOn1ine AlexOn1ine mentioned this pull request Dec 5, 2023
@Bassoonian
Copy link
Collaborator

Fix conflicts :)

@AlexOn1ine
Copy link
Collaborator Author

Fix conflicts :)

Solved!

@Bassoonian Bassoonian merged commit 44e81d4 into rh-hideout:upcoming Dec 11, 2023
1 check passed
PCG06 pushed a commit to PCG06/pokeemerald that referenced this pull request Dec 26, 2023
…h-hideout#3614)

* Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword

* use bitfield

* battler fix

* fields
@AlexOn1ine AlexOn1ine deleted the gen9_ability_changes branch April 19, 2024 12:31
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.

3 participants