mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-23 23:13:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ssui-refactor' of https://github.com/pagefaultgames/pokerogue into ssui-refactor

Browse Source
This commit is contained in:
Wlowscha 2025-09-11 18:50:36 +02:00
commit 39970212df
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/field/pokemon.ts
View File

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

1
src/ui/containers/starter-container.ts
View File

@ -111,6 +111,7 @@ export class StarterContainer extends Phaser.GameObjects.Container {
this.checkIconId(female, formIndex, shiny, variant); this.checkIconId(female, formIndex, shiny, variant);
this.icon.setTint(0); this.icon.setTint(0);
this.add(this.icon); this.add(this.icon);
this.icon.setBelow(this.label);
[ [
this.hiddenAbilityIcon, this.hiddenAbilityIcon,