fixing merge conflicts

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)