From 7ea82820ec66bfb91a4171a51c1a94fc8721964e Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Feb 2023 15:07:45 +0100 Subject: [PATCH 1/2] Consider nature power in AI_CalcDamage --- src/battle_ai_util.c | 4 ++++ src/data/battle_moves.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 4641ba2cdd..a48c051acb 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -744,6 +744,10 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, SetBattlerData(battlerDef); gBattleStruct->dynamicMoveType = 0; + + if (move == MOVE_NATURE_POWER) + move = GetNaturePowerMove(); + SetTypeBeforeUsingMove(move, battlerAtk); GET_MOVE_TYPE(move, moveType); diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 82883fb8c9..50e10d414d 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -4847,7 +4847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_NATURE_POWER] = { .effect = EFFECT_NATURE_POWER, - .power = 0, + .power = 1, .type = TYPE_NORMAL, .accuracy = 0, .pp = 20, From f249b58c01862fdf55a95dbb866a14d3c9b28388 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Feb 2023 15:24:31 +0100 Subject: [PATCH 2/2] fix style --- src/battle_ai_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index a48c051acb..22e88aac4c 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -746,7 +746,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, gBattleStruct->dynamicMoveType = 0; if (move == MOVE_NATURE_POWER) - move = GetNaturePowerMove(); + move = GetNaturePowerMove(); SetTypeBeforeUsingMove(move, battlerAtk); GET_MOVE_TYPE(move, moveType);