Fix regression introduced for Eject Button #3738
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
ghoulslash
reviewed
Dec 15, 2023
| @@ -5853,7 +5853,8 @@ static void Cmd_moveend(void) | |||
| if (IsBattlerAlive(battler) | |||
| && gBattlerAttacker != battler | |||
| && GetBattlerHoldEffect(battler, TRUE) == HOLD_EFFECT_EJECT_BUTTON | |||
| && TARGET_TURN_DAMAGED | |||
There was a problem hiding this comment.
maybe better to have a BATTLER_TURN_DAMAGED macro thats the same as TARGET_TURN_DAMAGED but for a given battler id
There was a problem hiding this comment.
Seems like it already exists BATTLER_DAMAGED but is only used once. Should I rename it? I like BATTLER_TURN_DAMAGED more
There was a problem hiding this comment.
Went ahead and made the change.
There was a problem hiding this comment.
Yeah BATTLER_DAMAGED is fine
|
Also Renamed |
ghoulslash
approved these changes
Dec 16, 2023
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.
Regression introduced in #3669
Target to upcoming because the recently introduced
enduredDamageBattle Struct field fixes a small bug that applies here as wellOther:
Fixes: #3633