atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Salt Cure script (#5895)

Browse source 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
This commit is contained in:
ghoulslash 2024-12-29 10:51:33 -05:00 committed by GitHub
parent 433058edc1
commit ca31145d36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/battle_scripts_1.s
View file

@ -407,13 +407,13 @@ BattleScript_SaltCureExtraDamage::
call BattleScript_HurtTarget_NoString call BattleScript_HurtTarget_NoString
printstring STRINGID_TARGETISHURTBYSALTCURE printstring STRINGID_TARGETISHURTBYSALTCURE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_TARGET
end2 end2
BattleScript_HurtTarget_NoString: BattleScript_HurtTarget_NoString:
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
healthbarupdate BS_TARGET healthbarupdate BS_TARGET
datahpupdate BS_TARGET datahpupdate BS_TARGET
tryfaintmon BS_TARGET
return return
BattleScript_EffectCorrosiveGas:: BattleScript_EffectCorrosiveGas::
@ -7582,13 +7582,8 @@ BattleScript_AbilityPopUp:
return return
BattleScript_AbilityPopUpScripting: BattleScript_AbilityPopUpScripting:
.if B_ABILITY_POP_UP == TRUE copybyte gBattlerAbility, sBATTLER
showabilitypopup BS_SCRIPTING goto BattleScript_AbilityPopUp
pause 40
.endif
recordability BS_SCRIPTING
sethword sABILITY_OVERWRITE, 0
return
BattleScript_AbilityPopUpOverwriteThenNormal: BattleScript_AbilityPopUpOverwriteThenNormal:
setbyte sFIXED_ABILITY_POPUP, TRUE setbyte sFIXED_ABILITY_POPUP, TRUE

15
test/battle/move_effect/salt_cure.c
View file

@ -117,3 +117,18 @@ SINGLE_BATTLE_TEST("Salt Cure residual damage does not inflict any damage agains
} }
} }
} }
SINGLE_BATTLE_TEST("If Salt Cure faints the target, messages will be applied in the correct order")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET) { HP(25); }
} WHEN {
TURN { MOVE(player, MOVE_SALT_CURE); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_SALT_CURE, player);
MESSAGE("The opposing Wobbuffet is being salt cured!");
MESSAGE("The opposing Wobbuffet is hurt by Salt Cure!");
MESSAGE("The opposing Wobbuffet fainted!");
}
}