Prankster tests + fixes

src/battle_script_commands.c

@@ -9530,7 +9530,7 @@ static void Cmd_various(void)
     case VARIOUS_TRY_INSTRUCT:
     {
         VARIOUS_ARGS(const u8 *failInstr);
-        u16 move = gLastMoves[gBattlerTarget];
+        u16 move = gLastPrintedMoves[gBattlerTarget];
         if (move == MOVE_NONE || move == MOVE_UNAVAILABLE || gBattleMoves[move].effect == EFFECT_RECHARGE
          || gBattleMoves[move].instructBanned || gBattleMoves[move].twoTurnMove || IsDynamaxed(gBattlerTarget))
         {
@@ -9540,7 +9540,7 @@ static void Cmd_various(void)
         {
             gSpecialStatuses[gBattlerTarget].instructedChosenTarget = *(gBattleStruct->moveTarget + gBattlerTarget) | 0x4;
             gBattlerAttacker = gBattlerTarget;
-            gCalledMove = gLastMoves[gBattlerAttacker];
+            gCalledMove = move;
             for (i = 0; i < MAX_MON_MOVES; i++)
             {
                 if (gBattleMons[gBattlerAttacker].moves[i] == gCalledMove)

src/battle_util.c

@@ -5044,7 +5044,9 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
                 gBattlescriptCurrInstr = BattleScript_DazzlingProtected;
                 effect = 1;
             }
-            else if (BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE) && !(IS_MOVE_STATUS(move) && targetAbility == ABILITY_MAGIC_BOUNCE))
+            else if (GetChosenMovePriority(gBattlerAttacker) > 0
+                     && BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE)
+                     && !(IS_MOVE_STATUS(move) && (targetAbility == ABILITY_MAGIC_BOUNCE || gProtectStructs[gBattlerTarget].bounceMove)))
             {
                 if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) || !(moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY)))
                     CancelMultiTurnMoves(gBattlerAttacker); // Don't cancel moves that can hit two targets bc one target might not be protected

test/battle/ability/prankster.c

@@ -1,29 +1,222 @@
 #include "global.h"
 #include "test/battle.h"
 
+ASSUMPTIONS
+{
+    ASSUME(gSpeciesInfo[SPECIES_UMBREON].types[0] == TYPE_DARK);
+    ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].split == SPLIT_STATUS);
+}
+
 SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon")
 {
     GIVEN {
-        ASSUME(gSpeciesInfo[SPECIES_UMBREON].types[0] == TYPE_DARK);
         PLAYER(SPECIES_UMBREON);
-        OPPONENT(SPECIES_MURKROW) { Ability(ABILITY_PRANKSTER); }
+        OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
     } WHEN {
         TURN { MOVE(opponent, MOVE_CONFUSE_RAY); }
     } SCENE {
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
+        MESSAGE("It doesn't affect Umbreon…");
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon after they switch-in")
+{
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET);
+        PLAYER(SPECIES_UMBREON);
+        OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { SWITCH(player, 1); MOVE(opponent, MOVE_CONFUSE_RAY); }
+    } SCENE {
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
+        MESSAGE("It doesn't affect Umbreon…");
+    }
+}
+
+DOUBLE_BATTLE_TEST("Prankster-affected moves affect Ally Dark-type Pokémon")
+{
+    GIVEN {
+        PLAYER(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+        PLAYER(SPECIES_UMBREON);
+        OPPONENT(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(playerLeft, MOVE_CONFUSE_RAY, target: playerRight); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerLeft);
+        NOT MESSAGE("It doesn't affect Umbreon…");
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster-affected moves called via Assist don't affect Dark-type Pokémon")
+{
+    GIVEN {
+        PLAYER(SPECIES_UMBREON);
+        OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+        OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CONFUSE_RAY); };
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_ASSIST); }
+    } SCENE {
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
         MESSAGE("It doesn't affect Umbreon…");
     }
 }
