Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field

Fix switch-in abilities activating on an empty field

test/ability_download.c

@@ -0,0 +1,95 @@
+#include "global.h"
+#include "test_battle.h"
+
+ASSUMPTIONS
+{
+    ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL);
+    ASSUME(gBattleMoves[MOVE_TRI_ATTACK].split == SPLIT_SPECIAL);
+}
+
+SINGLE_BATTLE_TEST("Download raises Attack if player has lower Def than Sp.Def", s16 damage)
+{
+    u32 ability;
+    PARAMETRIZE { ability = ABILITY_TRACE; }
+    PARAMETRIZE { ability = ABILITY_DOWNLOAD; }
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET) {Defense(100); SpDefense(200); };
+        OPPONENT(SPECIES_PORYGON) { Ability(ability); Attack(100); };
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_TACKLE); }
+    } SCENE {
+        if (ability == ABILITY_DOWNLOAD)
+        {
+            ABILITY_POPUP(opponent, ABILITY_DOWNLOAD);
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Porygon's Download raised its attack!");
+        }
+        HP_BAR(player, captureDamage: &results[i].damage);
+    } FINALLY {
+        EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage);
+    }
+}
+
+SINGLE_BATTLE_TEST("Download raises Sp.Attack if enemy has lower Sp.Def than Def", s16 damage)
+{
+    u32 ability;
+    PARAMETRIZE { ability = ABILITY_TRACE; }
+    PARAMETRIZE { ability = ABILITY_DOWNLOAD; }
+    GIVEN {
+        PLAYER(SPECIES_PORYGON) { Ability(ability); SpAttack(100); };
+        OPPONENT(SPECIES_WOBBUFFET) {Defense(200); SpDefense(100); };
+    } WHEN {
+        TURN { MOVE(player, MOVE_TRI_ATTACK); }
+    } SCENE {
+        if (ability == ABILITY_DOWNLOAD)
+        {
+            ABILITY_POPUP(player, ABILITY_DOWNLOAD);
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
+            MESSAGE("Porygon's Download raised its sp. attack!");
+        }
+        HP_BAR(opponent, captureDamage: &results[i].damage);
+    } FINALLY {
+        EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage);
+    }
+}
+
+SINGLE_BATTLE_TEST("Download doesn't activate if target hasn't been sent out yet", s16 damagePhysical, s16 damageSpecial)
+{
+    u32 ability;
+    PARAMETRIZE { ability = ABILITY_TRACE; }
+    PARAMETRIZE { ability = ABILITY_DOWNLOAD; }
+    GIVEN {
+        ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION);
+        PLAYER(SPECIES_WOBBUFFET) { Speed(100); };
+        PLAYER(SPECIES_PORYGON) { Ability(ability); Defense(400); SpDefense(300); Speed(300); Attack(100); };
+        OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); };
+        OPPONENT(SPECIES_PORYGON2) { Ability(ability); Defense(100); SpDefense(200); Speed(200); };
+    } WHEN {
+        TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); }
+        TURN { MOVE(player, MOVE_TACKLE); MOVE(opponent, MOVE_TRI_ATTACK);}
+    } SCENE {
+        HP_BAR(player, hp: 0);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player);
+        // Everyone faints.
+
+        MESSAGE("Go! Porygon!");
+        MESSAGE("2 sent out Porygon2!");
+
+        if (ability == ABILITY_DOWNLOAD)
+        {
+            ABILITY_POPUP(player, ABILITY_DOWNLOAD);
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
+            MESSAGE("Porygon's Download raised its attack!");
+            ABILITY_POPUP(opponent, ABILITY_DOWNLOAD);
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+            MESSAGE("Foe Porygon2's Download raised its sp. attack!");
+        }
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, player);
+        HP_BAR(opponent, captureDamage: &results[i].damagePhysical);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TRI_ATTACK, opponent);
+        HP_BAR(player, captureDamage: &results[i].damageSpecial);
+    } FINALLY {
+        EXPECT_MUL_EQ(results[0].damagePhysical, Q_4_12(1.5), results[1].damagePhysical);
+        EXPECT_MUL_EQ(results[0].damageSpecial, Q_4_12(1.5), results[1].damageSpecial);
+    }
+}

