Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: [Gen 1] Substitute + Confusion interaction #10802

Merged
merged 4 commits into from
Jan 10, 2025

Conversation

andrebastosdias
Copy link
Contributor

Fixes #9511

"In Gen 1, if a Pokemon with a Substitute hurts itself due to confusion or Jump Kick/Hi Jump Kick recoil and the target does not have a Substitute there is no damage dealt."

"In Gen 1, if a Pokemon with a Substitute hurts itself due to confusion or Jump Kick/Hi Jump Kick recoil and the target has a Substitute, the target's Substitute takes the damage."

There was a bug because if the confused Pokémon used a self-targeting move, the source was itself, so it always attacked its own substitute. This never happened with crash damage because those moves target the opponent.

@andrebastosdias andrebastosdias deleted the patch-3 branch January 7, 2025 19:22
@andrebastosdias andrebastosdias restored the patch-3 branch January 7, 2025 19:23
@DaWoblefet
Copy link
Member

I would like a test for this. You can use the forceRandomChance: true arg to always make the Pokemon hit itself in confusion.

@andrebastosdias
Copy link
Contributor Author

Done!

@DaWoblefet DaWoblefet merged commit 328e20d into smogon:master Jan 10, 2025
1 check passed
@DaWoblefet
Copy link
Member

Thanks andrebastosdias!

@andrebastosdias andrebastosdias deleted the patch-3 branch January 10, 2025 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gen 1: error in Substitute + Confusion interaction
2 participants