Fixes Multi Hit and Powder moves called by Metronome #2877
Closed
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
Comment on lines
+12993
to
+12997
| if (gBattleMoves[gCurrentMove].effect == EFFECT_MULTI_HIT) | ||
| gBattleStruct->atkCancellerTracker = CANCELLER_MULTIHIT_MOVES; | ||
| else if (gBattleMoves[gCurrentMove].flags & FLAG_POWDER) | ||
| gBattleStruct->atkCancellerTracker = CANCELLER_POWDER_MOVE; | ||
|
|
There was a problem hiding this comment.
Shouldn't it go through every move canceller instead of adding these patches?
There was a problem hiding this comment.
Probably but it goes through them already for other moves. Powder and Multi Hit (except for Scale Shot) moves specifically didn't seem to work.
/Edit: The reason it doesn't check those is because the move is still considered Metronome so these checks are false:
if (gBattleMoves[gCurrentMove].effect == EFFECT_MULTI_HIT)
if ((gBattleMoves[gCurrentMove].flags & FLAG_POWDER) && (gBattlerAttacker != gBattlerTarget))
Scale Shot has a dedicated script in battle_scripts_1.s so it works fine while all other multi hit moves use EFFECT_HIT
|
Putting this as draft for now because I noticed that mirror move has the same problem as metronome and solving this in patches seems wrong. |
|
Superseded by #3135. |
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 #2860
Solves issue were Multi Hit moves hit only once when they were called by Metronome.
Also solves Powder moves being able to hit Grass types when called by Metronome.
Discord contact info
AlexOnline#2331