diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/decompress.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/decompress.c')
| -rw-r--r-- | src/decompress.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/decompress.c b/src/decompress.c index 83a9db0b6..da1df436b 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -12,12 +12,12 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[]; static void DuplicateDeoxysTiles(void *pointer, s32 species); -void LZDecompressWram(const void *src, void *dest) +void LZDecompressWram(const u32 *src, void *dest) { LZ77UnCompWram(src, dest); } -void LZDecompressVram(const void *src, void *dest) +void LZDecompressVram(const u32 *src, void *dest) { LZ77UnCompVram(src, dest); } @@ -459,9 +459,10 @@ _08034964:\n\ .syntax divided"); } -u32 GetDecompressedDataSize(const u8 *ptr) +u32 GetDecompressedDataSize(const u32 *ptr) { - return (ptr[3] << 16) | (ptr[2] << 8) | (ptr[1]); + const u8 *ptr8 = (const u8 *)ptr; + return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]); } bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src) |