diff options
| author | shawlucas <lgs84@cornell.edu> | 2020-03-20 11:11:08 -0700 |
|---|---|---|
| committer | shawlucas <lgs84@cornell.edu> | 2020-03-20 11:11:08 -0700 |
| commit | 1ed67c4b218bb4228fcb02ecdd37ebb80a1394bb (patch) | |
| tree | a5a41287f996eb6df00f5726e4c74382b5dfe421 /src/code/z_lib.c | |
| parent | 37497e427c0cd154fd969b450aa8a4956adf197a (diff) | |
| parent | 9c9ad6160b15e1ce0294fe00da29bf20cca6a591 (diff) | |
Merge branch 'master' of https://github.com/zeldaret/oot
Diffstat (limited to 'src/code/z_lib.c')
| -rw-r--r-- | src/code/z_lib.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 7b8bcbc2c..a7411c53d 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -1,20 +1,17 @@ #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; + u32 i = 0; - for (i = 0; i < size; i++) - { - *destu++ = val; - } + // TODO: Convert this to while/for if possible + 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 +556,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 +598,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) { |