summaryrefslogtreecommitdiff
path: root/src/code/sys_math.c
diff options
context:
space:
mode:
authorJoshDuMan <40190173+JoshDuMan@users.noreply.github.com>2020-04-22 12:18:53 -0400
committerGitHub <noreply@github.com>2020-04-22 12:18:53 -0400
commit06b731c494b44e71422231872750acc35445392c (patch)
treefe19681bdd6abcf0e8575748a9a374e51f47e32f /src/code/sys_math.c
parentb8a0751518e4da775d299fbe2bedc50d274cab48 (diff)
Match sys_math.c and one in z_scene_table.c (#90)
* Match func_800CA63C * Remove func_800CA63C.s * Match func_8009BEEC? * Remove func_8009BEEC.s
Diffstat (limited to 'src/code/sys_math.c')
-rw-r--r--src/code/sys_math.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/code/sys_math.c b/src/code/sys_math.c
index 25af276ec..994f66475 100644
--- a/src/code/sys_math.c
+++ b/src/code/sys_math.c
@@ -12,13 +12,12 @@ f32 func_800CA540(f32 arg0) {
return ret;
}
-#ifdef NON_MATCHING
f32 func_800CA63C(u32 arg0) {
f32 ret;
s32 i;
if (arg0 > 12) {
ret = sFactorialTbl[12];
- for (i = 13; i < (s32)arg0; i++) {
+ for (i = 13; i <= (s32)arg0; i++) {
ret *= i;
}
} else {
@@ -26,9 +25,6 @@ f32 func_800CA63C(u32 arg0) {
}
return ret;
}
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math/func_800CA63C.s")
-#endif
f32 func_800CA6FC(f32 arg0, s32 arg1) {
f32 ret = 1.0f;