From c93421542692440dd132586de14b2e1d69feee98 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Tue, 24 Jun 2025 20:49:52 -0400 Subject: [PATCH] hhhhh --- src/data/moves/move.ts | 4 ++-- test/moves/assist.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 41d954d2d14..13955b94dd6 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -7053,8 +7053,8 @@ export class CopyMoveAttr extends CallMoveAttr { */ override getMove(_user: Pokemon, target: Pokemon): MoveId { return this.selfTarget - ? target.getLastXMoves()[0]?.move ?? MoveId.NONE - : globalScene.currentBattle.lastMove + ? globalScene.currentBattle.lastMove + : target.getLastXMoves()[0]?.move ?? MoveId.NONE } getCondition(): MoveConditionFunc { diff --git a/test/moves/assist.test.ts b/test/moves/assist.test.ts index 17f3da3d2f8..98fe1ee6f60 100644 --- a/test/moves/assist.test.ts +++ b/test/moves/assist.test.ts @@ -28,7 +28,7 @@ describe("Moves - Assist", () => { // Manual moveset overrides are required for the player pokemon in these tests // because the normal moveset override doesn't allow for accurate testing of moveset changes game.override - .ability(AbilityId.BALL_FETCH) + .ability(AbilityId.NO_GUARD) .battleStyle("single") .criticalHits(false) .enemySpecies(SpeciesId.MAGIKARP)