Fix battle tent again

src/battle_ai_main.c

@@ -233,20 +233,10 @@ u8 BattleAI_ChooseMoveOrAction(void)
 
 // damages/other info computed in GetAIDataAndCalcDmg
 u8 ComputeBattleAiScores(u8 battler)
-{
-    sBattler_AI = battler;
-    if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
-    {
-        u16 retVal = ChooseMoveAndTargetInBattlePalace(); // first byte is moveId, secondId is target
-        gBattleStruct->aiChosenTarget[sBattler_AI] = (retVal >> 8) & 0xFF;
-        return (retVal & 0xFF);
-    }
-    else
 {
     BattleAI_SetupAIData(0xF);
     return BattleAI_ChooseMoveOrAction();
 }
-}
 
 static void CopyBattlerDataToAIParty(u32 bPosition, u32 side)
 {

src/battle_controller_opponent.c

@@ -1553,6 +1553,12 @@ static void OpponentHandleChooseMove(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER)
      || IsWildMonSmart())
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
+        {
+            BtlController_EmitTwoReturnValues(BUFFER_B, 10, ChooseMoveAndTargetInBattlePalace());
+        }
+        else
         {
             chosenMoveId = gBattleStruct->aiMoveOrAction[gActiveBattler];
             gBattlerTarget = gBattleStruct->aiChosenTarget[gActiveBattler];
@@ -1591,6 +1597,7 @@ static void OpponentHandleChooseMove(void)
                 }
                 break;
             }
+        }
         OpponentBufferExecCompleted();
     }
     else // Wild pokemon - use random move

src/battle_controller_player.c

@@ -2843,10 +2843,8 @@ static void PlayerChooseMoveInBattlePalace(void)
 {
     if (--*(gBattleStruct->arenaMindPoints + gActiveBattler) == 0)
     {
-        u32 chosenMoveId = gBattleStruct->aiMoveOrAction[gActiveBattler];
-        gBattlerTarget = gBattleStruct->aiChosenTarget[gActiveBattler];
         gBattlePalaceMoveSelectionRngValue = gRngValue;
-        BtlController_EmitTwoReturnValues(BUFFER_B, 10, (chosenMoveId) | (gBattlerTarget << 8));
+        BtlController_EmitTwoReturnValues(BUFFER_B, 10, ChooseMoveAndTargetInBattlePalace());
         PlayerBufferExecCompleted();
     }
 }

src/battle_gfx_sfx_util.c

@@ -164,6 +164,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     {
         gBattleStruct->palaceFlags &= 0xF;
         gBattleStruct->palaceFlags |= (selectedMoves << 4);
+        sBattler_AI = gActiveBattler;
         BattleAI_SetupAIData(selectedMoves);
         chosenMoveId = BattleAI_ChooseMoveOrAction();
     }
@@ -173,6 +174,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     // If a move is chosen this way, there's a 50% chance that it will be unable to use it anyway
     if (chosenMoveId == -1 || chosenMoveId >= MAX_MON_MOVES)
     {
+        chosenMoveId = -1;
         if (unusableMovesBits != 0xF)
         {
             validMoveFlags = 0, numValidMoveGroups = 0;

src/battle_main.c

@@ -3974,7 +3974,7 @@ static void HandleTurnActionSelectionState(void)
 
             // Do AI score computations here so we can use them in AI_TrySwitchOrUseItem
             if ((gBattleTypeFlags & BATTLE_TYPE_HAS_AI || IsWildMonSmart())
-                && (IsBattlerAIControlled(gActiveBattler) || gBattleTypeFlags & BATTLE_TYPE_PALACE)) {
+                && (IsBattlerAIControlled(gActiveBattler) && !(gBattleTypeFlags & BATTLE_TYPE_PALACE))) {
                 gBattleStruct->aiMoveOrAction[gActiveBattler] = ComputeBattleAiScores(gActiveBattler);
             }
             break;