diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 4a5512caf16..7bd7ab897cc 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -211,6 +211,8 @@ export default class BattleScene extends Phaser.Scene { this.loadImage('starter_select_gen_cursor', 'ui'); this.loadImage('starter_select_gen_cursor_highlight', 'ui'); + this.loadImage('default_bg', 'arenas'); + // Load arena images Utils.getEnumValues(Biome).map(bt => { const btKey = Biome[bt].toLowerCase(); diff --git a/src/evolution-phase.ts b/src/evolution-phase.ts index a72223e51e1..65cf4dd42b2 100644 --- a/src/evolution-phase.ts +++ b/src/evolution-phase.ts @@ -44,7 +44,7 @@ export class EvolutionPhase extends BattlePhase { this.evolutionContainer = (this.scene.ui.getHandler() as EvolutionSceneHandler).evolutionContainer; - this.evolutionBaseBg = this.scene.add.image(0, 0, 'plains_bg'); + this.evolutionBaseBg = this.scene.add.image(0, 0, 'default_bg'); this.evolutionBaseBg.setOrigin(0, 0); this.evolutionContainer.add(this.evolutionBaseBg); diff --git a/src/ui/ability-bar.ts b/src/ui/ability-bar.ts index 0052bb51c76..85f1a1f19f2 100644 --- a/src/ui/ability-bar.ts +++ b/src/ui/ability-bar.ts @@ -4,6 +4,7 @@ import { TextStyle, addTextObject } from "./text"; const hiddenX = -91; const shownX = 10; +const baseY = -116; export default class AbilityBar extends Phaser.GameObjects.Container { private bg: Phaser.GameObjects.Image; @@ -15,7 +16,7 @@ export default class AbilityBar extends Phaser.GameObjects.Container { public shown: boolean; constructor(scene: BattleScene) { - super(scene, hiddenX, (-scene.game.canvas.height / 6) + 64); + super(scene, hiddenX, baseY); } setup(): void { @@ -43,9 +44,12 @@ export default class AbilityBar extends Phaser.GameObjects.Container { if (this.shown) return; + (this.scene as BattleScene).fieldUI.bringToTop(this); + if (this.tween) this.tween.stop(); + this.y = baseY + ((this.scene as BattleScene).currentBattle.double ? 14 : 0); this.tween = this.scene.tweens.add({ targets: this, x: shownX, diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts index cba38f5ae97..1abd817c391 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/evolution-scene-handler.ts @@ -13,6 +13,12 @@ export default class EvolutionSceneHandler extends UiHandler { this.evolutionContainer = this.scene.add.container(0, -this.scene.game.canvas.height / 6); this.scene.fieldUI.add(this.evolutionContainer); } + + show(_args: any[]): void { + super.show(_args); + + this.scene.fieldUI.bringToTop(this.evolutionContainer); + } processInput(button: Button) { this.scene.ui.getMessageHandler().processInput(button);