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

Fixes Absorb regression caused by #5670 (#5688)

Browse source
This commit is contained in:
Alex 2024-11-19 20:56:34 +01:00 committed by GitHub
parent 5fe39f6019
commit 572ea141af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/battle_scripts_1.s
View file

@ -3022,7 +3022,6 @@ BattleScript_EffectAbsorb::
printfromtable gAbsorbDrainStringIds printfromtable gAbsorbDrainStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER tryfaintmon BS_ATTACKER
tryfaintmon BS_TARGET
return return
BattleScript_EffectExplosion:: BattleScript_EffectExplosion::

1
src/battle_script_commands.c
View file

@ -5727,6 +5727,7 @@ static void Cmd_moveend(void)
gBattleMoveDamage = 1; gBattleMoveDamage = 1;
gBattleMoveDamage = GetDrainedBigRootHp(gBattlerAttacker, gBattleMoveDamage); gBattleMoveDamage = GetDrainedBigRootHp(gBattlerAttacker, gBattleMoveDamage);
gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE; gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE;
effect = TRUE;
if (GetBattlerAbility(gBattlerTarget) == ABILITY_LIQUID_OOZE) if (GetBattlerAbility(gBattlerTarget) == ABILITY_LIQUID_OOZE)
{ {
gBattleMoveDamage *= -1; gBattleMoveDamage *= -1;

1
test/battle/move_effect/absorb.c
View file

@ -107,7 +107,6 @@ DOUBLE_BATTLE_TEST("Matcha Gatcha will faint the pokemon if Liquid Ooze drain de
} }
} }
SINGLE_BATTLE_TEST("Draining Kiss recovers 75% of the damage dealt") SINGLE_BATTLE_TEST("Draining Kiss recovers 75% of the damage dealt")
{ {
s16 damage; s16 damage;