diff --git a/include/battle.h b/include/battle.h index 50f6a9834b..b1e3811929 100644 --- a/include/battle.h +++ b/include/battle.h @@ -57,8 +57,7 @@ struct __attribute__((packed, aligned(2))) BattleMoveEffect u16 twoTurnEffect:1; u16 semiInvulnerableEffect:1; u16 usesProtectCounter:1; - u16 forcePressure:1; - u16 padding:8; + u16 padding:9; }; #define GET_MOVE_EFFECT(move) gBattleMoveEffects[gMovesInfo[move].effect] diff --git a/include/pokemon.h b/include/pokemon.h index 7d78f4dbe9..86041d103a 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -495,6 +495,7 @@ struct MoveInfo u32 ignoreTypeIfFlyingAndUngrounded:1; u32 thawsUser:1; u32 ignoresSubstitute:1; + u32 forcePressure:1; u32 cantUseTwice:1; // Ban flags diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 90117df685..f4060fc83b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1839,7 +1839,7 @@ static void Cmd_ppreduce(void) if (moveTarget == MOVE_TARGET_BOTH || moveTarget == MOVE_TARGET_FOES_AND_ALLY || moveTarget == MOVE_TARGET_ALL_BATTLERS - || GET_MOVE_EFFECT(gCurrentMove).forcePressure) + || gMovesInfo[gCurrentMove].forcePressure) { for (i = 0; i < gBattlersCount; i++) { diff --git a/src/data/battle_move_effects.h b/src/data/battle_move_effects.h index 73f9218ab3..f5933098b7 100644 --- a/src/data/battle_move_effects.h +++ b/src/data/battle_move_effects.h @@ -577,7 +577,6 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] = { .battleScript = BattleScript_EffectSpikes, .battleTvScore = 4, - .forcePressure = TRUE, }, [EFFECT_FORESIGHT] = @@ -1030,7 +1029,6 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] = .battleScript = BattleScript_EffectImprison, .battleTvScore = 6, .encourageEncore = TRUE, - .forcePressure = TRUE, }, [EFFECT_REFRESH] = @@ -1051,7 +1049,6 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] = { .battleScript = BattleScript_EffectSnatch, .battleTvScore = 1, - .forcePressure = TRUE, }, [EFFECT_LOW_KICK] = @@ -1326,7 +1323,6 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] = { .battleScript = BattleScript_EffectToxicSpikes, .battleTvScore = 0, // TODO: Assign points - .forcePressure = TRUE, }, [EFFECT_GASTRO_ACID] = @@ -1340,7 +1336,6 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] = .battleScript = BattleScript_EffectStealthRock, .battleTvScore = 0, // TODO: Assign points .encourageEncore = TRUE, - .forcePressure = TRUE, }, [EFFECT_TELEKINESIS] = diff --git a/src/data/moves_info.h b/src/data/moves_info.h index d338d4605d..2db536438b 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -4674,6 +4674,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .ignoresProtect = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + .forcePressure = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -6959,6 +6960,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, + .forcePressure = TRUE, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, @@ -7030,6 +7032,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .priority = 4, .ignoresSubstitute = TRUE, + .forcePressure = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -9397,6 +9400,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .ignoresProtect = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + .forcePressure = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, @@ -10717,6 +10721,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .ignoresProtect = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + .forcePressure = TRUE, .mirrorMoveBanned = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, @@ -18410,7 +18415,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .description = COMPOUND_STRING( "If the user's Terastallized,\n" "it hits with its Tera-type."), - .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, // .forcePressure = TRUE, + .effect = EFFECT_PLACEHOLDER, // EFFECT_TERA_BLAST, .type = TYPE_NORMAL, .category = DAMAGE_CATEGORY_SPECIAL, .power = 80, @@ -18418,6 +18423,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .pp = 10, .priority = 0, + .forcePressure = TRUE, .metronomeBanned = TRUE, // Only since it isn't implemented yet },