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

Fixed Battle AI debug screen shiny sprites (#3922)

Browse source 
* Switched gBattleMons.isShiny to GetMonData

* Simplified getting party of Pokemon

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
Frank DeBlasio 2024-01-04 09:39:26 -05:00 committed by GitHub
parent 4d5c572d0c
commit bfe3e762ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/battle_debug.c
View file

@ -769,6 +769,7 @@ static void Task_ShowAiPoints(u8 taskId)
u32 i, count;
struct WindowTemplate winTemplate;
struct BattleDebugMenu *data = GetStructPtr(taskId);
struct Pokemon *mon;
switch (data->aiViewState)
{
@ -800,8 +801,11 @@ static void Task_ShowAiPoints(u8 taskId)
data->spriteIds.aiIconSpriteIds[i] = 0xFF;
}
}
mon = &GetBattlerParty(data->aiBattlerId)[gBattlerPartyIndexes[data->aiBattlerId]];
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
gBattleMons[data->aiBattlerId].isShiny,
GetMonData(mon, MON_DATA_IS_SHINY),
gBattleMons[data->aiBattlerId].personality,
TRUE,
39, 130, 15, TAG_NONE);
@ -926,6 +930,7 @@ static void Task_ShowAiKnowledge(u8 taskId)
u32 i, count;
struct WindowTemplate winTemplate;
struct BattleDebugMenu *data = GetStructPtr(taskId);
struct Pokemon *mon;
switch (data->aiViewState)
{
@ -957,8 +962,11 @@ static void Task_ShowAiKnowledge(u8 taskId)
data->spriteIds.aiIconSpriteIds[i] = 0xFF;
}
}
mon = &GetBattlerParty(data->aiBattlerId)[gBattlerPartyIndexes[data->aiBattlerId]];
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
gBattleMons[data->aiBattlerId].isShiny,
GetMonData(mon, MON_DATA_IS_SHINY),
gBattleMons[data->aiBattlerId].personality,
TRUE,
39, 130, 15, TAG_NONE);