From db43fc3c83aa163ef53ef1aead1ae3a6a95b9cdc Mon Sep 17 00:00:00 2001 From: khbsd Date: Mon, 29 Sep 2025 17:05:20 -0500 Subject: [PATCH] followup: AbilityBattleEffects return type is incorrect (#7827) --- include/battle_util.h | 2 +- src/battle_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/battle_util.h b/include/battle_util.h index c3641ea042..fc75904a8f 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -263,7 +263,7 @@ bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2 bool32 TryChangeBattleWeather(u32 battler, u32 battleWeatherId, bool32 viaAbility); bool32 CanAbilityBlockMove(u32 battlerAtk, u32 battlerDef, enum Ability abilityAtk, enum Ability abilityDef, u32 move, enum FunctionCallOption option); bool32 CanAbilityAbsorbMove(u32 battlerAtk, u32 battlerDef, enum Ability abilityDef, u32 move, u32 moveType, enum FunctionCallOption option); -enum Ability AbilityBattleEffects(u32 caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg); +u32 AbilityBattleEffects(u32 caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg); bool32 TryPrimalReversion(u32 battler); bool32 IsNeutralizingGasOnField(void); bool32 IsMoldBreakerTypeAbility(u32 battler, enum Ability ability); diff --git a/src/battle_util.c b/src/battle_util.c index 51d894f9d4..439ceb1a27 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3586,7 +3586,7 @@ static inline u32 SetStartingSideStatus(u32 flag, u32 side, u32 message, u32 ani return 0; } -enum Ability AbilityBattleEffects(u32 caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg) +u32 AbilityBattleEffects(u32 caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg) { u32 effect = 0; u32 moveType = 0, move = 0;