From 92429c76498c3b33c40420705b2026766e89f6dc Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 9 Sep 2021 13:38:46 -0400 Subject: [PATCH 1/2] better echoed voice power boost --- src/battle_util.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index d7fdc9fd6..9fb2758b7 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7195,10 +7195,9 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef) // gBattleStruct->sameMoveTurns incremented in ppreduce if (gBattleStruct->sameMoveTurns[battlerAtk] != 0) { - if (gBattleStruct->sameMoveTurns[battlerAtk] >= 5) - basePower *= 5; - else - basePower *= gBattleStruct->sameMoveTurns[battlerAtk]; + basePower += (40 * gBattleStruct->sameMoveTurns[battlerAtk]); + if (basePower > 200) + basePower = 200; } break; case EFFECT_PAYBACK: From f9cc09dc4842864ca9dbea04971d8b8ffb80a14b Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 9 Sep 2021 13:54:16 -0400 Subject: [PATCH 2/2] tweak formula --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 9fb2758b7..2215fea48 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7195,7 +7195,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef) // gBattleStruct->sameMoveTurns incremented in ppreduce if (gBattleStruct->sameMoveTurns[battlerAtk] != 0) { - basePower += (40 * gBattleStruct->sameMoveTurns[battlerAtk]); + basePower += (basePower * gBattleStruct->sameMoveTurns[battlerAtk]); if (basePower > 200) basePower = 200; }