From 4781ca41a9929d353912792d607573c83be1e0cb Mon Sep 17 00:00:00 2001 From: Nephrite Date: Tue, 27 Feb 2024 00:03:25 +0900 Subject: [PATCH] Renamed GET_ADDITIONAL_EFFECT_COUNT macro --- include/pokemon.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 3a9d533a5e..fa2c0f6e06 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -530,8 +530,8 @@ struct MoveInfo // Retrieve a move's additional effects and the count thereof #define GET_ADDITIONAL_EFFECTS(move) (void *)(gMovesInfo[move].additionalEffects & 0x8FFFFFF) -#define GET_ADDITIONAL_EFFECTS_COUNT(move) (gMovesInfo[move].additionalEffects >> 28) -#define GET_ADDITIONAL_EFFECTS_AND_COUNT(move, _count, _effects) u32 _count = GET_ADDITIONAL_EFFECTS_COUNT(move); const struct AdditionalEffect *_effects = GET_ADDITIONAL_EFFECTS(move) +#define GET_ADDITIONAL_EFFECT_COUNT(move) (gMovesInfo[move].additionalEffects >> 28) +#define GET_ADDITIONAL_EFFECTS_AND_COUNT(move, _count, _effects) u32 _count = GET_ADDITIONAL_EFFECT_COUNT(move); const struct AdditionalEffect *_effects = GET_ADDITIONAL_EFFECTS(move) // Just a hack to make a move boosted by Sheer Force despite having no secondary effects affected #define SHEER_FORCE_HACK { .moveEffect = 0, .chance = 100, }