ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 12:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1492 from LOuroboros/battle_debug

Browse Source 
Tweaked src/battle_debug.c to comply with the PE
This commit is contained in:
ultima-soul 2021-06-03 09:01:37 -07:00 committed by GitHub
commit 9584b8539f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/battle_debug.c
View File

@ -746,9 +746,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++;
} }
@ -757,11 +763,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
@ -855,9 +869,15 @@ static void Task_ShowAiKnowledge(u8 taskId)
{ {
if (GET_BATTLER_SIDE(i) == B_SIDE_PLAYER && IsBattlerAlive(i)) if (GET_BATTLER_SIDE(i) == B_SIDE_PLAYER && IsBattlerAlive(i))
{ {
#ifndef POKEMON_EXPANSION
data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species, data->aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species,
SpriteCallbackDummy, SpriteCallbackDummy,
95 + (count * 80), 17, 0, 0, FALSE); 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 gSprites[data->aiIconSpriteIds[i]].data[0] = i; // battler id
count++; count++;
} }
@ -866,11 +886,19 @@ static void Task_ShowAiKnowledge(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