summaryrefslogtreecommitdiff
path: root/src/decompress.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-11-27 20:09:53 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-11-27 20:09:53 -0500
commit88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (patch)
tree9b31cc1b61577ee20fa50b8feec5c7780cbce3ef /src/decompress.c
parent9840be1f0041e697f1aefbdc839a5227b7100112 (diff)
parent18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff)
Merge branch 'master' into clock
Diffstat (limited to 'src/decompress.c')
-rw-r--r--src/decompress.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/decompress.c b/src/decompress.c
index 9210799ec..e2ae6ce83 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -459,10 +459,9 @@ _08034964:\n\
.syntax divided");
}
-u32 sub_8034974(void* ptr)
+u32 sub_8034974(const u8 *ptr)
{
- u8* ptr_ = (u8*)(ptr);
- return (ptr_[3] << 16) | (ptr_[2] << 8) | (ptr_[1]);
+ return (ptr[3] << 16) | (ptr[2] << 8) | (ptr[1]);
}
bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src)