Fixed Parental Bond #3417
Merged
Fixed Parental Bond #3417
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
|
Making the executive decision to merge this PR. Will make an issue to make the missing tests. |
ghoulslash
reviewed
Oct 15, 2023
| @@ -15765,7 +15765,7 @@ bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) | |||
| { | |||
| if (move != MOVE_NONE && move != MOVE_STRUGGLE | |||
| && gBattleMoves[move].split != SPLIT_STATUS | |||
| && !gBattleMoves[move].strikeCount > 2) | |||
There was a problem hiding this comment.
on upcoming this is gBattleMoves[move].strikeCount <= 2 from 3412 (iirc). Which is correct?
There was a problem hiding this comment.
It shouldn't, because Parental Bond doesn't affect Multi-hit moves, and the <= 2 means that it would affect moves that hit twice.
There was a problem hiding this comment.
might be worth fixing on upcoming too, then
There was a problem hiding this comment.
Will do once I merge master into upcoming.
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.
Description
Fixes Parental Bond after #2952.
TODO: the rest of the tests.
Issue(s) that this PR fixes
#3407
Discord contact info
AsparagusEduardo