ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix merge conflicts

This commit is contained in:
Christopher Schmidt 2024-12-01 17:03:39 -05:00
parent 068b0189db
commit 9d5e84dd90
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/move.ts
View File

@ -6549,7 +6549,7 @@ export class RandomMovesetMoveAttr extends CallMoveAttr {
// includeParty will be true for Assist, false for Sleep Talk // includeParty will be true for Assist, false for Sleep Talk
let allies: Pokemon[]; let allies: Pokemon[];
if (this.includeParty) { if (this.includeParty) {
allies = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); allies = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty();
} else { } else {
allies = [ user ]; allies = [ user ];
} }