From 21d90d01ca93d9c76c4af55731c8cf16a8fbc4c4 Mon Sep 17 00:00:00 2001 From: Kasenn <115586266+Kasenn@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:01:57 +0200 Subject: [PATCH] Revert "Remove redundant AI score increases (#3504)" This reverts commit 8ed54609c30c5517c405e230f3485e9106974497. --- data/battle_scripts_1.s | 2 +- include/battle_ai_util.h | 1 + include/constants/battle_move_effects.h | 2 +- src/battle_ai_main.c | 124 +- src/battle_ai_util.c | 1 + src/battle_script_commands.c | 2 +- src/battle_tv.c | 2 +- src/battle_util.c | 2 +- src/data/battle_moves.h | 1425 +---------------------- test/battle/ai_check_viability.c | 145 --- 10 files changed, 166 insertions(+), 1540 deletions(-) delete mode 100644 test/battle/ai_check_viability.c diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 70ae5576f243..bb9ef9a7b7b8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -188,7 +188,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectMemento @ EFFECT_MEMENTO .4byte BattleScript_EffectHit @ EFFECT_FACADE .4byte BattleScript_EffectFocusPunch @ EFFECT_FOCUS_PUNCH - .4byte BattleScript_EffectSmellingsalt @ EFFECT_SMELLING_SALTS + .4byte BattleScript_EffectSmellingsalt @ EFFECT_SMELLINGSALT .4byte BattleScript_EffectFollowMe @ EFFECT_FOLLOW_ME .4byte BattleScript_EffectNaturePower @ EFFECT_NATURE_POWER .4byte BattleScript_EffectCharge @ EFFECT_CHARGE diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h index 8977ec2d93ac..37e9c509da59 100644 --- a/include/battle_ai_util.h +++ b/include/battle_ai_util.h @@ -128,6 +128,7 @@ bool32 ShouldFakeOut(u32 battlerAtk, u32 battlerDef, u32 move); bool32 HasThawingMove(u32 battler); bool32 IsStatRaisingEffect(u32 effect); bool32 IsStatLoweringEffect(u32 effect); +bool32 IsStatRaisingEffect(u32 effect); bool32 IsAttackBoostMoveEffect(u32 effect); bool32 IsUngroundingEffect(u32 effect); bool32 IsSemiInvulnerable(u32 battlerDef, u32 move); diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 77301669202d..90d14d58fb7e 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -167,7 +167,7 @@ #define EFFECT_MEMENTO 163 #define EFFECT_FACADE 164 #define EFFECT_FOCUS_PUNCH 165 -#define EFFECT_SMELLING_SALTS 166 +#define EFFECT_SMELLINGSALT 166 #define EFFECT_FOLLOW_ME 167 #define EFFECT_NATURE_POWER 168 #define EFFECT_CHARGE 169 diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 87691a4fdae4..d252fea400f2 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -1691,6 +1691,10 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (gDisableStructs[battlerAtk].stockpileCounter >= 3) ADJUST_SCORE(-10); break; + case EFFECT_SPIT_UP: + if (gDisableStructs[battlerAtk].stockpileCounter <= 1) + ADJUST_SCORE(-10); + break; case EFFECT_SWALLOW: if (gDisableStructs[battlerAtk].stockpileCounter == 0) { @@ -3309,16 +3313,63 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score // check thawing moves if ((gBattleMons[battlerAtk].status1 & (STATUS1_FREEZE | STATUS1_FROSTBITE)) && gBattleMoves[move].thawsUser) - ADJUST_SCORE(10); + score += (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) ? 20 : 10; + + // check burn + if (gBattleMons[battlerAtk].status1 & STATUS1_BURN) + { + switch (aiData->abilities[battlerAtk]) + { + case ABILITY_GUTS: + break; + case ABILITY_NATURAL_CURE: + if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING + && HasOnlyMovesWithSplit(battlerAtk, SPLIT_PHYSICAL, TRUE)) + score = 90; // Force switch if all your attacking moves are physical and you have Natural Cure. + break; + default: + if (IS_MOVE_PHYSICAL(move) && gBattleMoves[move].effect != EFFECT_FACADE) + ADJUST_SCORE(-2); + break; + } + } - // check burn / frostbite - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING && AI_DATA->abilities[battlerAtk] == ABILITY_NATURAL_CURE) + // check frostbite + if (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE) { - if ((gBattleMons[battlerAtk].status1 & STATUS1_BURN && HasOnlyMovesWithSplit(battlerAtk, SPLIT_PHYSICAL, TRUE)) - || (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE && HasOnlyMovesWithSplit(battlerAtk, SPLIT_SPECIAL, TRUE))) - ADJUST_SCORE(-20); // Force switch if all your attacking moves are physical and you have Natural Cure. + switch (aiData->abilities[battlerAtk]) + { + case ABILITY_GUTS: + break; + case ABILITY_NATURAL_CURE: + if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING + && HasOnlyMovesWithSplit(battlerAtk, SPLIT_SPECIAL, TRUE)) + score = 90; // Force switch if all your attacking moves are special and you have Natural Cure. + break; + default: + if (IS_MOVE_SPECIAL(move) && gBattleMoves[move].effect != EFFECT_FACADE) + ADJUST_SCORE(-2); + break; + } } + // attacker ability checks + switch (aiData->abilities[battlerAtk]) + { + case ABILITY_MOXIE: + case ABILITY_BEAST_BOOST: + case ABILITY_CHILLING_NEIGH: + case ABILITY_GRIM_NEIGH: + case ABILITY_AS_ONE_ICE_RIDER: + case ABILITY_AS_ONE_SHADOW_RIDER: + if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) // Attacker should go first + { + if (CanIndexMoveFaintTarget(battlerAtk, battlerDef, movesetIndex, 0)) + ADJUST_SCORE(8); // prioritize killing target for stat boost + } + break; + } // ability checks + // move effect checks switch (moveEffect) { @@ -3330,8 +3381,11 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score IncreaseSleepScore(battlerAtk, battlerDef, move, &score); break; case EFFECT_ABSORB: - if (aiData->holdEffects[battlerAtk] == HOLD_EFFECT_BIG_ROOT && effectiveness >= AI_EFFECTIVENESS_x1) - ADJUST_SCORE(2); + if (aiData->holdEffects[battlerAtk] == HOLD_EFFECT_BIG_ROOT) + ADJUST_SCORE(1); + if (effectiveness <= AI_EFFECTIVENESS_x0_5 && AI_RandLessThan(50)) + ADJUST_SCORE(-3); + break; case EFFECT_EXPLOSION: case EFFECT_MEMENTO: if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_WILL_SUICIDE && gBattleMons[battlerDef].statStages[STAT_EVASION] < 7) @@ -3545,6 +3599,11 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score if (aiData->hpPercents[battlerAtk] < 90) ADJUST_SCORE(-2); break; + case EFFECT_DREAM_EATER: + if (!(gBattleMons[battlerDef].status1 & STATUS1_SLEEP)) + break; + ADJUST_SCORE(1); // if target is asleep, dream eater is a pretty good move even without draining + // fallthrough case EFFECT_ACUPRESSURE: break; case EFFECT_ATTACK_ACCURACY_UP: // hone claws @@ -3693,12 +3752,20 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score || HasHighCritRatioMove(battlerAtk)) ADJUST_SCORE(2); break; + case EFFECT_CONFUSE_HIT: + if (sereneGraceBoost) + ADJUST_SCORE(1); + //fallthrough case EFFECT_CONFUSE: IncreaseConfusionScore(battlerAtk, battlerDef, move, &score); break; case EFFECT_PARALYZE: IncreaseParalyzeScore(battlerAtk, battlerDef, move, &score); break; + case EFFECT_GRAV_APPLE: + if (gFieldStatuses & STATUS_FIELD_GRAVITY) + ADJUST_SCORE(2); + // fall through case EFFECT_ATTACK_DOWN_HIT: case EFFECT_DEFENSE_DOWN_HIT: case EFFECT_SPECIAL_ATTACK_DOWN_HIT: @@ -4201,6 +4268,14 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score IncreaseStatUpScore(battlerAtk, battlerDef, STAT_DEF, &score); IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPDEF, &score); break; + case EFFECT_SPIT_UP: + if (gDisableStructs[battlerAtk].stockpileCounter >= 2) + ADJUST_SCORE(1); + break; + case EFFECT_ROLLOUT: + if (gBattleMons[battlerAtk].status2 & STATUS2_DEFENSE_CURL) + ADJUST_SCORE(8); + break; case EFFECT_SWAGGER: if (HasMoveEffect(battlerAtk, EFFECT_FOUL_PLAY) || HasMoveEffect(battlerAtk, EFFECT_PSYCH_UP) @@ -4696,8 +4771,11 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(2); break; case EFFECT_PLEDGE: - if (isDoubleBattle && HasMoveEffect(BATTLE_PARTNER(battlerAtk), EFFECT_PLEDGE)) - ADJUST_SCORE(3); // Partner might use pledge move + if (isDoubleBattle) + { + if (HasMoveEffect(BATTLE_PARTNER(battlerAtk), EFFECT_PLEDGE)) + ADJUST_SCORE(3); // Partner might use pledge move + } break; case EFFECT_TRICK_ROOM: if (!(gFieldStatuses & STATUS_FIELD_TRICK_ROOM) && GetBattlerSideSpeedAverage(battlerAtk) < GetBattlerSideSpeedAverage(battlerDef)) @@ -4900,6 +4978,15 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(3); } break; + case EFFECT_FLAIL: + if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER) // Ai goes first + { + if (aiData->hpPercents[battlerAtk] < 20) + ADJUST_SCORE(1); + else if (aiData->hpPercents[battlerAtk] < 8) + ADJUST_SCORE(2); + } + break; case EFFECT_SHORE_UP: if ((AI_GetWeather(aiData) & B_WEATHER_SANDSTORM) && ShouldRecover(battlerAtk, battlerDef, move, 67)) @@ -4907,6 +4994,10 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score else if (ShouldRecover(battlerAtk, battlerDef, move, 50)) ADJUST_SCORE(2); break; + case EFFECT_FACADE: + if (gBattleMons[battlerAtk].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON | STATUS1_FROSTBITE)) + ADJUST_SCORE(1); + break; case EFFECT_FOCUS_PUNCH: if (!isDoubleBattle && effectiveness > AI_EFFECTIVENESS_x0_5) { @@ -4916,6 +5007,19 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(1); } break; + case EFFECT_SMELLINGSALT: + if (gBattleMons[battlerDef].status1 & STATUS1_PARALYSIS) + ADJUST_SCORE(2); + break; + case EFFECT_WAKE_UP_SLAP: + if (gBattleMons[battlerDef].status1 & STATUS1_SLEEP) + ADJUST_SCORE(2); + break; + case EFFECT_REVENGE: + if (!(gBattleMons[battlerDef].status1 & STATUS1_SLEEP) + && !(gBattleMons[battlerDef].status2 & (STATUS2_INFATUATION | STATUS2_CONFUSION))) + ADJUST_SCORE(2); + break; case EFFECT_ENDEAVOR: if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_SLOWER) // Opponent faster { diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index d6e25d6ed21c..300c15453f1d 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -373,6 +373,7 @@ static const u16 sIgnoredPowerfulMoveEffects[] = EFFECT_RECHARGE, EFFECT_SKULL_BASH, EFFECT_SOLAR_BEAM, + EFFECT_SPIT_UP, EFFECT_FOCUS_PUNCH, EFFECT_SUPERPOWER, EFFECT_ERUPTION, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index efc2c38c25d3..2ad2f107a15f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -981,7 +981,7 @@ static const u16 sFinalStrikeOnlyEffects[] = EFFECT_SECRET_POWER, EFFECT_SMACK_DOWN, EFFECT_SPARKLING_ARIA, - EFFECT_SMELLING_SALTS, + EFFECT_SMELLINGSALT, EFFECT_WAKE_UP_SLAP, EFFECT_HIT_ESCAPE, EFFECT_RECOIL_HP_25, diff --git a/src/battle_tv.c b/src/battle_tv.c index af485df70d27..361b6fa2b9e3 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -253,7 +253,7 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] = [EFFECT_MEMENTO] = 7, [EFFECT_FACADE] = 1, [EFFECT_FOCUS_PUNCH] = 7, - [EFFECT_SMELLING_SALTS] = 1, + [EFFECT_SMELLINGSALT] = 1, [EFFECT_FOLLOW_ME] = 5, [EFFECT_NATURE_POWER] = 0, [EFFECT_CHARGE] = 4, diff --git a/src/battle_util.c b/src/battle_util.c index ee98dcfaef5c..d839c8877b3a 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8625,7 +8625,7 @@ static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u3 if (gBattleMons[battlerDef].status1 & STATUS1_SLEEP || abilityDef == ABILITY_COMATOSE) basePower *= 2; break; - case EFFECT_SMELLING_SALTS: + case EFFECT_SMELLINGSALT: if (gBattleMons[battlerDef].status1 & STATUS1_PARALYSIS) basePower *= 2; break; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 543c21e1d590..64eb7cf6ae4f 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -1,4 +1,4 @@ -const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = +const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = { [MOVE_NONE] = { @@ -11,8 +11,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, + .mimicBanned = TRUE, .metronomeBanned = TRUE, - .mirrorMoveBanned = TRUE, + .copycatBanned = TRUE, + .sleepTalkBanned = TRUE, + .instructBanned = TRUE, }, [MOVE_POUND] = @@ -221,10 +224,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .highCritRatio = TRUE, - .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_SWORDS_DANCE] = @@ -313,10 +314,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .windMove = TRUE, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, - .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_FLY] = @@ -335,12 +334,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_BIND] = @@ -658,7 +655,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .instructBanned = TRUE, }, [MOVE_DOUBLE_EDGE] = @@ -788,7 +784,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_DEF_UP_1, .magicCoatAffected = TRUE, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, [MOVE_ROAR] = @@ -808,11 +803,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .soundMove = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SING] = @@ -827,7 +820,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, }, @@ -844,7 +836,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, }, @@ -881,7 +872,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -950,8 +940,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1117,6 +1105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, + .instructBanned = TRUE, }, [MOVE_PECK] = @@ -1196,11 +1185,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, + .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .meFirstBanned = TRUE, .metronomeBanned = TRUE, // B_UPDATED_MOVE_FLAGS >= GEN_2 .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SEISMIC_TOSS] = @@ -1250,7 +1239,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_MEGA_DRAIN] = @@ -1270,7 +1258,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_LEECH_SEED] = @@ -1308,8 +1295,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1341,7 +1326,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, }, @@ -1416,7 +1400,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .danceMove = TRUE, - .instructBanned = TRUE, }, [MOVE_STRING_SHOT] = @@ -1607,11 +1590,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_TOXIC] = @@ -1690,8 +1671,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1707,8 +1686,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1754,8 +1731,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = -6, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_NIGHT_SHADE] = @@ -1784,14 +1759,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ACC_UP_1, - .ignoresSubstitute = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, // B_UPDATED_MOVE_FLAGS >= GEN_2 .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SCREECH] = @@ -1806,7 +1778,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, }, @@ -1823,8 +1794,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1846,9 +1815,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, .snatchAffected = TRUE, }, @@ -1864,8 +1830,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1885,8 +1849,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1932,8 +1894,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1949,8 +1909,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ACC_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1970,8 +1928,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -1987,8 +1943,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -2004,9 +1958,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_REFLECT] = @@ -2021,8 +1972,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -2038,9 +1987,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ACC_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, + .sleepTalkBanned = TRUE, }, [MOVE_BIDE] = @@ -2063,7 +2011,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_METRONOME] = @@ -2078,15 +2025,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, - .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = B_UPDATED_MOVE_FLAGS >= GEN_3, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_MIRROR_MOVE] = @@ -2101,13 +2043,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_2, - .mimicBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .copycatBanned = TRUE, .sleepTalkBanned = B_UPDATED_MOVE_FLAGS >= GEN_3, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SELF_DESTRUCT] = @@ -2122,7 +2061,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .parentalBondBanned = TRUE, }, [MOVE_EGG_BOMB] = @@ -2300,7 +2238,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -2348,8 +2285,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -2384,9 +2319,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, }, @@ -2447,7 +2379,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_POISON_GAS] = @@ -2507,7 +2438,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_LOVELY_KISS] = @@ -2538,7 +2468,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_FLINCH, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -2557,13 +2486,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_5, .copycatBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_BUBBLE] = @@ -2667,8 +2593,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_3, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, }, @@ -2689,8 +2613,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_CRABHAMMER] = @@ -2729,7 +2651,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .parentalBondBanned = TRUE, }, [MOVE_FURY_SWIPES] = @@ -2779,9 +2700,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, }, [MOVE_ROCK_SLIDE] = @@ -2829,8 +2747,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_CONVERSION] = @@ -2846,8 +2762,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TRI_ATTACK] = @@ -2911,8 +2825,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_STRUGGLE] = @@ -2937,11 +2849,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, - .sleepTalkBanned = TRUE, .copycatBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SKETCH] = @@ -2957,15 +2866,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = B_UPDATED_MOVE_FLAGS >= GEN_5, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_TRIPLE_KICK] = @@ -3006,7 +2911,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .meFirstBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SPIDER_WEB] = @@ -3095,7 +2999,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .sheerForceBoost = TRUE, .soundMove = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -3118,8 +3021,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_CURSE, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_FLAIL] = @@ -3150,8 +3051,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_AEROBLAST] = @@ -3221,7 +3120,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresSubstitute = TRUE, }, [MOVE_POWDER_SNOW] = @@ -3262,7 +3160,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .protectionMove = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_MACH_PUNCH] = @@ -3349,8 +3246,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SLUDGE_BOMB] = @@ -3412,10 +3307,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .forcePressure = TRUE, }, [MOVE_ZAP_CANNON] = @@ -3455,7 +3347,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_BOOST_CRITS, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresSubstitute = TRUE, }, [MOVE_DESTINY_BOND] = @@ -3470,12 +3361,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_FOLLOW_ME, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_PERISH_SONG] = @@ -3491,8 +3378,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .ignoresProtect = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, - .mirrorMoveBanned = TRUE, .soundMove = TRUE, }, @@ -3528,12 +3413,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_EVSN_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_BONE_RUSH] = @@ -3608,8 +3490,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .windMove = TRUE, }, @@ -3634,7 +3514,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_ENDURE] = @@ -3653,12 +3532,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_CHARM] = @@ -3694,7 +3570,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .instructBanned = TRUE, - .parentalBondBanned = TRUE, }, [MOVE_FALSE_SWIPE] = @@ -3747,10 +3622,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SPARK] = @@ -3836,7 +3708,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .magicCoatAffected = TRUE, - .ignoresSubstitute = TRUE, }, [MOVE_SLEEP_TALK] = @@ -3851,15 +3722,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_BOOST_CRITS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .mimicBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_HEAL_BELL] = @@ -3870,14 +3736,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, + .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .soundMove = B_UPDATED_MOVE_FLAGS != GEN_5, }, @@ -3939,8 +3802,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_PAIN_SPLIT] = @@ -4048,8 +3909,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ENCORE] = @@ -4065,8 +3924,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .encoreBanned = TRUE, - .ignoresSubstitute = TRUE, }, [MOVE_PURSUIT] = @@ -4182,10 +4039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SYNTHESIS] = @@ -4200,10 +4054,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_MOONLIGHT] = @@ -4222,15 +4073,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HIDDEN_POWER] = { - .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, + #if B_HIDDEN_POWER_DMG >= GEN_6 + .power = 60, + #else + .power = 1, + #endif .effect = EFFECT_HIDDEN_POWER, .type = TYPE_NORMAL, .accuracy = 100, @@ -4287,8 +4139,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SUNNY_DAY] = @@ -4303,8 +4153,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_CRUNCH] = @@ -4343,7 +4191,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .meFirstBanned = TRUE, .metronomeBanned = TRUE, - .assistBanned = TRUE, + .copycatBanned = TRUE, }, [MOVE_PSYCH_UP] = @@ -4359,8 +4207,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, }, @@ -4540,7 +4386,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -4563,8 +4408,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SPIT_UP] = @@ -4598,10 +4441,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HEAT_WAVE] = @@ -4636,8 +4476,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TORMENT] = @@ -4734,11 +4572,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .punchingMove = TRUE, .meFirstBanned = TRUE, - .sleepTalkBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SMELLING_SALTS] = @@ -4748,7 +4584,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .power = 60, #endif - .effect = EFFECT_SMELLING_SALTS, + .effect = EFFECT_SMELLINGSALT, .type = TYPE_NORMAL, .accuracy = 100, .pp = 10, @@ -4777,11 +4613,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_NATURE_POWER] = @@ -4800,9 +4633,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, - .mimicBanned = TRUE, }, [MOVE_CHARGE] = @@ -4818,8 +4648,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TAUNT] = @@ -4834,7 +4662,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, - .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -4854,12 +4681,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 5, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_TRICK] = @@ -4876,7 +4699,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_SPD_UP_2, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_ROLE_PLAY] = @@ -4892,8 +4714,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_WISH] = @@ -4908,10 +4728,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .healBlockBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ASSIST] = @@ -4926,15 +4743,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, - .mimicBanned = TRUE, }, [MOVE_INGRAIN] = @@ -4950,8 +4762,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SUPERPOWER] = @@ -4981,8 +4791,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 4, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_2, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_RECYCLE] = @@ -4998,8 +4806,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_2, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_REVENGE] = @@ -5079,7 +4885,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .parentalBondBanned = TRUE, }, [MOVE_ERUPTION] = @@ -5108,7 +4913,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = TRUE, }, [MOVE_IMPRISON] = @@ -5124,10 +4928,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_2, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, - .forcePressure = TRUE, }, [MOVE_REFRESH] = @@ -5143,8 +4943,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_GRUDGE] = @@ -5159,9 +4957,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_FOLLOW_ME, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SNATCH] = @@ -5176,11 +4971,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 4, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_2, - .ignoresSubstitute = TRUE, - .forcePressure = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, + .instructBanned = TRUE, }, [MOVE_SECRET_POWER] = @@ -5214,11 +5007,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_ARM_THRUST] = @@ -5249,8 +5040,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_EVSN_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TAIL_GLOW] = @@ -5270,8 +5059,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_LUSTER_PURGE] = @@ -5366,8 +5153,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ICE_BALL] = @@ -5385,7 +5170,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ballisticMove = TRUE, .instructBanned = TRUE, - .parentalBondBanned = TRUE, }, [MOVE_NEEDLE_ARM] = @@ -5421,10 +5205,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HYPER_VOICE] = @@ -5440,7 +5221,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, [MOVE_POISON_FANG] = @@ -5492,6 +5272,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, + .instructBanned = TRUE, }, [MOVE_HYDRO_CANNON] = @@ -5506,6 +5287,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, + .instructBanned = TRUE, }, [MOVE_METEOR_MASH] = @@ -5570,13 +5352,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, + .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_FAKE_TEARS] = @@ -5652,7 +5432,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, - .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -5690,7 +5469,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_METAL_SOUND] = @@ -5705,7 +5483,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, }, @@ -5722,7 +5499,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, }, @@ -5755,8 +5531,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_WATER_SPOUT] = @@ -5959,8 +5733,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_BLOCK] = @@ -5996,8 +5768,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .soundMove = B_UPDATED_MOVE_FLAGS >= GEN_8, }, @@ -6043,8 +5813,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_BOUNCE] = @@ -6060,13 +5828,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_PARALYSIS, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .sheerForceBoost = TRUE, .gravityBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_MUD_SHOT] = @@ -6130,7 +5896,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .meFirstBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_VOLT_TACKLE] = @@ -6180,8 +5945,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_CALM_MIND] = @@ -6197,8 +5960,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_LEAF_BLADE] = @@ -6236,8 +5997,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_RESET_STATS, .danceMove = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ROCK_BLAST] = @@ -6340,10 +6099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_GRAVITY] = @@ -6358,8 +6114,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_MIRACLE_EYE] = @@ -6374,7 +6128,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -6442,10 +6195,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .healBlockBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_BRINE] = @@ -6496,7 +6246,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_6, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_PLUCK] = @@ -6532,8 +6281,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_BOOST_CRITS, .snatchAffected = TRUE, .windMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ACUPRESSURE] = @@ -6549,14 +6296,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_BOOST_CRITS, .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, }, [MOVE_METAL_BURST] = { .effect = EFFECT_METAL_BURST, - .power = 0, + .power = 1, .type = TYPE_STEEL, .accuracy = 100, .pp = 10, @@ -6659,7 +6405,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .parentalBondBanned = TRUE, }, [MOVE_PSYCHO_SHIFT] = @@ -6683,7 +6428,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_TRUMP_CARD] = { .effect = EFFECT_TRUMP_CARD, - .power = 0, + .power = 1, .type = TYPE_NORMAL, .accuracy = 0, .pp = 5, @@ -6737,8 +6482,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_GASTRO_ACID] = @@ -6769,8 +6512,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_EVSN_UP_1, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ME_FIRST] = @@ -6785,16 +6526,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_2, - .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, - .mirrorMoveBanned = TRUE, - .meFirstBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, - .mimicBanned = TRUE, }, [MOVE_COPYCAT] = @@ -6809,15 +6544,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ACC_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, - .mimicBanned = TRUE, }, [MOVE_POWER_SWAP] = @@ -6832,7 +6562,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = TRUE, }, [MOVE_GUARD_SWAP] = @@ -6847,7 +6576,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = TRUE, }, [MOVE_PUNISHMENT] = @@ -6930,10 +6658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .forcePressure = TRUE, }, [MOVE_HEART_SWAP] = @@ -6948,7 +6673,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_BOOST_CRITS, - .ignoresSubstitute = TRUE, }, [MOVE_AQUA_RING] = @@ -6964,8 +6688,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_MAGNET_RISE] = @@ -6981,8 +6703,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_EVSN_UP_1, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, }, @@ -7053,8 +6773,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_POISON_JAB] = @@ -7186,7 +6904,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, [MOVE_DRAGON_PULSE] = @@ -7262,7 +6979,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_VACUUM_WAVE] = @@ -7359,7 +7075,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_SPD_UP_2, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_GIGA_IMPACT] = @@ -7375,6 +7090,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, + .instructBanned = TRUE, }, [MOVE_NASTY_PLOT] = @@ -7390,8 +7106,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_BULLET_PUNCH] = @@ -7634,7 +7348,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ACC_UP_1, - //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -7650,7 +7363,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = -7, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ACC_UP_1, - .ignoresProtect = TRUE, }, [MOVE_DRACO_METEOR] = @@ -7747,6 +7459,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, + .instructBanned = TRUE, }, [MOVE_CROSS_POISON] = @@ -7814,7 +7527,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .ballisticMove = TRUE, }, [MOVE_STONE_EDGE] = @@ -7860,9 +7572,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, - .forcePressure = TRUE, }, [MOVE_GRASS_KNOT] = @@ -7901,15 +7610,14 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_6, + .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_JUDGMENT] = @@ -8015,8 +7723,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HEAL_ORDER] = @@ -8031,10 +7737,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HEAD_SMASH] = @@ -8080,6 +7783,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, + .instructBanned = TRUE, }, [MOVE_SPACIAL_REND] = @@ -8110,9 +7814,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, .danceMove = TRUE, }, @@ -8200,7 +7901,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_SHADOW_FORCE] = @@ -8217,12 +7917,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .argument = MOVE_EFFECT_FEINT, - .twoTurnMove = TRUE, .ignoresProtect = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS == GEN_6, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_HONE_CLAWS] = @@ -8238,8 +7936,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_WIDE_GUARD] = @@ -8256,8 +7952,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = TRUE, // Protects the whole side. .zMoveEffect = Z_EFFECT_DEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, }, @@ -8274,7 +7968,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .mirrorMoveBanned = TRUE, }, [MOVE_POWER_SPLIT] = @@ -8289,7 +7982,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .mirrorMoveBanned = TRUE, }, [MOVE_WONDER_ROOM] = @@ -8308,7 +8000,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, }, [MOVE_PSYSHOCK] = @@ -8352,8 +8043,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_RAGE_POWDER] = @@ -8373,11 +8062,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .powderMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_TELEKINESIS] = @@ -8412,7 +8098,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, }, [MOVE_SMACK_DOWN] = @@ -8490,10 +8175,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .danceMove = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HEAVY_SLAM] = @@ -8509,6 +8191,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, + .danceMove = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_7, }, @@ -8590,8 +8273,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_LOW_SWEEP] = @@ -8687,9 +8368,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -8705,7 +8383,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -8721,7 +8398,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -8783,8 +8459,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = TRUE, // Protects the whole side. .zMoveEffect = Z_EFFECT_DEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .protectionMove = TRUE, .metronomeBanned = TRUE, }, @@ -8805,8 +8479,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_2, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SCALD] = @@ -8838,8 +8510,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HEAL_PULSE] = @@ -8855,8 +8525,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .magicCoatAffected = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, .pulseMove = TRUE, }, @@ -8890,12 +8558,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SHIFT_GEAR] = @@ -8911,8 +8577,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_CIRCLE_THROW] = @@ -8929,7 +8593,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_INCINERATE] = @@ -8962,6 +8625,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, + .magicCoatAffected = TRUE, .metronomeBanned = TRUE, }, @@ -8992,8 +8656,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, + .snatchAffected = TRUE, }, [MOVE_RETALIATE] = @@ -9024,7 +8687,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, - .parentalBondBanned = TRUE, }, [MOVE_BESTOW] = @@ -9040,10 +8702,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_2, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, - .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_INFERNO] = @@ -9195,7 +8855,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_WORK_UP] = @@ -9211,8 +8870,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE }, [MOVE_ELECTROWEB] = @@ -9306,7 +8963,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_SACRED_SWORD] = @@ -9376,7 +9032,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - //.windMove = TRUE, }, [MOVE_STEAMROLLER] = @@ -9409,8 +9064,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_NIGHT_DAZE] = @@ -9559,7 +9212,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .argument = STATUS1_SLEEP, .sheerForceBoost = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .metronomeBanned = TRUE, }, @@ -9576,7 +9228,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .slicingMove = TRUE, .metronomeBanned = TRUE, }, @@ -9655,7 +9306,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_PARALYSIS, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .sleepTalkBanned = TRUE, @@ -9675,7 +9325,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .argument = MOVE_EFFECT_BURN, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, .sleepTalkBanned = TRUE, @@ -9695,7 +9344,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .metronomeBanned = TRUE, }, @@ -9796,11 +9444,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = TRUE, // Protects the whole side. .zMoveEffect = Z_EFFECT_DEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_BELCH] = @@ -9818,11 +9463,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, - .mimicBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_ROTOTILLER] = @@ -9838,7 +9481,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_STICKY_WEB] = @@ -9853,8 +9495,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .magicCoatAffected = TRUE, }, @@ -9890,13 +9530,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_FEINT, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .ignoresProtect = TRUE, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS == GEN_6, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_TRICK_OR_TREAT] = @@ -9912,7 +9550,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .argument = TYPE_GHOST, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, - .magicCoatAffected = TRUE, }, [MOVE_NOBLE_ROAR] = @@ -9927,7 +9564,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, }, @@ -9944,8 +9580,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_PARABOLIC_CHARGE] = @@ -9964,7 +9598,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_FORESTS_CURSE] = @@ -9980,7 +9613,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .argument = TYPE_GRASS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, - .magicCoatAffected = TRUE, }, [MOVE_PETAL_BLIZZARD] = @@ -10025,7 +9657,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10042,7 +9673,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESTORE_REPLACEMENT_HP, .magicCoatAffected = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10079,7 +9709,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = 75, // restores 75% HP instead of 50% HP .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_CRAFTY_SHIELD] = @@ -10095,8 +9724,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .argument = TRUE, // Protects the whole side. .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -10113,7 +9740,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_GRASSY_TERRAIN] = @@ -10128,8 +9754,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_MISTY_TERRAIN] = @@ -10144,8 +9768,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ELECTRIFY] = @@ -10220,7 +9842,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10236,8 +9857,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, }, [MOVE_KINGS_SHIELD] = @@ -10253,12 +9872,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .protectionMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_PLAY_NICE] = @@ -10274,7 +9890,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, .magicCoatAffected = TRUE, }, @@ -10292,7 +9907,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10346,7 +9960,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, }, @@ -10401,11 +10014,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .protectionMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_AROMATIC_MIST] = @@ -10421,8 +10031,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_2, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_EERIE_IMPULSE] = @@ -10467,7 +10075,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 1, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_2, - .powderMove = TRUE, .magicCoatAffected = TRUE, }, @@ -10483,7 +10090,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, - .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, }, @@ -10501,9 +10107,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HAPPY_HOUR] = @@ -10518,8 +10121,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_ELECTRIC_TERRAIN] = @@ -10534,8 +10135,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_DAZZLING_GLEAM] = @@ -10564,14 +10163,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, - .mimicBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_HOLD_HANDS] = @@ -10587,13 +10182,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, - .mimicBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_BABY_DOLL_EYES] = @@ -10687,7 +10279,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .zMoveEffect = Z_EFFECT_NONE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_THOUSAND_ARROWS] = @@ -10830,10 +10421,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .healBlockBanned = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_FIRST_IMPRESSION] = @@ -10864,11 +10452,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .protectionMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_SPIRIT_SHACKLE] = @@ -10916,7 +10501,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = STATUS1_BURN, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10948,8 +10532,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, + .argument = MOVE_EFFECT_FLORAL_HEALING, .magicCoatAffected = TRUE, }, @@ -10981,7 +10564,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_DEF_UP_1, .magicCoatAffected = TRUE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_SOLAR_BLADE] = @@ -10996,7 +10578,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .makesContact = TRUE, .slicingMove = TRUE, .sleepTalkBanned = TRUE, @@ -11030,10 +10611,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPDEF_UP_1, .magicCoatAffected = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_TOXIC_THREAD] = @@ -11064,8 +10643,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_GEAR_UP] = @@ -11081,9 +10658,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_THROAT_CHOP] = @@ -11145,8 +10719,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_LUNGE] = @@ -11223,7 +10795,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresSubstitute = TRUE, }, [MOVE_SMART_STRIKE] = @@ -11253,8 +10824,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, .magicCoatAffected = TRUE, }, @@ -11315,8 +10884,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPATK_UP_1, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .instructBanned = TRUE, }, @@ -11340,7 +10907,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_CLANGING_SCALES] = @@ -11355,7 +10921,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -11402,8 +10967,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_SHELL_TRAP] = @@ -11424,7 +10987,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_FLEUR_CANNON] = @@ -11531,6 +11093,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, + .instructBanned = TRUE, }, [MOVE_SPECTRAL_THIEF] = @@ -11545,7 +11108,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .ignoresSubstitute = TRUE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -11626,6 +11188,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, }, @@ -11770,7 +11333,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, - .metronomeBanned = TRUE, }, [MOVE_BOUNCY_BUBBLE] = @@ -11793,7 +11355,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, - .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, [MOVE_BUZZY_BUZZ] = @@ -11998,15 +11559,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .mimicBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, - .parentalBondBanned = TRUE, }, [MOVE_SNIPE_SHOT] = @@ -12053,8 +11609,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_NO_RETREAT] = @@ -12070,8 +11624,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TAR_SHOT] = @@ -12119,7 +11671,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .strikeCount = 2, - .parentalBondBanned = TRUE, }, [MOVE_TEATIME] = @@ -12130,13 +11681,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_ALL_BATTLERS, + .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_OCTOLOCK] = @@ -12196,7 +11745,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, }, [MOVE_CLANGOROUS_SOUL] = @@ -12212,10 +11760,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .soundMove = TRUE, - .danceMove = TRUE, .metronomeBanned = TRUE, }, @@ -12237,6 +11782,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_DECORATE] = { + .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, .effect = EFFECT_DECORATE, .power = 0, .type = TYPE_FAIRY, @@ -12247,8 +11793,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -12318,8 +11862,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .slicingMove = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .mimicBanned = TRUE, - .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_BEHEMOTH_BASH] = @@ -12337,8 +11879,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, - .mimicBanned = TRUE, - .assistBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_AURA_WHEEL] = @@ -12402,7 +11942,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .metronomeBanned = TRUE, }, @@ -12479,15 +12018,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_ALL_BATTLERS, + .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, .metronomeBanned = TRUE, }, @@ -12504,9 +12039,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .protectionMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .copycatBanned = TRUE, .instructBanned = TRUE, }, @@ -12555,6 +12089,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, + .instructBanned = TRUE, }, [MOVE_STEEL_BEAM] = @@ -12629,7 +12164,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .twoTurnMove = TRUE, .instructBanned = TRUE, }, @@ -12665,7 +12199,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_GRASSY_GLIDE] = { #if B_UPDATED_MOVE_DATA >= GEN_9 - .power = 55, + .power = 60, #else .power = 70, #endif @@ -12797,9 +12331,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_FLIP_TURN] = @@ -12877,10 +12408,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .ignoresSubstitute = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13053,7 +12580,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, [MOVE_DIRE_CLAW] = @@ -13104,11 +12630,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, -}, + }, [MOVE_STONE_AXE] = { @@ -13146,7 +12669,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, - .metronomeBanned = TRUE, }, [MOVE_MYSTICAL_POWER] = @@ -13180,6 +12702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13249,8 +12772,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .danceMove = TRUE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_HEADLONG_RUSH] = @@ -13345,8 +12866,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TRIPLE_ARROWS] = @@ -13479,9 +12998,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, - .healBlockBanned = TRUE, }, [MOVE_TAKE_HEART] = @@ -13497,8 +13013,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, }, [MOVE_TERA_BLAST] = @@ -13513,8 +13027,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .metronomeBanned = TRUE, // Only since it isn't implemented yet - .forcePressure = TRUE, }, [MOVE_SILK_TRAP] = @@ -13530,8 +13042,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, .protectionMove = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13563,7 +13073,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .metronomeBanned = TRUE, // Only since it isn't implemented yet }, [MOVE_LUMINA_CRASH] = @@ -13594,7 +13103,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13693,8 +13201,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .makesContact = TRUE, - .metronomeBanned = TRUE, // Only since it isn't implemented yet }, [MOVE_REVIVAL_BLESSING] = @@ -13709,8 +13215,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13759,7 +13263,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .makesContact = TRUE, }, [MOVE_DOODLE] = @@ -13770,12 +13273,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, // Supposedly unconfirmed? + .priority = 0, // TO VERIFY .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13792,8 +13293,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RECOVER_HP, .snatchAffected = TRUE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13841,7 +13340,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, [MOVE_AQUA_STEP] = @@ -13870,7 +13368,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, - .priority = 0, + .priority = 0, // TO VERIFY .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, @@ -13951,8 +13449,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13968,8 +13464,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -13985,8 +13479,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_NONE, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -14002,8 +13494,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_SPD_UP_1, - .ignoresProtect = TRUE, - .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, }, @@ -14067,7 +13557,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .ignoresProtect = TRUE, .metronomeBanned = TRUE, }, @@ -14133,7 +13622,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, - .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_DOUBLE_SHOCK] = @@ -14148,13 +13636,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .makesContact = TRUE, .metronomeBanned = TRUE, }, [MOVE_GIGATON_HAMMER] = { - .effect = EFFECT_HIT, + .effect = EFFECT_GIGATON_HAMMER, .power = 160, .type = TYPE_STEEL, .accuracy = 100, @@ -14164,13 +13651,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .cantUseTwice = TRUE, }, [MOVE_COMEUPPANCE] = { .effect = EFFECT_METAL_BURST, - .power = 0, + .power = 1, .type = TYPE_DARK, .accuracy = 100, .pp = 10, @@ -14179,8 +13665,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, - .makesContact = TRUE, - .meFirstBanned = TRUE, .metronomeBanned = TRUE, }, @@ -14213,15 +13697,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .mirrorMoveBanned = TRUE, - .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_WICKED_TORQUE] = @@ -14237,15 +13717,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .mirrorMoveBanned = TRUE, - .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_NOXIOUS_TORQUE] = @@ -14261,15 +13737,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .mirrorMoveBanned = TRUE, - .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_COMBAT_TORQUE] = @@ -14285,15 +13757,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .mirrorMoveBanned = TRUE, - .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_MAGICAL_TORQUE] = @@ -14309,15 +13777,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, - .mirrorMoveBanned = TRUE, - .meFirstBanned = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, - .encoreBanned = TRUE, - .assistBanned = TRUE, }, [MOVE_PSYBLADE] = @@ -14348,71 +13812,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, - .thawsUser = TRUE, - }, - - [MOVE_BLOOD_MOON] = - { - .effect = EFFECT_HIT, - .power = 140, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .cantUseTwice = TRUE, - }, - - [MOVE_MATCHA_GOTCHA] = - { - .effect = EFFECT_MATCHA_GOTCHA, - .power = 80, - .type = TYPE_GRASS, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .thawsUser = TRUE, - .metronomeBanned = TRUE, - .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, - }, - - [MOVE_SYRUP_BOMB] = - { - .effect = EFFECT_SYRUP_BOMB, - .power = 60, - .type = TYPE_GRASS, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 100, // syrup bomb volatile status - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .ballisticMove = TRUE, - .metronomeBanned = TRUE, - }, - - [MOVE_IVY_CUDGEL] = - { - .effect = EFFECT_IVY_CUDGEL, - .power = 100, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, - .metronomeBanned = TRUE, }, // Z-Moves @@ -14809,7 +14208,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = 0, .soundMove = TRUE, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, [MOVE_GUARDIAN_OF_ALOLA] = { @@ -14876,737 +14274,4 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .zMoveEffect = 0, }, - - [MOVE_MAX_GUARD] = - { - .effect = EFFECT_PROTECT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 4, - .split = SPLIT_STATUS, - .protectionMove = TRUE, - }, - - [MOVE_MAX_FLARE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_SUN, - }, - - [MOVE_MAX_FLUTTERBY] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_BUG, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_SP_ATK, - }, - - [MOVE_MAX_LIGHTNING] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_ELECTRIC_TERRAIN, - }, - - [MOVE_MAX_STRIKE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_SPEED, - }, - - [MOVE_MAX_KNUCKLE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FIGHTING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RAISE_TEAM_ATTACK, - }, - - [MOVE_MAX_PHANTASM] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_GHOST, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_DEFENSE, - }, - - [MOVE_MAX_HAILSTORM] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_HAIL, - }, - - [MOVE_MAX_OOZE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_POISON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RAISE_TEAM_SP_ATK, - }, - - [MOVE_MAX_GEYSER] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RAIN, - }, - - [MOVE_MAX_AIRSTREAM] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FLYING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RAISE_TEAM_SPEED, - }, - - [MOVE_MAX_STARFALL] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FAIRY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_MISTY_TERRAIN, - }, - - [MOVE_MAX_WYRMWIND] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_DRAGON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_ATTACK, - }, - - [MOVE_MAX_MINDSTORM] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_PSYCHIC_TERRAIN, - }, - - [MOVE_MAX_ROCKFALL] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_ROCK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_SANDSTORM, - }, - - [MOVE_MAX_QUAKE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_GROUND, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RAISE_TEAM_SP_DEF, - }, - - [MOVE_MAX_DARKNESS] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_SP_DEF, - }, - - [MOVE_MAX_OVERGROWTH] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_GRASSY_TERRAIN, - }, - - [MOVE_MAX_STEELSPIKE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RAISE_TEAM_DEFENSE, - }, - - [MOVE_G_MAX_VINE_LASH] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_VINE_LASH, - }, - - [MOVE_G_MAX_WILDFIRE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_WILDFIRE, - }, - - [MOVE_G_MAX_CANNONADE] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_CANNONADE, - }, - - [MOVE_G_MAX_BEFUDDLE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_BUG, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_EFFECT_SPORE_FOES, - }, - - [MOVE_G_MAX_VOLT_CRASH] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_PARALYZE_FOES, - }, - - [MOVE_G_MAX_GOLD_RUSH] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_CONFUSE_FOES_PAY_DAY, - }, - - [MOVE_G_MAX_CHI_STRIKE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIGHTING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_CRIT_PLUS, - }, - - [MOVE_G_MAX_TERROR] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GHOST, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_MEAN_LOOK, - }, - - [MOVE_G_MAX_FOAM_BURST] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_SPEED_2_FOES, - }, - - [MOVE_G_MAX_RESONANCE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_AURORA_VEIL, - }, - - [MOVE_G_MAX_CUDDLE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_INFATUATE_FOES, - }, - - [MOVE_G_MAX_REPLENISH] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_RECYCLE_BERRIES, - }, - - [MOVE_G_MAX_MALODOR] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_POISON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_POISON_FOES, - }, - - [MOVE_G_MAX_MELTDOWN] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_TORMENT_FOES, - }, - - [MOVE_G_MAX_DRUM_SOLO] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO - .ignoresTargetAbility = TRUE, - }, - - [MOVE_G_MAX_FIREBALL] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO - .ignoresTargetAbility = TRUE, - }, - - [MOVE_G_MAX_HYDROSNIPE] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO - .ignoresTargetAbility = TRUE, - }, - - [MOVE_G_MAX_WIND_RAGE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FLYING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_DEFOG, - }, - - [MOVE_G_MAX_GRAVITAS] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_GRAVITY, - }, - - [MOVE_G_MAX_STONESURGE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_STEALTH_ROCK, - }, - - [MOVE_G_MAX_VOLCALITH] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ROCK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_VOLCALITH, - }, - - [MOVE_G_MAX_TARTNESS] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_LOWER_EVASIVENESS_FOES, - }, - - [MOVE_G_MAX_SWEETNESS] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_AROMATHERAPY, - }, - - [MOVE_G_MAX_SANDBLAST] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GROUND, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_SANDBLAST_FOES, - }, - - [MOVE_G_MAX_STUN_SHOCK] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_POISON_PARALYZE_FOES, - }, - - [MOVE_G_MAX_CENTIFERNO] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_FIRE_SPIN_FOES, - }, - - [MOVE_G_MAX_SMITE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FAIRY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_CONFUSE_FOES, - }, - - - [MOVE_G_MAX_SNOOZE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_YAWN_FOE, - }, - - [MOVE_G_MAX_FINALE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FAIRY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_HEAL_TEAM, - }, - - [MOVE_G_MAX_STEELSURGE] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_STEELSURGE, - }, - - [MOVE_G_MAX_DEPLETION] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_DRAGON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_SPITE, - }, - - [MOVE_G_MAX_ONE_BLOW] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO - }, - - [MOVE_G_MAX_RAPID_FLOW] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .split = SPLIT_PHYSICAL, - .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO - }, - }; diff --git a/test/battle/ai_check_viability.c b/test/battle/ai_check_viability.c deleted file mode 100644 index 11052fb163d8..000000000000 --- a/test/battle/ai_check_viability.c +++ /dev/null @@ -1,145 +0,0 @@ -#include "global.h" -#include "test/battle.h" -#include "battle_ai_util.h" - -ASSUMPTIONS -{ - ASSUME(gBattleMoves[MOVE_BODY_SLAM].effect == EFFECT_PARALYZE_HIT); -} - -AI_SINGLE_BATTLE_TEST("AI sees increased base power of Facade") -{ - u16 status1, expectedMove; - - PARAMETRIZE { status1 = STATUS1_NONE; expectedMove = MOVE_BODY_SLAM; } - PARAMETRIZE { status1 = STATUS1_BURN; expectedMove = MOVE_FACADE; } - - GIVEN { - ASSUME(gBattleMoves[MOVE_FACADE].effect == EFFECT_FACADE); - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { HP(60); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_FACADE); Status1(status1); } - } WHEN { - TURN { EXPECT_MOVE(opponent, expectedMove); } - } SCENE { - if (expectedMove == MOVE_FACADE) - MESSAGE("Wobbuffet fainted!"); - } -} - -AI_SINGLE_BATTLE_TEST("AI sees increased base power of Smelling Salt") -{ - u16 status1, expectedMove; - - PARAMETRIZE { status1 = STATUS1_NONE; expectedMove = MOVE_BODY_SLAM; } - PARAMETRIZE { status1 = STATUS1_PARALYSIS; expectedMove = MOVE_SMELLING_SALTS; } - - GIVEN { - ASSUME(B_UPDATED_MOVE_DATA >= GEN_6); - ASSUME(gBattleMoves[MOVE_SMELLING_SALTS].effect == EFFECT_SMELLING_SALTS); - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { HP(60); Status1(status1); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_SMELLING_SALTS); } - } WHEN { - TURN { EXPECT_MOVE(opponent, expectedMove); } - } SCENE { - if (expectedMove == MOVE_SMELLING_SALTS) - MESSAGE("Wobbuffet fainted!"); - } -} - -AI_SINGLE_BATTLE_TEST("AI sees increased base power of Wake Up Slap") -{ - u16 status1, expectedMove; - - PARAMETRIZE { status1 = STATUS1_NONE; expectedMove = MOVE_BODY_SLAM; } - PARAMETRIZE { status1 = STATUS1_SLEEP; expectedMove = MOVE_WAKE_UP_SLAP; } - - GIVEN { - ASSUME(B_UPDATED_MOVE_DATA >= GEN_6); - ASSUME(gBattleMoves[MOVE_WAKE_UP_SLAP].effect == EFFECT_WAKE_UP_SLAP); - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_MEGANIUM) { HP(35); Status1(status1); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_WAKE_UP_SLAP); } - } WHEN { - TURN { EXPECT_MOVE(opponent, expectedMove); } - } SCENE { - if (expectedMove == MOVE_WAKE_UP_SLAP) - MESSAGE("Meganium fainted!"); - } -} - -AI_SINGLE_BATTLE_TEST("AI sees increased base power of Grav Apple") -{ - u32 movePlayer; - u16 expectedMove; - - PARAMETRIZE { movePlayer = MOVE_CELEBRATE; expectedMove = MOVE_TROP_KICK; } - PARAMETRIZE { movePlayer = MOVE_GRAVITY; expectedMove = MOVE_GRAV_APPLE; } - - GIVEN { - ASSUME(gBattleMoves[MOVE_GRAV_APPLE].effect == EFFECT_GRAV_APPLE); - ASSUME(gBattleMoves[MOVE_TROP_KICK].effect == EFFECT_ATTACK_DOWN_HIT); - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { HP(81); Speed(20); } - OPPONENT(SPECIES_WOBBUFFET) { Speed(10); Moves(MOVE_TROP_KICK, MOVE_GRAV_APPLE); } - } WHEN { - TURN { MOVE(player, movePlayer); EXPECT_MOVE(opponent, MOVE_TROP_KICK); } - TURN { MOVE(player, MOVE_CELEBRATE); EXPECT_MOVE(opponent, expectedMove); } - } SCENE { - if (expectedMove == MOVE_GRAV_APPLE) - MESSAGE("Wobbuffet fainted!"); - } -} - -AI_SINGLE_BATTLE_TEST("AI sees increased base power of Flail") -{ - u16 hp, expectedMove; - - PARAMETRIZE { hp = 490; expectedMove = MOVE_BODY_SLAM; } - PARAMETRIZE { hp = 5; expectedMove = MOVE_FLAIL; } - - GIVEN { - ASSUME(gBattleMoves[MOVE_FLAIL].effect == EFFECT_FLAIL); - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { Speed(10); } - OPPONENT(SPECIES_WOBBUFFET) { HP(hp); MaxHP(490); Speed(20); Moves(MOVE_BODY_SLAM, MOVE_FLAIL); } - } WHEN { - TURN { EXPECT_MOVE(opponent, expectedMove); } - } -} - -AI_SINGLE_BATTLE_TEST("AI will only use Dream Eater if target is asleep") -{ - u16 status1, expectedMove; - - PARAMETRIZE { status1 = STATUS1_NONE; expectedMove = MOVE_BODY_SLAM; } - PARAMETRIZE { status1 = STATUS1_SLEEP; expectedMove = MOVE_DREAM_EATER; } - - GIVEN { - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_MEGANIUM) { HP(38); Status1(status1); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_BODY_SLAM, MOVE_DREAM_EATER); } - } WHEN { - TURN { EXPECT_MOVE(opponent, expectedMove); } - } SCENE { - if (expectedMove == MOVE_DREAM_EATER) - MESSAGE("Meganium fainted!"); - } -} - -AI_SINGLE_BATTLE_TEST("AI sees increased base power of Spit Up") -{ - GIVEN { - ASSUME(gBattleMoves[MOVE_STOCKPILE].effect == EFFECT_STOCKPILE); - ASSUME(gBattleMoves[MOVE_SPIT_UP].effect == EFFECT_SPIT_UP); - AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { HP(43); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_TACKLE); } - } WHEN { - TURN { EXPECT_MOVE(opponent, MOVE_STOCKPILE); } - TURN { EXPECT_MOVE(opponent, MOVE_SPIT_UP); } - } SCENE { - // MESSAGE("Wobbuffet fainted!"); - } -}