ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry

Browse Source 
Fix multihit moves vs damage reducing berries
This commit is contained in:
ghoulslash 2021-09-22 09:42:53 -06:00 committed by GitHub
commit 8cc0bb6ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_scripts_1.s
View File

@ -7616,6 +7616,7 @@ BattleScript_BerryReduceDmg::
BattleScript_PrintBerryReduceString:: BattleScript_PrintBerryReduceString::
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
printstring STRINGID_BERRYDMGREDUCES printstring STRINGID_BERRYDMGREDUCES
waitmessage B_WAIT_TIME_LONG
return return
BattleScript_BerryCureConfusionEnd2:: BattleScript_BerryCureConfusionEnd2::

9
src/battle_script_commands.c
View File

@ -1970,6 +1970,15 @@ static void Cmd_multihitresultmessage(void)
} }
} }
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
// Print berry reducing message after result message.
if (gSpecialStatuses[gBattlerTarget].berryReduced
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
{
gSpecialStatuses[gBattlerTarget].berryReduced = 0;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_PrintBerryReduceString;
}
} }
static void Cmd_attackanimation(void) static void Cmd_attackanimation(void)