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

Fixes Stomping Tantrum effect not doubling power in certain situations #5140

Merged
merged 3 commits into from
Aug 11, 2024

Conversation

AlexOn1ine
Copy link
Collaborator

Fixes Stomping Tantrum effect not doubling power in certain situations

@AlexOn1ine AlexOn1ine added the bugfix Bugfixes label Aug 11, 2024
@Bassoonian Bassoonian added category: battle-mechanic Pertains to battle mechanics category: move effect Pertains to move effects and removed category: battle-mechanic Pertains to battle mechanics labels Aug 11, 2024
@PhallenTree
Copy link

PhallenTree commented Aug 11, 2024

Dancer test fails here because in MOVEEND_DANCER there is this check:

if (!(gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker] || (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove && gBattleStruct->bouncedMoveIsUsed)))

Currently it fails since flinching/paralysis immobility didn't add the attacker to the list of gBattleStruct->lastMoveFailed.

Replacing gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker] with gMoveResultFlags & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE) should make the test pass if these MoveResultFlags aren't deleted before MOVEEND_DANCER

@AlexOn1ine
Copy link
Collaborator Author

Dancer test fails here because in MOVEEND_DANCER there is this check:

if (!(gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker] || (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove && gBattleStruct->bouncedMoveIsUsed)))

Currently it fails since flinching/paralysis immobility didn't add the attacker to the list of gBattleStruct->lastMoveFailed.

Replacing gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker] with gMoveResultFlags & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE) should make the test pass if these MoveResultFlags aren't deleted before MOVEEND_DANCER

Thx, that worked.

@AlexOn1ine
Copy link
Collaborator Author

eh, I might be wrong. Flinch might not double.

@AlexOn1ine AlexOn1ine marked this pull request as draft August 11, 2024 22:49
@AlexOn1ine
Copy link
Collaborator Author

eh, I might be wrong. Flinch might not double.

okay, it does.

@AlexOn1ine AlexOn1ine marked this pull request as ready for review August 11, 2024 22:51
@AsparagusEduardo AsparagusEduardo merged commit 863b96f into rh-hideout:master Aug 11, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Bugfixes category: move effect Pertains to move effects
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants