modifier fix

rh-hideout · Apr 5, 2024 · aafeeaf · aafeeaf
1 parent 6527abb
commit aafeeaf
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/battle_util.c b/src/battle_util.c
@@ -9805,17 +9805,21 @@ static inline s32 DoMoveDamageCalcVars(u32 move, u32 battlerAtk, u32 battlerDef,
         targetFinalDefense = CalcDefenseStat(move, battlerAtk, battlerDef, moveType, isCrit, updateFlags, ABILITY_NONE, abilityDef, holdEffectDef, weather);
         dmg = CalculateBaseDamage(gBattleMovePower, userFinalAttack, partyMonLevel, targetFinalDefense);
 
-        if (gSpeciesInfo[partyMonSpecies].types[0] == moveType || gSpeciesInfo[partyMonSpecies].types[1] == moveType)
-            DAMAGE_APPLY_MODIFIER(UQ_4_12(1.5));
-        else
-            DAMAGE_APPLY_MODIFIER(UQ_4_12(1.0));
         DAMAGE_APPLY_MODIFIER(GetCriticalModifier(isCrit));
 
         if (randomFactor)
         {
             dmg *= 100 - RandomUniform(RNG_DAMAGE_MODIFIER, 0, 15);
             dmg /= 100;
         }
+
+        // Same type attack bonus
+        if (gSpeciesInfo[partyMonSpecies].types[0] == moveType || gSpeciesInfo[partyMonSpecies].types[1] == moveType)
+            DAMAGE_APPLY_MODIFIER(UQ_4_12(1.5));
+        else
+            DAMAGE_APPLY_MODIFIER(UQ_4_12(1.0));
+        DAMAGE_APPLY_MODIFIER(typeEffectivenessModifier);
+
         if (dmg == 0)
             dmg = 1;