diff options
| author | CoderStig <79828759+CoderStig@users.noreply.github.com> | 2021-11-28 15:42:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 15:42:03 -0700 |
| commit | 632512ada9c7571f7babb52af56cf9045e545ae0 (patch) | |
| tree | 42886ccad52e0bb460d199271cac9758dcb0b95b /src/code_800AF9B0.c | |
| parent | 73877245091fe36c5cc43a8cf08be058a713dd89 (diff) | |
Imported funcs from sm64 to code_80004740.c and trig_tables.inc.c (#68)
* fixed float issue brought over from zeldaret
* Import trig_tables.inc.c
* Delete game_data_802BA370.s
* Import two funcs from sm64 into code_80004740.c
Diffstat (limited to 'src/code_800AF9B0.c')
| -rw-r--r-- | src/code_800AF9B0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code_800AF9B0.c b/src/code_800AF9B0.c index 47184c64d..c16c55be0 100644 --- a/src/code_800AF9B0.c +++ b/src/code_800AF9B0.c @@ -283,7 +283,7 @@ GLOBAL_ASM("asm/non_matchings/code_800AF9B0/func_800AFF58.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800AF9E4(s32, s32, s32, ?, s32, s32, s32, s32); // extern ? func_800AFF58(s32); // extern -f32 func_802B8018(s32); // extern +f32 sins(s32); // extern extern ? D_800E8680; extern ? D_800E8688; extern f32 D_800F2B44; @@ -359,8 +359,8 @@ void func_800B0004(void) { phi_s2 = 0; loop_5: temp_s1 = phi_s0 + 1; - temp_s4 = func_802B8018((D_8018EDB0 - (phi_s0 * D_8018EDB2)) & 0xFFFF) * 84.0f * phi_s0 * temp_f22; - func_800AF9E4((phi_s3 * 0x10) + spBC + (sp64 * 0x10), phi_s0, phi_fp, 0x54, temp_s4, func_802B8018((D_8018EDB0 - (temp_s1 * D_8018EDB2)) & 0xFFFF) * 84.0f * temp_s1 * temp_f22, phi_s2, 0x54); + temp_s4 = sins((D_8018EDB0 - (phi_s0 * D_8018EDB2)) & 0xFFFF) * 84.0f * phi_s0 * temp_f22; + func_800AF9E4((phi_s3 * 0x10) + spBC + (sp64 * 0x10), phi_s0, phi_fp, 0x54, temp_s4, sins((D_8018EDB0 - (temp_s1 * D_8018EDB2)) & 0xFFFF) * 84.0f * temp_s1 * temp_f22, phi_s2, 0x54); phi_s0 = temp_s1; phi_s3 += 4; phi_s2 += 0x54; |