address review comment and fix #375

BluRosie · Jan 10, 2025 · a092917 · a092917
1 parent e0818fa
commit a092917
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/data/text/221.txt b/data/text/221.txt
@@ -783,8 +783,8 @@ Having a Pokémon smell this mint can\nmake its Sp. Atk stat grow stronger.\nHow
 Having a Pokémon smell this mint can\nmake its Sp. Atk stat grow stronger.\nHowever, its Speed stat may suffer.
 Having a Pokémon smell this mint can\nmake its Sp. Def stat grow stronger.\nHowever, its Attack stat may suffer.
 Having a Pokémon smell this mint can\nmake its Sp. Def stat grow stronger.\nHowever, its Defense stat may suffer.
-Having a Pokémon smell this mint can\nmake its Sp. Atk stat grow stronger.\nHowever, its Sp. Def stat may suffer.
-Having a Pokémon smell this mint can\nmake its Sp. Atk stat grow stronger.\nHowever, its Speed stat may suffer.
+Having a Pokémon smell this mint can\nmake its Sp. Def stat grow stronger.\nHowever, its Sp. Atk stat may suffer.
+Having a Pokémon smell this mint can\nmake its Sp. Def stat grow stronger.\nHowever, its Speed stat may suffer.
 Having a Pokémon smell this mint can\nmake its Speed stat grow stronger.\nHowever, its Attack stat may suffer.
 Having a Pokémon smell this mint can\nmake its Speed stat grow stronger.\nHowever, its Defense stat may suffer.
 Having a Pokémon smell this mint can\nmake its Speed stat grow stronger.\nHowever, its Sp. Atk stat may suffer.

diff --git a/include/battle.h b/include/battle.h
@@ -3588,6 +3588,8 @@ void LONG_CALL ov12_02252D14(struct BattleSystem *bsys, struct BattleStruct *ctx
 
 #define CLIENT_DOES_NOT_HAVE_MOLD_BREAKER_VARIATIONS(ctx, client_no) (GetBattlerAbility(ctx, client_no) != ABILITY_MOLD_BREAKER && GetBattlerAbility(ctx, client_no) != ABILITY_TERAVOLT && GetBattlerAbility(ctx, client_no) != ABILITY_TURBOBLAZE)
 
+#define CLIENT_HAS_MOLD_BREAKER_VARIATION(ctx, client_no) (!(CLIENT_DOES_NOT_HAVE_MOLD_BREAKER_VARIATIONS(ctx, client_no)))
+
 void LONG_CALL SortRawSpeedNonRNGArray(struct BattleSystem *bsys, struct BattleStruct *ctx);
 
 BOOL LONG_CALL CanActivateDamageReductionBerry(struct BattleSystem *bsys, struct BattleStruct *ctx, int defender);

diff --git a/src/individual/BattleController_BeforeMove.c b/src/individual/BattleController_BeforeMove.c
@@ -1441,7 +1441,7 @@ BOOL BattlerController_RedirectTarget(struct BattleSystem *bsys, struct BattleSt
         return FALSE;
     }
 
-    if (GetBattlerAbility(ctx, battlerIdAttacker) == ABILITY_NORMALIZE || GetBattlerAbility(ctx, battlerIdAttacker) == ABILITY_MOLD_BREAKER) {
+    if (GetBattlerAbility(ctx, battlerIdAttacker) == ABILITY_NORMALIZE || CLIENT_HAS_MOLD_BREAKER_VARIATION(ctx, battlerIdAttacker)) {
         return FALSE;
     }