atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unused species argument in DecompressPicFromTable

Browse source
This commit is contained in:
Eduardo Quezada 2022-11-28 10:49:32 -03:00
parent 9d1ab936d5
commit 6b8494036d
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/decompress.h
View file

@ -17,7 +17,7 @@ void LoadCompressedSpritePaletteWithTag(const u32 *pal, u16 tag);
void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer); void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *src, void *buffer);
bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src); 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 DecompressPicFromTableGender(void* buffer, s32 species, u32 personality);
void HandleLoadSpecialPokePic(bool32 isFrontPic, void *dest, s32 species, u32 personality); void HandleLoadSpecialPokePic(bool32 isFrontPic, void *dest, s32 species, u32 personality);

6
src/battle_gfx_sfx_util.c
View file

@ -635,8 +635,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId)
{ {
u8 position = GetBattlerPosition(battlerId); u8 position = GetBattlerPosition(battlerId);
DecompressPicFromTable(&gTrainerFrontPicTable[frontPicId], DecompressPicFromTable(&gTrainerFrontPicTable[frontPicId],
gMonSpritesGfxPtr->sprites.ptr[position], gMonSpritesGfxPtr->sprites.ptr[position]);
SPECIES_NONE);
LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[frontPicId]); LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[frontPicId]);
} }
@ -644,8 +643,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battlerId)
{ {
u8 position = GetBattlerPosition(battlerId); u8 position = GetBattlerPosition(battlerId);
DecompressPicFromTable(&gTrainerBackPicTable[backPicId], DecompressPicFromTable(&gTrainerBackPicTable[backPicId],
gMonSpritesGfxPtr->sprites.ptr[position], gMonSpritesGfxPtr->sprites.ptr[position]);
SPECIES_NONE);
LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data, LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
0x100 + 16 * battlerId, 0x20); 0x100 + 16 * battlerId, 0x20);
} }

7
src/decompress.c
View file

@ -70,12 +70,9 @@ void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePale
LoadSpritePalette(&dest); 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(src->data, buffer);
LZ77UnCompWram(gBaseStats[SPECIES_NONE].frontPic, buffer);
else
LZ77UnCompWram(src->data, buffer);
} }
void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality) void DecompressPicFromTableGender(void* buffer, s32 species, u32 personality)

2
src/pokenav_match_call_gfx.c
View file

@ -1247,7 +1247,7 @@ static void LoadCheckPageTrainerPic(struct Pokenav_MatchCallGfx *gfx)
int trainerPic = GetMatchCallTrainerPic(PokenavList_GetSelectedIndex()); int trainerPic = GetMatchCallTrainerPic(PokenavList_GetSelectedIndex());
if (trainerPic >= 0) if (trainerPic >= 0)
{ {
DecompressPicFromTable(&gTrainerFrontPicTable[trainerPic], gfx->trainerPicGfx, SPECIES_NONE); DecompressPicFromTable(&gTrainerFrontPicTable[trainerPic], gfx->trainerPicGfx);
LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerPic].data, gfx->trainerPicPal); LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerPic].data, gfx->trainerPicPal);
cursor = RequestDma3Copy(gfx->trainerPicGfx, gfx->trainerPicGfxPtr, sizeof(gfx->trainerPicGfx), 1); cursor = RequestDma3Copy(gfx->trainerPicGfx, gfx->trainerPicGfxPtr, sizeof(gfx->trainerPicGfx), 1);
LoadPalette(gfx->trainerPicPal, gfx->trainerPicPalOffset, sizeof(gfx->trainerPicPal)); LoadPalette(gfx->trainerPicPal, gfx->trainerPicPalOffset, sizeof(gfx->trainerPicPal));

4
src/trainer_pokemon_sprites.c
View file

@ -69,9 +69,9 @@ static bool16 DecompressPic(u16 species, u32 personality, bool8 isFrontPic, u8 *
else else
{ {
if (isFrontPic) if (isFrontPic)
DecompressPicFromTable(&gTrainerFrontPicTable[species], dest, species); DecompressPicFromTable(&gTrainerFrontPicTable[species], dest);
else else
DecompressPicFromTable(&gTrainerBackPicTable[species], dest, species); DecompressPicFromTable(&gTrainerBackPicTable[species], dest);
} }
return FALSE; return FALSE;
} }