From 572ea141af83caf2f57d50c4e74cb493fb306c88 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:56:34 +0100 Subject: [PATCH] Fixes Absorb regression caused by #5670 (#5688) --- data/battle_scripts_1.s | 1 - src/battle_script_commands.c | 1 + test/battle/move_effect/absorb.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 97dd650088..8d24dc472d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3022,7 +3022,6 @@ BattleScript_EffectAbsorb:: printfromtable gAbsorbDrainStringIds waitmessage B_WAIT_TIME_LONG tryfaintmon BS_ATTACKER - tryfaintmon BS_TARGET return BattleScript_EffectExplosion:: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 69e41c62d6..2958d200ab 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5727,6 +5727,7 @@ static void Cmd_moveend(void) gBattleMoveDamage = 1; gBattleMoveDamage = GetDrainedBigRootHp(gBattlerAttacker, gBattleMoveDamage); gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE; + effect = TRUE; if (GetBattlerAbility(gBattlerTarget) == ABILITY_LIQUID_OOZE) { gBattleMoveDamage *= -1; diff --git a/test/battle/move_effect/absorb.c b/test/battle/move_effect/absorb.c index 70c1b621af..d046876b1b 100644 --- a/test/battle/move_effect/absorb.c +++ b/test/battle/move_effect/absorb.c @@ -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") { s16 damage;