From def80f2e1023457b5a4900d6f82b225f00deee97 Mon Sep 17 00:00:00 2001
From: SmhMyHead <191356399+SmhMyHead@users.noreply.github.com>
Date: Fri, 18 Jul 2025 05:36:53 +0200
Subject: [PATCH] [UI/UX] Baton shows on top, De/Activate form shows on bottom
 (#6104)

[UI/UX] Batton shows on top, De/Activate form shows on bottom
---
 src/ui/party-ui-handler.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index bb33026cc77..ce5f60813c7 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -1284,17 +1284,18 @@ export class PartyUiHandler extends MessageUiHandler {
           const allowBatonModifierSwitch = this.allowBatonModifierSwitch();
           const isBatonPassMove = this.isBatonPassMove();
 
+          if (allowBatonModifierSwitch && !isBatonPassMove) {
+            // the BATON modifier gives an extra switch option for
+            // pokemon-command switches, allowing buffs to be optionally passed
+            this.options.push(PartyOption.PASS_BATON);
+          }
+
           // isBatonPassMove and allowBatonModifierSwitch shouldn't ever be true
           // at the same time, because they both explicitly check for a mutually
           // exclusive partyUiMode. But better safe than sorry.
           this.options.push(
             isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT,
           );
-          if (allowBatonModifierSwitch && !isBatonPassMove) {
-            // the BATON modifier gives an extra switch option for
-            // pokemon-command switches, allowing buffs to be optionally passed
-            this.options.push(PartyOption.PASS_BATON);
-          }
         }
         this.addCommonOptions(pokemon);
         if (this.partyUiMode === PartyUiMode.SWITCH) {
@@ -1334,13 +1335,13 @@ export class PartyUiHandler extends MessageUiHandler {
         this.addCommonOptions(pokemon);
         break;
       case PartyUiMode.CHECK:
+        this.addCommonOptions(pokemon);
         if (globalScene.phaseManager.getCurrentPhase()?.is("SelectModifierPhase")) {
           const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon);
           for (let i = 0; i < formChangeItemModifiers.length; i++) {
             this.options.push(PartyOption.FORM_CHANGE_ITEM + i);
           }
         }
-        this.addCommonOptions(pokemon);
         break;
       case PartyUiMode.SELECT:
         this.options.push(PartyOption.SELECT);