From 76b4e08e5e9a93b279186b9570e97bdfa10c9751 Mon Sep 17 00:00:00 2001 From: Nephrite Date: Tue, 26 Dec 2023 10:46:11 +0900 Subject: [PATCH] Trapping moves, Secret Power, rampage moves Also tidied up a lot of #ifs and commas in battle_moves.h --- asm/macros/battle_script.inc | 2 +- data/battle_scripts_1.s | 18 +- include/battle_util.h | 2 +- include/constants/battle.h | 3 +- src/battle_script_commands.c | 25 +- src/battle_util.c | 9 +- src/data/battle_moves.h | 433 ++++++++++++++--------------------- 7 files changed, 196 insertions(+), 296 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 6b7704acec..b6a5decdff 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1177,7 +1177,7 @@ .4byte \jumpInstr .endm - .macro getsecretpowereffect + .macro unused_0xe4 .byte 0xe4 .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 45d66fe1e6..b535a2e269 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -194,7 +194,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectGrudge @ EFFECT_GRUDGE .4byte BattleScript_EffectSnatch @ EFFECT_SNATCH .4byte BattleScript_EffectHit @ EFFECT_LOW_KICK - .4byte BattleScript_EffectSecretPower @ EFFECT_SECRET_POWER + .4byte BattleScript_EffectHit @ EFFECT_SECRET_POWER .4byte BattleScript_EffectTeeterDance @ EFFECT_TEETER_DANCE .4byte BattleScript_EffectHitEscape @ EFFECT_HIT_ESCAPE .4byte BattleScript_EffectMudSport @ EFFECT_MUD_SPORT @@ -1073,15 +1073,15 @@ BattleScript_FlingFailConsumeItem:: goto BattleScript_FailedFromAtkString BattleScript_FlingFlameOrb: - setmoveeffect MOVE_EFFECT_BURN + setmoveeffect MOVE_EFFECT_BURN | MOVE_EFFECT_CERTAIN seteffectprimary goto BattleScript_FlingEnd BattleScript_FlingFlinch: - setmoveeffect MOVE_EFFECT_FLINCH + setmoveeffect MOVE_EFFECT_FLINCH | MOVE_EFFECT_CERTAIN seteffectprimary goto BattleScript_FlingEnd BattleScript_FlingLightBall: - setmoveeffect MOVE_EFFECT_PARALYSIS + setmoveeffect MOVE_EFFECT_PARALYSIS | MOVE_EFFECT_CERTAIN seteffectprimary goto BattleScript_FlingEnd BattleScript_FlingMentalHerb: @@ -1095,11 +1095,11 @@ BattleScript_FlingMentalHerb: restoretarget goto BattleScript_FlingEnd BattleScript_FlingPoisonBarb: - setmoveeffect MOVE_EFFECT_POISON + setmoveeffect MOVE_EFFECT_POISON | MOVE_EFFECT_CERTAIN seteffectprimary goto BattleScript_FlingEnd BattleScript_FlingToxicOrb: - setmoveeffect MOVE_EFFECT_TOXIC + setmoveeffect MOVE_EFFECT_TOXIC | MOVE_EFFECT_CERTAIN seteffectprimary goto BattleScript_FlingEnd BattleScript_FlingWhiteHerb: @@ -1118,7 +1118,6 @@ BattleScript_FlingMissed: BattleScript_EffectShellSideArm: shellsidearmcheck - setmoveeffect MOVE_EFFECT_POISON goto BattleScript_EffectHit BattleScript_EffectPhotonGeyser: @@ -5369,7 +5368,6 @@ BattleScript_NotAffectedAbilityPopUp:: BattleScript_EffectUproar:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - setmoveeffect MOVE_EFFECT_UPROAR | MOVE_EFFECT_AFFECTS_USER attackstring jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit ppreduce @@ -5915,10 +5913,6 @@ BattleScript_EffectSnatch: waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd -BattleScript_EffectSecretPower:: - getsecretpowereffect - goto BattleScript_EffectHit - BattleScript_EffectRecoilHP25: setmoveeffect MOVE_EFFECT_RECOIL_HP_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit diff --git a/include/battle_util.h b/include/battle_util.h index f275bdba67..9f23c934af 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -252,7 +252,7 @@ void RemoveConfusionStatus(u32 battler); u8 GetBattlerGender(u32 battler); bool32 AreBattlersOfOppositeGender(u32 battler1, u32 battler2); bool32 AreBattlersOfSameGender(u32 battler1, u32 battler2); -u32 CalcSecondaryEffectChance(u32 battler, u8 secondaryEffectChance, u16 moveEffect); +u32 CalcSecondaryEffectChance(u32 battler, const struct AdditionalEffect *additionalEffect); u8 GetBattlerType(u32 battler, u8 typeIndex); bool8 CanMonParticipateInSkyBattle(struct Pokemon *mon); bool8 IsMonBannedFromSkyBattles(u16 species); diff --git a/include/constants/battle.h b/include/constants/battle.h index 17f221a92f..8dc0a92843 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -393,8 +393,9 @@ #define MOVE_EFFECT_SPIKES 76 #define MOVE_EFFECT_SYRUP_BOMB 77 #define MOVE_EFFECT_FLORAL_HEALING 78 +#define MOVE_EFFECT_SECRET_POWER 79 -#define NUM_MOVE_EFFECTS 79 +#define NUM_MOVE_EFFECTS 80 #define MOVE_EFFECT_AFFECTS_USER 0x2000 #define MOVE_EFFECT_CERTAIN 0x4000 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e08a948607..675c556e0a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -584,7 +584,7 @@ static void Cmd_trysetsnatch(void); static void Cmd_unused2(void); static void Cmd_switchoutabilities(void); static void Cmd_jumpifhasnohp(void); -static void Cmd_getsecretpowereffect(void); +static void Cmd_unused0xe4(void); static void Cmd_pickup(void); static void Cmd_unused3(void); static void Cmd_unused4(void); @@ -843,7 +843,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = Cmd_unused2, //0xE1 Cmd_switchoutabilities, //0xE2 Cmd_jumpifhasnohp, //0xE3 - Cmd_getsecretpowereffect, //0xE4 + Cmd_unused0xe4, //0xE4 Cmd_pickup, //0xE5 Cmd_unused3, //0xE6 Cmd_unused4, //0xE7 @@ -3662,7 +3662,7 @@ void SetMoveEffect(bool32 primary, u32 certain) { static const u8 sDireClawEffects[] = { MOVE_EFFECT_POISON, MOVE_EFFECT_PARALYSIS, MOVE_EFFECT_SLEEP }; gBattleScripting.moveEffect = RandomElement(RNG_DIRE_CLAW, sDireClawEffects); - SetMoveEffect(TRUE, 0); + SetMoveEffect(FALSE, 0); } break; case MOVE_EFFECT_STEALTH_ROCK: @@ -3697,6 +3697,10 @@ void SetMoveEffect(bool32 primary, u32 certain) gBattlescriptCurrInstr = BattleScript_SyrupBombActivates; } break; + case MOVE_EFFECT_SECRET_POWER: + gBattleScripting.moveEffect = GetSecretPowerMoveEffect(); + SetMoveEffect(FALSE, 0); + break; } } } @@ -3712,7 +3716,7 @@ static void Cmd_seteffectwithchance(void) { if (gBattleScripting.moveEffect &= ~(MOVE_EFFECT_CONTINUE)) { - u32 percentChance = CalcSecondaryEffectChance(gBattlerAttacker, gBattleMoves[gCurrentMove].secondaryEffectChance, gCurrentMove); + u32 percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance; // CalcSecondaryEffectChance(gBattlerAttacker, gBattleMoves[gCurrentMove].secondaryEffectChance, gCurrentMove); if (gBattleScripting.moveEffect & MOVE_EFFECT_CERTAIN || percentChance >= 100) { @@ -3733,8 +3737,7 @@ static void Cmd_seteffectwithchance(void) { u32 percentChance = CalcSecondaryEffectChance( gBattlerAttacker, - gBattleMoves[gCurrentMove].additionalEffects[gBattleStruct->additionalEffectsCounter].chance, - gCurrentMove + &gBattleMoves[gCurrentMove].additionalEffects[gBattleStruct->additionalEffectsCounter] ); const u8 *currentPtr = gBattlescriptCurrInstr; @@ -3746,7 +3749,7 @@ static void Cmd_seteffectwithchance(void) SetMoveEffect( percentChance == 0, // a primary effect - percentChance >= 100 // certain to happen + MOVE_EFFECT_CERTAIN * (percentChance >= 100) // certain to happen ); } @@ -11649,7 +11652,7 @@ static void Cmd_confuseifrepeatingattackends(void) CMD_ARGS(); if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE) && !gSpecialStatuses[gBattlerAttacker].dancerUsedMove) - gBattleScripting.moveEffect = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER); + gBattleScripting.moveEffect = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN); gBattlescriptCurrInstr = cmd->nextInstr; } @@ -14391,12 +14394,8 @@ static void Cmd_jumpifhasnohp(void) gBattlescriptCurrInstr = cmd->nextInstr; } -static void Cmd_getsecretpowereffect(void) +static void Cmd_unused0xe4(void) { - CMD_ARGS(); - - gBattleScripting.moveEffect = GetSecretPowerMoveEffect(); - gBattlescriptCurrInstr = cmd->nextInstr; } u16 GetSecretPowerMoveEffect(void) diff --git a/src/battle_util.c b/src/battle_util.c index 41d679a84a..e0d7650640 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -11351,17 +11351,18 @@ bool32 AreBattlersOfSameGender(u32 battler1, u32 battler2) return (gender1 != MON_GENDERLESS && gender2 != MON_GENDERLESS && gender1 == gender2); } -u32 CalcSecondaryEffectChance(u32 battler, u8 secondaryEffectChance, u16 move) +u32 CalcSecondaryEffectChance(u32 battler, const struct AdditionalEffect *additionalEffect) { bool8 hasSereneGrace = (GetBattlerAbility(battler) == ABILITY_SERENE_GRACE); bool8 hasRainbow = (gSideStatuses[GetBattlerSide(battler)] & SIDE_STATUS_RAINBOW) != 0; + u16 secondaryEffectChance = additionalEffect->chance; - if (hasRainbow && hasSereneGrace && MoveHasMoveEffect(move, MOVE_EFFECT_FLINCH, FALSE)) - return secondaryEffectChance *= 2; + if (hasRainbow && hasSereneGrace && additionalEffect->moveEffect == MOVE_EFFECT_FLINCH) + return secondaryEffectChance * 2; if (hasSereneGrace) secondaryEffectChance *= 2; - if (hasRainbow && gBattleMoves[move].effect != EFFECT_SECRET_POWER) + if (hasRainbow && additionalEffect->moveEffect != MOVE_EFFECT_SECRET_POWER) secondaryEffectChance *= 2; return secondaryEffectChance; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index c246db0ed8..345de2c102 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -113,7 +113,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_ICE_PUNCH] = @@ -149,7 +149,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 10) - ) + ), }, [MOVE_SCRATCH] = @@ -316,21 +316,19 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BIND] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 85, - #else - .accuracy = 75, - #endif .effect = EFFECT_TRAP, .power = 15, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 85 : 75, .pp = 20, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_SLAM] = @@ -384,7 +382,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .skyBattleBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_DOUBLE_KICK] = @@ -451,7 +449,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_SAND_ATTACK] = @@ -561,25 +559,23 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .skyBattleBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_WRAP] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 90, - #else - .accuracy = 85, - #endif .effect = EFFECT_TRAP, .power = 15, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 85, .pp = 20, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_TAKE_DOWN] = @@ -608,7 +604,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_RAMPAGE, .type = TYPE_NORMAL, .accuracy = 100, - .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -657,7 +652,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 30) - ) + ), }, [MOVE_TWINEEDLE] = @@ -675,7 +670,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .strikeCount = 2, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 20) - ) + ), }, [MOVE_PIN_MISSILE] = @@ -724,7 +719,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .bitingMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_GROWL] = @@ -866,7 +861,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_FLAMETHROWER] = @@ -886,7 +881,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_MIST] = @@ -1011,7 +1006,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 10) - ) + ), }, [MOVE_BUBBLE_BEAM] = @@ -1327,7 +1322,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_RAMPAGE, .type = TYPE_GRASS, .accuracy = 100, - .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -1369,21 +1363,18 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FIRE_SPIN] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 35, - .accuracy = 85, - #else - .power = 15, - .accuracy = 70, - #endif .effect = EFFECT_TRAP, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_FIRE, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 85 : 70, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_THUNDER_SHOCK] = @@ -1399,7 +1390,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 10) - ) + ), }, [MOVE_THUNDERBOLT] = @@ -1419,7 +1410,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 10) - ) + ), }, [MOVE_THUNDER_WAVE] = @@ -1526,16 +1517,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TOXIC] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 90, - #else - .accuracy = 85, - #endif .effect = EFFECT_TOXIC, .power = 0, .type = TYPE_POISON, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 85, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -1556,7 +1542,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 10) - ) + ), }, [MOVE_PSYCHIC] = @@ -2036,7 +2022,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_SMOG] = @@ -2056,7 +2042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 40) - ) + ), }, [MOVE_SLUDGE] = @@ -2072,7 +2058,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 30) - ) + ), }, [MOVE_BONE_CLUB] = @@ -2088,7 +2074,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 10) - ) + ), }, [MOVE_FIRE_BLAST] = @@ -2108,7 +2094,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_WATERFALL] = @@ -2126,28 +2112,25 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 20) - ) + ), #endif }, [MOVE_CLAMP] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .accuracy = 85, - .pp = 15, - #else - .accuracy = 75, - .pp = 10, - #endif .effect = EFFECT_TRAP, .power = 35, .type = TYPE_WATER, - .secondaryEffectChance = 100, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 85 : 75, + .pp = B_UPDATED_MOVE_DATA >= GEN_5 ? 15 : 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_SWIFT] = @@ -2462,7 +2445,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 20) - ) + ), }, [MOVE_SPORE] = @@ -2645,7 +2628,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_HYPER_FANG] = @@ -2663,7 +2646,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .bitingMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 10) - ) + ), }, [MOVE_SHARPEN] = @@ -3187,7 +3170,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ballisticMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 30) - ) + ), }, [MOVE_MUD_SLAP] = @@ -3259,7 +3242,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ballisticMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 100) - ) + ), }, [MOVE_FORESIGHT] = @@ -3405,7 +3388,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_RAMPAGE, .type = TYPE_DRAGON, .accuracy = 100, - .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -3522,16 +3504,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SWAGGER] = { - #if B_UPDATED_MOVE_DATA >= GEN_7 - .accuracy = 85, - #else - .accuracy = 90, - #endif .effect = EFFECT_SWAGGER, .power = 0, .type = TYPE_NORMAL, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_7 ? 85 : 90, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -3574,7 +3551,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_FURY_CUTTER] = @@ -3766,7 +3743,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .thawsUser = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 50) - ) + ), }, [MOVE_MAGNITUDE] = @@ -3798,7 +3775,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 100) - ) + ), }, [MOVE_MEGAHORN] = @@ -3828,7 +3805,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_BATON_PASS] = @@ -4054,7 +4031,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .windMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 20) - ) + ), }, [MOVE_RAIN_DANCE] = @@ -4242,21 +4219,18 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WHIRLPOOL] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 35, - .accuracy = 85, - #else - .power = 15, - .accuracy = 70, - #endif .effect = EFFECT_TRAP, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_WATER, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 85 : 70, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_BEAT_UP] = @@ -4301,16 +4275,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_UPROAR] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 90, - #else - .power = 50, - #endif .effect = EFFECT_UPROAR, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 90 : 50, .type = TYPE_NORMAL, .accuracy = 100, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, @@ -4318,6 +4287,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .soundMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT_SELF(MOVE_EFFECT_UPROAR) + ), }, [MOVE_STOCKPILE] = @@ -4392,7 +4364,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .windMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_HAIL] = @@ -4925,21 +4897,19 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_NORMAL, .accuracy = 100, .pp = 20, - .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, + ADDITIONAL_EFFECTS( + SECONDARY_EFFECT(MOVE_EFFECT_SECRET_POWER, 30) + ), }, [MOVE_DIVE] = { - #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_WATER, .accuracy = 100, .pp = 10, @@ -5081,7 +5051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_MUD_SPORT] = @@ -5131,7 +5101,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_SLACK_OFF] = @@ -5272,7 +5242,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_WEATHER_BALL] = @@ -5498,7 +5468,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 10) - ) + ), }, [MOVE_SHADOW_PUNCH] = @@ -5533,7 +5503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 10) - ) + ), }, [MOVE_SKY_UPPERCUT] = @@ -5553,20 +5523,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SAND_TOMB] = { - #if B_UPDATED_MOVE_DATA >= GEN_5 - .power = 35, - .accuracy = 85, - #else - .power = 15, - .accuracy = 70, - #endif .effect = EFFECT_TRAP, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 35 : 15, .type = TYPE_GROUND, + .accuracy = B_UPDATED_MOVE_DATA >= GEN_5 ? 85 : 70, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_SHEER_COLD] = @@ -5799,33 +5766,20 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 10) - ) + ), }, [MOVE_COVET] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .power = 60, - .pp = 25, - .makesContact = TRUE, - #elif B_UPDATED_MOVE_DATA == GEN_5 - .power = 60, - .pp = 40, - .makesContact = TRUE, - #elif B_UPDATED_MOVE_DATA == GEN_4 - .power = 40, - .pp = 40, - .makesContact = TRUE, - #else - .power = 40, - .pp = 40, - #endif .effect = EFFECT_THIEF, + .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 60 : 40, .type = TYPE_NORMAL, .accuracy = 100, + .pp = B_UPDATED_MOVE_DATA >= GEN_6 ? 25 : 40, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, + .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .meFirstBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -5837,21 +5791,22 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { - #if B_UPDATED_MOVE_DATA >= GEN_4 - .argument = STATUS1_PARALYSIS, - #endif .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_ELECTRIC, .accuracy = 100, .recoil = 33, .pp = 15, - .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, - .sheerForceBoost = TRUE, + #if B_UPDATED_MOVE_DATA >= GEN_4 + .sheerForceBoost = TRUE, + ADDITIONAL_EFFECTS( + SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 10) + ), + #endif }, [MOVE_MAGICAL_LEAF] = @@ -5977,7 +5932,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pulseMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 20) - ) + ), }, [MOVE_DOOM_DESIRE] = @@ -6322,7 +6277,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_DARK, .accuracy = 100, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -6639,7 +6593,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 100, .recoil = 33, .pp = 15, - .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -6647,6 +6600,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .sheerForceBoost = TRUE, .thawsUser = TRUE, + ADDITIONAL_EFFECTS( + SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) + ), }, [MOVE_FORCE_PALM] = @@ -6663,7 +6619,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_AURA_SPHERE] = @@ -6714,7 +6670,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 30) - ) + ), }, [MOVE_DARK_PULSE] = @@ -6731,7 +6687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pulseMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 20) - ) + ), }, [MOVE_NIGHT_SLASH] = @@ -6793,7 +6749,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .slicingMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_X_SCISSOR] = @@ -6860,7 +6816,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 20) - ) + ), }, [MOVE_POWER_GEM] = @@ -7137,7 +7093,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10), SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 10) - ) + ), }, [MOVE_SHADOW_SNEAK] = @@ -7198,7 +7154,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 20) - ) + ), }, [MOVE_MIRROR_SHOT] = @@ -7247,7 +7203,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 20) - ) + ), }, [MOVE_DEFOG] = @@ -7307,7 +7263,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_LAVA_PLUME] = @@ -7323,7 +7279,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_LEAF_STORM] = @@ -7386,7 +7342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .slicingMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 10) - ) + ), }, [MOVE_GUNK_SHOT] = @@ -7406,7 +7362,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 30) - ) + ), }, [MOVE_IRON_HEAD] = @@ -7423,7 +7379,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_MAGNET_BOMB] = @@ -7497,10 +7453,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .skyBattleBanned = TRUE, }, -#if B_UPDATED_MOVE_DATA == GEN_5 -#define CHATTER_EFFECT_CHANCE 10 -#elif B_UPDATED_MOVE_DATA >= GEN_6 +#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 @@ -7747,10 +7703,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_TRAP, .type = TYPE_FIRE, .pp = 5, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_DARK_VOID] = @@ -8005,17 +7963,19 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SMACK_DOWN] = { - .effect = EFFECT_SMACK_DOWN, + .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, .accuracy = 100, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .damagesAirborne = TRUE, .skyBattleBanned = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_SMACK_DOWN) + ), }, [MOVE_STORM_THROW] = @@ -8038,15 +7998,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLAME_BURST] = { - .effect = EFFECT_FLAME_BURST, + .effect = EFFECT_HIT, .power = 70, .type = TYPE_FIRE, .accuracy = 100, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT_SELF(MOVE_EFFECT_FLAME_BURST) + ), }, [MOVE_SLUDGE_WAVE] = @@ -8062,7 +8024,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 10) - ) + ), }, [MOVE_QUIVER_DANCE] = @@ -8394,7 +8356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .thawsUser = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_SHELL_SMASH] = @@ -8612,7 +8574,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 100) - ) + ), }, [MOVE_WATER_PLEDGE] = @@ -8833,7 +8795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_HORN_LEECH] = @@ -8933,7 +8895,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .minimizeDoubleDamage = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_COTTON_GUARD] = @@ -9057,7 +9019,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ballisticMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_TECHNO_BLAST] = @@ -9142,7 +9104,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 20) - ) + ), }, [MOVE_BLUE_FLARE] = @@ -9158,7 +9120,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 20) - ) + ), }, [MOVE_FIERY_DANCE] = @@ -9215,7 +9177,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_SNARL] = @@ -9250,7 +9212,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_V_CREATE] = @@ -9835,7 +9797,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_HYPERSPACE_HOLE] = @@ -10115,7 +10077,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 100) - ) + ), }, [MOVE_HOLD_BACK] = @@ -10138,11 +10100,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_BUG, .accuracy = 100, .pp = 20, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_POWER_UP_PUNCH] = @@ -10179,12 +10143,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_THOUSAND_ARROWS] = { - .effect = EFFECT_SMACK_DOWN, + .effect = EFFECT_HIT, .power = 90, .type = TYPE_GROUND, .accuracy = 100, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -10192,6 +10155,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoreTypeIfFlyingAndUngrounded = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_SMACK_DOWN) + ), }, [MOVE_THOUSAND_WAVES] = @@ -11191,7 +11157,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_PIKA_PAPOW] = @@ -11248,7 +11214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 100) - ) + ), }, [MOVE_SIZZLY_SLIDE] = @@ -11272,7 +11238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 100) - ) + ), }, [MOVE_GLITZY_GLOW] = @@ -11407,7 +11373,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_DYNAMAX_CANNON] = @@ -11672,13 +11638,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GRASS, .accuracy = 100, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_PYRO_BALL] = @@ -11697,7 +11665,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 10) - ) + ), }, [MOVE_BEHEMOTH_BLADE] = @@ -11862,7 +11830,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 20) - ) + ), }, [MOVE_LIFE_DEW] = @@ -12021,11 +11989,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_POISON, .accuracy = 100, .pp = 10, - .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, + ADDITIONAL_EFFECTS( + SECONDARY_EFFECT(MOVE_EFFECT_POISON, 20) + ), }, [MOVE_MISTY_EXPLOSION] = @@ -12112,7 +12082,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 100) - ) + ), }, [MOVE_LASH_OUT] = @@ -12223,7 +12193,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .thawsUser = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_JUNGLE_HEALING] = @@ -12287,11 +12257,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ELECTRIC, .accuracy = 90, .pp = 15, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + ADDITIONAL_EFFECTS( + PRIMARY_EFFECT(MOVE_EFFECT_WRAP) + ), }, [MOVE_DRAGON_ENERGY] = @@ -12515,16 +12487,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_RAGING_FURY] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 120, - #else - .power = 90, - #endif .effect = EFFECT_RAMPAGE, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 90, .type = TYPE_FIRE, .accuracy = 100, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -12533,17 +12500,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WAVE_CRASH] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 120, - #else - .power = 75, - #endif .effect = EFFECT_RECOIL, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 120 : 75, .type = TYPE_WATER, .accuracy = 100, .recoil = 33, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -12553,12 +12515,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHLOROBLAST] = { - #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 150, - #else - .power = 120, - #endif .effect = EFFECT_STEEL_BEAM, + .power = B_UPDATED_MOVE_DATA >= GEN_9 ? 150 : 120, .type = TYPE_GRASS, .accuracy = 95, .pp = 5, @@ -12580,7 +12538,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_VICTORY_DANCE] = @@ -12590,7 +12548,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIGHTING, .accuracy = 0, .pp = 20, - .secondaryEffectChance = 100, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -12634,7 +12591,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 50) - ) + ), }, [MOVE_ESPER_WING] = @@ -12686,7 +12643,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_STEEL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_USER, .priority = 0, .category = BATTLE_CATEGORY_STATUS, @@ -12715,7 +12671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_DEF_MINUS_1, 50), SECONDARY_EFFECT(MOVE_EFFECT_FLINCH, 30) - ) + ), }, [MOVE_INFERNAL_PARADE] = @@ -12731,7 +12687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_CEASELESS_EDGE] = @@ -12793,7 +12749,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .windMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 20) - ) + ), }, [MOVE_SANDSEAR_STORM] = @@ -12815,7 +12771,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .windMove = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 20) - ) + ), }, [MOVE_LUNAR_BLESSING] = @@ -12893,7 +12849,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .sheerForceBoost = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 30) - ) + ), }, [MOVE_LAST_RESPECTS] = @@ -12984,7 +12940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, ADDITIONAL_EFFECTS( PRIMARY_EFFECT_SELF(MOVE_EFFECT_SPD_MINUS_2) - ) + ), }, [MOVE_POPULATION_BOMB] = @@ -13090,7 +13046,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = ADDITIONAL_EFFECTS( PRIMARY_EFFECT_SELF(MOVE_EFFECT_RAPIDSPIN), SECONDARY_EFFECT(MOVE_EFFECT_POISON, 100) - ) + ), }, [MOVE_DOODLE] = @@ -13524,7 +13480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .assistBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_BURN, 30) - ) + ), }, [MOVE_WICKED_TORQUE] = @@ -13549,7 +13505,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .assistBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_SLEEP, 10) - ) + ), }, [MOVE_NOXIOUS_TORQUE] = @@ -13574,7 +13530,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .assistBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_POISON, 30) - ) + ), }, [MOVE_COMBAT_TORQUE] = @@ -13599,7 +13555,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .assistBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 30) - ) + ), }, [MOVE_MAGICAL_TORQUE] = @@ -13624,7 +13580,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .assistBanned = TRUE, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_CONFUSION, 30) - ) + ), }, [MOVE_PSYBLADE] = @@ -13952,7 +13908,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .category = BATTLE_CATEGORY_SPECIAL, ADDITIONAL_EFFECTS( SECONDARY_EFFECT(MOVE_EFFECT_PARALYSIS, 100) - ) + ), }, [MOVE_EXTREME_EVOBOOST] = { @@ -14136,7 +14092,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIRE, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14150,7 +14105,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_BUG, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14164,7 +14118,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ELECTRIC, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14178,7 +14131,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14192,7 +14144,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIGHTING, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14206,7 +14157,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GHOST, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14220,7 +14170,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ICE, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14234,7 +14183,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_POISON, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14248,7 +14196,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_WATER, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14262,7 +14209,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FLYING, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14276,7 +14222,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FAIRY, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14290,7 +14235,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_DRAGON, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14304,7 +14248,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_PSYCHIC, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14318,7 +14261,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ROCK, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14332,7 +14274,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GROUND, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14347,7 +14288,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_DARK, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14361,7 +14301,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GRASS, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14375,7 +14314,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_STEEL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14389,7 +14327,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GRASS, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14403,7 +14340,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIRE, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14417,7 +14353,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_WATER, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14431,7 +14366,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_BUG, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14445,7 +14379,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ELECTRIC, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14459,7 +14392,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14473,7 +14405,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIGHTING, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14487,7 +14418,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GHOST, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14501,7 +14431,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_WATER, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14515,7 +14444,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ICE, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14529,7 +14457,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14543,7 +14470,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14557,7 +14483,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_POISON, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14571,7 +14496,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_STEEL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14585,7 +14509,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GRASS, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14600,7 +14523,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIRE, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14615,7 +14537,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_WATER, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14630,7 +14551,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FLYING, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14644,7 +14564,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_PSYCHIC, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14658,7 +14577,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_WATER, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14672,7 +14590,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ROCK, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14686,7 +14603,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GRASS, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14700,7 +14616,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GRASS, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14714,7 +14629,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GROUND, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14728,7 +14642,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ELECTRIC, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14742,7 +14655,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FIRE, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14756,7 +14668,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FAIRY, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14771,7 +14682,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_DARK, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14785,7 +14695,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FAIRY, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14799,7 +14708,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_STEEL, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14813,7 +14721,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_DRAGON, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14827,7 +14734,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_DARK, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, @@ -14841,7 +14747,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_WATER, .accuracy = 0, .pp = 10, - .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL,