mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-09-06 03:18:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Imported funcs from sm64 to code_80004740.c and trig_tables.inc.c (#68)

Browse Source 
* 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
This commit is contained in:
CoderStig
2021-11-28 15:42:03 -07:00
committed by GitHub
parent 7387724509
commit 632512ada9
132 changed files with 2469 additions and 6154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80086E70.c
+27 -27
View File
@@ -285,8 +285,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800873F4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 func_802B8018(u16); // extern
f32 func_802B8038(u16); // extern
f32 sins(u16); // extern
f32 coss(u16); // extern
extern ? D_80165C18;
void func_8008751C(s32 arg0) {
@@ -295,8 +295,8 @@ void func_8008751C(s32 arg0) {
temp_v0 = (arg0 * 0xE0) + &D_80165C18;
sp1C = temp_v0;
temp_v0->unk38 = func_802B8018(temp_v0->unkC0) * temp_v0->unk34;
temp_v0->unk40 = func_802B8038(temp_v0->unkC0) * temp_v0->unk34;
temp_v0->unk38 = sins(temp_v0->unkC0) * temp_v0->unk34;
temp_v0->unk40 = coss(temp_v0->unkC0) * temp_v0->unk34;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008751C.s")
@@ -304,8 +304,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008751C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 func_802B8018(u16); // extern
f32 func_802B8038(u16); // extern
f32 sins(u16); // extern
f32 coss(u16); // extern
extern ? D_80165C18;
void func_8008757C(s32 arg0) {
@@ -313,11 +313,11 @@ void func_8008757C(s32 arg0) {
void *temp_s0;
temp_s0 = (arg0 * 0xE0) + &D_80165C18;
sp24 = func_802B8038(temp_s0->unkBE);
temp_s0->unk38 = func_802B8018(temp_s0->unkC0) * (temp_s0->unk34 * sp24);
temp_s0->unk3C = func_802B8018(temp_s0->unkBE) * -temp_s0->unk34;
sp24 = func_802B8038(temp_s0->unkBE);
temp_s0->unk40 = func_802B8038(temp_s0->unkC0) * (temp_s0->unk34 * sp24);
sp24 = coss(temp_s0->unkBE);
temp_s0->unk38 = sins(temp_s0->unkC0) * (temp_s0->unk34 * sp24);
temp_s0->unk3C = sins(temp_s0->unkBE) * -temp_s0->unk34;
sp24 = coss(temp_s0->unkBE);
temp_s0->unk40 = coss(temp_s0->unkC0) * (temp_s0->unk34 * sp24);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008757C.s")
@@ -325,8 +325,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008757C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 func_802B8018(s32); // extern
f32 func_802B8038(s32); // extern
f32 sins(s32); // extern
f32 coss(s32); // extern
extern ? D_80165C18;
void func_80087620(s32 arg0) {
@@ -335,8 +335,8 @@ void func_80087620(s32 arg0) {
temp_v0 = (arg0 * 0xE0) + &D_80165C18;
sp1C = temp_v0;
temp_v0->unk38 = func_802B8018((temp_v0->unkC0 + 0x8000) & 0xFFFF) * temp_v0->unk34;
temp_v0->unk40 = func_802B8038((temp_v0->unkC0 + 0x8000) & 0xFFFF) * temp_v0->unk34;
temp_v0->unk38 = sins((temp_v0->unkC0 + 0x8000) & 0xFFFF) * temp_v0->unk34;
temp_v0->unk40 = coss((temp_v0->unkC0 + 0x8000) & 0xFFFF) * temp_v0->unk34;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80087620.s")
@@ -344,8 +344,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80087620.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 func_802B8018(u16); // extern
f32 func_802B8038(u16); // extern
f32 sins(u16); // extern
f32 coss(u16); // extern
extern ? D_80165C18;
void func_800876A0(s32 arg0) {
@@ -354,8 +354,8 @@ void func_800876A0(s32 arg0) {
temp_v0 = (arg0 * 0xE0) + &D_80165C18;
sp18 = temp_v0;
temp_v0->unk28 = temp_v0->unk28 + (temp_v0->unk34 * func_802B8018(temp_v0->unkC0));
temp_v0->unk30 = temp_v0->unk30 + (temp_v0->unk34 * func_802B8038(temp_v0->unkC0));
temp_v0->unk28 = temp_v0->unk28 + (temp_v0->unk34 * sins(temp_v0->unkC0));
temp_v0->unk30 = temp_v0->unk30 + (temp_v0->unk34 * coss(temp_v0->unkC0));
}
#else
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800876A0.s")
@@ -704,8 +704,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80087E08.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 func_802B8018(s32); // extern
f32 func_802B8038(u16); // extern
f32 sins(s32); // extern
f32 coss(u16); // extern
extern ? D_80165C18;
void func_80088038(s32 arg0, f32 arg1, s32 arg2) {
@@ -724,8 +724,8 @@ void func_80088038(s32 arg0, f32 arg1, s32 arg2) {
sp1C = temp_v0;
sp24 = temp_f4;
sp20 = temp_v0->unk30;
temp_v0->unk28 = func_802B8018(temp_t0 & 0xFFFF) * arg1;
temp_f2 = func_802B8038(temp_v0->unkC4) * arg1;
temp_v0->unk28 = sins(temp_t0 & 0xFFFF) * arg1;
temp_f2 = coss(temp_v0->unkC4) * arg1;
temp_v0->unk30 = temp_f2;
temp_v0->unk38 = temp_v0->unk28 - temp_f4;
temp_v0->unk40 = temp_f2 - sp20;
@@ -2603,8 +2603,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008BD14.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 func_802B8018(u16); // extern
f32 func_802B8038(u16); // extern
f32 sins(u16); // extern
f32 coss(u16); // extern
extern ? D_80165C18;
void func_8008BE0C(s32 arg0, s16 arg1, u16 arg2) {
@@ -2615,12 +2615,12 @@ void func_8008BE0C(s32 arg0, s16 arg1, u16 arg2) {
void *temp_v0;
temp_f2 = arg1;
temp_f6 = func_802B8018(arg2) * temp_f2;
temp_f6 = sins(arg2) * temp_f2;
temp_v0 = (arg0 * 0xE0) + &D_80165C18;
sp1C = temp_v0;
sp18 = temp_f2;
temp_v0->unk10 = temp_f6 + D_800DC4FC->posX;
temp_v0->unk18 = (func_802B8038(arg2) * temp_f2) + D_800DC4FC->posZ;
temp_v0->unk18 = (coss(arg2) * temp_f2) + D_800DC4FC->posZ;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008BE0C.s")