Fixed some failing tests with GEN_LATEST = GEN_5 (#8241)

test/battle/ability/magic_bounce.c

@@ -42,6 +42,7 @@ SINGLE_BATTLE_TEST("Magic Bounce bounces back powder moves")
 SINGLE_BATTLE_TEST("Magic Bounce cannot bounce back powder moves against Grass Types")
 {
     GIVEN {
+        WITH_CONFIG(GEN_CONFIG_POWDER_GRASS, GEN_6);
         ASSUME(IsPowderMove(MOVE_STUN_SPORE));
         ASSUME(GetSpeciesType(SPECIES_ODDISH, 0) == TYPE_GRASS);
         PLAYER(SPECIES_ODDISH);

test/battle/ability/overcoat.c

@@ -71,17 +71,29 @@ DOUBLE_BATTLE_TEST("Overcoat blocks damage from hail")
     }
 }
 
-SINGLE_BATTLE_TEST("Overcoat blocks Effect Spore's effect")
+SINGLE_BATTLE_TEST("Overcoat blocks Effect Spore's effect (Gen6+)")
 {
+    u32 config;
+    PARAMETRIZE { config = GEN_5; }
+    PARAMETRIZE { config = GEN_6; }
     GIVEN {
+        WITH_CONFIG(GEN_CONFIG_POWDER_OVERCOAT, config);
         PLAYER(SPECIES_PINECO) {Ability(ABILITY_OVERCOAT);}
         OPPONENT(SPECIES_SHROOMISH) {Ability(ABILITY_EFFECT_SPORE);}
     } WHEN {
         TURN { MOVE(player, MOVE_TACKLE, WITH_RNG(RNG_EFFECT_SPORE, 1)); }
     } SCENE {
         MESSAGE("Pineco used Tackle!");
-        NOT ABILITY_POPUP(opponent, ABILITY_EFFECT_SPORE);
+        if (config == GEN_6) {
+            NOT ABILITY_POPUP(opponent, ABILITY_EFFECT_SPORE);
+        }
+        else {
+            ABILITY_POPUP(opponent, ABILITY_EFFECT_SPORE);
+        }
     } THEN {
-        EXPECT_EQ(player->status1, 0);
+        if (config == GEN_6)
+            EXPECT_EQ(player->status1, 0);
+        else
+            EXPECT_NE(player->status1, 0);
     }
 }

test/battle/hold_effect/life_orb.c

@@ -34,6 +34,7 @@ SINGLE_BATTLE_TEST("Life Orb activates if it hits a Substitute")
 SINGLE_BATTLE_TEST("Life Orb does not activate if using status move on a Substitute")
 {
     GIVEN {
+        ASSUME(MoveIgnoresSubstitute(MOVE_GROWL));
         PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LIFE_ORB); }
         OPPONENT(SPECIES_WOBBUFFET);
     } WHEN {

test/battle/move_effect/metronome.c

@@ -25,6 +25,7 @@ SINGLE_BATTLE_TEST("Metronome picks a random move")
 SINGLE_BATTLE_TEST("Metronome's called powder move fails against Grass Types")
 {
     GIVEN {
+        WITH_CONFIG(GEN_CONFIG_POWDER_GRASS, GEN_6);
         ASSUME(IsPowderMove(MOVE_POISON_POWDER));
         ASSUME(GetSpeciesType(SPECIES_TANGELA, 0) == TYPE_GRASS);
         ASSUME(GetMoveEffect(MOVE_POISON_POWDER) == EFFECT_NON_VOLATILE_STATUS);

test/battle/move_effect/mirror_move.c

@@ -41,6 +41,7 @@ SINGLE_BATTLE_TEST("Mirror Move fails if no move was used before")
 SINGLE_BATTLE_TEST("Mirror Move's called powder move fails against Grass Types")
 {
     GIVEN {
+        WITH_CONFIG(GEN_CONFIG_POWDER_GRASS, GEN_6);
         ASSUME(IsPowderMove(MOVE_STUN_SPORE));
         ASSUME(GetSpeciesType(SPECIES_ODDISH, 0) == TYPE_GRASS);
         ASSUME(GetMoveEffect(MOVE_STUN_SPORE) == EFFECT_NON_VOLATILE_STATUS);

test/battle/move_effect/powder.c

@@ -168,7 +168,7 @@ SINGLE_BATTLE_TEST("Powder fails if the target is Grass type (Gen6+)")
 SINGLE_BATTLE_TEST("Powder fails if the target has Overcoat (Gen6+)")
 {
     GIVEN {
-        WITH_CONFIG(GEN_CONFIG_POWDER_GRASS, GEN_6);
+        WITH_CONFIG(GEN_CONFIG_POWDER_OVERCOAT, GEN_6);
         PLAYER(SPECIES_FORRETRESS) { Ability(ABILITY_OVERCOAT); }
         OPPONENT(SPECIES_VIVILLON);
     } WHEN {

test/battle/move_effect/psychic_terrain.c

@@ -120,6 +120,8 @@ SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves against semi-in
     PARAMETRIZE { move = MOVE_SOLAR_BEAM; shouldWork = FALSE;}
     PARAMETRIZE { move = MOVE_FLY; shouldWork = TRUE;}
     GIVEN {
+        WITH_CONFIG(GEN_CONFIG_TOXIC_NEVER_MISS, GEN_6);
+        ASSUME(IsSpeciesOfType(SPECIES_SHROODLE, TYPE_POISON));
         PLAYER(SPECIES_SHROODLE) { Ability(ABILITY_PRANKSTER); }
         OPPONENT(SPECIES_WOBBUFFET);
     } WHEN {

test/battle/move_effect_secondary/remove_status.c

@@ -118,6 +118,7 @@ TO_DO_BATTLE_TEST("Wake-Up Slap gets increased power against Pokémon with Comat
 DOUBLE_BATTLE_TEST("Sparkling Aria cures burns from all Pokemon on the field and behind substitutes")
 {
     GIVEN {
+        ASSUME(MoveIgnoresSubstitute(MOVE_SPARKLING_ARIA));
         ASSUME(MoveHasAdditionalEffect(MOVE_SPARKLING_ARIA, MOVE_EFFECT_REMOVE_STATUS) == TRUE);
         ASSUME(GetMoveEffectArg_Status(MOVE_SPARKLING_ARIA) == STATUS1_BURN);
         PLAYER(SPECIES_PRIMARINA);