From dcbe8ada042b83f6916b1d307f077b9460a19b26 Mon Sep 17 00:00:00 2001
From: Tiago Rodrigues <tiago.n.rodrigues@tecnico.ulisboa.pt>
Date: Wed, 9 Jul 2025 01:58:10 +0100
Subject: [PATCH] [Fix] Implemented UI suggestions and removed discard text
 confirmation

---
 src/ui/party-ui-handler.ts | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 2a5cae83977..96d008b3755 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -367,6 +367,7 @@ export default class PartyUiHandler extends MessageUiHandler {
       this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double" : ""}`);
     }
 
+    this.showPartyText();
     this.populatePartySlots();
     this.partyDiscardModeButton.toggleIcon(this.partyUiMode);
     this.setCursor(0);
@@ -658,7 +659,6 @@ export default class PartyUiHandler extends MessageUiHandler {
   }
 
   private processDiscardMenuInput(pokemon: PlayerPokemon) {
-    const ui = this.getUi();
     this.clearOptions();
 
     const itemModifiers = this.getTransferrableItemsFromPokemon(pokemon);
@@ -676,15 +676,6 @@ export default class PartyUiHandler extends MessageUiHandler {
       );
     }
 
-    if (success) {
-      this.showText(
-        i18next.t("partyUiHandler:discardItemConfirmation", { pokemonName: getPokemonNameWithAffix(pokemon) }),
-      );
-      ui.playSelect();
-    } else {
-      ui.playError();
-    }
-
     return success;
   }
 
@@ -997,6 +988,7 @@ export default class PartyUiHandler extends MessageUiHandler {
       ui.playSelect();
     }
 
+    // Toggle item transfer mode to discard items or vice versa
     if (this.cursor === 7) {
       switch (this.partyUiMode) {
         case PartyUiMode.DISCARD:
@@ -1012,6 +1004,7 @@ export default class PartyUiHandler extends MessageUiHandler {
           break;
       }
       this.partyDiscardModeButton.toggleIcon(this.partyUiMode);
+      this.showPartyText();
       ui.playSelect();
     }
     // Pressing return button
@@ -1278,6 +1271,20 @@ export default class PartyUiHandler extends MessageUiHandler {
     this.setCursor(0);
   }
 
+  private showPartyText() {
+    switch (this.partyUiMode) {
+      case PartyUiMode.MODIFIER_TRANSFER:
+        this.showText(i18next.t("partyUiHandler:PartyTransfer"));
+        break;
+      case PartyUiMode.DISCARD:
+        this.showText(i18next.t("partyUiHandler:PartyDiscard"));
+        break;
+      default:
+        this.showText("", 0);
+        break;
+    }
+  }
+
   private allowBatonModifierSwitch(): boolean {
     return !!(
       this.partyUiMode !== PartyUiMode.FAINT_SWITCH &&
@@ -1729,7 +1736,7 @@ export default class PartyUiHandler extends MessageUiHandler {
     this.eraseOptionsCursor();
 
     this.partyMessageBox.setSize(262, 30);
-    this.showText("", 0);
+    this.showPartyText();
   }
 
   eraseOptionsCursor() {
@@ -2143,7 +2150,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container {
 
   toggleIcon(partyMode: number) {
     switch (partyMode) {
-      case PartyUiMode.DISCARD:
+      case PartyUiMode.MODIFIER_TRANSFER:
         this.transferIcon.setVisible(true);
         this.discardIcon.setVisible(false);
         this.partyDiscardPb.setVisible(true);
@@ -2155,7 +2162,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container {
         );
         this.transferIcon.displayWidth = this.textBox.text.length * 9 + 3;
         break;
-      case PartyUiMode.MODIFIER_TRANSFER:
+      case PartyUiMode.DISCARD:
         this.transferIcon.setVisible(false);
         this.discardIcon.setVisible(true);
         this.partyDiscardPb.setVisible(true);