atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
DizzyEggg 2023-08-09 09:57:42 +02:00
parent a0c34813f1
commit d0fe75b06a
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/battle_ai_util.c
View file

@ -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;
}

12
src/battle_controller_player_partner.c
View file

@ -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);