dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some STAT_CHANGE macros

Browse Source
This commit is contained in:
GriffinR
2019-10-26 11:53:00 -04:00
parent 73b96fe145
commit 5fd44d1e74
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@@ -4393,7 +4393,7 @@ static void Cmd_playstatchangeanimation(void)
{
if (statsToCheck & 1)
{
if (gBattlescriptCurrInstr[3] & STAT_CHANGE_IGNORE_ABILITY)
if (gBattlescriptCurrInstr[3] & STAT_CHANGE_CANT_PREVENT)
{
if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
{
@@ -4452,7 +4452,7 @@ static void Cmd_playstatchangeanimation(void)
}
}
if (gBattlescriptCurrInstr[3] & STAT_CHANGE_SKIP_NEXT_ANIM && changeableStatsCount < 2)
if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount < 2)
{
gBattlescriptCurrInstr += 4;
}
@@ -4460,7 +4460,7 @@ static void Cmd_playstatchangeanimation(void)
{
BtlController_EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId);
MarkBattlerForControllerExec(gActiveBattler);
if (gBattlescriptCurrInstr[3] & STAT_CHANGE_SKIP_NEXT_ANIM && changeableStatsCount > 1)
if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount > 1)
gBattleScripting.statAnimPlayed = TRUE;
gBattlescriptCurrInstr += 4;
}