test/ability_intimidate.c

@@ -20,7 +20,11 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch ou
         TURN { MOVE(player, MOVE_TACKLE); }
     } SCENE {
         if (ability == ABILITY_INTIMIDATE)
+        {
             ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
+            MESSAGE("Foe Staraptor's Intimidate cuts Wobbuffet's ATTACK!");
+        }
         HP_BAR(opponent, captureDamage: &results[i].damage);
     } FINALLY {
         EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage);
@@ -30,21 +34,64 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch ou
 SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16 damage)
 {
     u32 ability;
-    KNOWN_FAILING;
     PARAMETRIZE { ability = ABILITY_INTIMIDATE; }
     PARAMETRIZE { ability = ABILITY_RECKLESS; }
     GIVEN {
         PLAYER(SPECIES_WOBBUFFET) { Speed(2); };
         OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); };
-        OPPONENT(SPECIES_STARAPTOR) { Ability(ABILITY_INTIMIDATE); Speed(1); };
+        OPPONENT(SPECIES_STARAPTOR) { Ability(ability); Speed(1); };
     } WHEN {
         TURN { MOVE(player, MOVE_TACKLE); SEND_OUT(opponent, 1); }
         TURN { MOVE(player, MOVE_TACKLE); }
     } SCENE {
+        HP_BAR(opponent);
         if (ability == ABILITY_INTIMIDATE)
+        {
             ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
+            ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
+            MESSAGE("Foe Staraptor's Intimidate cuts Wobbuffet's ATTACK!");
+        }
         HP_BAR(opponent, captureDamage: &results[i].damage);
     } FINALLY {
         EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage);
     }
 }
+
+DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double battle")
+{
+    GIVEN {
+        ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION);
+        PLAYER(SPECIES_WOBBUFFET) { };
+        PLAYER(SPECIES_WOBBUFFET) { HP(1); };
+        PLAYER(SPECIES_STARAVIA) { Ability(ABILITY_INTIMIDATE); };
+        PLAYER(SPECIES_ABRA);
+        OPPONENT(SPECIES_WOBBUFFET) { HP(1); };
+        OPPONENT(SPECIES_WOBBUFFET) { HP(1); };
+        OPPONENT(SPECIES_STARAPTOR) { Ability(ABILITY_INTIMIDATE); };
+        OPPONENT(SPECIES_WYNAUT);
+    } WHEN {
+        TURN { MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 2); SEND_OUT(opponentLeft, 2); SEND_OUT(playerRight, 3); SEND_OUT(opponentRight, 3); }
+        TURN { MOVE(playerLeft, MOVE_CELEBRATE);}
+    } SCENE {
+        HP_BAR(playerLeft, hp: 0);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft);
+        // Everyone faints.
+
+        MESSAGE("Go! Staravia!");
+        MESSAGE("2 sent out Staraptor!");
+        MESSAGE("Go! Abra!");
+        MESSAGE("2 sent out Wynaut!");
+
+        ABILITY_POPUP(playerLeft, ABILITY_INTIMIDATE);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft);
+        MESSAGE("Staravia's Intimidate cuts Foe Staraptor's ATTACK!");
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight);
+        MESSAGE("Staravia's Intimidate cuts Foe Wynaut's ATTACK!");
+
+        ABILITY_POPUP(opponentLeft, ABILITY_INTIMIDATE);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft);
+        MESSAGE("Foe Staraptor's Intimidate cuts Staravia's ATTACK!");
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight);
+        MESSAGE("Foe Staraptor's Intimidate cuts Abra's ATTACK!");
+    }
+}

test/test_runner.c

@@ -7,7 +7,7 @@
 #include "test.h"
 #include "test_runner.h"
 
-#define TIMEOUT_SECONDS 30
+#define TIMEOUT_SECONDS 55
 
 void CB2_TestRunner(void);