From 2784f701d860a51be8a97a8306124b0d4a15a495 Mon Sep 17 00:00:00 2001
From: voloved <36523934+voloved@users.noreply.github.com>
Date: Sat, 26 Aug 2023 12:58:51 -0400
Subject: [PATCH] =?UTF-8?q?Pok=C3=A9=20Ball=20shortcut=20tweaks=20(#3254)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/battle_controller_player.c | 2 +-
 src/battle_interface.c         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index d349381329..6950a06b3d 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -326,7 +326,7 @@ static void HandleInputChooseAction(void)
             SwapBallToDisplay(sameBall);
             PlaySE(SE_SELECT);
         }
-        else if (!JOY_HELD(B_LAST_USED_BALL_BUTTON) && sBallSwapped)
+        else if (JOY_NEW(B_BUTTON) || (!JOY_HELD(B_LAST_USED_BALL_BUTTON) && sBallSwapped))
         {
             sAckBallUseBtn = FALSE;
             sBallSwapped = FALSE;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 09b1200d2b..e2cdcff528 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -3256,13 +3256,13 @@ static const struct SpriteSheet sSpriteSheet_LastUsedBallWindow =
     sLastUsedBallWindowGfx, sizeof(sLastUsedBallWindowGfx), LAST_BALL_WINDOW_TAG
 };
 
-#define LAST_USED_BALL_X_F    15
-#define LAST_USED_BALL_X_0    -15
+#define LAST_USED_BALL_X_F    14
+#define LAST_USED_BALL_X_0    -14
 #define LAST_USED_BALL_Y      ((IsDoubleBattle()) ? 78 : 68)
 #define LAST_USED_BALL_Y_BNC  ((IsDoubleBattle()) ? 76 : 66)
 
-#define LAST_BALL_WIN_X_F       (LAST_USED_BALL_X_F - 1)
-#define LAST_BALL_WIN_X_0       (LAST_USED_BALL_X_0 - 1)
+#define LAST_BALL_WIN_X_F       (LAST_USED_BALL_X_F - 0)
+#define LAST_BALL_WIN_X_0       (LAST_USED_BALL_X_0 - 0)
 #define LAST_USED_WIN_Y         (LAST_USED_BALL_Y - 8)
 
 #define sHide  data[0]