From 6b8494036d64c6f84cde3d8273326e1c3141a5db Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon, 28 Nov 2022 10:49:32 -0300
Subject: [PATCH] Removed unused species argument in DecompressPicFromTable

---
 include/decompress.h          | 2 +-
 src/battle_gfx_sfx_util.c     | 6 ++----
 src/decompress.c              | 7 ++-----
 src/pokenav_match_call_gfx.c  | 2 +-
 src/trainer_pokemon_sprites.c | 4 ++--
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/include/decompress.h b/include/decompress.h
index 04f460454a..c2335bb5c7 100644
--- a/include/decompress.h
+++ b/include/decompress.h
@@ -17,7 +17,7 @@ void LoadCompressedSpritePaletteWithTag(const u32 *pal, u16 tag);
 void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer);
 bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src);
 
-void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer, s32 species);
+void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer);
 void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality);
 
 void HandleLoadSpecialPokePic(bool32 isFrontPic, void *dest, s32 species, u32 personality);
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 738546d334..2fa7751d01 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -635,8 +635,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId)
 {
     u8 position = GetBattlerPosition(battlerId);
     DecompressPicFromTable(&gTrainerFrontPicTable[frontPicId],
-                           gMonSpritesGfxPtr->sprites.ptr[position],
-                           SPECIES_NONE);
+                           gMonSpritesGfxPtr->sprites.ptr[position]);
     LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[frontPicId]);
 }
 
@@ -644,8 +643,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battlerId)
 {
     u8 position = GetBattlerPosition(battlerId);
     DecompressPicFromTable(&gTrainerBackPicTable[backPicId],
-                           gMonSpritesGfxPtr->sprites.ptr[position],
-                           SPECIES_NONE);
+                           gMonSpritesGfxPtr->sprites.ptr[position]);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
                           0x100 + 16 * battlerId, 0x20);
 }
diff --git a/src/decompress.c b/src/decompress.c
index c66009666d..bbefa36022 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -70,12 +70,9 @@ void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePale
     LoadSpritePalette(&dest);
 }
 
-void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer, s32 species)
+void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer)
 {
-    if (species > NUM_SPECIES)
-        LZ77UnCompWram(gBaseStats[SPECIES_NONE].frontPic, buffer);
-    else
-        LZ77UnCompWram(src->data, buffer);
+    LZ77UnCompWram(src->data, buffer);
 }
 
 void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality)
diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c
index fd5b36fae0..30d6c7c7af 100755
--- a/src/pokenav_match_call_gfx.c
+++ b/src/pokenav_match_call_gfx.c
@@ -1247,7 +1247,7 @@ static void LoadCheckPageTrainerPic(struct Pokenav_MatchCallGfx *gfx)
     int trainerPic = GetMatchCallTrainerPic(PokenavList_GetSelectedIndex());
     if (trainerPic >= 0)
     {
-        DecompressPicFromTable(&gTrainerFrontPicTable[trainerPic], gfx->trainerPicGfx, SPECIES_NONE);
+        DecompressPicFromTable(&gTrainerFrontPicTable[trainerPic], gfx->trainerPicGfx);
         LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerPic].data, gfx->trainerPicPal);
         cursor = RequestDma3Copy(gfx->trainerPicGfx, gfx->trainerPicGfxPtr, sizeof(gfx->trainerPicGfx), 1);
         LoadPalette(gfx->trainerPicPal, gfx->trainerPicPalOffset, sizeof(gfx->trainerPicPal));
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 4f433e6ee2..f8cdeb4866 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -69,9 +69,9 @@ static bool16 DecompressPic(u16 species, u32 personality, bool8 isFrontPic, u8 *
     else
     {
         if (isFrontPic)
-            DecompressPicFromTable(&gTrainerFrontPicTable[species], dest, species);
+            DecompressPicFromTable(&gTrainerFrontPicTable[species], dest);
         else
-            DecompressPicFromTable(&gTrainerBackPicTable[species], dest, species);
+            DecompressPicFromTable(&gTrainerBackPicTable[species], dest);
     }
     return FALSE;
 }