From b863ab88a708b1494d3417a46595b14c08dad741 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Fri, 26 Apr 2024 01:18:08 -0400
Subject: [PATCH] Fix some minor superficial bugs

---
 src/ui/party-ui-handler.ts       | 12 ++++++------
 src/ui/pokemon-info-container.ts |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index c6f32869f..919b96067 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -646,7 +646,11 @@ export default class PartyUiHandler extends MessageUiHandler {
       const option = this.options[this.options.length - (o + 1)];
       let altText = false;
       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) {
           case PartyOption.MOVE_1:
           case PartyOption.MOVE_2:
@@ -662,11 +666,7 @@ export default class PartyUiHandler extends MessageUiHandler {
               optionName = Utils.toReadableString(PartyOption[option]);
             break;
         }
-      } else if (option === PartyOption.SCROLL_UP)
-        optionName = '↑';
-      else if (option === PartyOption.SCROLL_DOWN)
-        optionName = '↓';
-      else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) {
+      } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) {
         const move = learnableLevelMoves[option];
         optionName = allMoves[move].name;
         altText = !pokemon.getSpeciesForm().getLevelMoves().find(plm => plm[1] === move);
diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts
index c11552c72..2b2dcb07e 100644
--- a/src/ui/pokemon-info-container.ts
+++ b/src/ui/pokemon-info-container.ts
@@ -200,6 +200,8 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
         x: this.initialX,
         onComplete: () => {
           this.setVisible(false);
+          this.pokemonShinyIcon.off('pointerover');
+          this.pokemonShinyIcon.off('pointerout');
           (this.scene as BattleScene).ui.hideTooltip();
           resolve();
         }