From a01f868a1a562f8d8c7aebdf8caff60eaccf9f1a Mon Sep 17 00:00:00 2001
From: wed <>
Date: Fri, 20 Mar 2020 08:48:38 +1100
Subject: Finish z_lib.c

---
 src/code/z_lib.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 7b8bcbc2c..51867991a 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -1,20 +1,16 @@
 #include <ultra64.h>
 #include <global.h>
 
-#ifdef NON_MATCHING
-void Lib_MemSet(void* dest, size_t size, u8 val)
+void Lib_MemSet(u8 dest[], size_t size, u8 val)
 {
-    u8* destu = dest;
-    u32 i;
+    size_t i = 0;
 
-    for (i = 0; i < size; i++)
-    {
-        *destu++ = val;
-    }
+    if (i == size) return;
+    do {
+        *dest++ = val;
+        i++;
+    } while (i != size);
 }
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_lib/Lib_MemSet.s")
-#endif
 
 f32 Math_Coss(s16 angle)
 {
@@ -559,15 +555,12 @@ f32 func_800784D8(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep)
     return step;
 }
 
-#ifdef NON_MATCHING
-// regalloc differences
 s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep, s16 minStep)
 {
+    s16 step = 0;
     s16 diff = (target - *pValue);
-    s32 baseStep;
-    s16 step;
 
-    baseStep = diff / invScale;
+    s32 baseStep = diff / invScale;
 
     if (*pValue != target)
     {
@@ -604,9 +597,6 @@ s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep,
 
     return diff;
 }
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.s")
-#endif
 
 void Math_SmoothScaleMaxS(s16* pValue, s16 target, s16 invScale, s16 maxStep)
 {
-- 
cgit v1.2.3


From 8a7468689046bd6ab3be6f8d47703559c90434de Mon Sep 17 00:00:00 2001
From: wed <>
Date: Fri, 20 Mar 2020 11:25:53 +1100
Subject: Changes

---
 src/code/z_lib.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 51867991a..a7411c53d 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;
-- 
cgit v1.2.3