diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-29 00:52:32 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-29 00:52:32 -0600 |
| commit | 70743f4b951bb84ca33fd2151e55b2f5018eb6c5 (patch) | |
| tree | 7298959f4e81c88adeac0c26b9016b9d197da1fd /src/decompress.c | |
| parent | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (diff) | |
| parent | 54da96309186b98263b4434911e1c5b8d4b4e3ec (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/decompress.c')
| -rw-r--r-- | src/decompress.c | 5 |
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) |