From 6b23f425c08549057d570977afc7453f79e491e3 Mon Sep 17 00:00:00 2001
From: Tiago Rodrigues <tiago.n.rodrigues@tecnico.ulisboa.pt>
Date: Fri, 27 Jun 2025 23:02:17 +0100
Subject: [PATCH] [Fix] Implemented 3 suggestions

---
 src/ui/party-ui-handler.ts         | 3 ++-
 test/ui/item-manage-button.test.ts | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 42efa06f013..69dd02e6f44 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -1099,7 +1099,7 @@ export default class PartyUiHandler extends MessageUiHandler {
         break;
       case Button.LEFT:
         if (this.cursor >= battlerCount && this.cursor <= 6) {
-          success = this.setCursor(0);
+          success = this.setCursor(this.isItemManageMode() ? 7 : 0);
         }
         break;
       case Button.RIGHT:
@@ -2052,6 +2052,7 @@ class PartyCancelButton extends Phaser.GameObjects.Container {
 
     this.setup();
   }
+
   setup() {
     const partyCancelBg = globalScene.add.sprite(0, 0, "party_cancel");
     this.add(partyCancelBg);
diff --git a/test/ui/item-manage-button.test.ts b/test/ui/item-manage-button.test.ts
index 38f51c135e5..9f282afac3a 100644
--- a/test/ui/item-manage-button.test.ts
+++ b/test/ui/item-manage-button.test.ts
@@ -33,7 +33,6 @@ describe("UI - Transfer Items", () => {
       { name: "BERRY", count: 2, type: BerryType.APICOT },
       { name: "BERRY", count: 2, type: BerryType.LUM },
     ]);
-    game.override.moveset(MoveId.DRAGON_CLAW);
     game.override.enemySpecies(SpeciesId.MAGIKARP);
     game.override.enemyMoveset(MoveId.SPLASH);