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.

Sign up for GitHub

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

[battle_engine] fix multi hit/stormdrain-like interactions #1958

Closed
wants to merge 2 commits into from
Closed

[battle_engine] fix multi hit/stormdrain-like interactions #1958

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa76181
fix multi hit/stormdrain-like interactions
kleeenexfeu Nov 30, 2021
18773f6
turns out tryfaint mon is necessary, and one was even lacking
kleeenexfeu Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions data/battle_scripts_1.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8072,7 +8072,8 @@ BattleScript_MoveStatDrain::
printstring STRINGID_TARGETABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
clearsemiinvulnerablebit
tryfaintmon BS_ATTACKER, FALSE, NULL
tryfaintmon BS_ATTACKER, FALSE, NULL @ this should be removed, unless I'm missing something
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is here just for Explosion/Self Destruct, which can be changed to electric type and absorbed. I think running tryfaintmon only for those move effects would be fine, but it does need to be there or they'll glitch out.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting!
Why is it not there for volt absorb then?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For whatever reason it was working properly with Volt Absorb IIRC, but not Lightningrod/Motor Drive.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the fix for waterabsorb-like abilities, also left a comment to not wonder what's up in the future

orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd

BattleScript_MonMadeMoveUseless_PPLoss::
Expand All @@ -8083,7 +8084,7 @@ BattleScript_MonMadeMoveUseless::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXMADEYUSELESS
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER, FALSE, NULL
tryfaintmon BS_ATTACKER, FALSE, NULL @ this should be removed, unless I'm missing something
orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd

Expand All @@ -8095,7 +8096,8 @@ BattleScript_FlashFireBoost::
call BattleScript_AbilityPopUp
printfromtable gFlashFireStringIds
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER, FALSE, NULL
tryfaintmon BS_ATTACKER, FALSE, NULL @ this should be removed, unless I'm missing something
orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd

BattleScript_AbilityPreventsPhasingOut::
Expand Down