diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
| commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
| tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /src/decompress.c | |
| parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
merge with master, fix conflicts
Diffstat (limited to 'src/decompress.c')
| -rw-r--r-- | src/decompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/decompress.c b/src/decompress.c index 2863ff1f5..9210799ec 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -465,7 +465,7 @@ u32 sub_8034974(void* ptr) return (ptr_[3] << 16) | (ptr_[2] << 8) | (ptr_[1]); } -bool8 LoadCompressedObjectPicUsingHeap(struct CompressedSpriteSheet* src) +bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src) { struct SpriteSheet dest; void* buffer; |