-TO_DO_BATTLE_TEST("Prankster-affected moves affect Ally Dark-type Pokémon")
-TO_DO_BATTLE_TEST("Prankster-affected moves called via Assist don't affect Dark-type Pokémon");
+
+// Tested on Showdown, even though Bulbapedia says otherwise.
+DOUBLE_BATTLE_TEST("Prankster-affected moves called via Instruct do not affect Dark-type Pokémon")
+{
+    GIVEN {
+        PLAYER(SPECIES_VOLBEAT) { Speed(20); Ability(ABILITY_PRANKSTER); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(10);}
+        OPPONENT(SPECIES_UMBREON) { Speed(1); }
+        OPPONENT(SPECIES_WOBBUFFET) { Speed(1); }
+    } WHEN {
+        TURN { MOVE(playerLeft, MOVE_CONFUSE_RAY, target: opponentLeft);
+               MOVE(playerRight, MOVE_INSTRUCT, target: playerLeft);
+        }
+    } SCENE {
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerLeft);
+        MESSAGE("It doesn't affect Foe Umbreon…");
+        MESSAGE("Wobbuffet used Instruct!");
+        MESSAGE("Volbeat used Confuse Ray!");
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerLeft);
+        MESSAGE("It doesn't affect Foe Umbreon…");
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster increases the priority of moves by 1")
+{
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET) { Speed(10); }
+        OPPONENT(SPECIES_VOLBEAT) { Speed(5); Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_CONFUSE_RAY); MOVE(player, MOVE_CELEBRATE, WITH_RNG(RNG_CONFUSION, FALSE)); } // RNG_CONFUSION so that Wobb doesn't hit itself.
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player);
+    }
+}
+
+DOUBLE_BATTLE_TEST("Moves called via Prankster-affected After you affect Dark-type Pokémon")
+{
+    GIVEN {
+        PLAYER(SPECIES_VOLBEAT) { Speed(1); Ability(ABILITY_PRANKSTER); }
+        PLAYER(SPECIES_WOBBUFFET) { Speed(1);}
+        OPPONENT(SPECIES_UMBREON) { Speed(10); }
+        OPPONENT(SPECIES_WOBBUFFET) { Speed(10); }
+    } WHEN {
+        TURN { MOVE(playerLeft, MOVE_AFTER_YOU, target: playerRight);
+               MOVE(playerRight, MOVE_CONFUSE_RAY, target: opponentLeft);
+        }
+    } SCENE {
+        MESSAGE("Volbeat used After You!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_AFTER_YOU, playerLeft);
+        MESSAGE("Wobbuffet used Confuse Ray!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerRight);
+        MESSAGE("Foe Umbreon became confused!");
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster is blocked by Quick Guard in Gen5+")
+{
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_QUICK_GUARD); MOVE(opponent, MOVE_CONFUSE_RAY); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_QUICK_GUARD, player);
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
+        MESSAGE("Wobbuffet protected itself!");
+    }
+}
+
+DOUBLE_BATTLE_TEST("Prankster-affected moves that target all Pokémon are successful regardless of the presence of Dark-type Pokémon")
+{
+    GIVEN {
+        ASSUME(gBattleMoves[MOVE_CAPTIVATE].target == MOVE_TARGET_BOTH);
+        PLAYER(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_UMBREON);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(playerLeft, MOVE_CAPTIVATE); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CAPTIVATE, playerLeft);
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster-affected moves can still be bounced back by Dark-types using Magic Coat")
+{
+    GIVEN {
+        PLAYER(SPECIES_UMBREON);
+        OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_MAGIC_COAT); MOVE(opponent, MOVE_CONFUSE_RAY); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, player);
+        MESSAGE("Foe Volbeat used Confuse Ray!");
+        MESSAGE("Foe Volbeat's Confuse Ray was bounced back by MAGIC COAT!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
+        MESSAGE("Foe Volbeat became confused!");
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster-affected moves which are reflected by Magic Coat can affect Dark-type Pokémon, unless the Pokémon that bounced the move also has Prankster")
+{
+    u16 sableyeAbility;
+
+    PARAMETRIZE { sableyeAbility = ABILITY_PRANKSTER; }
+    PARAMETRIZE { sableyeAbility = ABILITY_KEEN_EYE; }
+
+    GIVEN {
+        PLAYER(SPECIES_SABLEYE) { Ability(sableyeAbility); }
+        OPPONENT(SPECIES_MURKROW) { Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_MAGIC_COAT); MOVE(opponent, MOVE_CONFUSE_RAY); }
+    } SCENE {
+        MESSAGE("Sableye used Magic Coat!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, player);
+        MESSAGE("Foe Murkrow used Confuse Ray!");
+        MESSAGE("Foe Murkrow's Confuse Ray was bounced back by MAGIC COAT!");
+        if (sableyeAbility == ABILITY_PRANKSTER) {
+            NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
+            MESSAGE("It doesn't affect Foe Murkrow…");
+        } else {
+            ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
+            MESSAGE("Foe Murkrow became confused!");
+        }
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster-affected moves can still be bounced back by a Dark-type with Magic Bounce")
+{
+    GIVEN {
+        PLAYER(SPECIES_ABSOL) { Item(ITEM_ABSOLITE); }
+        OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(opponent, MOVE_CONFUSE_RAY); }
+    } SCENE {
+        MESSAGE("Foe Volbeat's Confuse Ray was bounced back by Absol's Magic Bounce!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
+    }
+}
+
+SINGLE_BATTLE_TEST("Prankster-affected moves that are bounced back by Magic Bounce can affect Dark-type Pokémon")
+{
+    GIVEN {
+        PLAYER(SPECIES_ABSOL) { Item(ITEM_ABSOLITE); }
+        OPPONENT(SPECIES_MURKROW) { Ability(ABILITY_PRANKSTER); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(opponent, MOVE_CONFUSE_RAY); }
+    } SCENE {
+        MESSAGE("Foe Murkrow's Confuse Ray was bounced back by Absol's Magic Bounce!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
+        MESSAGE("Foe Murkrow became confused!");
+    }
+}
+
 TO_DO_BATTLE_TEST("Prankster-affected moves called via Nature Power don't affect Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster-affected moves called via Instruct affect Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster-affected moves called via After you affect Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster-affected moves that are bounced back by Magic Bounce/Coat can affect Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster-affected moves that are bounced back by Magic Coat from a Pokémon with Prankster can't affect Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster-affected moves that target all Pokémon are successful regardless of the presence of Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster-affected move effects don't affect Dark-type Pokémon");
-TO_DO_BATTLE_TEST("Prankster increases the priority of moves by 1");
 TO_DO_BATTLE_TEST("Prankster increases the priority of status Z-Moves by 1");
 TO_DO_BATTLE_TEST("Prankster increases the priority of Extreme Evoboost by 1");
-TO_DO_BATTLE_TEST("Prankster is blocked by Quick Guard in Gen5+");