From 83a1351e82a54b1fb6193ba8d34548bad09b3349 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 17 May 2021 18:33:12 -0300 Subject: [PATCH 1/4] 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 461f841582..04891e89d8 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 From bf679fc99eb7b51965fa003c009c81facecf942b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 2 Jun 2021 17:42:25 -0300 Subject: [PATCH 2/4] Tweaked Task_ShowAiKnowledge too --- src/battle_debug.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/battle_debug.c b/src/battle_debug.c index b6a0c9cfdd..4dee2ed3b3 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -869,9 +869,15 @@ static void Task_ShowAiKnowledge(u8 taskId) { if (GET_BATTLER_SIDE(i) == B_SIDE_PLAYER && IsBattlerAlive(i)) { + #ifndef POKEMON_EXPANSION data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species, SpriteCallbackDummy, 95 + (count * 80), 17, 0, 0, FALSE); + #else + data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species, + SpriteCallbackDummy, + 95 + (count * 80), 17, 0, 0); + #endif gSprites[data->aiIconSpriteIds[i]].data[0] = i; // battler id count++; } @@ -880,11 +886,19 @@ static void Task_ShowAiKnowledge(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 From cb4f16a17869d0aaffc53e0f54af8b38c7fb09f1 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 3 Jun 2021 05:17:41 -0300 Subject: [PATCH 3/4] Syntax change #1 Though I don't like it, personally. Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_debug.c b/src/battle_debug.c index 4dee2ed3b3..1c3de961dc 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -763,19 +763,19 @@ static void Task_ShowAiPoints(u8 taskId) data->aiIconSpriteIds[i] = 0xFF; } } - #ifndef POKEMON_EXPANSION + #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 + #else data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species, gBattleMons[data->aiBattlerId].otId, gBattleMons[data->aiBattlerId].personality, TRUE, 39, 130, 15, 0xFFFF); - #endif + #endif data->aiViewState++; break; // Put text From b67e82c7c191aba6554880fb8b5fdb78aa21e8dd Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 3 Jun 2021 05:17:52 -0300 Subject: [PATCH 4/4] Syntax change #2 Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/battle_debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_debug.c b/src/battle_debug.c index 1c3de961dc..d75ba84719 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -886,19 +886,19 @@ static void Task_ShowAiKnowledge(u8 taskId) data->aiIconSpriteIds[i] = 0xFF; } } - #ifndef POKEMON_EXPANSION + #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 + #else data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species, gBattleMons[data->aiBattlerId].otId, gBattleMons[data->aiBattlerId].personality, TRUE, 39, 130, 15, 0xFFFF); - #endif + #endif data->aiViewState++; break; // Put text