diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/decompress.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/decompress.h')
| -rw-r--r-- | include/decompress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/decompress.h b/include/decompress.h index e98181c82..853230aea 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -5,8 +5,8 @@ extern u8 gDecompressionBuffer[0x4000]; -void LZDecompressWram(const void *src, void *dest); -void LZDecompressVram(const void *src, void *dest); +void LZDecompressWram(const u32 *src, void *dest); +void LZDecompressVram(const u32 *src, void *dest); u16 LoadCompressedObjectPic(const struct CompressedSpriteSheet *src); void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer); @@ -28,6 +28,6 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); -u32 GetDecompressedDataSize(const u8 *ptr); +u32 GetDecompressedDataSize(const u32 *ptr); #endif // GUARD_DECOMPRESS_H |