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 'beta' into refactor-starter-handling

Browse Source
This commit is contained in:
Wlowscha 2025-09-10 16:41:16 +02:00 committed by GitHub
commit 168c141b80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/field/mystery-encounter-intro.ts
View File

@ -6,7 +6,6 @@ import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
import { loadPokemonVariantAssets } from "#sprites/pokemon-sprite"; import { loadPokemonVariantAssets } from "#sprites/pokemon-sprite";
import type { Variant } from "#sprites/variant"; import type { Variant } from "#sprites/variant";
import { isNullOrUndefined } from "#utils/common"; import { isNullOrUndefined } from "#utils/common";
import console from "node:console";
import type { GameObjects } from "phaser"; import type { GameObjects } from "phaser";
type PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig; type PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig;

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/loading-scene.ts
View File

@ -131,7 +131,6 @@ export class LoadingScene extends SceneBase {
this.loadAtlas("party_transfer", "ui"); this.loadAtlas("party_transfer", "ui");
this.loadImage("summary_bg", "ui"); this.loadImage("summary_bg", "ui");
this.loadImage("summary_overlay_shiny", "ui");
this.loadImage("summary_profile", "ui"); this.loadImage("summary_profile", "ui");
this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt
this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt