From c74ad262cb5e6a2267e0115a3554e8b4181f2c8e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 12 Aug 2024 16:32:11 -0400 Subject: [PATCH] Fixed incoming usage of GET_MOVE_TYPE from master --- src/battle_util.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index adcb745c7b..9da592b09f 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8256,8 +8256,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget) { u8 targetBattler = 0; u32 moveTarget, side; - u32 moveType; - GET_MOVE_TYPE(move, moveType); + u32 moveType = GetMoveType(move); if (setTarget != NO_TARGET_OVERRIDE) moveTarget = setTarget - 1; @@ -10468,8 +10467,7 @@ uq4_12_t CalcTypeEffectivenessMultiplier(u32 move, u32 moveType, u32 battlerAtk, uq4_12_t CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef) { uq4_12_t modifier = UQ_4_12(1.0); - u32 moveType; - GET_MOVE_TYPE(move, moveType); + u32 moveType = GetMoveType(move); if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY) {