Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs #5493
Conversation
…ed, Simple Beam, Fix Doodle and Role Play issues
data/battle_scripts_1.s
Outdated
| .if B_ABILITY_POP_UP == TRUE | ||
| setbyte sFIXED_ABILITY_POPUP, TRUE | ||
| showabilitypopup BS_TARGET | ||
| pause 60 | ||
| sethword sABILITY_OVERWRITE, 0 | ||
| updateabilitypopup BS_TARGET | ||
| pause 20 | ||
| destroyabilitypopup | ||
| pause 40 | ||
| .endif |
There was a problem hiding this comment.
do you think it would make sense to make a script for those to reduce duplicate scripts?
There was a problem hiding this comment.
Added BattleScript_AbilityPopupOverwriteThenNormal which requires gBattlerAbility to be set to the battler, to be within .if B_ABILITY_POPUP == TRUE ... .endif and sABILITY_OVERWRITE to be set before being called.
There was a problem hiding this comment.
I also added some missing recordability calls.
There was a problem hiding this comment.
Added
BattleScript_AbilityPopupOverwriteThenNormalwhich requiresgBattlerAbilityto be set to the battler, to be within.if B_ABILITY_POPUP == TRUE....endifandsABILITY_OVERWRITEto be set before being called.
Damn, I asked specifically because of the preprocs 😅
I let you decide if the change is still worth it otherwise or the previous state is better.
AlexOn1ine
added
category: battle-mechanic
Updated Ability Popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed and Simple Beam to show the previous abilities of the affected battler(s). Also added Skill Swap on ally interaction (no ability popups).
Fixed Doodle checking if target has a valid ally instead of checking if user has a valid ally (potentially gave fainted allies new abilities).
Fixed Role Play failing if ally's ability couldn't be suppressed + Doodle failing for this same reason even if ally was fainted.
Fixed Doodle playing its animation despite failing.
Added Skill Swap, Worry Seed, Simple Beam and Role Play tests.
Also reordered some tests that check specific abilities that cause Role Play to fail by ability number to make it easier to check.
Discord contact info
PhallenTree