mirror of
https://github.com/n64decomp/mk64
synced 2026-08-10 10:53:54 -04:00
Some matches in code_80086E70 (#361)
Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
+126
-265
@@ -405,74 +405,34 @@ UNUSED void func_800880DC(void) {
|
||||
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern s16 D_80165760;
|
||||
extern s16 D_80165770;
|
||||
extern s16 D_80165780;
|
||||
extern s16 D_80165784;
|
||||
extern ? D_80165C94;
|
||||
|
||||
void func_800880E4(s32 arg0) {
|
||||
? *temp_a1;
|
||||
? *temp_a2;
|
||||
? *temp_a3;
|
||||
void *temp_v0;
|
||||
void *phi_v0;
|
||||
? *phi_a1;
|
||||
? *phi_a2;
|
||||
? *phi_a3;
|
||||
|
||||
phi_v0 = *(&D_80165C94 + (arg0 * 0xE0));
|
||||
phi_a1 = &D_80165760;
|
||||
phi_a2 = &D_80165770;
|
||||
phi_a3 = &D_80165780;
|
||||
do {
|
||||
temp_a3 = phi_a3 + 2;
|
||||
temp_a1 = phi_a1 + 2;
|
||||
temp_a1->unk-2 = phi_v0->unk0;
|
||||
temp_a2 = phi_a2 + 2;
|
||||
temp_v0 = phi_v0 + 8;
|
||||
temp_a2->unk-2 = phi_v0->unk2;
|
||||
temp_a3->unk-2 = temp_v0->unk-4;
|
||||
phi_v0 = temp_v0;
|
||||
phi_a1 = temp_a1;
|
||||
phi_a2 = temp_a2;
|
||||
phi_a3 = temp_a3;
|
||||
} while (temp_a3 != &D_80165784);
|
||||
void func_800880E4(s32 objectIndex) {
|
||||
Vec4s *phi_v0;
|
||||
s32 someIndex;
|
||||
phi_v0 = D_80165C18[objectIndex].unk_07C;
|
||||
for (someIndex = 0; someIndex < 2; someIndex++, phi_v0++) {
|
||||
D_80165760[someIndex] = (*phi_v0)[0];
|
||||
D_80165770[someIndex] = (*phi_v0)[1];
|
||||
D_80165780[someIndex] = (*phi_v0)[2];
|
||||
}
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800880E4.s")
|
||||
#endif
|
||||
|
||||
void func_80088150(s32 arg0) {
|
||||
D_80165C18[arg0].unk_07C += 8;
|
||||
D_80165C18[arg0].unk_07C++;
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
extern s16 D_80165760;
|
||||
extern s16 D_80165780;
|
||||
|
||||
void func_80088178(s32 objectIndex, s32 arg1) {
|
||||
s16 temp_a1;
|
||||
struct_80165C18_entry *temp_v1;
|
||||
u16 temp_a0;
|
||||
|
||||
temp_v1 = &D_80165C18[objectIndex];
|
||||
temp_a0 = temp_v1->unk_0BE[1];
|
||||
temp_a1 = atan2s((f32) (D_80165760.unk2 - D_80165760.unk0), (f32) (D_80165780.unk2 - D_80165780.unk0)) - temp_a0;
|
||||
temp_a1 = atan2s(D_80165760[1] - D_80165760[0], D_80165780[1] - D_80165780[0]);
|
||||
temp_a1 -= temp_v1->unk_0BE[1];
|
||||
if (temp_a1 > 0) {
|
||||
temp_v1->unk_0BE[1] = temp_a0 + (arg1 << 8);
|
||||
return;
|
||||
}
|
||||
if (temp_a1 < 0) {
|
||||
temp_v1->unk_0BE[1] = temp_a0 - (arg1 << 8);
|
||||
temp_v1->unk_0BE[1] += (arg1 << 8);
|
||||
} else if (temp_a1 < 0) {
|
||||
temp_v1->unk_0BE[1] -= (arg1 << 8);
|
||||
}
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088178.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
@@ -494,48 +454,32 @@ void func_80088228(s32 objectIndex) {
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088228.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern s16 D_80165762;
|
||||
extern s16 D_80165772;
|
||||
extern s16 D_80165782;
|
||||
extern struct_80165C18_entry D_80165C18;
|
||||
s32 func_800882B0(s32 objectIndex, s32 arg1) {
|
||||
s32 temp_f0;
|
||||
s32 temp_f12;
|
||||
s32 temp_f2;
|
||||
s32 var_v1;
|
||||
|
||||
s32 func_800882B0(s32 arg0, s32 arg1) {
|
||||
f32 temp_f0;
|
||||
f32 temp_f12;
|
||||
f32 temp_f2;
|
||||
void *temp_a2;
|
||||
? phi_v1;
|
||||
|
||||
temp_a2 = (arg0 * 0xE0) + &D_80165C18;
|
||||
temp_f0 = D_80165762 - temp_a2->unk28;
|
||||
temp_f2 = D_80165772 - temp_a2->unk2C;
|
||||
temp_f12 = D_80165782 - temp_a2->unk30;
|
||||
phi_v1 = 0;
|
||||
if ((((temp_f0 * temp_f0) + (temp_f2 * temp_f2) + (temp_f12 * temp_f12)) - (arg1 * arg1)) <= 0) {
|
||||
phi_v1 = 1;
|
||||
var_v1 = 0;
|
||||
temp_f0 = (s32)((D_80165760[1] - D_80165C18[objectIndex].unk_028[0]) * (D_80165760[1] - D_80165C18[objectIndex].unk_028[0]));
|
||||
temp_f12 = (s32)((D_80165770[1] - D_80165C18[objectIndex].unk_028[1]) * (D_80165770[1] - D_80165C18[objectIndex].unk_028[1]));
|
||||
temp_f2 = (s32)((D_80165780[1] - D_80165C18[objectIndex].unk_028[2]) * (D_80165780[1] - D_80165C18[objectIndex].unk_028[2]));
|
||||
if ((temp_f0 + temp_f12 + temp_f2 - (arg1 * arg1)) <= 0) {
|
||||
var_v1 = 1;
|
||||
}
|
||||
return phi_v1;
|
||||
return var_v1;
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800882B0.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
void func_800880E4(); /* extern */
|
||||
void func_80088178(s32, ?); /* extern */
|
||||
s32 func_800882B0(s32, ?); /* extern */
|
||||
|
||||
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-09-2023
|
||||
void func_80088364(s32 objectIndex) {
|
||||
s16 temp_t9;
|
||||
struct_80165C18_entry *temp_v0;
|
||||
|
||||
func_800880E4();
|
||||
func_800880E4(objectIndex);
|
||||
func_80088178(objectIndex, 1);
|
||||
func_800876A0(objectIndex);
|
||||
if (func_800882B0(objectIndex, 0xA) != 0) {
|
||||
if (func_800882B0(objectIndex, 0x0000000A) != 0) {
|
||||
temp_v0 = &D_80165C18[objectIndex];
|
||||
temp_t9 = (u16) temp_v0->unk_084[9] + 1;
|
||||
temp_v0->unk_084[9] = temp_t9;
|
||||
@@ -1363,40 +1307,25 @@ s32 func_8008A8B0(s16 arg0, s16 arg1) {
|
||||
return var_v1;
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
void func_8008A920(s32 objectIndex) {
|
||||
s32 temp_v0;
|
||||
struct_80165C18_entry *temp_v1;
|
||||
Vec4s *temp_v0;
|
||||
|
||||
temp_v1 = &D_80165C18[objectIndex];
|
||||
temp_v0 = temp_v1->unk_07C;
|
||||
temp_v1->unk_038[0] = (f32) (temp_v0->unk8 - temp_v0->unk0) / (f32) temp_v0->unk6;
|
||||
temp_v1->unk_038[1] = (f32) (temp_v0->unkA - temp_v0->unk2) / (f32) temp_v0->unk6;
|
||||
temp_v1->unk_038[2] = (f32) (temp_v0->unkC - temp_v0->unk4) / (f32) temp_v0->unk6;
|
||||
temp_v0 = D_80165C18[objectIndex].unk_07C;
|
||||
D_80165C18[objectIndex].unk_038[0] = (f32) (temp_v0[1][0] - temp_v0[0][0]) / (f32) temp_v0[0][3];
|
||||
D_80165C18[objectIndex].unk_038[1] = (f32) (temp_v0[1][1] - temp_v0[0][1]) / (f32) temp_v0[0][3];
|
||||
D_80165C18[objectIndex].unk_038[2] = (f32) (temp_v0[1][2] - temp_v0[0][2]) / (f32) temp_v0[0][3];
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A920.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
void func_8008A920(); /* extern */
|
||||
|
||||
void func_8008A9B8(s32 objectIndex) {
|
||||
s32 temp_t9;
|
||||
struct_80165C18_entry *temp_v0;
|
||||
|
||||
temp_v0 = &D_80165C18[objectIndex];
|
||||
temp_t9 = temp_v0->unk_07C + 8;
|
||||
temp_v0->unk_07C = temp_t9;
|
||||
temp_v0->unk_09A = (s16) (0x2710 / (s16) temp_t9->unk6);
|
||||
temp_v0->unk_07C++;
|
||||
temp_v0->unk_09A = (s16) (0x2710 / (s16) (*temp_v0->unk_07C)[3]);
|
||||
temp_v0->unk_098 = 0;
|
||||
func_8008A920();
|
||||
func_8008A920(objectIndex);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A9B8.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
@@ -1423,34 +1352,24 @@ void func_8008AA3C(s32 objectIndex) {
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008AA3C.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
void func_8008A9B8(); /* extern */
|
||||
|
||||
void func_8008AB10(s32 objectIndex) {
|
||||
s16 temp_t0;
|
||||
s16 temp_t3;
|
||||
struct_80165C18_entry *temp_v0;
|
||||
|
||||
temp_v0 = &D_80165C18[objectIndex];
|
||||
temp_v0->unk_028[0] += temp_v0->unk_038[0];
|
||||
temp_t0 = (u16) temp_v0->unk_098 + (u16) temp_v0->unk_09A;
|
||||
temp_v0->unk_028[1] += temp_v0->unk_038[1];
|
||||
temp_v0->unk_028[2] += temp_v0->unk_038[2];
|
||||
temp_v0->unk_098 = temp_t0;
|
||||
if ((temp_t0 & 0xFFFF) >= 0x2710) {
|
||||
temp_t3 = (u16) temp_v0->unk_084[9] + 1;
|
||||
temp_v0->unk_084[9] = temp_t3;
|
||||
if (((temp_t3 & 0xFFFF) + 1) == (u16) temp_v0->unk_084[8]) {
|
||||
temp_v0->unk_098 += (u16)temp_v0->unk_09A;
|
||||
if (temp_v0->unk_098 >= 0x2710) {
|
||||
temp_v0->unk_084[9] = (u16)temp_v0->unk_084[9] + 1;
|
||||
if (((u16)temp_v0->unk_084[9] + 1) == (u16) temp_v0->unk_084[8]) {
|
||||
temp_v0->unk_0AE += 1;
|
||||
return;
|
||||
} else {
|
||||
func_8008A9B8(objectIndex);
|
||||
}
|
||||
func_8008A9B8();
|
||||
}
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008AB10.s")
|
||||
#endif
|
||||
|
||||
UNUSED void func_8008ABC0(s32 arg0) {
|
||||
switch (D_80165C18[arg0].unk_0AE) {
|
||||
@@ -1501,26 +1420,23 @@ UNUSED void func_8008ACD8(void) {
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern f64 D_800EF4F8;
|
||||
extern f64 D_800EF500;
|
||||
|
||||
void func_8008ACE0(void *arg0, f32 arg1) {
|
||||
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-09-2023
|
||||
void func_8008ACE0(f32 *arg0, f32 arg1) {
|
||||
f32 temp_f14;
|
||||
f32 temp_f2;
|
||||
f64 temp_f0;
|
||||
f64 temp_f16;
|
||||
f64 temp_f18;
|
||||
|
||||
temp_f0 = arg1;
|
||||
temp_f2 = 1.0 - temp_f0;
|
||||
temp_f0 = (f64) arg1;
|
||||
temp_f2 = (f32) (1.0 - temp_f0);
|
||||
temp_f14 = arg1 * arg1;
|
||||
temp_f18 = temp_f14;
|
||||
temp_f16 = temp_f14 * arg1;
|
||||
arg0->unk0 = (temp_f2 * temp_f2 * temp_f2) / 6.0;
|
||||
arg0->unk4 = ((temp_f16 * 0.5) - temp_f18) + D_800EF4F8;
|
||||
arg0->unk8 = (temp_f16 * -0.5) + (0.5 * temp_f18) + (0.5 * temp_f0) + D_800EF500;
|
||||
arg0->unkC = temp_f16 / 6.0;
|
||||
temp_f18 = (f64) temp_f14;
|
||||
temp_f16 = (f64) (temp_f14 * arg1);
|
||||
arg0->unk0 = (f32) ((f64) (temp_f2 * temp_f2 * temp_f2) / 6.0);
|
||||
arg0->unk4 = (f32) (((temp_f16 * 0.5) - temp_f18) + 0.6666666666666666);
|
||||
arg0->unk8 = (f32) ((temp_f16 * -0.5) + (0.5 * temp_f18) + (0.5 * temp_f0) + 0.16666666666666666);
|
||||
arg0->unkC = (f32) (temp_f16 / 6.0);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008ACE0.s")
|
||||
@@ -1535,21 +1451,21 @@ UNUSED void func_8008ADC8(void) {
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
void func_8008ADD0(void *arg0, f32 arg1) {
|
||||
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-09-2023
|
||||
void func_8008ADD0(f32 *arg0, f32 arg1) {
|
||||
f64 temp_f0;
|
||||
f64 temp_f14;
|
||||
f64 temp_f16;
|
||||
f64 temp_f2;
|
||||
|
||||
temp_f0 = arg1;
|
||||
temp_f0 = (f64) arg1;
|
||||
temp_f16 = 2.0 * temp_f0;
|
||||
temp_f2 = 1.0 - temp_f0;
|
||||
temp_f14 = arg1 * arg1;
|
||||
arg0->unk0 = temp_f2 * -0.5 * temp_f2;
|
||||
arg0->unk4 = (temp_f14 * 1.5) - temp_f16;
|
||||
arg0->unk8 = (((temp_f14 * 3.0) - temp_f16) - 1.0) * -0.5;
|
||||
arg0->unkC = temp_f14 * 0.5;
|
||||
temp_f2 = (f64) (f32) (1.0 - temp_f0);
|
||||
temp_f14 = (f64) (arg1 * arg1);
|
||||
arg0->unk0 = (f32) (temp_f2 * -0.5 * temp_f2);
|
||||
arg0->unk4 = (f32) ((temp_f14 * 1.5) - temp_f16);
|
||||
arg0->unk8 = (f32) ((((temp_f14 * 3.0) - temp_f16) - 1.0) * -0.5);
|
||||
arg0->unkC = (f32) (temp_f14 * 0.5);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008ADD0.s")
|
||||
@@ -1563,37 +1479,18 @@ UNUSED void func_8008AE94(void) {
|
||||
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern s16 D_80165760;
|
||||
extern s16 D_80165770;
|
||||
extern s16 D_80165780;
|
||||
extern struct_80165C18_entry D_80165C18;
|
||||
extern s32 D_80183DC8;
|
||||
void func_8008AE9C(s32 objectIndex) {
|
||||
struct_80165C18_entry *temp_v0;
|
||||
|
||||
void func_8008AE9C(s32 arg0) {
|
||||
f32 temp_f0;
|
||||
f32 temp_f12;
|
||||
f32 temp_f14;
|
||||
f32 temp_f2;
|
||||
void *temp_v0;
|
||||
|
||||
temp_f2 = D_80183DC8.unk0;
|
||||
temp_f12 = D_80183DC8.unk4;
|
||||
temp_f14 = D_80183DC8.unk8;
|
||||
temp_f0 = D_80183DC8.unkC;
|
||||
temp_v0 = (arg0 * 0xE0) + &D_80165C18;
|
||||
temp_v0->unk38 = (D_80165760.unk6 * temp_f0) + ((temp_f2 * D_80165760.unk0) + (temp_f12 * D_80165760.unk2) + (temp_f14 * D_80165760.unk4));
|
||||
temp_v0->unk3C = (D_80165770.unk6 * temp_f0) + ((temp_f2 * D_80165770.unk0) + (temp_f12 * D_80165770.unk2) + (temp_f14 * D_80165770.unk4));
|
||||
temp_v0->unk40 = (D_80165780.unk6 * temp_f0) + ((temp_f2 * D_80165780.unk0) + (temp_f12 * D_80165780.unk2) + (temp_f14 * D_80165780.unk4));
|
||||
temp_v0 = &D_80165C18[objectIndex];
|
||||
temp_v0->unk_038[0] = (D_80183DC8[0] * D_80165760[0]) + (D_80183DC8[1] * D_80165760[1]) + (D_80183DC8[2] * D_80165760[2]) + (D_80183DC8[3] * D_80165760[3]);
|
||||
temp_v0->unk_038[1] = (D_80183DC8[0] * D_80165770[0]) + (D_80183DC8[1] * D_80165770[1]) + (D_80183DC8[2] * D_80165770[2]) + (D_80183DC8[3] * D_80165770[3]);
|
||||
temp_v0->unk_038[2] = (D_80183DC8[0] * D_80165780[0]) + (D_80183DC8[1] * D_80165780[1]) + (D_80183DC8[2] * D_80165780[2]) + (D_80183DC8[3] * D_80165780[3]);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008AE9C.s")
|
||||
#endif
|
||||
|
||||
void func_8008AFE0(s32 arg0, f32 arg1) {
|
||||
func_8008ADD0((s32 *)&D_80183DC8, arg1);
|
||||
func_8008AE9C(arg0);
|
||||
void func_8008AFE0(s32 objectIndex, f32 arg1) {
|
||||
func_8008ADD0(D_80183DC8, arg1);
|
||||
func_8008AE9C(objectIndex);
|
||||
}
|
||||
|
||||
UNUSED void func_8008B018(void) {
|
||||
@@ -1612,37 +1509,18 @@ UNUSED void func_8008B030(void) {
|
||||
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern s16 D_80165760;
|
||||
extern s16 D_80165770;
|
||||
extern s16 D_80165780;
|
||||
extern struct_80165C18_entry D_80165C18;
|
||||
extern s32 D_80183DA8;
|
||||
void func_8008B038(s32 objectIndex) {
|
||||
struct_80165C18_entry *temp_v0;
|
||||
|
||||
void func_8008B038(s32 arg0) {
|
||||
f32 temp_f0;
|
||||
f32 temp_f12;
|
||||
f32 temp_f14;
|
||||
f32 temp_f2;
|
||||
void *temp_v0;
|
||||
|
||||
temp_f2 = D_80183DA8.unk0;
|
||||
temp_f12 = D_80183DA8.unk4;
|
||||
temp_f14 = D_80183DA8.unk8;
|
||||
temp_f0 = D_80183DA8.unkC;
|
||||
temp_v0 = (arg0 * 0xE0) + &D_80165C18;
|
||||
temp_v0->unk28 = (D_80165760.unk6 * temp_f0) + ((temp_f2 * D_80165760.unk0) + (temp_f12 * D_80165760.unk2) + (temp_f14 * D_80165760.unk4));
|
||||
temp_v0->unk2C = (D_80165770.unk6 * temp_f0) + ((temp_f2 * D_80165770.unk0) + (temp_f12 * D_80165770.unk2) + (temp_f14 * D_80165770.unk4));
|
||||
temp_v0->unk30 = (D_80165780.unk6 * temp_f0) + ((temp_f2 * D_80165780.unk0) + (temp_f12 * D_80165780.unk2) + (temp_f14 * D_80165780.unk4));
|
||||
temp_v0 = &D_80165C18[objectIndex];
|
||||
temp_v0->unk_028[0] = (D_80183DA8[0] * D_80165760[0]) + (D_80183DA8[1] * D_80165760[1]) + (D_80183DA8[2] * D_80165760[2]) + (D_80183DA8[3] * D_80165760[3]);
|
||||
temp_v0->unk_028[1] = (D_80183DA8[0] * D_80165770[0]) + (D_80183DA8[1] * D_80165770[1]) + (D_80183DA8[2] * D_80165770[2]) + (D_80183DA8[3] * D_80165770[3]);
|
||||
temp_v0->unk_028[2] = (D_80183DA8[0] * D_80165780[0]) + (D_80183DA8[1] * D_80165780[1]) + (D_80183DA8[2] * D_80165780[2]) + (D_80183DA8[3] * D_80165780[3]);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B038.s")
|
||||
#endif
|
||||
|
||||
void func_8008B17C(s32 arg0, f32 arg1) {
|
||||
func_8008ACE0((s32 *) &D_80183DA8, arg1);
|
||||
func_8008B038(arg0);
|
||||
void func_8008B17C(s32 objectIndex, f32 arg1) {
|
||||
func_8008ACE0(D_80183DA8, arg1);
|
||||
func_8008B038(objectIndex);
|
||||
}
|
||||
|
||||
UNUSED void func_8008B1B4(void) {
|
||||
@@ -1701,38 +1579,33 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B1D4.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern s16 D_80165760;
|
||||
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-09-2023
|
||||
extern s16 D_80165762;
|
||||
extern s16 D_80165764;
|
||||
extern s16 D_80165766;
|
||||
extern s16 D_80165770;
|
||||
extern s16 D_80165772;
|
||||
extern s16 D_80165774;
|
||||
extern s16 D_80165776;
|
||||
extern s16 D_80165780;
|
||||
extern s16 D_80165782;
|
||||
extern s16 D_80165784;
|
||||
extern s16 D_80165786;
|
||||
|
||||
void func_8008B284(s32 arg0) {
|
||||
void func_8008B284(s32 objectIndex) {
|
||||
s32 sp0;
|
||||
s16 *temp_v0_2;
|
||||
s16 (*temp_v0)[4];
|
||||
s16 (*var_v0)[4];
|
||||
s16 (*var_v0_2)[4];
|
||||
s16 *var_v0_3;
|
||||
s16 temp_a1;
|
||||
struct_80165C18_entry *temp_v1;
|
||||
u16 temp_a2;
|
||||
void *temp_v0;
|
||||
void *temp_v0_3;
|
||||
void *temp_v1;
|
||||
s16 *phi_v0;
|
||||
void *phi_v0_2;
|
||||
void *phi_v0_3;
|
||||
|
||||
temp_v1 = (arg0 * 0xE0) + &D_80165C18;
|
||||
temp_a2 = temp_v1->unk94;
|
||||
temp_a1 = temp_v1->unk96;
|
||||
temp_v0 = temp_v1->unk7C;
|
||||
temp_v1 = &D_80165C18[objectIndex];
|
||||
temp_a2 = (u16) temp_v1->unk_084[8];
|
||||
temp_a1 = temp_v1->unk_084[9];
|
||||
temp_v0 = temp_v1->unk_07C;
|
||||
if ((temp_a2 - 4) >= temp_a1) {
|
||||
sp0 = 0x2710;
|
||||
sp0 = 0x00002710;
|
||||
} else if ((temp_a1 + 3) == temp_a2) {
|
||||
sp0 = 2;
|
||||
} else if ((temp_a1 + 2) == temp_a2) {
|
||||
@@ -1740,33 +1613,31 @@ void func_8008B284(s32 arg0) {
|
||||
} else if ((temp_a1 + 1) == temp_a2) {
|
||||
sp0 = 0;
|
||||
}
|
||||
D_80165760 = temp_v0->unk0;
|
||||
temp_v0_2 = temp_v0 + 8;
|
||||
D_80165770 = temp_v0->unk2;
|
||||
D_80165780 = temp_v0_2->unk-4;
|
||||
phi_v0 = temp_v0_2;
|
||||
*D_80165760 = temp_v0[0][0];
|
||||
var_v0 = temp_v0 + 8;
|
||||
*D_80165770 = temp_v0[0][1];
|
||||
*D_80165780 = var_v0->unk-4;
|
||||
if (sp0 == 0) {
|
||||
phi_v0 = temp_v1->unk80 + 2;
|
||||
var_v0 = (s16 (*)[4]) &temp_v1->unk_080[0][1];
|
||||
}
|
||||
temp_v0_3 = phi_v0 + 8;
|
||||
D_80165762 = *phi_v0;
|
||||
D_80165772 = temp_v0_3->unk-6;
|
||||
D_80165782 = temp_v0_3->unk-4;
|
||||
phi_v0_2 = temp_v0_3;
|
||||
var_v0_2 = var_v0 + 8;
|
||||
D_80165762 = var_v0[0][0];
|
||||
D_80165772 = var_v0_2->unk-6;
|
||||
D_80165782 = var_v0_2->unk-4;
|
||||
if (sp0 == 1) {
|
||||
phi_v0_2 = temp_v1->unk80 + 2;
|
||||
var_v0_2 = (s16 (*)[4]) &temp_v1->unk_080[0][1];
|
||||
}
|
||||
D_80165764 = phi_v0_2->unk0;
|
||||
D_80165774 = phi_v0_2->unk2;
|
||||
D_80165784 = phi_v0_2->unk4;
|
||||
D_80165764 = var_v0_2[0][0];
|
||||
D_80165774 = var_v0_2[0][1];
|
||||
D_80165784 = var_v0_2[0][2];
|
||||
if (sp0 == 2) {
|
||||
phi_v0_3 = temp_v1->unk80 + 2;
|
||||
var_v0_3 = &temp_v1->unk_080[0][1];
|
||||
} else {
|
||||
phi_v0_3 = phi_v0_2 + 8;
|
||||
var_v0_3 = *(var_v0_2 + 8);
|
||||
}
|
||||
D_80165766 = phi_v0_3->unk0;
|
||||
D_80165776 = phi_v0_3->unk2;
|
||||
D_80165786 = phi_v0_3->unk4;
|
||||
D_80165766 = var_v0_3->unk0;
|
||||
D_80165776 = var_v0_3->unk2;
|
||||
D_80165786 = var_v0_3->unk4;
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B284.s")
|
||||
@@ -1794,16 +1665,14 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B3E4.s")
|
||||
|
||||
void func_8008B44C(s32 arg0) {
|
||||
D_80165C18[arg0].unk_098 = 0;
|
||||
D_80165C18[arg0].unk_07C += 8;
|
||||
D_80165C18[arg0].unk_07C++;
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
void func_8008B1D4(s32); /* extern */
|
||||
void func_8008B284(s32); /* extern */
|
||||
void func_8008B3E4(); /* extern */
|
||||
extern f64 D_800EF508;
|
||||
extern f64 D_800EF510;
|
||||
//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-09-2023
|
||||
? func_8008B1D4(s32); /* extern */
|
||||
? func_8008B284(s32); /* extern */
|
||||
? func_8008B3E4(); /* extern */
|
||||
|
||||
void func_8008B478(s32 objectIndex, s32 arg1) {
|
||||
f32 sp34;
|
||||
@@ -1811,7 +1680,7 @@ void func_8008B478(s32 objectIndex, s32 arg1) {
|
||||
f32 temp_f0;
|
||||
f32 temp_f0_2;
|
||||
f32 var_f6;
|
||||
s32 temp_v0;
|
||||
s16 (*temp_v0)[4];
|
||||
struct_80165C18_entry *temp_v1;
|
||||
u16 temp_t9;
|
||||
u32 temp_t3;
|
||||
@@ -1823,7 +1692,7 @@ void func_8008B478(s32 objectIndex, s32 arg1) {
|
||||
func_8008B1D4(objectIndex);
|
||||
}
|
||||
temp_v1 = &D_80165C18[objectIndex];
|
||||
temp_t9 = (u16) temp_v1->unk_098;
|
||||
temp_t9 = temp_v1->unk_098;
|
||||
var_f6 = (f32) temp_t9;
|
||||
if ((s32) temp_t9 < 0) {
|
||||
var_f6 += 4294967296.0f;
|
||||
@@ -1837,10 +1706,10 @@ void func_8008B478(s32 objectIndex, s32 arg1) {
|
||||
func_8008AFE0(objectIndex, sp34);
|
||||
}
|
||||
temp_v0 = temp_v1->unk_07C;
|
||||
temp_f0_2 = (f32) temp_v0->unk6;
|
||||
temp_f0_2 = (f32) temp_v0[0][3];
|
||||
temp_t3 = (u32) (10000.0 / (f64) ((((f32) temp_v0->unkE - temp_f0_2) * sp34) + temp_f0_2));
|
||||
temp_v1->unk_09A = (s16) temp_t3;
|
||||
temp_v1->unk_098 = (u16) temp_v1->unk_098 + temp_t3;
|
||||
temp_v1->unk_098 += temp_t3;
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B478.s")
|
||||
@@ -2063,25 +1932,17 @@ void func_8008BF18(s32 objectIndex) {
|
||||
D_80165C18[objectIndex].pos[2] = D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2];
|
||||
}
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
|
||||
extern f32 D_80183E40;
|
||||
extern s16 D_80183E80;
|
||||
|
||||
void func_8008BF64(s32 objectIndex) {
|
||||
struct_80165C18_entry *temp_v0;
|
||||
|
||||
temp_v0 = &D_80165C18[objectIndex];
|
||||
D_80183E40.unk0 = (f32) temp_v0->pos[0];
|
||||
D_80183E40.unk4 = (f32) temp_v0->pos[1];
|
||||
D_80183E40.unk8 = (f32) temp_v0->pos[2];
|
||||
D_80183E80.unk0 = (u16) temp_v0->unk_0BE[0];
|
||||
D_80183E80.unk2 = (u16) temp_v0->unk_0BE[1];
|
||||
D_80183E80.unk4 = (u16) temp_v0->unk_0BE[2];
|
||||
D_80183E40[0] = temp_v0->pos[0];
|
||||
D_80183E40[1] = temp_v0->pos[1];
|
||||
D_80183E40[2] = temp_v0->pos[2];
|
||||
D_80183E80[0] = temp_v0->unk_0BE[0];
|
||||
D_80183E80[1] = temp_v0->unk_0BE[1];
|
||||
D_80183E80[2] = temp_v0->unk_0BE[2];
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008BF64.s")
|
||||
#endif
|
||||
|
||||
void func_8008BFC0(s32 objectIndex) {
|
||||
D_80165C18[objectIndex].unk_09C = D_80165C18[objectIndex].pos[0];
|
||||
|
||||
+20
-4
@@ -53,7 +53,10 @@ s32 func_80087E08(s32, f32, f32, f32, s16, s32);
|
||||
s32 func_80087F14(s32, f32, f32, f32, s16, s32);
|
||||
void func_80088038(s32, f32, u16);
|
||||
void func_800880DC();
|
||||
void func_800880E4(s32);
|
||||
void func_80088150(s32);
|
||||
void func_80088178(s32, s32);
|
||||
s32 func_800882B0(s32, s32);
|
||||
s32 func_8008847C(s32);
|
||||
s32 func_80088538(s32);
|
||||
s32 func_8008861C(s32);
|
||||
@@ -106,6 +109,9 @@ void func_8008A850(s32);
|
||||
s32 func_8008A870(Player*);
|
||||
s32 func_8008A890(Camera*);
|
||||
s32 func_8008A8B0(s16, s16);
|
||||
void func_8008A920(s32);
|
||||
void func_8008A9B8(s32);
|
||||
void func_8008AB10(s32);
|
||||
void func_8008ABC0(s32);
|
||||
void func_8008AC40(s32);
|
||||
void func_8008ACC0();
|
||||
@@ -116,13 +122,15 @@ void func_8008ADC0();
|
||||
void func_8008ADC8();
|
||||
void func_8008AE8C();
|
||||
void func_8008AE94();
|
||||
void func_8008ADD0(s32*, f32);
|
||||
void func_8008AE9C(s32);
|
||||
void func_8008ADD0(f32*, f32);
|
||||
void func_8008AFE0(s32, f32);
|
||||
void func_8008B018();
|
||||
void func_8008B020();
|
||||
void func_8008B028();
|
||||
void func_8008B030();
|
||||
void func_8008ACE0(s32*,f32);
|
||||
void func_8008B038(s32);
|
||||
void func_8008ACE0(f32*,f32);
|
||||
void func_8008B17C(s32, f32);
|
||||
void func_8008B1B4();
|
||||
void func_8008B1BC();
|
||||
@@ -146,18 +154,26 @@ void func_8008BE0C(s32, s16, u16);
|
||||
void func_8008BEA4(s32, u16, u16);
|
||||
void func_8008BFC0(s32);
|
||||
void func_8008BF18(s32);
|
||||
void func_8008BF64(s32);
|
||||
void func_8008C1B8();
|
||||
void func_8008C1C0();
|
||||
|
||||
// This may be a list of tilemap flags on a per-camera basis
|
||||
extern s16 D_8018CF68[];
|
||||
extern s32 gPlayerCountSelection1;
|
||||
extern s32 D_80183DA8;
|
||||
extern s32 D_80183DC8;
|
||||
extern f32 D_80183DA8[];
|
||||
extern f32 D_80183DC8[];
|
||||
extern f32 gVBlankTimer;
|
||||
extern UnkActorInner D_8018C3B0;
|
||||
extern Player *gPlayerOne;
|
||||
extern Player *gPlayerOneCopy;
|
||||
extern s16 gCurrentCourseId;
|
||||
|
||||
extern Vec4s D_80165760;
|
||||
extern Vec4s D_80165770;
|
||||
extern Vec4s D_80165780;
|
||||
|
||||
extern Vec3f D_80183E40;
|
||||
extern Vec3su D_80183E80;
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user