From 58736211547fd4ec95ddfb2342fd3943c870a660 Mon Sep 17 00:00:00 2001
From: grintoul <166724814+grintoul1@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:24:13 +0000
Subject: [PATCH] Corrects battler position checks in battle_message.c (#8070)

---
 src/battle_message.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/battle_message.c b/src/battle_message.c
index 3e10ec6227..ddc3cf3f0c 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -2178,7 +2178,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
     case STRINGID_RETURNMON: // sending poke to ball msg
         if (IsOnPlayerSide(battler))
         {
-            if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerAtPosition(battler) == 2)
+            if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)
                 stringPtr = sText_InGamePartnerWithdrewPkmn2;
             else if (*(&gBattleStruct->hpScale) == 0)
                 stringPtr = sText_PkmnThatsEnough;
@@ -2202,7 +2202,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
                 {
-                    if (GetBattlerAtPosition(battler) == 1)
+                    if (GetBattlerPosition(battler) == B_POSITION_OPPONENT_LEFT)
                         stringPtr = sText_Trainer1WithdrewPkmn;
                     else
                         stringPtr = sText_Trainer2WithdrewPkmn;