diff --git a/include/functions.h b/include/functions.h
index a7f5d5f58f..f6e1b06e7c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -846,7 +846,7 @@ void func_800775D8();
 s32 func_800775E4();
 void func_800775F0(u16);
 // ? func_80077600(?);
-void Lib_MemSet(u8 dest[], size_t size, u8 val);
+void Lib_MemSet(u8* dest, size_t size, u8 val);
 f32 Math_Coss(s16 angle);
 f32 Math_Sins(s16 angle);
 s32 Math_ApproxUpdateScaledS(s16* fp, s16 target, s16 step);
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 51867991a4..a7411c53de 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -1,10 +1,11 @@
 #include <ultra64.h>
 #include <global.h>
 
-void Lib_MemSet(u8 dest[], size_t size, u8 val)
+void Lib_MemSet(u8* dest, size_t size, u8 val)
 {
-    size_t i = 0;
+    u32 i = 0;
 
+    // TODO: Convert this to while/for if possible
     if (i == size) return;
     do {
         *dest++ = val;