From 95f39c8c81dd92b950d4af3ab501ba28b0332251 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 27 Dec 2022 15:24:43 -0300 Subject: [PATCH] Config to restore Gen 3's damage reduction to multi target moves --- include/config/battle.h | 1 + src/battle_util.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/config/battle.h b/include/config/battle.h index 47a2acee4..dd1132082 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -30,6 +30,7 @@ #define B_SPORT_DMG_REDUCTION GEN_LATEST // In Gen5+, Water/Mud Sport reduce Fire/Electric Damage by 67% instead of 50%. #define B_EXPLOSION_DEFENSE GEN_LATEST // In Gen5+, Self-Destruct and Explosion don't halve the targets' defense. #define B_PARENTAL_BOND_DMG GEN_LATEST // In Gen7+, Parental Bond's second hit does 25% of the initial hits damage. Before, it did 50%. +#define B_MULTIPLE_TARGETS_DMG GEN_LATEST // In Gen4+, damage dealt by moves that hit multiple targets at once is reduced to 75%. Before, it was 50%. // Type settings #define B_GHOSTS_ESCAPE GEN_LATEST // In Gen6+, abilities like Shadow Tag or moves like Mean Look fail on Ghost-type Pokémon. They can also escape any Wild Battle. diff --git a/src/battle_util.c b/src/battle_util.c index 75e77a86b..ff21b0be1 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -9198,7 +9198,11 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move // check multiple targets in double battle if (GetMoveTargetCount(move, battlerAtk, battlerDef) >= 2) + #if B_MULTIPLE_TARGETS_DMG >= GEN_4 MulModifier(&finalModifier, UQ_4_12(0.75)); + #else + MulModifier(&finalModifier, UQ_4_12(0.5)); + #endif // take type effectiveness MulModifier(&finalModifier, typeEffectivenessModifier);