From f160ffad20b4858190b73460c68ad5e3dfd16efd Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 May 2024 10:46:41 +0200 Subject: [PATCH 1/2] Missing ignoreSubstitute flags --- include/pokemon.h | 1 + src/data/moves_info.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/pokemon.h b/include/pokemon.h index d37e5f4ae946..a4a7ad47a006 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -514,6 +514,7 @@ struct MoveInfo u32 parentalBondBanned:1; u32 skyBattleBanned:1; u32 sketchBanned:1; + u32 padding:5; // end of word u32 argument; diff --git a/src/data/moves_info.h b/src/data/moves_info.h index fa11b510e150..6f7c47621aca 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -6329,6 +6329,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, + .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, @@ -10411,7 +10412,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, - //.ignoresSubstitute = TRUE, + .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, @@ -14338,6 +14339,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, + .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, From 0877195eb1d0cda199659115ccf69054e8b56006 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 28 May 2024 07:48:44 +0200 Subject: [PATCH 2/2] update defog flag --- src/data/moves_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 6f7c47621aca..35672537a6da 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -10412,7 +10412,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, - .ignoresSubstitute = TRUE, + .ignoresSubstitute = B_UPDATED_MOVE_FLAGS == GEN_4, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY,