ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make Big Root affect absorb moves

Browse Source 
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
This commit is contained in:
BuffelSaft 2021-05-04 23:20:22 +12:00
parent d270dee6bc
commit 5d177f0a15
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -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

7
src/battle_script_commands.c
View File

@ -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++;
}