atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed incoming usage of GET_MOVE_TYPE from master

Browse source
This commit is contained in:
Eduardo Quezada 2024-08-12 16:32:11 -04:00
parent abb1fd20f3
commit c74ad262cb
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle_util.c
View file

@ -8256,8 +8256,7 @@ u32 GetMoveTarget(u16 move, u8 setTarget)
{ {
u8 targetBattler = 0; u8 targetBattler = 0;
u32 moveTarget, side; u32 moveTarget, side;
u32 moveType; u32 moveType = GetMoveType(move);
GET_MOVE_TYPE(move, moveType);
if (setTarget != NO_TARGET_OVERRIDE) if (setTarget != NO_TARGET_OVERRIDE)
moveTarget = setTarget - 1; 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 CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef)
{ {
uq4_12_t modifier = UQ_4_12(1.0); uq4_12_t modifier = UQ_4_12(1.0);
u32 moveType; u32 moveType = GetMoveType(move);
GET_MOVE_TYPE(move, moveType);
if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY) if (move != MOVE_STRUGGLE && moveType != TYPE_MYSTERY)
{ {