Detect 'NOT x; NOT y;'

[mrgriffin]

NOT x; NOT y; does not behave how you would expect, so this PR detects uses of that and tells the developer to write NONE_OF { x; y; } instead.

Purifying Salt's can't-be-frozen test was erroneously passing because of this, so that has been fixed too.

[mrgriffin]

When merging to upcoming we also need this change:

diff --git a/test/battle/move_effect/syrup_bomb.c b/test/battle/move_effect/syrup_bomb.c
index ae689b3629..18b032f5cb 100644
--- a/test/battle/move_effect/syrup_bomb.c
+++ b/test/battle/move_effect/syrup_bomb.c
@@ -33,8 +33,10 @@ SINGLE_BATTLE_TEST("Syrup Bomb is prevented by Bulletproof")
     } SCENE {
         ABILITY_POPUP(opponent, ABILITY_BULLETPROOF);
         MESSAGE("Foe Chespin's Bulletproof blocks Syrup Bomb!");
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
-        NOT HP_BAR(opponent);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
+            HP_BAR(opponent);
+        }
     }
 }
 
@@ -75,8 +77,10 @@ SINGLE_BATTLE_TEST("Clear Body, White Smoke and Full Metal Body prevent Sticky S
             ABILITY_POPUP(opponent, ABILITY_FULL_METAL_BODY);
             MESSAGE("Foe Solgaleo's Full Metal Body prevents stat loss!");
         }
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Beldum's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Beldum's Speed fell!");
+        }
     }
 }
 
@@ -92,7 +96,9 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents Sticky Syrup speed reduction")
         HP_BAR(opponent);
         MESSAGE("Foe Wobbuffet got covered in sticky syrup!");
         MESSAGE("Foe Wobbuffet's Speed was not lowered!");
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Wobbuffet's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Wobbuffet's Speed fell!");
+        }
     }
 }

[AlexOn1ine]

When merging to upcoming we also need this change:

diff --git a/test/battle/move_effect/syrup_bomb.c b/test/battle/move_effect/syrup_bomb.c
index ae689b3629..18b032f5cb 100644
--- a/test/battle/move_effect/syrup_bomb.c
+++ b/test/battle/move_effect/syrup_bomb.c
@@ -33,8 +33,10 @@ SINGLE_BATTLE_TEST("Syrup Bomb is prevented by Bulletproof")
     } SCENE {
         ABILITY_POPUP(opponent, ABILITY_BULLETPROOF);
         MESSAGE("Foe Chespin's Bulletproof blocks Syrup Bomb!");
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
-        NOT HP_BAR(opponent);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
+            HP_BAR(opponent);
+        }
     }
 }
 
@@ -75,8 +77,10 @@ SINGLE_BATTLE_TEST("Clear Body, White Smoke and Full Metal Body prevent Sticky S
             ABILITY_POPUP(opponent, ABILITY_FULL_METAL_BODY);
             MESSAGE("Foe Solgaleo's Full Metal Body prevents stat loss!");
         }
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Beldum's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Beldum's Speed fell!");
+        }
     }
 }
 
@@ -92,7 +96,9 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents Sticky Syrup speed reduction")
         HP_BAR(opponent);
         MESSAGE("Foe Wobbuffet got covered in sticky syrup!");
         MESSAGE("Foe Wobbuffet's Speed was not lowered!");
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Wobbuffet's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Wobbuffet's Speed fell!");
+        }
     }
 }

Should an issue be opened as a reminder?

[AlexOn1ine]

Looks good!

I liked to do those, sorry 😅

[mrgriffin]

I liked to those, sorry 😅

Me too 😂 I think the vast majority of the fixes were to code I wrote 😅

[AlexOn1ine]

When merging to upcoming we also need this change:

diff --git a/test/battle/move_effect/syrup_bomb.c b/test/battle/move_effect/syrup_bomb.c
index ae689b3629..18b032f5cb 100644
--- a/test/battle/move_effect/syrup_bomb.c
+++ b/test/battle/move_effect/syrup_bomb.c
@@ -33,8 +33,10 @@ SINGLE_BATTLE_TEST("Syrup Bomb is prevented by Bulletproof")
     } SCENE {
         ABILITY_POPUP(opponent, ABILITY_BULLETPROOF);
         MESSAGE("Foe Chespin's Bulletproof blocks Syrup Bomb!");
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
-        NOT HP_BAR(opponent);
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_SYRUP_BOMB, player);
+            HP_BAR(opponent);
+        }
     }
 }
 
@@ -75,8 +77,10 @@ SINGLE_BATTLE_TEST("Clear Body, White Smoke and Full Metal Body prevent Sticky S
             ABILITY_POPUP(opponent, ABILITY_FULL_METAL_BODY);
             MESSAGE("Foe Solgaleo's Full Metal Body prevents stat loss!");
         }
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Beldum's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Beldum's Speed fell!");
+        }
     }
 }
 
@@ -92,7 +96,9 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents Sticky Syrup speed reduction")
         HP_BAR(opponent);
         MESSAGE("Foe Wobbuffet got covered in sticky syrup!");
         MESSAGE("Foe Wobbuffet's Speed was not lowered!");
-        NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
-        NOT MESSAGE("Foe Wobbuffet's Speed fell!");
+        NONE_OF {
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Wobbuffet's Speed fell!");
+        }
     }
 }

Should an issue be opened as a reminder?

Fixed in #3437