Fixes Quick Draw #3724
Merged
Fixes Quick Draw #3724
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
|
Drafting this until I figure out what is going on |
|
Couldn't figure out the problem. Each time I
Technically it could be kept open on draft but I don't know when I will pick it up again. |
|
So I accidentally fixed it. When I was fixing issue #3662 I realized the fix might apply here as well and it seems like it did. I moved all the Custap, Quick Draw, Quick Claw checks out of the function to a new one so it's only called from |
Bassoonian
requested changes
Dec 14, 2023
Bassoonian
approved these changes
Dec 14, 2023
ghoulslash
reviewed
Dec 15, 2023
| gProtectStructs[battler1].quickDraw = TRUE; | ||
| // Quick Claw and Custap Berry | ||
| if (!gProtectStructs[battler1].quickDraw | ||
| && ((holdEffectBattler1 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, 10)) |
There was a problem hiding this comment.
Quick Claw has a 20% chance of boosting priority
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.
Quick Draw was not functioning correctly. Even though the ability triggered it didn't attack first sometimes. Additionally the user randomly attacked first without the ability triggering. For some reason tests don't catch it so it has to be tested manually. I've ran it manually a lot of times but it would be good to have confirmation that it is fixed now.
Recording with Slowbro attacking first without the ability triggering.
quick_draw.mp4
Also I added a test for Quick Claw and removed
EWRAM_DATA u16 gRandomTurnNumber. The only place it was used was the Quick Claw check which I replaced withRandomPercentageFixes #3662