Merge pull request #1342 from ghoulslash/fixes

Magic Room Affects Macho Brace/Power Item Speed Drop
This commit is contained in:
ultima-soul 2021-03-01 08:50:59 -08:00 committed by GitHub
commit ef054c5d48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4266,7 +4266,7 @@ u32 GetBattlerTotalSpeedStat(u8 battlerId)
}
// item effects
if (GetBattlerHoldEffect(battlerId, FALSE) == HOLD_EFFECT_MACHO_BRACE || GetBattlerHoldEffect(battlerId, FALSE) == HOLD_EFFECT_POWER_ITEM)
if (holdEffect == HOLD_EFFECT_MACHO_BRACE || holdEffect == HOLD_EFFECT_POWER_ITEM)
speed /= 2;
else if (holdEffect == HOLD_EFFECT_IRON_BALL)
speed /= 2;