Merge branch 'beta' into change-lng-in-login

This commit is contained in:
Sirz Benjie 2025-09-09 16:07:33 -05:00 committed by GitHub
commit 4afa62be87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3049,7 +3049,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
public generateAndPopulateMoveset(): void {
this.moveset = [];
let movePool: [MoveId, number][] = [];
const allLevelMoves = this.getLevelMoves(1, true, true);
const allLevelMoves = this.getLevelMoves(1, true, true, this.hasTrainer());
if (!allLevelMoves) {
console.warn("Error encountered trying to generate moveset for:", this.species.name);
return;