From 83a1351e82a54b1fb6193ba8d34548bad09b3349 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 17 May 2021 18:33:12 -0300 Subject: [PATCH] Tweaked Task_ShowAiPoints to comply with the PE 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. --- src/battle_debug.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/battle_debug.c b/src/battle_debug.c index 461f84158..04891e89d 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -737,9 +737,15 @@ static void Task_ShowAiPoints(u8 taskId) { if (i != data->aiBattlerId && IsBattlerAlive(i)) { + #ifndef POKEMON_EXPANSION data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species, SpriteCallbackDummy, 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 count++; } @@ -748,11 +754,19 @@ static void Task_ShowAiPoints(u8 taskId) data->aiIconSpriteIds[i] = 0xFF; } } + #ifndef POKEMON_EXPANSION data->aiMonSpriteId = CreateMonPicSprite_HandleDeoxys(gBattleMons[data->aiBattlerId].species, gBattleMons[data->aiBattlerId].otId, gBattleMons[data->aiBattlerId].personality, TRUE, 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++; break; // Put text