Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix follower compression (#7038)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-06-01 10:06:12 +02:00 committed by GitHub
parent 0917af214c
commit 392d4db319
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/decompress.h
View File

@ -81,5 +81,6 @@ void HandleLoadSpecialPokePic(bool32 isFrontPic, void *dest, s32 species, u32 pe
void LoadSpecialPokePic(void *dest, s32 species, u32 personality, bool8 isFrontPic);
u32 GetDecompressedDataSize(const u32 *ptr);
bool32 IsCompressedData(const u32 *ptr);
#endif // GUARD_DECOMPRESS_H

52
src/decompress.c
View File

@ -227,18 +227,21 @@ u32 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s
u32 size;
// Check for LZ77 header and read uncompressed size, or fallback if not compressed (zero size)
if ((size = IsLZ77Data(template->images->data, TILE_SIZE_4BPP, MAX_DECOMPRESSION_BUFFER_SIZE)) == 0)
return LoadSpriteSheetByTemplate(template, 0, offset);
if (IsCompressedData(template->images->data))
{
size = GetDecompressedDataSize(template->images->data);
void *buffer = malloc_and_decompress(template->images->data, NULL);
myImage.data = buffer;
myImage.size = size + offset;
myTemplate.images = &myImage;
myTemplate.tileTag = template->tileTag;
void *buffer = malloc_and_decompress(template->images->data, NULL);
myImage.data = buffer;
myImage.size = size + offset;
myTemplate.images = &myImage;
myTemplate.tileTag = template->tileTag;
u32 ret = LoadSpriteSheetByTemplate(&myTemplate, 0, offset);
Free(buffer);
return ret;
}
return LoadSpriteSheetByTemplate(template, 0, offset);
u32 ret = LoadSpriteSheetByTemplate(&myTemplate, 0, offset);
Free(buffer);
return ret;
}
void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer)
@ -1324,6 +1327,35 @@ u32 GetDecompressedDataSize(const u32 *ptr)
}
}
bool32 IsCompressedData(const u32 *ptr)
{
u32 size;
union CompressionHeader *header = (union CompressionHeader *)ptr;
switch (header->smol.mode)
{
case MODE_LZ77:
return IsLZ77Data(ptr, TILE_SIZE_4BPP, MAX_DECOMPRESSION_BUFFER_SIZE);
case BASE_ONLY:
case ENCODE_SYMS:
case ENCODE_DELTA_SYMS:
case ENCODE_LO:
case ENCODE_BOTH:
case ENCODE_BOTH_DELTA_SYMS:
size = GetDecompressedDataSize(ptr);
if (size % TILE_SIZE_4BPP == 0 && size < MAX_DECOMPRESSION_BUFFER_SIZE)
return TRUE;
break;
case IS_FRAME_CONTAINER:
// No implemented yet
case IS_TILEMAP:
// Has to use another assumption
default:
// Is not one of these cases, it's not compressed data
return FALSE;
}
return FALSE;
}
bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet *src)
{
struct SpriteSheet dest;