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

Fix multihit moves vs damage reducing berries

Browse Source 
The extra waitmessage command is ugly but appears to be needed - if it's moved before the printstring, the message isn't displayed long enough on single hit moves.
This commit is contained in:
BuffelSaft 2021-09-12 18:33:04 +12:00
parent 0cd7f3ffcd
commit 7d3980de58
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

@ -7519,6 +7519,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

@ -1967,6 +1967,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)