mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-15 20:39:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match the other move_towards functions (#125)

Browse Source 
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-01-01 20:22:31 -05:00
committed by GitHub
parent c4048a1e1c
commit c669d792a2
30 changed files with 237 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_8001C4D0.c
+45 -45
View File
@@ -248,7 +248,7 @@ void func_8001CA24(Player *arg0, f32 arg1) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_800225CC(f32 *, ?, ?); // extern
//? move_f32_towards(f32 *, ?, ?); // extern
//? func_802B63B8(f32 *, f32 *); // extern
extern u16 D_801645C8;
extern f32 D_80164A30;
@@ -304,7 +304,7 @@ void func_8001CA78(s32 arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32 *
sp44 = temp_f16;
temp_f18 = sp6C + (temp_s2->unk2 + D_80164A30 + 6.0f);
sp48 = temp_f18;
func_800225CC(&D_80164A30, 0, 0x3CA3D70A);
move_f32_towards(&D_80164A30, 0, 0x3CA3D70A);
temp_f0 = arg1->unk0;
*arg3 = ((phi_f14_2 - temp_f0) * 1.0f) + temp_f0;
temp_f2 = arg1->unk4;
@@ -318,7 +318,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001CA78.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(f32, f32, f32 *, f32, ?); // extern
? move_f32_towards(f32, f32, f32 *, f32, ?); // extern
? func_802B63B8(f32 *, f32 *, f32 *, f32 *); // extern
extern ? D_800DDB30;
extern f64 D_800ED528;
@@ -442,10 +442,10 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp44 = temp_a0;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
temp_a0_2 = temp_s2 + &D_80164A48;
sp40 = temp_a0_2;
func_800225CC((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
temp_v1_2 = temp_s2 + &D_80164A78;
*temp_v1_2 = *temp_v1_2 + D_800ED550;
phi_v1_2 = temp_v1_2;
@@ -458,10 +458,10 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp44 = temp_a0_3;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
temp_a0_4 = temp_s2_2 + &D_80164A48;
sp40 = temp_a0_4;
func_800225CC((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
temp_v1_3 = temp_s2_2 + &D_80164A78;
*temp_v1_3 = *temp_v1_3 - D_800ED558;
temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4));
@@ -477,35 +477,35 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
temp_a0_9 = phi_s2 + &D_80164A90;
sp38 = temp_a0_9;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_9, 20.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_9, 20.0f, 0x3CA3D70A);
temp_a0_10 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_10;
func_800225CC((bitwise f32) temp_a0_10, 10.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_10, 10.0f, 0x3CA3D70A);
} else if (gCurrentCourseId == 4) {
temp_a0_5 = phi_s2 + &D_80164A90;
sp38 = temp_a0_5;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_5, 50.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_5, 50.0f, 0x3D23D70A);
temp_a0_6 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_6;
func_800225CC((bitwise f32) temp_a0_6, 35.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_6, 35.0f, 0x3D23D70A);
} else {
temp_a0_7 = phi_s2 + &D_80164A90;
sp38 = temp_a0_7;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_7, 40.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_7, 40.0f, 0x3CA3D70A);
temp_a0_8 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_8;
func_800225CC((bitwise f32) temp_a0_8, 20.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_8, 20.0f, 0x3CA3D70A);
}
} else {
temp_a0_11 = phi_s2 + &D_80164A90;
sp38 = temp_a0_11;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_11, 0.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_11, 0.0f, 0x3D23D70A);
temp_a0_12 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_12;
func_800225CC((bitwise f32) temp_a0_12, 0.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_12, 0.0f, 0x3D23D70A);
}
temp_f0_5 = D_800ED560;
sp90 = arg1->unk30;
@@ -561,7 +561,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001CCEC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, ?); // extern
? move_f32_towards(void *, f32, ?); // extern
? func_802B63B8(f32 *, f32 *, f32 *, f32 *); // extern
extern ? D_80164A90;
extern ? D_80164AA0;
@@ -586,9 +586,9 @@ void func_8001D53C(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
arg1->unkA0 = 0.0f;
}
if (arg0->unk222 != 4) {
func_800225CC(arg1 + 0xA0, 20.0f, 0x3D75C28F);
move_f32_towards(arg1 + 0xA0, 20.0f, 0x3D75C28F);
} else {
func_800225CC(arg1 + 0xA0, 0.0f, 0x3D75C28F);
move_f32_towards(arg1 + 0xA0, 0.0f, 0x3D75C28F);
}
temp_f6 = D_801652A0[arg7];
sp3C = temp_f6;
@@ -669,7 +669,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001D794.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(f32, f32, f32 *, f32, ?); // extern
? move_f32_towards(f32, f32, f32 *, f32, ?); // extern
? func_802B63B8(f32 *, f32 *, f32 *, f32 *); // extern
extern ? D_800DDB30;
extern f64 D_800ED580;
@@ -789,10 +789,10 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp48 = temp_a0;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
temp_a0_2 = temp_s2 + &D_80164A48;
sp44 = temp_a0_2;
func_800225CC((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
temp_v0_2 = temp_s2 + &D_80164A78;
*temp_v0_2 = *temp_v0_2 + D_800ED5A8;
phi_v0_2 = temp_v0_2;
@@ -805,10 +805,10 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp48 = temp_a0_3;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
temp_a0_4 = temp_s2_2 + &D_80164A48;
sp44 = temp_a0_4;
func_800225CC((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
temp_v0_3 = temp_s2_2 + &D_80164A78;
*temp_v0_3 = *temp_v0_3 - D_800ED5B0;
temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4));
@@ -822,18 +822,18 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
temp_a0_5 = phi_s2 + &D_80164A90;
sp3C = temp_a0_5;
sp40 = phi_v0_2;
func_800225CC((bitwise f32) temp_a0_5, 15.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_5, 15.0f, 0x3CA3D70A);
temp_a0_6 = phi_s2 + &D_80164AA0;
sp38 = temp_a0_6;
func_800225CC((bitwise f32) temp_a0_6, 20.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_6, 20.0f, 0x3CA3D70A);
} else {
temp_a0_7 = phi_s2 + &D_80164A90;
sp3C = temp_a0_7;
sp40 = phi_v0_2;
func_800225CC((bitwise f32) temp_a0_7, 0.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_7, 0.0f, 0x3CA3D70A);
temp_a0_8 = phi_s2 + &D_80164AA0;
sp38 = temp_a0_8;
func_800225CC((bitwise f32) temp_a0_8, 0.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_8, 0.0f, 0x3CA3D70A);
}
temp_f2_3 = D_800ED5B8;
sp90 = arg1->unk30;
@@ -973,7 +973,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001E0C4.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8001CCEC(void *, void *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); // extern
? func_800224F0(void *, s16, s16, s16); // extern
? func_80022634(void *, ?, ?, s16); // extern
? move_s16_towards(void *, ?, ?, s16); // extern
? func_802ADDC8(void *, f32, f32, f32, f32); // extern
s16 func_802B7830(f32, f32); // extern
@@ -1008,26 +1008,26 @@ void func_8001E45C(void *arg0, void *arg1, s8 arg2) {
temp_a3 = 0xA5 - (temp_v1 / 2);
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
} else {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
}
} else {
temp_a3_2 = (temp_v1 / 2) + 0xA5;
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
} else {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
}
}
phi_a3 = sp4E;
}
goto block_26;
}
func_80022634(arg0 + 0xB0, 0, 0x3D4CCCCD);
move_s16_towards(arg0 + 0xB0, 0, 0x3D4CCCCD);
temp_v1_2 = arg1->unk78;
temp_a3_3 = (arg0->unk2C / 0xB6) - (arg1->unk2E / 0xB6);
if (temp_v1_2 == 0) {
@@ -1121,7 +1121,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001E8E8.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8001D944(void *, void *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); // extern
? func_800224F0(void *, s16, s16, s16); // extern
? func_80022634(void *, ?, ?, s16); // extern
? move_s16_towards(void *, ?, ?, s16); // extern
? func_802ADDC8(void *, f32, f32, f32, f32); // extern
s16 func_802B7830(f32, f32); // extern
@@ -1156,26 +1156,26 @@ void func_8001EA0C(void *arg0, void *arg1, s8 arg2) {
temp_a3 = 0xA5 - (temp_v1 / 2);
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
} else {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
}
} else {
temp_a3_2 = (temp_v1 / 2) + 0xA5;
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
} else {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
}
}
phi_a3 = sp4E;
}
goto block_26;
}
func_80022634(arg0 + 0xB0, 0, 0x3D4CCCCD);
move_s16_towards(arg0 + 0xB0, 0, 0x3D4CCCCD);
temp_v1_2 = arg1->unk78;
temp_a3_3 = (arg0->unk2C / 0xB6) - (arg1->unk2E / 0xB6);
if (temp_v1_2 == 0) {
@@ -1382,7 +1382,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001EE98.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(f32, f32 *, ?, ?, s32); /* extern */
? move_f32_towards(f32, f32 *, ?, ?, s32); /* extern */
extern ? D_80164498;
extern ? D_80164A08;
@@ -1451,7 +1451,7 @@ void func_8001F394(Player *player, f32 *arg1) {
phi_a0 = temp_a0;
if (player->unk_00C & 0x40000) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0, 0x41A00000, 0x3E4CCCCD, temp_t3);
move_f32_towards(0.0f, temp_a0, 0x41A00000, 0x3E4CCCCD, temp_t3);
} else {
temp_f0 = *temp_a0;
if (temp_f0 > 1.0f) {
@@ -1467,7 +1467,7 @@ block_51:
if ((player->unk_0BC & 0x2000) == 0x2000) {
if (player->unk_0DC != 0) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_t3 + &D_80164498, 0x41000000, 0x3E4CCCCD, temp_t3);
move_f32_towards(0.0f, temp_t3 + &D_80164498, 0x41000000, 0x3E4CCCCD, temp_t3);
}
} else {
temp_a0_2 = temp_t3 + &D_80164498;
@@ -1487,7 +1487,7 @@ block_51:
phi_a0 = temp_a0_3;
if (((temp_v0_2 & 0x100000) == 0x100000) && ((temp_v0_2 & 8) == 8)) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0_3, 0x41A00000, 0x3DCCCCCD, temp_t3);
move_f32_towards(0.0f, temp_a0_3, 0x41A00000, 0x3DCCCCCD, temp_t3);
} else {
temp_f0_3 = *temp_a0_3;
if (temp_f0_3 > 1.0f) {
@@ -1503,7 +1503,7 @@ block_51:
phi_a0 = temp_a0_4;
if ((player->unk_00C & 0x100) == 0x100) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0_4, 0x41C80000, 0x3F800000, temp_t3);
move_f32_towards(0.0f, temp_a0_4, 0x41C80000, 0x3F800000, temp_t3);
} else {
temp_f0_4 = *temp_a0_4;
if (temp_f0_4 > 1.0f) {
@@ -1520,7 +1520,7 @@ block_51:
phi_a0 = temp_a0_5;
if (((temp_v0_3 & 0x80) == 0x80) || ((temp_v0_3 & 0x40) == 0x40)) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0_5, 0x41900000, 0x3E4CCCCD, temp_t3);
move_f32_towards(0.0f, temp_a0_5, 0x41900000, 0x3E4CCCCD, temp_t3);
} else {
temp_f0_5 = *temp_a0_5;
if (temp_f0_5 > 1.0f) {
src/code_8001F980.c
+13 -37
View File
@@ -1050,23 +1050,15 @@ block_8:
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800224F0.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_80022598(s32 *arg0, s32 arg1, f32 arg2) {
s32 temp_v0;
temp_v0 = *arg0;
*arg0 = temp_v0 - ((temp_v0 - arg1) * arg2);
void move_s32_towards(s32 *startingValue, s32 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022598.s")
#endif
extern f64 D_800ED680;
extern f64 D_800ED688;
/**
* Function: func_800225CC
* Function: move_f32_towards
* Parameters:
* f32 *startingValue - Pointer to the float that will be modified
@@ -1077,7 +1069,7 @@ extern f64 D_800ED688;
* Moves a given startingValue the given somePercent towards the targetValue
* f32 *thing = 2500;
* func_800225CC(thing, 500, 0.75f);
* move_f32_towards(thing, 500, 0.75f);
* thing now has a value of 1000
* If after the move startingValue is inside of the range [D_800ED688, D_800ED680],
@@ -1088,36 +1080,20 @@ extern f64 D_800ED688;
* can't hit exactly 0 with any reliability, so they force it to 0 if you're
* in a small range around it. Why they only do this for 0 is anyone's guess though
**/
void func_800225CC(f32 *startingValue, f32 targetValue, f32 somePercent) {
void move_f32_towards(f32 *startingValue, f32 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
if ((*startingValue < D_800ED680) && (D_800ED688 < *startingValue)) {
*startingValue = 0.0f;
}
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_80022634(s16 *arg0, s16 arg1, f32 arg2) {
s16 temp_v0;
temp_v0 = *arg0;
*arg0 = temp_v0 - ((temp_v0 - arg1) * arg2);
void move_s16_towards(s16 *startingValue, s16 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022634.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_80022674(u16 *arg0, s16 arg1, f32 arg2) {
u16 temp_v0;
temp_v0 = *arg0;
*arg0 = temp_v0 - ((temp_v0 - arg1) * arg2);
void move_u16_towards(u16 *startingValue, s16 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022674.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -1489,7 +1465,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022F14.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022674(void *, s16, s32, s8); // extern
? move_u16_towards(void *, s16, s32, s8); // extern
extern ? D_80164B40;
extern ? D_80164B50;
extern ? D_80164B60;
@@ -1500,9 +1476,9 @@ void func_80023038(s32 arg0, s8 arg1, s32 arg2, s32 arg3) {
temp_v0 = arg1 * 2;
sp1C = temp_v0;
func_80022674(temp_v0 + &D_80164B40, (arg2 >> 0x10) & 0xFF, arg3, arg1);
func_80022674(sp1C + &D_80164B50, (arg2 >> 8) & 0xFF, arg3);
func_80022674(sp1C + &D_80164B60, arg2 & 0xFF, arg3);
move_u16_towards(temp_v0 + &D_80164B40, (arg2 >> 0x10) & 0xFF, arg3, arg1);
move_u16_towards(sp1C + &D_80164B50, (arg2 >> 8) & 0xFF, arg3);
move_u16_towards(sp1C + &D_80164B60, arg2 & 0xFF, arg3);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80023038.s")
src/code_80027D00.c
+35 -35
View File
@@ -828,7 +828,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80029200.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022634(void *, s16, ?, void *); // extern
? move_s16_towards(void *, s16, ?, void *); // extern
? func_80029200(Player *, s8); // extern
s16 func_802B7830(f32, f32); // extern
s32 func_802B7C40(f32, s32); // extern
@@ -940,7 +940,7 @@ void func_8002934C(Player *player, s32 arg1, s8 arg2, s8 arg3) {
temp_a0 = (player->unk_02E + phi_a3->unk48 + player->unk_0C0) & 0xFFFF;
sp20 = temp_a0;
sp28 = sins(temp_a0);
func_80022634(phi_a3 + 0x50, (coss(temp_a0) * phi_a3->unkCC) + (phi_a3->unkD4 * sp28), 0x3F000000, phi_a3);
move_s16_towards(phi_a3 + 0x50, (coss(temp_a0) * phi_a3->unkCC) + (phi_a3->unkD4 * sp28), 0x3F000000, phi_a3);
temp_a0_2 = phi_a3->unk244;
temp_t3 = arg2 * 4;
temp_v1_2 = 4 << temp_t3;
@@ -1052,8 +1052,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002934C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, ?); // extern
? func_80022634(void *, s16, ?); // extern
? move_f32_towards(void *, f32, ?); // extern
? move_s16_towards(void *, s16, ?); // extern
s32 func_802ABD10(u16); // extern
? func_802AFA34(void *, void *, f32, f32, f32); // extern
? func_802B63B8(f32, f32 *, f32 *, f32 *); // extern
@@ -1167,10 +1167,10 @@ void func_80029B4C(void *arg0, ? arg1, f32 arg2, ? arg3) {
arg0->unk1E8 = sp94 + arg0->unk1C;
func_802AFA34(arg0, arg0 + 0x1E0, sp80, sp84, sp88);
if ((arg0->unkBC & 8) == 0) {
func_800225CC(arg0 + 0x230, (arg0->unk1A8 + arg0->unk1D8) / 2.0f, 0x3F000000);
func_800225CC(arg0 + 0x23C, (arg0->unk1C0 + arg0->unk1F0) / 2.0f, 0x3F000000);
func_800225CC(arg0 + 0x1FC, (arg0->unk1A8 + arg0->unk1C0) / 2.0f, 0x3F000000);
func_800225CC(arg0 + 0x1F8, (arg0->unk1D8 + arg0->unk1F0) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x230, (arg0->unk1A8 + arg0->unk1D8) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x23C, (arg0->unk1C0 + arg0->unk1F0) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x1FC, (arg0->unk1A8 + arg0->unk1C0) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x1F8, (arg0->unk1D8 + arg0->unk1F0) / 2.0f, 0x3F000000);
}
temp_f2_3 = ((*(&D_800DDBD4 + (arg0->unk254 * 4)) * 18.0f) + 1.0f) * arg0->unk224;
sp50 = temp_f2_3;
@@ -1180,7 +1180,7 @@ void func_80029B4C(void *arg0, ? arg1, f32 arg2, ? arg3) {
phi_v0 = arg0->unkBC & 8;
}
if (phi_v0 != 8) {
func_80022634(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f2_3), 0x3F000000);
move_s16_towards(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f2_3), 0x3F000000);
} else {
temp_f0_2 = arg0->unk24 - arg2;
sp54 = temp_f0_2;
@@ -1189,7 +1189,7 @@ void func_80029B4C(void *arg0, ? arg1, f32 arg2, ? arg3) {
if (temp_f0_2 >= 0.0f) {
phi_a1 = temp_v0 / 4;
}
func_80022634(arg0 + 0xC4, phi_a1, 0x3F000000);
move_s16_towards(arg0 + 0xC4, phi_a1, 0x3F000000);
}
if (((arg0->unkBC & 8) == 8) && ((arg0->unkCA & 2) == 2)) {
arg0->unkC4 = arg0->unkD9C;
@@ -1222,7 +1222,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80029B4C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022634(void *, s16, ?); // extern
? move_s16_towards(void *, s16, ?); // extern
s32 func_802ABD10(u16); // extern
s32 func_802ABD7C(u16); // extern
f32 func_802ABE30(f32, f32, f32, u16); // extern
@@ -1305,7 +1305,7 @@ void func_8002A194(void *arg0, f32 arg1, f32 arg2, f32 arg3) {
temp_f20 = (*(&D_800DDBD4 + (arg0->unk254 * 4)) * 18.0f) + 1.0f;
arg0->unk206 = -func_802B7C40((arg0->unk23C - arg0->unk230) / temp_f20);
if ((arg0->unkBC & 8) != 8) {
func_80022634(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f20), 0x3F000000);
move_s16_towards(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f20), 0x3F000000);
} else {
temp_f0_2 = arg0->unk24 - arg2;
sp30 = temp_f0_2;
@@ -1314,7 +1314,7 @@ void func_8002A194(void *arg0, f32 arg1, f32 arg2, f32 arg3) {
if (temp_f0_2 >= 0.0f) {
phi_a1 = (temp_v0 << 0x11) >> 0x10;
}
func_80022634(arg0 + 0xC4, phi_a1, 0x3F000000);
move_s16_towards(arg0 + 0xC4, phi_a1, 0x3F000000);
}
if (func_802ABD7C(arg0->unk11A) != 0) {
arg0->unk1F4 = arg0->unk1F4 | 1;
@@ -1608,7 +1608,7 @@ void func_8002AAC0(Player *player) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, ?); // extern
? move_f32_towards(void *, f32, ?); // extern
extern f32 D_800ED7B8;
extern f32 D_800ED7BC;
extern f32 D_800ED7C0;
@@ -1629,38 +1629,38 @@ void func_8002AB70(void *arg0) {
if (((arg0->unkBC & 8) != 8) && (arg0->unk8C > 0.0f)) {
temp_lo = arg0->unkC4 / 0xB6;
if ((temp_lo < -1) && (temp_lo >= -0x14) && (((arg0->unk94 / 18.0f) * 216.0f) >= 20.0f)) {
func_800225CC(arg0 + 0x100, 500.0f, 0x3F800000);
move_f32_towards(arg0 + 0x100, 500.0f, 0x3F800000);
temp_a0 = arg0 + 0xDAC;
sp20 = temp_a0;
func_800225CC(temp_a0, 3.0f, 0x3D4CCCCD);
move_f32_towards(temp_a0, 3.0f, 0x3D4CCCCD);
} else {
func_800225CC(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3DCCCCCD);
move_f32_towards(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3DCCCCCD);
temp_a0_2 = arg0 + 0xDAC;
sp20 = temp_a0_2;
func_800225CC(temp_a0_2, 1.0f, 0x3D8F5C29);
move_f32_towards(temp_a0_2, 1.0f, 0x3D8F5C29);
}
} else {
if (arg0->unk124 >= 50.0f) {
arg0->unkDAC = 2.0f;
}
func_800225CC(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3CA3D70A);
move_f32_towards(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3CA3D70A);
temp_a0_3 = arg0 + 0xDAC;
if ((arg0->unkBC & 2) == 2) {
temp_a0_4 = arg0 + 0xDAC;
sp20 = temp_a0_4;
func_800225CC(temp_a0_4, 1.0f, 0x3D8F5C29);
move_f32_towards(temp_a0_4, 1.0f, 0x3D8F5C29);
} else {
sp20 = temp_a0_3;
func_800225CC(temp_a0_3, 1.0f, 0x3D8F5C29);
move_f32_towards(temp_a0_3, 1.0f, 0x3D8F5C29);
}
}
if ((arg0->unkBC & 0x100000) == 0x100000) {
func_800225CC(sp20, 20.0f, 0x3F800000);
move_f32_towards(sp20, 20.0f, 0x3F800000);
arg0->unk100 = D_800ED7B8;
}
phi_v0 = arg0->unkBC;
if ((arg0->unkBC & 4) == 4) {
func_800225CC(sp20, 25.0f, 0x3F800000);
move_f32_towards(sp20, 25.0f, 0x3F800000);
arg0->unk100 = 1800.0f;
phi_v0 = arg0->unkBC;
}
@@ -4272,7 +4272,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002FE84.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, void *, f32, ?, void *); // extern
? move_f32_towards(void *, f32, void *, f32, ?, void *); // extern
? func_8002FE84(f32, void *, f32); // extern
extern ? D_800E2E90;
extern ? D_800E2EB0;
@@ -4460,13 +4460,13 @@ block_44:
temp_f18 = temp_a3->unk8C * D_800ED998;
sp24 = phi_f0;
arg0 = temp_a3;
func_800225CC(phi_f12, 0.0f, temp_a3 + 0xA0, temp_f18, 0x3E19999A, temp_a3);
move_f32_towards(phi_f12, 0.0f, temp_a3 + 0xA0, temp_f18, 0x3E19999A, temp_a3);
phi_a3 = arg0;
phi_f0_2 = phi_f0;
} else {
arg0 = temp_a3;
sp24 = phi_f0;
func_800225CC(phi_f12, 0.0f, temp_a3 + 0xA0, 0.0f, 0x3DCCCCCD, temp_a3);
move_f32_towards(phi_f12, 0.0f, temp_a3 + 0xA0, 0.0f, 0x3DCCCCCD, temp_a3);
phi_a3 = arg0;
phi_f0_2 = phi_f0;
}
@@ -4489,13 +4489,13 @@ block_44:
if ((phi_a3->unkBC & 0x200000) == 0x200000) {
arg0 = phi_a3;
sp24 = phi_f0_2;
func_800225CC(phi_a3 + 0xE8, 380.0f, 0x3F000000, (bitwise f32) phi_a3);
move_f32_towards(phi_a3 + 0xE8, 380.0f, 0x3F000000, (bitwise f32) phi_a3);
phi_v0_2 = arg0->unk0 & 0x4000;
phi_a3_2 = arg0;
} else {
arg0 = phi_a3;
sp24 = phi_f0_2;
func_800225CC(phi_a3 + 0xE8, 0.0f, 0x3DCCCCCD, (bitwise f32) phi_a3);
move_f32_towards(phi_a3 + 0xE8, 0.0f, 0x3DCCCCCD, (bitwise f32) phi_a3);
phi_v0_2 = arg0->unk0 & 0x4000;
phi_a3_2 = arg0;
}
@@ -4508,26 +4508,26 @@ block_44:
if (((temp_a1_2 & 0x100) == 0x100) && ((temp_a1_2 & 0x10) != 0x10)) {
arg0 = phi_a3_2;
sp24 = phi_f0_2;
func_800225CC(temp_a0, 580.0f, 0x3E4CCCCD, (bitwise f32) phi_a3_2);
move_f32_towards(temp_a0, 580.0f, 0x3E4CCCCD, (bitwise f32) phi_a3_2);
} else {
arg0 = phi_a3_2;
sp24 = phi_f0_2;
func_800225CC(temp_a0, phi_f14, 0x3C23D70A, (bitwise f32) phi_a3_2);
move_f32_towards(temp_a0, phi_f14, 0x3C23D70A, (bitwise f32) phi_a3_2);
}
if ((arg0->unkBC & 0x200000) == 0x200000) {
arg0 = arg0;
sp24 = sp24;
func_800225CC(arg0 + 0xE4, 580.0f, 0x3C23D70A, (bitwise f32) arg0);
move_f32_towards(arg0 + 0xE4, 580.0f, 0x3C23D70A, (bitwise f32) arg0);
} else {
arg0 = arg0;
sp24 = sp24;
func_800225CC(arg0 + 0xE4, 0.0f, 0x3C23D70A, (bitwise f32) arg0);
move_f32_towards(arg0 + 0xE4, 0.0f, 0x3C23D70A, (bitwise f32) arg0);
}
phi_a3_3 = arg0;
phi_f0_3 = sp24;
}
arg0 = phi_a3_3;
func_800225CC(phi_a3_3 + 0x104, phi_f0_3, (bitwise void *) (*(&gKartTurnSpeedReductionTable1 + (phi_a3_3->unk254 * 4)) + D_800ED9B0), (bitwise f32) phi_a3_3);
move_f32_towards(phi_a3_3 + 0x104, phi_f0_3, (bitwise void *) (*(&gKartTurnSpeedReductionTable1 + (phi_a3_3->unk254 * 4)) + D_800ED9B0), (bitwise f32) phi_a3_3);
temp_f0_3 = arg0->unk8C;
temp_f12 = arg0->unk80;
temp_f2_3 = (temp_f0_3 + arg0->unkE8 + temp_f12 + arg0->unkE4) - arg0->unkA0;
@@ -6633,7 +6633,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80033AE0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022598(f32, s32 *, s16, ?, void *); // extern
? move_s32_towards(f32, s32 *, s16, ?, void *); // extern
? func_80036CB4(f32, void *, s32); // extern
extern s32 D_800E4068;
extern ? D_800E4308;
@@ -6694,7 +6694,7 @@ void func_8003680C(void *arg0, s16 arg1) {
if ((temp_t8 & 0x40) == 0) {
sp304 = temp_a3->unk7C >> 0x10;
arg0 = temp_a3;
func_80022598(216.0f, temp_a0, arg1, 0x3EB33333, temp_a3);
move_s32_towards(216.0f, temp_a0, arg1, 0x3EB33333, temp_a3);
temp_t4 = sp304 << 0x10;
sp304 = temp_t4;
temp_v0_2 = arg0->unkBC;
src/code_80057C60.c
+4 -4
View File
@@ -10310,7 +10310,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A50C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022634(void *, s16, ?); // extern
? move_s16_towards(void *, s16, ?); // extern
? func_80062B18(f32 *, f32 *, f32 *, s32, f32, f32, s32, s32); // extern
? func_8006B974(void *, s8, s8); // extern
extern ? D_800E4914;
@@ -10448,7 +10448,7 @@ void func_8006A7C0(void *arg0, s32 arg1, f32 arg2, s8 arg3, s8 arg4) {
}
*(&D_8018D620 + ((arg3 * 6) + (arg4 * 2))) = -arg0->unk2E - arg0->unkC0;
sp5C = arg4 * 2;
func_80022634((arg3 * 6) + (arg4 * 2) + &D_8018D890, arg0->unk94 * 182.0f, 0x3DCCCCCD);
move_s16_towards((arg3 * 6) + (arg4 * 2) + &D_8018D890, arg0->unk94 * 182.0f, 0x3DCCCCCD);
phi_t0 = arg4 * 2;
phi_f12_2 = arg0->unk94;
}
@@ -10530,8 +10530,8 @@ void func_8006A7C0(void *arg0, s32 arg1, f32 arg2, s8 arg3, s8 arg4) {
*temp_v1_3 = *temp_v1_3 + 1;
sp60 = temp_v1_3;
sp5C = phi_t0;
func_80022634((arg3 * 6) + phi_t0 + &D_8018D890, 0, 0x3DCCCCCD);
func_80022634((arg3 * 6) + phi_t0 + &D_8018D860, 0, 0x3DCCCCCD);
move_s16_towards((arg3 * 6) + phi_t0 + &D_8018D890, 0, 0x3DCCCCCD);
move_s16_towards((arg3 * 6) + phi_t0 + &D_8018D860, 0, 0x3DCCCCCD);
if (*temp_v1_3 >= 0x78) {
func_8006B974(arg0, arg3, arg4);
}
src/code_8008C1D0.c
+24 -24
View File
@@ -800,7 +800,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008D3C4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, ?, ?, void *); /* extern */
? move_f32_towards(void *, ?, ?, void *); /* extern */
void func_8008D4B4(void *arg0) {
s16 temp_v0;
@@ -816,10 +816,10 @@ void func_8008D4B4(void *arg0) {
if (arg0->unkDC != 0) {
temp_a0 = temp_a3 + 0x80;
arg0 = temp_a3;
func_800225CC(temp_a0, 0x43C80000, 0x3F000000, temp_a3);
move_f32_towards(temp_a0, 0x43C80000, 0x3F000000, temp_a3);
} else {
arg0 = temp_a3;
func_800225CC(temp_a3 + 0x80, 0, 0x3DCCCCCD, temp_a3);
move_f32_towards(temp_a3 + 0x80, 0, 0x3DCCCCCD, temp_a3);
}
if (arg0->unk80 <= 1.0f) {
arg0->unkBC = arg0->unkBC & ~0x2000;
@@ -1313,7 +1313,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008DF98.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, f32, ?); /* extern */
? move_f32_towards(void *, f32, ?); /* extern */
? func_80031F48(void *, ?, s8); /* extern */
? func_8008DABC(void *, s8, s8); /* extern */
? func_8008E3C0(s8, s8, s8); /* extern */
@@ -1385,8 +1385,8 @@ void func_8008E118(void *arg0, s8 arg1) {
phi_a2 = arg1;
}
if ((arg0->unkB0 >= 0) && (arg0->unkB0 < 0x1CC)) {
func_800225CC(arg0 + 0x224, 0.7f, 0x3DCCCCCD);
func_800225CC(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)) * 0.9, 0x3DCCCCCD);
move_f32_towards(arg0 + 0x224, 0.7f, 0x3DCCCCCD);
move_f32_towards(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)) * 0.9, 0x3DCCCCCD);
return;
}
arg1 = phi_a2;
@@ -1401,7 +1401,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008E118.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, s32, ?, void *); /* extern */
? move_f32_towards(void *, s32, ?, void *); /* extern */
extern ? gKartBoundingBoxTable;
void func_8008E3C0(void *arg0, ? arg1) {
@@ -1411,8 +1411,8 @@ void func_8008E3C0(void *arg0, ? arg1) {
temp_a3 = arg0;
arg0 = temp_a3;
func_800225CC(arg0 + 0x224, 0x3F800000, 0x3DCCCCCD, temp_a3);
func_800225CC(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)), 0x3DCCCCCD, arg0);
move_f32_towards(arg0 + 0x224, 0x3F800000, 0x3DCCCCCD, temp_a3);
move_f32_towards(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)), 0x3DCCCCCD, arg0);
temp_t9 = arg0->unkBC & 0xBFFFFFFF;
arg0->unkBC = temp_t9;
arg0->unk224 = 1.0f;
@@ -1804,7 +1804,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008EC88.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, ?, ?, void *); /* extern */
? move_f32_towards(void *, ?, ?, void *); /* extern */
void func_8008EDC0(void *arg0) {
void *temp_a0;
@@ -1818,10 +1818,10 @@ void func_8008EDC0(void *arg0) {
if ((temp_a3->unkF8 != 0xFE) && ((temp_a3->unkBC & 8) != 8)) {
temp_a0 = temp_a3 + 0x80;
arg0 = temp_a3;
func_800225CC(temp_a0, 0, 0x3F800000, temp_a3);
move_f32_towards(temp_a0, 0, 0x3F800000, temp_a3);
} else {
arg0 = temp_a3;
func_800225CC(temp_a3 + 0x80, 0x43C80000, 0x3C23D70A, temp_a3);
move_f32_towards(temp_a3 + 0x80, 0x43C80000, 0x3C23D70A, temp_a3);
}
if (arg0->unk80 <= 1.0f) {
arg0->unkBC = arg0->unkBC & 0xFFEFFFFF;
@@ -1893,7 +1893,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008EEE4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, ?, ?, void *); /* extern */
? move_f32_towards(void *, ?, ?, void *); /* extern */
extern s32 D_800E261C;
void func_8008F008(void *arg0) {
@@ -1904,10 +1904,10 @@ void func_8008F008(void *arg0) {
arg0->unk9C = *(D_800E261C + (arg0->unk254 * 4));
if ((arg0->unkF8 != 0xFC) && (temp_a0 = arg0 + 0x80, ((arg0->unkBC & 8) != 8))) {
arg0 = temp_a3;
func_800225CC(temp_a0, 0, 0x3F800000, temp_a3);
move_f32_towards(temp_a0, 0, 0x3F800000, temp_a3);
} else {
arg0 = temp_a3;
func_800225CC(temp_a3 + 0x80, 0x43960000, 0x3DCCCCCD, temp_a3);
move_f32_towards(temp_a3 + 0x80, 0x43960000, 0x3DCCCCCD, temp_a3);
}
if (arg0->unk80 <= 1.0f) {
arg0->unkBC = arg0->unkBC & ~4;
@@ -2988,8 +2988,8 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80090868.s")
// Should put this func through mips to C prior to decomp.
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, f32, ?); /* extern */
? func_80022634(void *, ?, ?); /* extern */
? move_f32_towards(void *, f32, ?); /* extern */
? move_s16_towards(void *, ?, ?); /* extern */
? func_8006B8B4(void *, s8); /* extern */
? func_8008C354(s8); /* extern */
? func_8008F104(void *, s8); /* extern */
@@ -3047,8 +3047,8 @@ void func_80090970(void *arg0, s8 arg1, s8 arg2) {
} else {
temp_v0_2 = (arg1 * 4) + &D_801652A0;
sp28 = temp_v0_2;
func_800225CC(arg0 + 0x18, *temp_v0_2 + 100.0f, 0x3C449BA6);
func_80022634(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
move_f32_towards(arg0 + 0x18, *temp_v0_2 + 100.0f, 0x3C449BA6);
move_s16_towards(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
phi_at = 40.0f;
if ((*sp28 + 40.0f) <= arg0->unk18) {
arg0->unk222 = 1;
@@ -3060,8 +3060,8 @@ void func_80090970(void *arg0, s8 arg1, s8 arg2) {
} else {
phi_at = 100.0f;
if ((temp_v1 & 2) == 2) {
func_800225CC(arg0 + 0x18, arg0->unk74 + 100.0f, 0x3CCCCCCD);
func_80022634(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
move_f32_towards(arg0 + 0x18, arg0->unk74 + 100.0f, 0x3CCCCCCD);
move_s16_towards(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
phi_at = 40.0f;
if ((arg0->unk74 + 40.0f) <= arg0->unk18) {
arg0->unk222 = 1;
@@ -3088,7 +3088,7 @@ block_49:
func_8009E088(arg1, 0xA);
}
if ((arg0->unkCA & 1) == 1) {
func_800225CC(arg0 + 0x18, *(&D_801652A0 + (arg1 * 4)) + 40.0f, 0x3CA3D70A);
move_f32_towards(arg0 + 0x18, *(&D_801652A0 + (arg1 * 4)) + 40.0f, 0x3CA3D70A);
arg0->unkC6 = arg0->unkC6 - 8;
if (arg0->unkC6 < 9) {
arg0->unkC6 = 0;
@@ -3096,7 +3096,7 @@ block_49:
arg0->unkCA = arg0->unkCA & 0xFFFE;
}
} else {
func_800225CC(arg0 + 0x18, arg0->unk24 + 40.0f, 0x3CA3D70A);
move_f32_towards(arg0 + 0x18, arg0->unk24 + 40.0f, 0x3CA3D70A);
arg0->unkC6 = arg0->unkC6 - 8;
if (arg0->unkC6 < 9) {
arg0->unkC6 = 0;
@@ -3148,7 +3148,7 @@ block_49:
arg0->unk18 = temp_v0_7->unk2;
arg0->unk1C = temp_v0_7->unk4;
}
func_800225CC(arg0 + 0x18, (arg0->unk74 + arg0->unk70) - 2.0f, 0x3D23D70A);
move_f32_towards(arg0 + 0x18, (arg0->unk74 + arg0->unk70) - 2.0f, 0x3D23D70A);
arg0->unkC8 = arg0->unkC8 + 1;
phi_at = (bitwise f32) 8;
if ((arg0->unkBC & 8) == 8) {