Merge branch 'master' into record_mixing

1 files changed, 3 insertions, 4 deletions

diff --git a/src/decompress.c b/src/decompress.c
index 9210799ec..8e8827194 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "decompress.h"
-#include "species.h"
+#include "constants/species.h"
 #include "text.h"
 #include "malloc.h"
 #include "pokemon.h"
@@ -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)