ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 20:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked Task_ShowAiPoints to comply with the PE

Browse Source 
Due to the removal of the Deoxys hack, this function needed some minor adjustments that could have always been handled by using the #ifdef preproc directive.
This commit is contained in:
LOuroboros 2021-05-17 18:33:12 -03:00
parent cd84e8f05c
commit 83a1351e82
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/battle_debug.c
View File

@ -737,9 +737,15 @@ static void Task_ShowAiPoints(u8 taskId)
{ {
if (i != data->aiBattlerId && IsBattlerAlive(i)) if (i != data->aiBattlerId && IsBattlerAlive(i))
{ {
#ifndef POKEMON_EXPANSION
data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species, data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
SpriteCallbackDummy, SpriteCallbackDummy,
95 + (count * 60), 17, 0, 0, FALSE); 95 + (count * 60), 17, 0, 0, FALSE);
#else
data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
SpriteCallbackDummy,
95 + (count * 60), 17, 0, 0);
#endif
gSprites[data->aiIconSpriteIds[i]].data[0] = i; // battler id gSprites[data->aiIconSpriteIds[i]].data[0] = i; // battler id
count++; count++;
} }
@ -748,11 +754,19 @@ static void Task_ShowAiPoints(u8 taskId)
data->aiIconSpriteIds[i] = 0xFF; data->aiIconSpriteIds[i] = 0xFF;
} }
} }
#ifndef POKEMON_EXPANSION
data->aiMonSpriteId = CreateMonPicSprite_HandleDeoxys(gBattleMons[data->aiBattlerId].species, data->aiMonSpriteId = CreateMonPicSprite_HandleDeoxys(gBattleMons[data->aiBattlerId].species,
gBattleMons[data->aiBattlerId].otId, gBattleMons[data->aiBattlerId].otId,
gBattleMons[data->aiBattlerId].personality, gBattleMons[data->aiBattlerId].personality,
TRUE, TRUE,
39, 130, 15, 0xFFFF); 39, 130, 15, 0xFFFF);
#else
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
gBattleMons[data->aiBattlerId].otId,
gBattleMons[data->aiBattlerId].personality,
TRUE,
39, 130, 15, 0xFFFF);
#endif
data->aiViewState++; data->aiViewState++;
break; break;
// Put text // Put text