mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Match sys_math.c and one in z_scene_table.c (#90)

Browse source 
* Match func_800CA63C

* Remove func_800CA63C.s

* Match func_8009BEEC?

* Remove func_8009BEEC.s
This commit is contained in:
JoshDuMan 2020-04-22 12:18:53 -04:00 • committed by GitHub
parent b8a0751518
commit 06b731c494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/sys_math.c
View file

@ -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;

6
src/code/z_scene_table.c
View file

@ -1495,8 +1495,6 @@ void func_8009BC44(GlobalContext* globalCtx) {
}
// Screen Shake for Ganon's Tower Collapse
#ifdef NON_MATCHING
// regalloc differences
void func_8009BEEC(GlobalContext* globalCtx) {
s32 var;
@ -1514,10 +1512,6 @@ void func_8009BEEC(GlobalContext* globalCtx) {
Quake_SetCountdown(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f));
}
}
#else
void func_8009BEEC(GlobalContext* globalCtx);
#pragma GLOBAL_ASM("asm/non_matchings/code/z_scene_table/func_8009BEEC.s")
#endif
// Scene Draw Config 38
void func_8009C0AC(GlobalContext* globalCtx) {