Fixes Kee Maranga and Enigma Berry #5727
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlexOn1ine
added
bugfix
Bassoonian
approved these changes
Nov 28, 2024
|
I'm merging this so it's fixed, but feel free to make a new issue for the upcoming refactor you're mentioning |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #5674
The berries checked for
TARGET_TURN_DAMAGEDwhich is a global battler check which caused a partner of a damaged mon to trigger a berry. Ideally we replace allTARGET_TURN_DAMAGEDbattler checks with a functionBattlerTurnDamagedand deprecate both macros to prevent us and users from potential bugs. Should be done in upcoming though.