From 52b17b32494963fda4dc78a6dddcc1800406d829 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 12 Jan 2024 18:20:14 -0300 Subject: [PATCH 1/2] Move data ternaries --- src/data/battle_moves.h | 1087 ++++++++------------------------------- 1 file changed, 226 insertions(+), 861 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 8020cc752060..bd5c833d8b8e 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -1,3 +1,11 @@ +#include "battle_dynamax.h" +#include "constants/battle.h" +#include "constants/battle_move_effects.h" +#include "constants/battle_script_commands.h" +#include "constants/z_move_effects.h" +#include "constants/hold_effects.h" +#include "constants/moves.h" + const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { [MOVE_NONE] = @@ -214,15 +222,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWORDS_DANCE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 20, - #else - .pp = 30, - #endif .effect = EFFECT_ATTACK_UP_2, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 30, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -275,14 +279,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLWIND] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 0 : 100, .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = -6, @@ -298,12 +298,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLY] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .power = 90, - #else - .power = 70, - #endif .effect = EFFECT_SEMI_INVULNERABLE, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, .type = TYPE_FLYING, .accuracy = 95, .pp = 15, @@ -352,16 +348,14 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VINE_WHIP] = { #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 45, .pp = 25, #elif B_UPDATED_MOVE_DATA >= GEN_4 - .power = 35, .pp = 15, #else - .power = 35, .pp = 10, #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 45 : 35, .type = TYPE_GRASS, .accuracy = 100, .target = MOVE_TARGET_SELECTED, @@ -421,17 +415,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, - .pp = 10, - #elif B_UPDATED_MOVE_DATA == GEN_4 + #elif B_UPDATED_MOVE_DATA >= GEN_4 .power = 85, - .pp = 25, #else .power = 70, - .pp = 25, #endif .effect = EFFECT_RECOIL_IF_MISS, .type = TYPE_FIGHTING, .accuracy = 95, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 25, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -533,16 +525,14 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_7 .power = 40, - .accuracy = 100, #elif B_UPDATED_MOVE_DATA >= GEN_5 .power = 50, - .accuracy = 100, #else .power = 35, - .accuracy = 95, #endif .effect = EFFECT_HIT, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 100 : 95, .pp = 35, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -602,16 +592,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THRASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 120, - .pp = 10, - #else - .power = 90, - .pp = 20, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 120 : 90, .type = TYPE_NORMAL, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 20, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -679,7 +664,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .strikeCount = 2, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_POISON, @@ -689,15 +674,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PIN_MISSILE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 25, - .accuracy = 95, - #else - .power = 14, - .accuracy = 85, - #endif .effect = EFFECT_MULTI_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 14, .type = TYPE_BUG, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 85, .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -755,14 +735,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROAR] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 0 : 100, .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = -6, @@ -853,19 +829,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, - #if B_UPDATED_MOVE_DATA >= GEN_4 .additionalEffects = ADDITIONAL_EFFECTS({ - .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, + .moveEffect = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_EFFECT_SP_DEF_MINUS_1 : MOVE_EFFECT_DEF_MINUS_1, .chance = 10, - } - ), - #else - .additionalEffects = ADDITIONAL_EFFECTS({ - .moveEffect = MOVE_EFFECT_DEF_MINUS_1, - .chance = 10, - } - ), - #endif + }), }, [MOVE_EMBER] = @@ -887,12 +854,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAMETHROWER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - #else - .power = 95, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_FIRE, .accuracy = 100, .pp = 15, @@ -936,12 +899,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HYDRO_PUMP] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 110, - #else - .power = 120, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_WATER, .accuracy = 80, .pp = 5, @@ -952,20 +911,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURF] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - .target = MOVE_TARGET_FOES_AND_ALLY, - #elif B_UPDATED_MOVE_DATA >= GEN_4 - .power = 95, - .target = MOVE_TARGET_FOES_AND_ALLY, - #else - .power = 95, - .target = MOVE_TARGET_BOTH, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, .accuracy = 100, .pp = 15, + .target = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_TARGET_FOES_AND_ALLY : MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, @@ -974,14 +925,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICE_BEAM] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - #else - .power = 95, - #endif - // The following effect is also relevant in battle_pike.c - // If you cherry-pick this to use something other than the config, make sure to update it there too .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_ICE, .accuracy = 100, .pp = 10, @@ -990,6 +935,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ + // The following effect is also relevant in battle_pike.c + // If you cherry-pick this to use something other than the config, make sure to update it there too .moveEffect = MOVE_EFFECT_FREEZE_OR_FROSTBITE, .chance = 10, }), @@ -997,12 +944,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLIZZARD] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 110, - #else - .power = 120, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_ICE, .accuracy = 70, .pp = 5, @@ -1113,15 +1056,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUBMISSION] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 20, - #else - .pp = 25, - #endif .effect = EFFECT_HIT, .power = 80, .type = TYPE_FIGHTING, .accuracy = 80, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 25, .recoil = 25, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -1153,9 +1092,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = -5, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .meFirstBanned = TRUE, - .metronomeBanned = TRUE, // B_UPDATED_MOVE_FLAGS >= GEN_2 + .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_2, .copycatBanned = TRUE, .assistBanned = TRUE, }, @@ -1189,37 +1128,29 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ABSORB] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .pp = 25, - #else - .pp = 20, - #endif .effect = EFFECT_ABSORB, .power = 20, .type = TYPE_GRASS, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 25 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_MEGA_DRAIN] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .pp = 15, - #else - .pp = 10, - #endif .effect = EFFECT_ABSORB, .power = 40, .type = TYPE_GRASS, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 15 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, }, @@ -1239,19 +1170,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GROWTH] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 20, - #else - .pp = 40, - #endif - #if B_GROWTH_STAT_RAISE >= GEN_5 - .effect = EFFECT_GROWTH, - #else - .effect = EFFECT_SPECIAL_ATTACK_UP, - #endif + .effect = B_GROWTH_STAT_RAISE >= GEN_5 ? EFFECT_GROWTH : EFFECT_SPECIAL_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 40, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -1339,17 +1262,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 120, - .pp = 10, #elif B_UPDATED_MOVE_DATA == GEN_4 .power = 90, - .pp = 20, #else .power = 70, - .pp = 20, #endif .effect = EFFECT_HIT, .type = TYPE_GRASS, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 20, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -1364,11 +1285,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRING_SHOT] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .effect = EFFECT_SPEED_DOWN_2, - #else - .effect = EFFECT_SPEED_DOWN, - #endif + .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_SPEED_DOWN_2 : EFFECT_SPEED_DOWN, .power = 0, .type = TYPE_BUG, .accuracy = 95, @@ -1429,12 +1346,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDERBOLT] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - #else - .power = 95, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_ELECTRIC, .accuracy = 100, .pp = 15, @@ -1450,14 +1363,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER_WAVE] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .accuracy = 90, - #else - .accuracy = 100, - #endif .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_ELECTRIC, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_7 ? 90 : 100, .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -1468,12 +1377,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THUNDER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 110, - #else - .power = 120, - #endif .effect = EFFECT_THUNDER, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_ELECTRIC, .accuracy = 70, .pp = 10, @@ -1531,12 +1436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIG] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .power = 80, - #else - .power = 60, - #endif .effect = EFFECT_SEMI_INVULNERABLE, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 80 : 60, .type = TYPE_GROUND, .accuracy = 100, .pp = 10, @@ -1711,7 +1612,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresSubstitute = TRUE, .mimicBanned = TRUE, - .metronomeBanned = TRUE, // B_UPDATED_MOVE_FLAGS >= GEN_2 + .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_2, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -1792,15 +1693,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MINIMIZE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 10, - #else - .pp = 20, - #endif .effect = EFFECT_MINIMIZE, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 10 : 20, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -1872,15 +1769,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BARRIER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 20, - #else - .pp = 30, - #endif .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 30, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -1956,18 +1849,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIDE] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .accuracy = 0, - .priority = 1, - #else - .accuracy = 100, - .priority = 0, - #endif .effect = EFFECT_BIDE, .power = 1, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_4 ? 0 : 100, .pp = 10, .target = MOVE_TARGET_USER, + .priority = B_UPDATED_MOVE_DATA >= GEN_4 ? 1 : 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -2044,12 +1932,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LICK] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 30, - #else - .power = 20, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, .type = TYPE_GHOST, .accuracy = 100, .pp = 30, @@ -2066,12 +1950,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMOG] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 30, - #else - .power = 20, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 30 : 20, .type = TYPE_POISON, .accuracy = 70, .pp = 20, @@ -2121,12 +2001,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_BLAST] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 110, - #else - .power = 120, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_FIRE, .accuracy = 85, .pp = 5, @@ -2191,16 +2067,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SKULL_BASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 130, - .pp = 10, - #else - .power = 100, - .pp = 15, - #endif .effect = EFFECT_SKULL_BASH, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 130 : 100, .type = TYPE_NORMAL, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -2272,15 +2143,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SOFT_BOILED] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .pp = 5, - #else - .pp = 10, - #endif .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -2295,17 +2162,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_5 .power = 130, - .pp = 10, #elif B_UPDATED_MOVE_DATA == GEN_4 .power = 100, - .pp = 20, #else .power = 85, - .pp = 20, #endif .effect = EFFECT_RECOIL_IF_MISS, .type = TYPE_FIGHTING, .accuracy = 90, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -2350,18 +2215,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, - .target = MOVE_TARGET_BOTH, - #elif B_UPDATED_MOVE_DATA == GEN_5 + #elif B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 80, - .target = MOVE_TARGET_BOTH, #else .accuracy = 55, - .target = MOVE_TARGET_SELECTED, #endif .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, .pp = 40, + .target = B_UPDATED_MOVE_DATA >= GEN_5 ? MOVE_TARGET_BOTH : MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, @@ -2383,21 +2246,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEECH_LIFE] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .power = 80, - .pp = 10, - #else - .power = 20, - .pp = 15, - #endif .effect = EFFECT_ABSORB, + .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 80 : 20, .type = TYPE_BUG, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_7 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, }, @@ -2459,12 +2317,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUBBLE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 40, - #else - .power = 20, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 40 : 20, .type = TYPE_WATER, .accuracy = 100, .pp = 30, @@ -2514,14 +2368,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .accuracy = 100, - #else - .accuracy = 70, - #endif .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_4 ? 100 : 70, .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -2532,14 +2382,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYWAVE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 100, - #else - .accuracy = 80, - #endif .effect = EFFECT_PSYWAVE, .power = 1, .type = TYPE_PSYCHIC, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 80, .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -2564,15 +2410,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ACID_ARMOR] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 20, - #else - .pp = 40, - #endif .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_POISON, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 40, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -2584,18 +2426,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CRABHAMMER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 100, - .accuracy = 90, - #elif B_UPDATED_MOVE_DATA == GEN_5 - .power = 90, - .accuracy = 90, - #else - .power = 90, - .accuracy = 85, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 90, .type = TYPE_WATER, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 85, .criticalHitStage = 1, .pp = 10, .target = MOVE_TARGET_SELECTED, @@ -2645,15 +2479,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_REST] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .pp = 5, - #else - .pp = 10, - #endif .effect = EFFECT_REST, .power = 0, .type = TYPE_PSYCHIC, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -2760,7 +2590,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), }, [MOVE_SLASH] = @@ -2868,21 +2698,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THIEF] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - .pp = 25, - #else - .power = 40, - .pp = 10, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_DARK, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .meFirstBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -2909,14 +2734,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIND_READER] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_4 ? 0 : 100, .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -2926,14 +2747,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_NIGHTMARE] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .accuracy = 100, - #else - .accuracy = 0, - #endif .effect = EFFECT_NIGHTMARE, .power = 0, .type = TYPE_GHOST, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_4 ? 100 : 0, .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -2963,12 +2780,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SNORE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 50, - #else - .power = 40, - #endif .effect = EFFECT_SNORE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 40, .type = TYPE_NORMAL, .accuracy = 100, .pp = 15, @@ -2987,13 +2800,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CURSE] = { - #if B_UPDATED_MOVE_TYPES >= GEN_5 - .type = TYPE_GHOST, - #else - .type = TYPE_MYSTERY, - #endif .effect = EFFECT_CURSE, .power = 0, + .type = B_UPDATED_MOVE_TYPES >= GEN_5 ? TYPE_GHOST : TYPE_MYSTERY, .accuracy = 0, .pp = 10, .target = MOVE_TARGET_SELECTED, @@ -3050,20 +2859,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_COTTON_SPORE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 100, - .target = MOVE_TARGET_BOTH, - #elif B_UPDATED_MOVE_DATA == GEN_5 - .accuracy = 100, - .target = MOVE_TARGET_SELECTED, - #else - .accuracy = 85, - .target = MOVE_TARGET_SELECTED, - #endif .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_GRASS, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 100 : 85, .pp = 40, + .target = B_UPDATED_MOVE_DATA >= GEN_6 ? MOVE_TARGET_BOTH : MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, @@ -3118,17 +2919,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PROTECT] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .priority = 4, - #else - .priority = 3, - #endif .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, .target = MOVE_TARGET_USER, + .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 4 : 3, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, @@ -3153,14 +2950,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SCARY_FACE] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 100, - #else - .accuracy = 90, - #endif .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 100 : 90, .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -3171,9 +2964,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FEINT_ATTACK] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .makesContact = TRUE, - #endif .effect = EFFECT_HIT, .power = 60, .type = TYPE_DARK, @@ -3182,17 +2972,14 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, }, [MOVE_SWEET_KISS] = { - #if B_UPDATED_MOVE_TYPES >= GEN_6 - .type = TYPE_FAIRY, - #else - .type = TYPE_NORMAL, - #endif .effect = EFFECT_CONFUSE, .power = 0, + .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, .accuracy = 75, .pp = 10, .target = MOVE_TARGET_SELECTED, @@ -3291,12 +3078,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ZAP_CANNON] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .power = 120, - #else - .power = 100, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 100, .type = TYPE_ELECTRIC, .accuracy = 50, .pp = 5, @@ -3313,14 +3096,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FORESIGHT] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 0 : 100, .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -3386,17 +3165,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DETECT] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .priority = 4, - #else - .priority = 3, - #endif .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, .accuracy = 0, .pp = 5, .target = MOVE_TARGET_USER, + .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 4 : 3, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .ignoresProtect = TRUE, @@ -3409,14 +3184,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BONE_RUSH] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 90, - #else - .accuracy = 80, - #endif .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_GROUND, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 80, .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -3425,14 +3196,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOCK_ON] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_4 ? 0 : 100, .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -3442,19 +3209,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_OUTRAGE] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 120, - .pp = 10, - #elif B_UPDATED_MOVE_DATA == GEN_4 - .power = 120, - .pp = 15, - #else - .power = 90, - .pp = 15, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 120 : 90, .type = TYPE_DRAGON, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 15, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -3484,39 +3243,27 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GIGA_DRAIN] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 75, - .pp = 10, - #elif B_UPDATED_MOVE_DATA == GEN_4 - .power = 60, - .pp = 10, - #else - .power = 60, - .pp = 5, - #endif .effect = EFFECT_ABSORB, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, .type = TYPE_GRASS, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 10 : 5, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), .healingMove = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_ENDURE] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .priority = 4, - #else - .priority = 3, - #endif .effect = EFFECT_ENDURE, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, .target = MOVE_TARGET_USER, + .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 4 : 3, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, @@ -3529,13 +3276,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHARM] = { - #if B_UPDATED_MOVE_TYPES >= GEN_6 - .type = TYPE_FAIRY, - #else - .type = TYPE_NORMAL, - #endif .effect = EFFECT_ATTACK_DOWN_2, .power = 0, + .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, .accuracy = 100, .pp = 20, .target = MOVE_TARGET_SELECTED, @@ -3589,15 +3332,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MILK_DRINK] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .pp = 5, - #else - .pp = 10, - #endif .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -3630,7 +3369,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 40, - #elif B_UPDATED_MOVE_DATA == GEN_5 + #elif B_UPDATED_MOVE_DATA >= GEN_5 .power = 20, #else .power = 10, @@ -3758,7 +3497,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), }, [MOVE_FRUSTRATION] = @@ -3927,7 +3666,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 + .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_3 || B_UPDATED_MOVE_FLAGS == GEN_4), }, [MOVE_RAPID_SPIN] = @@ -3957,11 +3696,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWEET_SCENT] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .effect = EFFECT_EVASION_DOWN_2, - #else - .effect = EFFECT_EVASION_DOWN, - #endif + .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN, .power = 0, .type = TYPE_NORMAL, .accuracy = 100, @@ -4059,13 +3794,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MOONLIGHT] = { - #if B_UPDATED_MOVE_TYPES >= GEN_6 - .type = TYPE_FAIRY, - #else - .type = TYPE_NORMAL, - #endif .effect = EFFECT_MOONLIGHT, .power = 0, + .type = B_UPDATED_MOVE_TYPES >= GEN_6 ? TYPE_FAIRY : TYPE_NORMAL, .accuracy = 0, .pp = 5, .target = MOVE_TARGET_USER, @@ -4166,19 +3897,14 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, - #if B_UPDATED_MOVE_DATA >= GEN_4 .additionalEffects = ADDITIONAL_EFFECTS({ + #if B_UPDATED_MOVE_DATA >= GEN_4 .moveEffect = MOVE_EFFECT_DEF_MINUS_1, - .chance = 10, - } - ), #else - .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_1, - .chance = 10, - } - ), #endif + .chance = 10, + }), }, [MOVE_MIRROR_COAT] = @@ -4216,17 +3942,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTREME_SPEED] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .priority = 2, - #else - .priority = 1, - #endif .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, .accuracy = 100, .pp = 5, .target = MOVE_TARGET_SELECTED, + .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 2 : 1, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4272,19 +3994,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = { #if B_UPDATED_MOVE_DATA >= GEN_6 .power = 120, - .accuracy = 100, - .pp = 10, - #elif B_UPDATED_MOVE_DATA == GEN_5 + #elif B_UPDATED_MOVE_DATA >= GEN_5 .power = 100, - .accuracy = 100, - .pp = 10, #else .power = 80, - .accuracy = 90, - .pp = 15, #endif .effect = EFFECT_FUTURE_SIGHT, .type = TYPE_PSYCHIC, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 100 : 90, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -4294,12 +4012,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_SMASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .power = 40, - #else - .power = 20, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 40 : 20, .type = TYPE_FIGHTING, .accuracy = 100, .pp = 15, @@ -4332,12 +4046,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BEAT_UP] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 1, - #else - .power = 10, - #endif .effect = EFFECT_BEAT_UP, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 1 : 10, .type = TYPE_DARK, .accuracy = 100, .pp = 10, @@ -4348,15 +4058,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FAKE_OUT] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .priority = 3, - .makesContact = TRUE, - #elif B_UPDATED_MOVE_DATA == GEN_4 - .priority = 1, - .makesContact = TRUE, - #else - .priority = 1, - #endif + .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 3 : 1, + .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .effect = EFFECT_FAKE_OUT, .power = 40, .type = TYPE_NORMAL, @@ -4393,15 +4096,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STOCKPILE] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .pp = 20, - #else - .pp = 10, - #endif .effect = EFFECT_STOCKPILE, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_4 ? 20 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -4413,12 +4112,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPIT_UP] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .power = 1, - #else - .power = 100, - #endif .effect = EFFECT_SPIT_UP, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 1 : 100, .type = TYPE_NORMAL, .accuracy = 100, .pp = 10, @@ -4447,12 +4142,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAT_WAVE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 95, - #else - .power = 100, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 100, .type = TYPE_FIRE, .accuracy = 90, .pp = 10, @@ -4512,14 +4203,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILL_O_WISP] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 85, - #else - .accuracy = 75, - #endif .effect = EFFECT_WILL_O_WISP, .power = 0, .type = TYPE_FIRE, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 85 : 75, .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -4662,16 +4349,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HELPING_HAND] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .target = MOVE_TARGET_ALLY, - #else - .target = MOVE_TARGET_USER, - #endif .effect = EFFECT_HELPING_HAND, .power = 0, .type = TYPE_NORMAL, .accuracy = 100, .pp = 20, + .target = B_UPDATED_MOVE_DATA >= GEN_4 ? MOVE_TARGET_ALLY : MOVE_TARGET_USER, .priority = 5, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, @@ -5048,11 +4731,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAIL_GLOW] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .effect = EFFECT_SPECIAL_ATTACK_UP_3, - #else - .effect = EFFECT_SPECIAL_ATTACK_UP_2, - #endif + .effect = B_UPDATED_MOVE_DATA >= GEN_5 ? EFFECT_SPECIAL_ATTACK_UP_3 : EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_BUG, .accuracy = 0, @@ -5203,15 +4882,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SLACK_OFF] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .pp = 5, - #else - .pp = 10, - #endif .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_NORMAL, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -5307,15 +4982,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_METEOR_MASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - .accuracy = 90, - #else - .power = 100, - .accuracy = 85, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 100, .type = TYPE_STEEL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 85, .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -5394,12 +5064,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_CUTTER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - #else - .power = 55, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 55, .type = TYPE_FLYING, .accuracy = 95, .criticalHitStage = 1, @@ -5430,14 +5096,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ODOR_SLEUTH] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_4 ? 0 : 100, .pp = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -5449,17 +5111,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_TOMB] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - .accuracy = 95, - .pp = 15, - #else - .power = 50, - .accuracy = 80, - .pp = 10, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, .type = TYPE_ROCK, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 80, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -5596,15 +5252,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_EXTRASENSORY] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 20, - #else - .pp = 30, - #endif .effect = EFFECT_HIT, .power = 80, .type = TYPE_PSYCHIC, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 20 : 30, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -5660,12 +5312,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MUDDY_WATER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - #else - .power = 95, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, .accuracy = 85, .pp = 10, @@ -5682,12 +5330,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BULLET_SEED] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 25, - #else - .power = 10, - #endif .effect = EFFECT_MULTI_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, .type = TYPE_GRASS, .accuracy = 100, .pp = 30, @@ -5713,12 +5357,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ICICLE_SPEAR] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 25, - #else - .power = 10, - #endif .effect = EFFECT_MULTI_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 25 : 10, .type = TYPE_ICE, .accuracy = 100, .pp = 30, @@ -5760,12 +5400,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HOWL] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .effect = EFFECT_ATTACK_UP_USER_ALLY, - #else - .effect = EFFECT_ATTACK_UP, - #endif .power = 0, + .effect = B_UPDATED_MOVE_DATA >= GEN_8 ? EFFECT_ATTACK_UP_USER_ALLY : EFFECT_ATTACK_UP, .type = TYPE_NORMAL, .accuracy = 0, .pp = 40, @@ -5971,12 +5607,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LEAF_BLADE] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .power = 90, - #else - .power = 70, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_4 ? 90 : 70, .type = TYPE_GRASS, .accuracy = 100, .criticalHitStage = 1, @@ -6007,14 +5639,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROCK_BLAST] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 90, - #else - .accuracy = 80, - #endif .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_ROCK, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 80, .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -6054,15 +5682,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DOOM_DESIRE] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 140, - .accuracy = 100, - #else - .power = 120, - .accuracy = 85, - #endif .effect = EFFECT_FUTURE_SIGHT, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 120, .type = TYPE_STEEL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 100 : 85, .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -6089,15 +5712,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ROOST] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .pp = 5, - #else - .pp = 10, - #endif .effect = EFFECT_ROOST, .power = 0, .type = TYPE_FLYING, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -6266,15 +5885,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TAILWIND] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 15, - #else - .pp = 30, - #endif .effect = EFFECT_TAILWIND, .power = 0, .type = TYPE_FLYING, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 30, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -6359,12 +5974,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ASSURANCE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - #else - .power = 50, - #endif .effect = EFFECT_ASSURANCE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 50, .type = TYPE_DARK, .accuracy = 100, .pp = 10, @@ -6403,14 +6014,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PSYCHO_SHIFT] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 100, - #else - .accuracy = 90, - #endif .effect = EFFECT_PSYCHO_SHIFT, .power = 0, .type = TYPE_PSYCHIC, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 90, .pp = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -6592,12 +6199,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LAST_RESORT] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 140, - #else - .power = 130, - #endif .effect = EFFECT_LAST_RESORT, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 130, .type = TYPE_NORMAL, .accuracy = 100, .pp = 5, @@ -6623,12 +6226,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SUCKER_PUNCH] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .power = 70, - #else - .power = 80, - #endif .effect = EFFECT_SUCKER_PUNCH, + .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 70 : 80, .type = TYPE_DARK, .accuracy = 100, .pp = 5, @@ -6744,12 +6343,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AURA_SPHERE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 80, - #else - .power = 90, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 90, .type = TYPE_FIGHTING, .accuracy = 0, .pp = 20, @@ -6855,15 +6450,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_AIR_SLASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 15, - #else - .pp = 20, - #endif .effect = EFFECT_HIT, .power = 75, .type = TYPE_FLYING, .accuracy = 95, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -6910,12 +6501,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAGON_PULSE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 85, - #else - .power = 90, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 85 : 90, .type = TYPE_DRAGON, .accuracy = 100, .pp = 10, @@ -6942,16 +6529,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 20, }), - }, - - [MOVE_POWER_GEM] = - { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 80, - #else - .power = 70, - #endif + }, + + [MOVE_POWER_GEM] = + { .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 70, .type = TYPE_ROCK, .accuracy = 100, .pp = 20, @@ -6962,16 +6545,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DRAIN_PUNCH] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 75, - .pp = 10, - #else - .power = 60, - .pp = 5, - #endif .effect = EFFECT_ABSORB, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 60, .type = TYPE_FIGHTING, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 10 : 5, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -7012,12 +6590,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ENERGY_BALL] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 90, - #else - .power = 80, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 80, .type = TYPE_GRASS, .accuracy = 100, .pp = 10, @@ -7499,14 +7073,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GUNK_SHOT] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .accuracy = 80, - #else - .accuracy = 70, - #endif .effect = EFFECT_HIT, .power = 120, .type = TYPE_POISON, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 70, .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -7607,14 +7177,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .skyBattleBanned = TRUE, }, -#if B_UPDATED_MOVE_DATA >= GEN_6 -#define CHATTER_EFFECT_CHANCE 100 -#elif B_UPDATED_MOVE_DATA == GEN_5 -#define CHATTER_EFFECT_CHANCE 10 -#else -#define CHATTER_EFFECT_CHANCE 31 -#endif - [MOVE_CHATTER] = { .effect = EFFECT_HIT, @@ -7637,7 +7199,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .assistBanned = TRUE, .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_CONFUSION, - .chance = CHATTER_EFFECT_CHANCE, + #if B_UPDATED_MOVE_DATA >= GEN_6 + .chance = 100, + #elif B_UPDATED_MOVE_DATA >= GEN_5 + .chance = 10, + #else + .chance = 31, + #endif }), }, @@ -7850,18 +7418,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGMA_STORM] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 100, - .accuracy = 75, - #elif B_UPDATED_MOVE_DATA == GEN_5 - .power = 120, - .accuracy = 75, - #else - .power = 120, - .accuracy = 70, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 100 : 120, .type = TYPE_FIRE, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 75 : 70, .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -7873,14 +7433,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DARK_VOID] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .accuracy = 50, - #else - .accuracy = 80, - #endif .effect = EFFECT_DARK_VOID, .power = 0, .type = TYPE_DARK, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_7 ? 50 : 80, .pp = 10, .target = MOVE_TARGET_BOTH, .priority = 0, @@ -8013,17 +7569,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WONDER_ROOM] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .priority = 0, - #else - .priority = -7, - #endif .effect = EFFECT_WONDER_ROOM, .power = 0, .type = TYPE_PSYCHIC, .accuracy = 0, .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, + .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 0 : -7, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, @@ -8072,17 +7624,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGE_POWDER] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .priority = 2, - #else - .priority = 3, - #endif .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_BUG, .accuracy = 0, .pp = 20, .target = MOVE_TARGET_USER, + .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 2 : 3, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .powderMove = TRUE, @@ -8110,17 +7658,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MAGIC_ROOM] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .priority = 0, - #else - .priority = -7, - #endif .effect = EFFECT_MAGIC_ROOM, .power = 0, .type = TYPE_PSYCHIC, .accuracy = 0, .pp = 10, .target = MOVE_TARGET_ALL_BATTLERS, + .priority = B_UPDATED_MOVE_DATA >= GEN_6 ? 0 : -7, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, @@ -8145,12 +7689,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STORM_THROW] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - #else - .power = 40, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_FIGHTING, .accuracy = 100, .pp = 10, @@ -8228,16 +7768,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SYNCHRONOISE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 120, - .pp = 10, - #else - .power = 70, - .pp = 15, - #endif .effect = EFFECT_SYNCHRONOISE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 70, .type = TYPE_PSYCHIC, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 10 : 15, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -8307,12 +7842,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LOW_SWEEP] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 65, - #else - .power = 60, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 65 : 60, .type = TYPE_FIGHTING, .accuracy = 100, .pp = 20, @@ -8496,17 +8027,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLY_SWITCH] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .priority = 2, - #else - .priority = 1, - #endif .effect = EFFECT_ALLY_SWITCH, .power = 0, .type = TYPE_PSYCHIC, .accuracy = 0, .pp = 15, .target = MOVE_TARGET_USER, + .priority = B_UPDATED_MOVE_DATA >= GEN_7 ? 2 : 1, .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = TRUE, @@ -8628,12 +8155,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_INCINERATE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - #else - .power = 30, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 30, .type = TYPE_FIRE, .accuracy = 100, .pp = 15, @@ -8751,12 +8274,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_PLEDGE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 80, - #else - .power = 50, - #endif .effect = EFFECT_PLEDGE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_WATER, .accuracy = 100, .pp = 10, @@ -8768,12 +8287,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_PLEDGE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 80, - #else - .power = 50, - #endif .effect = EFFECT_PLEDGE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_FIRE, .accuracy = 100, .pp = 10, @@ -8785,12 +8300,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASS_PLEDGE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 80, - #else - .power = 50, - #endif .effect = EFFECT_PLEDGE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 80 : 50, .type = TYPE_GRASS, .accuracy = 100, .pp = 10, @@ -8814,12 +8325,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_STRUGGLE_BUG] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 50, - #else - .power = 30, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, .type = TYPE_BUG, .accuracy = 100, .pp = 20, @@ -8853,12 +8360,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FROST_BREATH] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - #else - .power = 40, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 60 : 40, .type = TYPE_ICE, .accuracy = 90, .pp = 10, @@ -8992,15 +8495,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SACRED_SWORD] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .pp = 15, - #else - .pp = 20, - #endif .effect = EFFECT_HIT, .power = 90, .type = TYPE_FIGHTING, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 15 : 20, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -9139,12 +8638,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HURRICANE] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 110, - #else - .power = 120, - #endif .effect = EFFECT_HURRICANE, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 110 : 120, .type = TYPE_FLYING, .accuracy = 70, .pp = 10, @@ -9208,12 +8703,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TECHNO_BLAST] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 120, - #else - .power = 85, - #endif .effect = EFFECT_CHANGE_TYPE_ON_ITEM, + .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 85, .type = TYPE_NORMAL, .accuracy = 100, .pp = 5, @@ -9454,12 +8945,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLYING_PRESS] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .power = 100, - #else - .power = 80, - #endif .effect = EFFECT_TWO_TYPED_MOVE, + .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 100 : 80, .type = TYPE_FIGHTING, .accuracy = 95, .pp = 10, @@ -9549,12 +9036,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FELL_STINGER] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .power = 50, - #else - .power = 30, - #endif .effect = EFFECT_FELL_STINGER, + .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 50 : 30, .type = TYPE_BUG, .accuracy = 100, .pp = 25, @@ -9634,12 +9117,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_PARABOLIC_CHARGE] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .power = 65, - #else - .power = 50, - #endif .effect = EFFECT_ABSORB, + .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 65 : 50, .type = TYPE_ELECTRIC, .accuracy = 100, .pp = 20, @@ -9726,14 +9205,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOPSY_TURVY] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .accuracy = 0, - #else - .accuracy = 100, - #endif .effect = EFFECT_TOPSY_TURVY, .power = 0, .type = TYPE_DARK, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_7 ? 0 : 100, .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -10020,11 +9495,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .category = BATTLE_CATEGORY_SPECIAL, - #else - .category = BATTLE_CATEGORY_PHYSICAL, - #endif .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_WATER, @@ -10032,17 +9502,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 1, - + .category = B_UPDATED_MOVE_DATA >= GEN_7 ? BATTLE_CATEGORY_SPECIAL : BATTLE_CATEGORY_PHYSICAL, }, [MOVE_MYSTICAL_FIRE] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .power = 75, - #else - .power = 65, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_7 ? 75 : 65, .type = TYPE_FIRE, .accuracy = 100, .pp = 10, @@ -10480,15 +9946,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SHORE_UP] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .pp = 5, - #else - .pp = 10, - #endif .effect = EFFECT_SHORE_UP, .power = 0, .type = TYPE_GROUND, .accuracy = 0, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 5 : 10, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -11279,12 +10741,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MULTI_ATTACK] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 120, - #else - .power = 90, - #endif .effect = EFFECT_CHANGE_TYPE_ON_ITEM, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, .type = TYPE_NORMAL, .accuracy = 100, .pp = 10, @@ -11356,8 +10814,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_EVS_PLUS_1, .chance = 100, - } - ), + }), #endif }, @@ -11417,20 +10874,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BOUNCY_BUBBLE] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 60, - .pp = 20, - .argument = 100, // restores 100% HP instead of 50% HP - #else - .power = 90, - .pp = 15, - #endif .effect = EFFECT_ABSORB, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_WATER, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 20 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + .argument = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 50, // restores 100% HP instead of 50% HP .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, @@ -11438,16 +10890,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BUZZY_BUZZ] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 60, - .pp = 20, - #else - .power = 90, - .pp = 15, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_ELECTRIC, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 20 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -11461,16 +10908,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SIZZLY_SLIDE] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 60, - .pp = 20, - #else - .power = 90, - .pp = 15, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 60 : 90, .type = TYPE_FIRE, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 20 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -11486,15 +10928,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLITZY_GLOW] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 80, - .accuracy = 95, - #else - .power = 90, - .accuracy = 100, - #endif .effect = EFFECT_GLITZY_GLOW, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, .type = TYPE_PSYCHIC, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_8 ? 95 : 100, .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -11505,15 +10942,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BADDY_BAD] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 80, - .accuracy = 95, - #else - .power = 90, - .accuracy = 100, - #endif .effect = EFFECT_BADDY_BAD, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 80 : 90, .type = TYPE_DARK, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_8 ? 95 : 100, .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -11524,17 +10956,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAPPY_SEED] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 100, - .accuracy = 90, - .pp = 10, - #else - .power = 90, - .accuracy = 100, - .pp = 15, - #endif .effect = EFFECT_SAPPY_SEED, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, .type = TYPE_GRASS, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_8 ? 90 : 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -11545,17 +10971,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FREEZY_FROST] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 100, - .accuracy = 90, - .pp = 10, - #else - .power = 90, - .accuracy = 100, - .pp = 15, - #endif .effect = EFFECT_FREEZY_FROST, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 100 : 90, .type = TYPE_ICE, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_8 ? 90 : 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 10 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -11565,17 +10985,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPARKLY_SWIRL] = { - #if B_UPDATED_MOVE_DATA >= GEN_8 - .power = 120, - .accuracy = 85, - .pp = 5, - #else - .power = 90, - .accuracy = 100, - .pp = 15, - #endif .effect = EFFECT_SPARKLY_SWIRL, + .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 120 : 90, .type = TYPE_FAIRY, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_8 ? 85 : 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_8 ? 5 : 15, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -12276,12 +11690,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 55, - #else - .power = 70, - #endif .effect = EFFECT_GRASSY_GLIDE, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 55 : 70, .type = TYPE_GRASS, .accuracy = 100, .pp = 20, @@ -12483,12 +11893,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WICKED_BLOW] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 75, - #else - .power = 80, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 80, .type = TYPE_DARK, .accuracy = 100, .pp = 5, @@ -12603,12 +12009,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GLACIAL_LANCE] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 120, - #else - .power = 130, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 130, .type = TYPE_ICE, .accuracy = 100, .pp = 5, @@ -12648,12 +12050,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DIRE_CLAW] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 80, - #else - .power = 60, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 60, .type = TYPE_POISON, .accuracy = 100, .pp = 15, @@ -12724,12 +12122,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SPRINGTIDE_STORM] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 100, - #else - .power = 95, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_FAIRY, .accuracy = 80, .pp = 5, @@ -12878,15 +12272,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ESPER_WING] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 80, - .accuracy = 100, - #else - .power = 75, - .accuracy = 90, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 80 : 75, .type = TYPE_PSYCHIC, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 90, .criticalHitStage = 1, .pp = 10, .target = MOVE_TARGET_SELECTED, @@ -12902,12 +12291,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BITTER_MALICE] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 75, - #else - .power = 60, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 75 : 60, .type = TYPE_GHOST, .accuracy = 100, .pp = 15, @@ -12938,16 +12323,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRIPLE_ARROWS] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 90, - .pp = 10, - #else - .power = 50, - .pp = 15, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 90 : 50, .type = TYPE_FIGHTING, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 15, .criticalHitStage = 1, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -13002,16 +12382,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BLEAKWIND_STORM] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 100, - .pp = 10, - #else - .power = 95, - .pp = 5, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_FLYING, .accuracy = 80, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 5, .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -13025,16 +12400,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WILDBOLT_STORM] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 100, - .pp = 10, - #else - .power = 95, - .pp = 5, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_ELECTRIC, .accuracy = 80, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 5, .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -13048,16 +12418,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SANDSEAR_STORM] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 100, - .pp = 10, - #else - .power = 95, - .pp = 5, - #endif .effect = EFFECT_HIT, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 100 : 95, .type = TYPE_GROUND, .accuracy = 80, + .pp = B_UPDATED_MOVE_DATA >= GEN_9 ? 10 : 5, .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, From 9a632b11c6da0aa34d018858ab72c6d997afb232 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 13 Jan 2024 10:33:41 -0300 Subject: [PATCH 2/2] Updated Sky Attack with pre-gen 3 config --- src/data/battle_moves.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 8faba08fa499..05cb1cd3ec67 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -2278,20 +2278,22 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_FLYING, - .criticalHitStage = 1, .accuracy = 90, .pp = 5, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + .criticalHitStage = B_UPDATED_MOVE_DATA >= GEN_3 ? 1 : 0, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, + #if B_UPDATED_MOVE_DATA >= GEN_3 .additionalEffects = ADDITIONAL_EFFECTS({ .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + #endif }, [MOVE_TRANSFORM] =