src/data/ability.ts

@@ -4243,7 +4243,7 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
         (args[0] as Utils.NumberHolder).value = this.multiplier;
         pokemon.removeTag(this.tagType);
         if (this.recoilDamageFunc) {
-          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true);
+          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER);
         }
       }
       return true;

src/test/abilities/disguise.test.ts

@@ -207,18 +207,4 @@ describe("Abilities - Disguise", () => {
 
     expect(mimikyu1.formIndex).toBe(disguisedForm);
   }, TIMEOUT);
-
-  it("doesn't faint twice when fainting due to Disguise break damage, nor prevent faint from Disguise break damage if using Endure", async () => {
-    game.override.enemyMoveset(Array(4).fill(Moves.ENDURE));
-    await game.startBattle();
-
-    const mimikyu = game.scene.getEnemyPokemon()!;
-    mimikyu.hp = 1;
-
-    game.move.select(Moves.SHADOW_SNEAK);
-    await game.toNextWave();
-
-    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
-    expect(game.scene.currentBattle.waveIndex).toBe(2);
-  }, TIMEOUT);
 });

src/ui/modifier-select-ui-handler.ts

@@ -334,11 +334,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
             success = false;
             break;
           case 1:
-            if (this.transferButtonContainer.visible) {
+            success = this.rerollButtonContainer.visible && this.setCursor(0);
-              success = this.setCursor(3);
-            } else {
-              success = this.rerollButtonContainer.visible && this.setCursor(0);
-            }
             break;
           case 2:
             if (this.transferButtonContainer.visible) {
@@ -372,13 +368,6 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
           case 2:
             success = false;
             break;
-          case 3:
-            if (this.transferButtonContainer.visible) {
-              success = this.setCursor(1);
-            } else {
-              success = this.setCursor(2);
-            }
-            break;
           }
         } else if (this.cursor < this.getRowItems(this.rowCursor) - 1) {
           success = this.setCursor(this.cursor + 1);