cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some minor superficial bugs

pull/275/head
Flashfyre 2024-04-26 01:18:08 -04:00
parent 587197dac4
commit b863ab88a7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/party-ui-handler.ts
View File

@ -646,7 +646,11 @@ export default class PartyUiHandler extends MessageUiHandler {
const option = this.options[this.options.length - (o + 1)]; const option = this.options[this.options.length - (o + 1)];
let altText = false; let altText = false;
let optionName: string; let optionName: string;
if ((this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) || option === PartyOption.CANCEL) { if (option === PartyOption.SCROLL_UP)
optionName = '↑';
else if (option === PartyOption.SCROLL_DOWN)
optionName = '↓';
else if ((this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) || option === PartyOption.CANCEL) {
switch (option) { switch (option) {
case PartyOption.MOVE_1: case PartyOption.MOVE_1:
case PartyOption.MOVE_2: case PartyOption.MOVE_2:
@ -662,11 +666,7 @@ export default class PartyUiHandler extends MessageUiHandler {
optionName = Utils.toReadableString(PartyOption[option]); optionName = Utils.toReadableString(PartyOption[option]);
break; break;
} }
} else if (option === PartyOption.SCROLL_UP) } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) {
optionName = '↑';
else if (option === PartyOption.SCROLL_DOWN)
optionName = '↓';
else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) {
const move = learnableLevelMoves[option]; const move = learnableLevelMoves[option];
optionName = allMoves[move].name; optionName = allMoves[move].name;
altText = !pokemon.getSpeciesForm().getLevelMoves().find(plm => plm[1] === move); altText = !pokemon.getSpeciesForm().getLevelMoves().find(plm => plm[1] === move);

2
src/ui/pokemon-info-container.ts
View File

@ -200,6 +200,8 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
x: this.initialX, x: this.initialX,
onComplete: () => { onComplete: () => {
this.setVisible(false); this.setVisible(false);
this.pokemonShinyIcon.off('pointerover');
this.pokemonShinyIcon.off('pointerout');
(this.scene as BattleScene).ui.hideTooltip(); (this.scene as BattleScene).ui.hideTooltip();
resolve(); resolve();
} }