Fix Quash implementation, adds After You and Quash missing configs + tests #5400
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.
Quash's current implementation has a fair amount of problems (in
BS_TryQuash
), which have been fixed.gBattlersByTurnOrder
but notgActionsByTurnOrder
which causes the same issue described in Fixes After You/Shell Trap not updating battlers' actions correctly #5384.if (!gProtectStructs[i].quash && !gProtectStructs[j].quash && GetWhichBattlerFaster(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], FALSE) == -1)
, anyone affected by Quash will move in that order (player's Left mon would move first, opponent's Left mon would move second, etc.)If you don't want spend a lot of time analyzing the current implementation's code, here's a rundown:
So if the player's left mon is affected by Quash (via move), it will never act on that turn.
As proven by running the following test:
Added After You config
B_AFTER_YOU_TURN_ORDER
:Added Quash config
B_QUASH_TURN_ORDER
:Added tests for After You and Quash.
Discord contact info
PhallenTree