From 5d177f0a152f60ce00db62e3cae3105ff5d1b2e4 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Tue, 4 May 2021 23:20:22 +1200 Subject: [PATCH] Make Big Root affect absorb moves Big Root should increase the HP recovered by Absorb, Giga Drain etc. --- data/battle_scripts_1.s | 2 ++ src/battle_script_commands.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 16bb6e92c8..f10880c6c8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2234,6 +2234,7 @@ BattleScript_EffectAbsorb:: resultmessage waitmessage 0x40 setdrainedhp + manipulatedamage DMG_BIG_ROOT orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze setbyte cMULTISTRING_CHOOSER, 0x0 @@ -2361,6 +2362,7 @@ BattleScript_DreamEaterWorked: resultmessage waitmessage 0x40 setdrainedhp + manipulatedamage DMG_BIG_ROOT orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0c5250050e..443fc44753 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8877,15 +8877,16 @@ static void Cmd_stockpiletohpheal(void) } } +// Sign change for drained HP handled in GetDrainedBigRootHp static void Cmd_setdrainedhp(void) { if (gBattleMoves[gCurrentMove].argument != 0) - gBattleMoveDamage = -(gHpDealt * gBattleMoves[gCurrentMove].argument / 100); + gBattleMoveDamage = (gHpDealt * gBattleMoves[gCurrentMove].argument / 100); else - gBattleMoveDamage = -(gHpDealt / 2); + gBattleMoveDamage = (gHpDealt / 2); if (gBattleMoveDamage == 0) - gBattleMoveDamage = -1; + gBattleMoveDamage = 1; gBattlescriptCurrInstr++; }