From d0fe75b06ad9fc49e6b9afd52a978b401823aaec Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 9 Aug 2023 09:57:42 +0200
Subject: [PATCH] fixes

---
 src/battle_ai_util.c                   |  5 ++++-
 src/battle_controller_player_partner.c | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 8d35e98ff5..b27501c190 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -453,7 +453,10 @@ bool32 BattlerHasAi(u32 battlerId)
     case B_POSITION_OPPONENT_LEFT:
         return TRUE;
     case B_POSITION_PLAYER_RIGHT:
-        return ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) != 0);
+        if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || FlagGet(B_FLAG_AI_VS_AI_BATTLE))
+            return TRUE;
+        else
+            return FALSE;
     case B_POSITION_OPPONENT_RIGHT:
         return TRUE;
     }
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 3a4beeca93..996ac15a56 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -11,6 +11,7 @@
 #include "battle_z_move.h"
 #include "bg.h"
 #include "data.h"
+#include "event_data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -1316,6 +1317,12 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
         xPos = 90;
         yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80;
     }
+    else if (FlagGet(B_FLAG_AI_VS_AI_BATTLE))
+    {
+        trainerPicId = gTrainers[gPartnerTrainerId].trainerPic;
+        xPos = 60;
+        yPos = (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 80;
+    }
     else
     {
         trainerPicId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId);
@@ -1823,6 +1830,11 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
         u8 spriteId = gPartnerSpriteId;
         LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32);
     }
+    else if (FlagGet(B_FLAG_AI_VS_AI_BATTLE))
+    {
+        u8 spriteId = gTrainers[gPartnerTrainerId].trainerPic;
+        LoadCompressedPalette(gTrainerFrontPicPaletteTable[spriteId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
+    }
     else
     {
         u8 spriteId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId);