From e93d22c0f16744295977c787a8997c0bc45f4b3f Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 23 Jan 2023 09:37:05 -0500 Subject: [PATCH] optimize IsMoveMakingContact --- src/battle_util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 8adb32b332..4c6e5f707e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8200,6 +8200,8 @@ u32 GetBattlerHoldEffectParam(u8 battlerId) bool32 IsMoveMakingContact(u16 move, u8 battlerAtk) { + u16 atkHoldEffect = GetBattlerHoldEffect(battlerAtk, TRUE); + if (!(gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) { if (gBattleMoves[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->swapDamageCategory) @@ -8207,12 +8209,11 @@ bool32 IsMoveMakingContact(u16 move, u8 battlerAtk) else return FALSE; } - else if (GetBattlerAbility(battlerAtk) == ABILITY_LONG_REACH - || GetBattlerHoldEffect(battlerAtk, TRUE) == HOLD_EFFECT_PUNCHING_GLOVE) + else if (GetBattlerAbility(battlerAtk) == ABILITY_LONG_REACH || atkHoldEffect == HOLD_EFFECT_PUNCHING_GLOVE) { return FALSE; } - else if (GetBattlerHoldEffect(battlerAtk, TRUE) == HOLD_EFFECT_PROTECTIVE_PADS) + else if (atkHoldEffect == HOLD_EFFECT_PROTECTIVE_PADS) { return FALSE; }