Fixed Battle AI debug screen shiny sprites (rh-hideout#3922)

* Switched gBattleMons.isShiny to GetMonData * Simplified getting party of Pokemon --------- Co-authored-by: Alex <[email protected]>
Fervstheone · Jan 4, 2024 · bfe3e76 · bfe3e76
1 parent 4d5c572
commit bfe3e76
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/battle_debug.c b/src/battle_debug.c
@@ -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);