fix psychic terrain blocking moves it shouldnt block (#3521)

rh-hideout · Nov 3, 2023 · 8b359c2 · 8b359c2
1 parent 90d9334
commit 8b359c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/battle_util.c b/src/battle_util.c
@@ -3824,6 +3824,8 @@ u8 AtkCanceller_UnableToUseMove2(void)
             if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN
                 && IsBattlerGrounded(gBattlerTarget)
                 && GetChosenMovePriority(gBattlerAttacker) > 0
+                && gBattleMoves[gCurrentMove].target != MOVE_TARGET_ALL_BATTLERS
+                && gBattleMoves[gCurrentMove].target != MOVE_TARGET_OPPONENTS_FIELD
                 && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
             {
                 CancelMultiTurnMoves(gBattlerAttacker);

diff --git a/test/battle/terrain/psychic.c b/test/battle/terrain/psychic.c
@@ -78,7 +78,6 @@ SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target the
 
 SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all battlers")
 {
-    KNOWN_FAILING;
     GIVEN {
         PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
         OPPONENT(SPECIES_WOBBUFFET);
@@ -93,7 +92,6 @@ SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all
 
 SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all opponents")
 {
-    KNOWN_FAILING;
     GIVEN {
         PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
         OPPONENT(SPECIES_WOBBUFFET);
@@ -124,7 +122,6 @@ DOUBLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all
 
 SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority field moves")
 {
-    KNOWN_FAILING;
     GIVEN {
         PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
         OPPONENT(SPECIES_WOBBUFFET);