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

Named "*_step_*_towards" functions (#154)

Browse Source 
Also redefined a Lights1 variable in terms of GBI macros.

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-01-28 23:27:32 -05:00
committed by GitHub
parent a5e945b233
commit b28dd3898d
34 changed files with 557 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800029B0.c
+2 -10
View File
@@ -98,16 +98,8 @@ u8 *D_800DC600 = &osAppNmiBuffer[0];
s32 gIsMirrorMode = 0;
f32 D_800DC608 = 1.0f;
Lights1 D_800DC610[] = {
{
{175, 175, 175, 0, 175, 175, 175, 0},
{255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 120, 0},
},
{
{115, 115, 115, 0, 115, 115, 115, 0},
{255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 120, 0},
},
gdSPDefLights1(175, 175, 175, 255, 255, 255, 0, 0, 120),
gdSPDefLights1(115, 115, 115, 255, 255, 255, 0, 0, 120),
};
static s32 pad = 0x80000000;
s16 gCreditsCourseId = COURSE_LUIGI_RACEWAY;
src/code_80040E50.c
+170 -193
View File
@@ -4,9 +4,8 @@
#include "code_80040E50.h"
#include "main.h"
#include "variables.h"
#include "math_util.h"
//#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
UNUSED void func_80040E50(s32 *arg0, s32 arg1) {
*arg0 = (s32) (*arg0 | arg1);
}
@@ -45,282 +44,276 @@ void func_80040EC4(Vec3f arg0, Vec3f arg1) {
arg0[2] = arg1[2];
}
s32 func_80040EE0(f32 *arg0, f32 arg1, f32 arg2) {
s32 phi_v1 = 0;
s32 f32_step_up_towards(f32 *value, f32 target, f32 step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
*arg0 += arg2;
if (arg1 <= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (*value < target) {
*value += step;
if (target <= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_80040F2C(f32 *arg0, f32 arg1, f32 arg2) {
s32 phi_v1 = 0;
s32 f32_step_down_towards(f32 *value, f32 target, f32 step) {
s32 targetReached = 0;
if (arg1 < *arg0) {
*arg0 -= arg2;
if (*arg0 <= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (target < *value) {
*value -= step;
if (*value <= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_80040F78(s32 *arg0, s32 arg1, s32 arg2) {
s32 phi_v1 = 0;
s32 s32_step_up_towards(s32 *value, s32 target, s32 step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
*arg0 = *arg0 + arg2;
phi_v1 = 0;
if (*arg0 >= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value < target) {
*value = *value + step;
targetReached = 0;
if (*value >= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_80040FA8(s32 *arg0, s32 arg1, s32 arg2) {
s32 phi_v1 = 0;
s32 s32_step_down_towards(s32 *value, s32 target, s32 step) {
s32 targetReached = 0;
if (arg1 < *arg0) {
*arg0 = *arg0 - arg2;;
if (arg1 >= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target < *value) {
*value = *value - step;;
if (target >= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_80040FD8(s16 *arg0, s16 arg1, s16 arg2) {
s32 phi_v1 = 0;
s32 s16_step_up_towards(s16 *value, s16 target, s16 step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
*arg0 = *arg0 + arg2;
if (*arg0 >= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value < target) {
*value = *value + step;
if (*value >= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_80041028(u16 *arg0, u16 arg1, u16 arg2) {
s32 phi_v1 = 0;
u16 temp_t6 = arg1;
u16 temp_t8 = arg2;
s32 u16_step_up_towards(u16 *value, u16 target, u16 step) {
s32 targetReached = 0;
if (*arg0 < temp_t6) {
*arg0 += temp_t8;
if (*arg0 >= temp_t6) {
*arg0 = temp_t6;
phi_v1 = 1;
if (*value < target) {
*value += step;
if (*value >= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_8004106C(s16 *arg0, s16 arg1, s16 arg2) {
s32 phi_v1 = 0;
s32 s16_step_down_towards(s16 *value, s16 target, s16 step) {
s32 targetReached = 0;
if (arg1 < *arg0) {
*arg0 -= arg2;
if (arg1 >= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target < *value) {
*value -= step;
if (target >= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_800410BC(u16 *arg0, s32 arg1, s32 arg2) {
s32 phi_v1 = 0;
s32 temp = *arg0;
// wtf is up with the argument types for this one?
s32 u16_step_down_towards(u16 *value, s32 target, s32 step) {
s32 targetReached = 0;
s32 temp = *value;
if (arg1 < temp) {
temp -= arg2;
if (arg1 >= temp) {
temp = arg1;
phi_v1 = 1;
if (target < temp) {
temp -= step;
if (target >= temp) {
temp = target;
targetReached = 1;
}
*arg0 = temp;
*value = temp;
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_800410F0(f32 *arg0, f32 arg1, f32 *arg2) {
s32 phi_v1 = 0;
UNUSED s32 f32_step_up_towards_alternate(f32 *value, f32 target, f32 *step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
*arg0 = (f32) (*arg2 + *arg0);
if (arg1 <= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (*value < target) {
*value += *step;
if (target <= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_8004113C(f32 *arg0, f32 arg1, f32 *arg2) {
s32 phi_v1 = 0;
UNUSED s32 f32_step_down_towards_alternate(f32 *value, f32 target, f32 *step) {
s32 targetReached = 0;
if (arg1 < *arg0) {
*arg0 = (f32) (*arg0 - *arg2);
if (*arg0 <= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (target < *value) {
*value -= *step;
if (*value <= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_80041188(s32 *arg0, s32 arg1, s32 *arg2) {
s32 phi_v1 = 0;
UNUSED s32 s32_step_up_towards_alternate(s32 *value, s32 target, s32 *step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
*arg0 += *arg2;
if (*arg0 >= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value < target) {
*value += *step;
if (*value >= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_800411C0(s32 *arg0, s32 arg1, s32 *arg2) {
UNUSED s32 s32_step_down_towards_alternate(s32 *value, s32 target, s32 *step) {
s32 temp_t7;
s32 phi_v1 = 0;
s32 targetReached = 0;
if (arg1 < *arg0) {
*arg0 -= *arg2;
if (arg1 >= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target < *value) {
*value -= *step;
if (target >= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_800411F8(s16 *arg0, s16 arg1, s16 *arg2) {
s32 phi_v1 = 0;
UNUSED s32 s16_step_up_towards_alternate(s16 *value, s16 target, s16 *step) {
s32 targetReached = 0;
if ((s32) *arg0 < (s32) arg1) {
*arg0 = (s16) (*arg2 + *arg0);
if ((s32) *arg0 >= (s32) arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value < target) {
*value += *step;
if (*value >= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_80041240(s16 *arg0, s16 arg1, s16 *arg2) {
s32 phi_v1 = 0;
UNUSED s32 s16_step_down_towards_alternate(s16 *value, s16 target, s16 *step) {
s32 targetReached = 0;
if ((s32) arg1 < (s32) *arg0) {
*arg0 = (s16) (*arg0 - *arg2);
if ((s32) arg1 >= (s32) *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target < *value) {
*value -= *step;
if (target >= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
//#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_80041288(s16 *arg0, s16 arg1, s16 arg2) {
s32 phi_v1 = 0;
s32 s16_step_towards(s16 *value, s16 target, s16 step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
if (arg2 >= 0) {
*arg0 += arg2;
if (*value < target) {
if (step >= 0) {
*value += step;
} else {
*arg0 -= arg2;
*value -= step;
}
if (*arg0 >= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value >= target) {
*value = target;
targetReached = 1;
}
} else if (arg1 < *arg0) {
if (arg2 >= 0) {
*arg0 -= arg2;
} else if (target < *value) {
if (step >= 0) {
*value -= step;
} else {
*arg0 += arg2;
*value += step;
}
if (arg1 >= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target >= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
UNUSED s32 func_8004132C(s32 *arg0, s32 arg1, s32 arg2) {
UNUSED s32 s32_step_towards(s32 *value, s32 target, s32 step) {
s32 temp_v0;
s32 phi_v1;
s32 targetReached;
temp_v0 = *arg0;
phi_v1 = 0;
if (temp_v0 < arg1) {
if (arg2 >= 0) {
*arg0 = (s32) (temp_v0 + arg2);
temp_v0 = *value;
targetReached = 0;
if (temp_v0 < target) {
if (step >= 0) {
*value = (s32) (temp_v0 + step);
} else {
*arg0 = (s32) (temp_v0 - arg2);
*value = (s32) (temp_v0 - step);
}
if (*arg0 >= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value >= target) {
*value = target;
targetReached = 1;
}
} else if (arg1 < temp_v0) {
if (arg2 >= 0) {
*arg0 = (s32) (temp_v0 - arg2);
} else if (target < temp_v0) {
if (step >= 0) {
*value = (s32) (temp_v0 - step);
} else {
*arg0 = (s32) (temp_v0 + arg2);
*value = (s32) (temp_v0 + step);
}
if (arg1 >= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target >= *value) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
s32 func_800413B8(f32 *arg0, f32 arg1, f32 arg2) {
s32 phi_v1 = 0;
s32 f32_step_towards(f32 *value, f32 target, f32 step) {
s32 targetReached = 0;
if (*arg0 < arg1) {
if (arg2 >= 0.0f) {
*arg0 += arg2;
if (*value < target) {
if (step >= 0.0f) {
*value += step;
} else {
*arg0 -= arg2;
*value -= step;
}
if (arg1 <= *arg0) {
*arg0 = arg1;
phi_v1 = 1;
if (target <= *value) {
*value = target;
targetReached = 1;
}
} else if (arg1 < *arg0) {
if (arg2 >= 0.0f) {
*arg0 -= arg2;
} else if (target < *value) {
if (step >= 0.0f) {
*value -= step;
} else {
*arg0 += arg2;
*value += step;
}
if (*arg0 <= arg1) {
*arg0 = arg1;
phi_v1 = 1;
if (*value <= target) {
*value = target;
targetReached = 1;
}
}
return phi_v1;
return targetReached;
}
void func_80041480(s16 *arg0, s16 arg1, s16 arg2, s16 *arg3) {
@@ -384,10 +377,6 @@ UNUSED s32 func_80041608(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041608.s")
#endif
// todo: Check that func_802B7830 is s32 and not void.
// these funcs match as void with no return. (except func_80041658)
extern s32 func_802B7830(f32 arg0, f32 arg1); // extern
s32 func_80041658(f32 arg0, f32 arg1) {
return -func_802B7830(arg0, arg1) & 0xFFFF;
}
@@ -400,9 +389,6 @@ UNUSED s32 func_800416AC(f32 arg0, f32 arg1) {
return func_802B7830(arg1, arg0);
}
f32 sins(u16); // extern
f32 coss(u16); // extern
f32 func_800416D8(f32 arg0, f32 arg1, u16 arg2) {
f32 sp1C;
@@ -410,9 +396,6 @@ f32 func_800416D8(f32 arg0, f32 arg1, u16 arg2) {
return (sp1C * arg0) - (sins(arg2) * arg1);
}
f32 sins(u16); // extern
f32 coss(u16); // extern
f32 func_80041724(f32 arg0, f32 arg1, u16 arg2) {
f32 sp1C;
@@ -463,15 +446,9 @@ s32 func_800418AC(f32 arg0, f32 arg1, Vec3f arg2) {
return func_802B7830(arg0 - arg2[0], arg1 - arg2[2]);
}
//#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800418E8(f32 arg0, f32 arg1, Vec3f arg2) {
return func_802B7830(arg0 - arg2[1], arg1 - arg2[2]);
}
//#else
//GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800418E8.s")
//#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
src/code_80040E50.h
+38
View File
@@ -4,6 +4,44 @@
#include "common_structs.h"
/* Function Prototypes */
// Unused functions
void func_80040E50(s32*, s32);
void func_80040E60(s32*,s32);
void func_80040E74(s32*, s32);
s32 func_80040E84(s32*, s32);
s32 func_80040EA4(s32*, s32);
s32 f32_step_up_towards_alternate(f32*, f32, f32*);
s32 f32_step_down_towards_alternate(f32*, f32, f32*);
s32 s32_step_up_towards_alternate(s32*, s32, s32*);
s32 s32_step_down_towards_alternate(s32*, s32, s32*);
s32 s16_step_up_towards_alternate(s16*, s16, s16*);
s32 s16_step_down_towards_alternate(s16*, s16, s16*);
s32 s32_step_towards(s32*, s32, s32);
s32 func_80041680(f32, f32);
s32 func_800416AC(f32, f32);
void func_80040EC4(Vec3f, Vec3f);
s32 f32_step_up_towards(f32*, f32, f32);
s32 f32_step_down_towards(f32*, f32, f32);
s32 s32_step_up_towards(s32*, s32, s32);
s32 s32_step_down_towards(s32*, s32, s32);
s32 s16_step_up_towards(s16*, s16, s16);
s32 u16_step_up_towards(u16*, u16, u16);
s32 s16_step_down_towards(s16*, s16, s16);
s32 u16_step_down_towards(u16*, s32, s32);
s32 s16_step_towards(s16*, s16, s16);
s32 f32_step_towards(f32*, f32, f32);
void func_80041480(s16*, s16, s16, s16*);
s32 func_80041500(Vec3f, f32, f32, f32);
Vec3f *func_80041594(Vec3f, Vec3f, Vec3f);
s32 func_80041658(f32, f32);
f32 func_800416D8(f32, f32, u16);
f32 func_80041724(f32, f32, u16);
s32 func_80041770(f32, f32, f32, f32);
s32 func_800418AC(f32, f32, Vec3f);
s32 func_800418E8(f32, f32, Vec3f);
void func_80041EF4();
/* This is where I'd put my static data, if I had any */
src/code_80057C60.c
+98 -98
View File
@@ -1250,9 +1250,9 @@ void func_8005A070(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80041028(s32, ?, ?); // extern
? func_800410BC(s32, ?, ?); // extern
? func_800413B8(void *, ?, ?, s32); // extern
? u16_step_up_towards(s32, ?, ?); // extern
? u16_step_down_towards(s32, ?, ?); // extern
? f32_step_towards(void *, ?, ?, s32); // extern
? func_80087D24(s32, ?, ?, ?); // extern
extern f32 D_800EE1E0;
extern ? D_80165C18;
@@ -1291,25 +1291,25 @@ block_5:
if ((temp_t0->unk_0BC * 2) < 0) {
sp2C = temp_a3;
sp24 = temp_t0;
func_800413B8(phi_s0, 0x3E99999A, 0x3CA3D70A, temp_a3);
f32_step_towards(phi_s0, 0x3E99999A, 0x3CA3D70A, temp_a3);
} else {
sp2C = temp_a3;
sp24 = temp_t0;
func_800413B8(phi_s0, 0x3F19999A, 0x3CA3D70A, temp_a3);
f32_step_towards(phi_s0, 0x3F19999A, 0x3CA3D70A, temp_a3);
}
if (sp24->unk_0BC & 0x4000000) {
sp24 = sp24;
func_80041028(phi_s0 + 0xBE, 0xC00, 0x100);
u16_step_up_towards(phi_s0 + 0xBE, 0xC00, 0x100);
} else {
sp24 = sp24;
func_800410BC(phi_s0 + 0xBE, 0, 0x100);
u16_step_down_towards(phi_s0 + 0xBE, 0, 0x100);
}
if ((sp24->unk_0BC & 0x3000000) != 0) {
sp24 = sp24;
func_80087D24(sp2C, 0x40C00000, 0x3FC00000, 0);
} else {
sp24 = sp24;
func_800413B8(phi_s0 + 0x2C, 0, 0x3F800000);
f32_step_towards(phi_s0 + 0x2C, 0, 0x3F800000);
}
if (((sp24->unk_000 & 0x100) != 0) || (sp24->unk_0BC & 0x80000000)) {
phi_s0->unkA0 = 0x50;
@@ -1626,7 +1626,7 @@ void func_8005AB20(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
s32 func_80041288(? *, ?, ?); /* extern */
s32 s16_step_towards(? *, ?, ?); /* extern */
extern s16 D_8016579E;
extern u8 D_801657E7;
extern ? D_8018CAAE;
@@ -1658,45 +1658,45 @@ void func_8005AB60(void) {
temp_t6 = (u8) D_8018CA70->unk_78;
switch (temp_t6) { /* switch 1 */
case 1: /* switch 1 */
func_80041288(&D_8018CAAE, 0x106, 0x10);
if (func_80041288(&D_8018CAB0, 0xB6, 0x10) != 0) {
s16_step_towards(&D_8018CAAE, 0x106, 0x10);
if (s16_step_towards(&D_8018CAB0, 0xB6, 0x10) != 0) {
D_8018CA70->unk_79 = 1;
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
case 2: /* switch 1 */
func_80041288(&D_8018CAAE, 0x116, 4);
if (func_80041288(&D_8018CAB0, 0xC6, 4) != 0) {
s16_step_towards(&D_8018CAAE, 0x116, 4);
if (s16_step_towards(&D_8018CAB0, 0xC6, 4) != 0) {
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
case 3: /* switch 1 */
func_80041288(&D_8018CAAE, 0x106, 4);
if (func_80041288(&D_8018CAB0, 0xB6, 4) != 0) {
s16_step_towards(&D_8018CAAE, 0x106, 4);
if (s16_step_towards(&D_8018CAB0, 0xB6, 4) != 0) {
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
case 4: /* switch 1 */
func_80041288(&D_8018CAAE, 0x10E, 4);
if (func_80041288(&D_8018CAB0, 0xBE, 4) != 0) {
s16_step_towards(&D_8018CAAE, 0x10E, 4);
if (s16_step_towards(&D_8018CAB0, 0xBE, 4) != 0) {
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
case 5: /* switch 1 */
func_80041288(&D_8018CAAE, 0x106, 4);
if (func_80041288(&D_8018CAB0, 0xB6, 4) != 0) {
s16_step_towards(&D_8018CAAE, 0x106, 4);
if (s16_step_towards(&D_8018CAB0, 0xB6, 4) != 0) {
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
case 6: /* switch 1 */
func_80041288(&D_8018CAAE, 0x10A, 2);
if (func_80041288(&D_8018CAB0, 0xBA, 2) != 0) {
s16_step_towards(&D_8018CAAE, 0x10A, 2);
if (s16_step_towards(&D_8018CAB0, 0xBA, 2) != 0) {
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
case 7: /* switch 1 */
func_80041288(&D_8018CAAE, 0x106, 2);
if (func_80041288(&D_8018CAB0, 0xB6, 2) != 0) {
s16_step_towards(&D_8018CAAE, 0x106, 2);
if (s16_step_towards(&D_8018CAB0, 0xB6, 2) != 0) {
D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1;
}
break;
@@ -1720,37 +1720,37 @@ void func_8005AB60(void) {
temp_t8 = D_8018CA70->unk80;
switch (temp_t8) { /* switch 2 */
case 1: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x40, 8) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x40, 8) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
case 2: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x38, 8) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x38, 8) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
case 3: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x40, 8) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x40, 8) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
case 4: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x38, 8) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x38, 8) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
case 5: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x40, 8) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x40, 8) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
case 6: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x38, 4) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x38, 4) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
case 7: /* switch 2 */
if (func_80041288(&D_8018CAB8, 0x40, 4) != 0) {
if (s16_step_towards(&D_8018CAB8, 0x40, 4) != 0) {
D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1);
}
break;
@@ -1761,37 +1761,37 @@ void func_8005AB60(void) {
temp_t3_2 = (u8) D_8018CA70->unk_7A;
switch (temp_t3_2) { /* switch 3 */
case 1: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xE4, 0x10) != 0) {
if (s16_step_towards(&D_8018CABE, 0xE4, 0x10) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
case 2: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xF4, 4) != 0) {
if (s16_step_towards(&D_8018CABE, 0xF4, 4) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
case 3: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xE4, 4) != 0) {
if (s16_step_towards(&D_8018CABE, 0xE4, 4) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
case 4: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xEC, 4) != 0) {
if (s16_step_towards(&D_8018CABE, 0xEC, 4) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
case 5: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xE4, 4) != 0) {
if (s16_step_towards(&D_8018CABE, 0xE4, 4) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
case 6: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xE8, 2) != 0) {
if (s16_step_towards(&D_8018CABE, 0xE8, 2) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
case 7: /* switch 3 */
if (func_80041288(&D_8018CABE, 0xE4, 2) != 0) {
if (s16_step_towards(&D_8018CABE, 0xE4, 2) != 0) {
D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1;
}
break;
@@ -1802,37 +1802,37 @@ void func_8005AB60(void) {
temp_t8_2 = (u8) D_8018CA70->unk_7D;
switch (temp_t8_2) { /* switch 4 */
case 1: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x53, 0x10) != 0) {
if (s16_step_towards(&D_8018CACA, 0x53, 0x10) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
case 2: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x43, 4) != 0) {
if (s16_step_towards(&D_8018CACA, 0x43, 4) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
case 3: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x53, 4) != 0) {
if (s16_step_towards(&D_8018CACA, 0x53, 4) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
case 4: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x4B, 4) != 0) {
if (s16_step_towards(&D_8018CACA, 0x4B, 4) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
case 5: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x53, 4) != 0) {
if (s16_step_towards(&D_8018CACA, 0x53, 4) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
case 6: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x4F, 2) != 0) {
if (s16_step_towards(&D_8018CACA, 0x4F, 2) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
case 7: /* switch 4 */
if (func_80041288(&D_8018CACA, 0x53, 2) != 0) {
if (s16_step_towards(&D_8018CACA, 0x53, 2) != 0) {
D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1;
}
break;
@@ -1845,37 +1845,37 @@ void func_8005AB60(void) {
temp_t7 = (u8) D_8018CA70->unk_7B;
switch (temp_t7) { /* switch 5 */
case 1: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xE4, 0x10) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xE4, 0x10) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
case 2: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xF4, 4) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xF4, 4) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
case 3: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xE4, 4) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xE4, 4) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
case 4: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xEC, 4) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xEC, 4) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
case 5: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xE4, 4) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xE4, 4) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
case 6: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xE8, 2) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xE8, 2) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
case 7: /* switch 5 */
if (func_80041288(&D_8018CAC0, 0xE4, 2) != 0) {
if (s16_step_towards(&D_8018CAC0, 0xE4, 2) != 0) {
D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1;
}
break;
@@ -1886,37 +1886,37 @@ void func_8005AB60(void) {
temp_t2 = (u8) D_8018CA70->unk_7E;
switch (temp_t2) { /* switch 6 */
case 1: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x53, 0x10) != 0) {
if (s16_step_towards(&D_8018CACC, 0x53, 0x10) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
case 2: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x43, 4) != 0) {
if (s16_step_towards(&D_8018CACC, 0x43, 4) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
case 3: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x53, 4) != 0) {
if (s16_step_towards(&D_8018CACC, 0x53, 4) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
case 4: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x4B, 4) != 0) {
if (s16_step_towards(&D_8018CACC, 0x4B, 4) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
case 5: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x53, 4) != 0) {
if (s16_step_towards(&D_8018CACC, 0x53, 4) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
case 6: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x4F, 2) != 0) {
if (s16_step_towards(&D_8018CACC, 0x4F, 2) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
case 7: /* switch 6 */
if (func_80041288(&D_8018CACC, 0x53, 2) != 0) {
if (s16_step_towards(&D_8018CACC, 0x53, 2) != 0) {
D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1;
}
break;
@@ -1927,37 +1927,37 @@ void func_8005AB60(void) {
temp_t7_2 = (u8) D_8018CA70->unk_7C;
switch (temp_t7_2) { /* switch 7 */
case 1: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xE4, 0x10) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xE4, 0x10) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
case 2: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xF4, 4) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xF4, 4) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
case 3: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xE4, 4) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xE4, 4) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
case 4: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xEC, 4) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xEC, 4) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
case 5: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xE4, 4) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xE4, 4) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
case 6: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xE8, 2) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xE8, 2) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
case 7: /* switch 7 */
if (func_80041288(&D_8018CAC2, 0xE4, 2) != 0) {
if (s16_step_towards(&D_8018CAC2, 0xE4, 2) != 0) {
D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1;
}
break;
@@ -1968,44 +1968,44 @@ void func_8005AB60(void) {
temp_t2_2 = (u8) D_8018CA70->unk_7F;
switch (temp_t2_2) { /* switch 8 */
case 1: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x53, 0x10) != 0) {
if (s16_step_towards(&D_8018CACE, 0x53, 0x10) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
default: /* switch 8 */
return;
case 2: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x43, 4) != 0) {
if (s16_step_towards(&D_8018CACE, 0x43, 4) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
break;
case 3: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x53, 4) != 0) {
if (s16_step_towards(&D_8018CACE, 0x53, 4) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
break;
case 4: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x4B, 4) != 0) {
if (s16_step_towards(&D_8018CACE, 0x4B, 4) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
break;
case 5: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x53, 4) != 0) {
if (s16_step_towards(&D_8018CACE, 0x53, 4) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
break;
case 6: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x4F, 2) != 0) {
if (s16_step_towards(&D_8018CACE, 0x4F, 2) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
break;
case 7: /* switch 8 */
if (func_80041288(&D_8018CACE, 0x53, 2) != 0) {
if (s16_step_towards(&D_8018CACE, 0x53, 2) != 0) {
D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1;
return;
}
@@ -2021,8 +2021,8 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AB60.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_80041288(? *, ?, ?); /* extern */
? func_800413B8(f32 *, f32, f32); /* extern */
? s16_step_towards(? *, ?, ?); /* extern */
? f32_step_towards(f32 *, f32, f32); /* extern */
extern ? D_8018CAC0;
extern ? D_8018CAC2;
extern ? D_8018CAC4;
@@ -2042,10 +2042,10 @@ void func_8005B7A0(void) {
f32 *phi_s1;
s32 phi_s0;
func_80041288(&D_8018CAC0, 0xE4, 0x10);
func_80041288(&D_8018CAC2, 0xE4, 0x10);
func_80041288(&D_8018CAC4, 0xE4, 0x10);
func_80041288(&D_8018CAC6, 0xE4, 0x10);
s16_step_towards(&D_8018CAC0, 0xE4, 0x10);
s16_step_towards(&D_8018CAC2, 0xE4, 0x10);
s16_step_towards(&D_8018CAC4, 0xE4, 0x10);
s16_step_towards(&D_8018CAC6, 0xE4, 0x10);
phi_s1 = &D_8018D050;
phi_s0 = 0;
do {
@@ -2053,7 +2053,7 @@ void func_8005B7A0(void) {
temp_s3 = &D_8018D0C8 + phi_s0;
temp_s4 = &D_8018D078 + phi_s0;
if (*phi_s1 >= 0.0f) {
func_800413B8(temp_s2, *temp_s3, *temp_s4);
f32_step_towards(temp_s2, *temp_s3, *temp_s4);
temp_f0 = *temp_s2;
if (temp_f0 == *temp_s3) {
*temp_s4 = 0.0f;
@@ -2073,7 +2073,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005B7A0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_800413B8(f32 *, f32, ?32); /* extern */
? f32_step_towards(f32 *, f32, ?32); /* extern */
? func_8005AA4C(); /* extern */
? func_8005AA6C(?); /* extern */
? func_8005AA80(); /* extern */
@@ -2438,7 +2438,7 @@ block_81:
sp20 = phi_v0_5;
sp18 = phi_v1;
sp1C = phi_a0;
func_800413B8(phi_a0, *phi_v1, *phi_v0_5);
f32_step_towards(phi_a0, *phi_v1, *phi_v0_5);
temp_v1 = phi_v1 + 4;
phi_v1 = temp_v1;
phi_a0 += 4;
@@ -2746,8 +2746,8 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C980.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_80041288(s16 *, ?, ?, s32); /* extern */
? func_800413B8(f32 *, ?, ?, s32); /* extern */
? s16_step_towards(s16 *, ?, ?, s32); /* extern */
? f32_step_towards(f32 *, ?, ?, s32); /* extern */
? func_80079054(s32); /* extern */
? func_80079084(s32); /* extern */
? func_800790B4(s32); /* extern */
@@ -2906,36 +2906,36 @@ void func_8005CB60(s32 playerId, s32 arg1) {
}
} else {
playerId = temp_a3;
func_800413B8(&temp_s0->rankScaling, 0x3F800000, 0x3E000000, temp_a3);
f32_step_towards(&temp_s0->rankScaling, 0x3F800000, 0x3E000000, temp_a3);
temp_v0_6 = gScreenModeSelection;
switch (temp_v0_6) { /* irregular */
case 0:
func_80041288(&temp_s0->slideRankX, 0x1C, 7, playerId);
s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId);
if (D_8018D1FC != 0) {
func_80041288(&temp_s0->slideRankY, -0x28, 1);
s16_step_towards(&temp_s0->slideRankY, -0x28, 1);
} else {
func_80041288(&temp_s0->slideRankY, -0x10, 4);
s16_step_towards(&temp_s0->slideRankY, -0x10, 4);
}
break;
case 2:
func_80041288(&temp_s0->slideRankX, 0x1C, 7, playerId);
func_80041288(&temp_s0->slideRankY, -0x10, 4);
s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId);
s16_step_towards(&temp_s0->slideRankY, -0x10, 4);
break;
case 1:
func_80041288(&temp_s0->slideRankX, 0x1C, 7, playerId);
func_80041288(&temp_s0->slideRankY, -0x10, 4);
func_80041288(&temp_s0->lap1CompletionTimeX, 0xE4, 0x10);
func_80041288(&temp_s0->lap2CompletionTimeX, 0xE4, 0x10);
func_80041288(&temp_s0->lap3CompletionTimeX, 0xE4, 0x10);
func_80041288(&temp_s0->totalTimeX, 0xE4, 0x10);
s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId);
s16_step_towards(&temp_s0->slideRankY, -0x10, 4);
s16_step_towards(&temp_s0->lap1CompletionTimeX, 0xE4, 0x10);
s16_step_towards(&temp_s0->lap2CompletionTimeX, 0xE4, 0x10);
s16_step_towards(&temp_s0->lap3CompletionTimeX, 0xE4, 0x10);
s16_step_towards(&temp_s0->totalTimeX, 0xE4, 0x10);
break;
case 3:
if ((playerId & 1) == 1) {
func_80041288(&temp_s0->slideRankX, -8, 2, playerId);
s16_step_towards(&temp_s0->slideRankX, -8, 2, playerId);
} else {
func_80041288(&temp_s0->slideRankX, 8, 2, playerId);
s16_step_towards(&temp_s0->slideRankX, 8, 2, playerId);
}
func_80041288(&temp_s0->slideRankY, -0x10, 4);
s16_step_towards(&temp_s0->slideRankY, -0x10, 4);
break;
}
}
src/code_80071F00.c
+94 -94
View File
@@ -1534,7 +1534,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074924.s")
void func_80074D94(s32 arg0) {
if (D_80165C18[arg0].unk_0AE == 1) {
if ((D_80165740 <= D_80165C18[arg0].unk_02C) && (func_8004106C(&D_80165C18[arg0].unk_0A0, 0, 8) != 0)) {
if ((D_80165740 <= D_80165C18[arg0].unk_02C) && (s16_step_down_towards(&D_80165C18[arg0].unk_0A0, 0, 8) != 0)) {
func_80086F60(arg0);
}
func_800877C4(arg0);
@@ -1926,7 +1926,7 @@ void func_80075714(s32 arg0) {
break;
case 2:
D_80165C18[arg0].unk_03C -= D_800EEAD0;
func_80040EE0(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C);
f32_step_up_towards(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C);
func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, D_800EEAD8, 1, 0);
if (func_80073B00(arg0, &D_80165C18[arg0].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) {
func_80072488(arg0);
@@ -2097,7 +2097,7 @@ void func_80075B84(s32 arg0) {
break;
case 2:
D_80165C18[arg0].unk_03C -= D_800EEAE0;
func_80040EE0(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C);
f32_step_up_towards(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C);
func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, D_800EEAE8, 1, 0);
if (func_80073B00(arg0, &D_80165C18[arg0].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) {
func_80072488(arg0);
@@ -2429,8 +2429,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007634C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_80041288(void *, ?, ?); /* extern */
? func_800413B8(void *, ?, ?); /* extern */
? s16_step_towards(void *, ?, ?); /* extern */
? f32_step_towards(void *, ?, ?); /* extern */
? func_80072428(s32); /* extern */
? func_80072488(s32); /* extern */
s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); /* extern */
@@ -2458,13 +2458,13 @@ void func_800763CC(s32 arg0) {
return;
case 3:
if (temp_s0->unkD5 == 4) {
func_800413B8(temp_s0, 0x40800000, 0x3DCCCCCD);
func_80041288(temp_s0 + 0xA4, 0, 0x18);
func_80041288(temp_s0 + 0xA2, 0x80, 0xC);
f32_step_towards(temp_s0, 0x40800000, 0x3DCCCCCD);
s16_step_towards(temp_s0 + 0xA4, 0, 0x18);
s16_step_towards(temp_s0 + 0xA2, 0x80, 0xC);
} else {
func_800413B8(temp_s0, 0x3F800000, 0x3DCCCCCD);
func_80041288(temp_s0 + 0xA4, 0, 0x18);
func_80041288(temp_s0 + 0xA2, 0x80, 0xC);
f32_step_towards(temp_s0, 0x3F800000, 0x3DCCCCCD);
s16_step_towards(temp_s0 + 0xA4, 0, 0x18);
s16_step_towards(temp_s0 + 0xA2, 0x80, 0xC);
}
if ((temp_s0->unkAE >= 2) && (func_80073B00(arg0, temp_s0 + 0xA0, 0xFF, 0x50, 0x20, 0, 0) != 0)) {
func_80072488(arg0);
@@ -2485,7 +2485,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800763CC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800410BC(void *, ?, ?); // extern
? u16_step_down_towards(void *, ?, ?); // extern
? func_80086FD4(s32); // extern
s32 func_80087060(s32, ?); // extern
? func_80087844(s32); // extern
@@ -2503,7 +2503,7 @@ void func_80076538(s32 arg0) {
if (temp_v1 != 2) {
} else {
func_800410BC(temp_s0 + 0xBE, 0, 0x400);
u16_step_down_towards(temp_s0 + 0xBE, 0, 0x400);
goto block_11;
}
} else {
@@ -2674,8 +2674,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076958.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_80041288(void *, ?, ?); /* extern */
? func_800413B8(void *, ?, ?); /* extern */
? s16_step_towards(void *, ?, ?); /* extern */
? f32_step_towards(void *, ?, ?); /* extern */
? func_80072428(s32); /* extern */
? func_80072488(s32); /* extern */
s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); /* extern */
@@ -2702,8 +2702,8 @@ void func_800769D8(s32 arg0) {
default:
return;
case 3:
func_800413B8(temp_s0, 0x40000000, 0x3D4CCCCD);
func_80041288(temp_s0 + 0xA4, 0, 0x18);
f32_step_towards(temp_s0, 0x40000000, 0x3D4CCCCD);
s16_step_towards(temp_s0 + 0xA4, 0, 0x18);
if ((temp_s0->unkAE >= 2) && (func_80073B00(arg0, temp_s0 + 0xA0, 0xFF, 0x50, 0x20, 0, 0) != 0)) {
func_80072488(arg0);
return;
@@ -3155,7 +3155,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077428.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80040EE0(void *, ?, ?, s32); // extern
? f32_step_up_towards(void *, ?, ?, s32); // extern
? func_8005C6B4(s8, s16 *, s16 *, s16 *); // extern
? func_80072428(s32); // extern
s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); // extern
@@ -3182,7 +3182,7 @@ void func_80077450(s32 arg0) {
} else {
arg0 = temp_a3;
func_80040EE0(temp_a0, 0x3DCCCCCD, 0x3C23D70A, temp_a3);
f32_step_up_towards(temp_a0, 0x3DCCCCCD, 0x3C23D70A, temp_a3);
if ((temp_s0->unk8 <= temp_s0->unk8E) && (func_80073B00(arg0, temp_s0 + 0xA0, 0xFF, 0, 0x10, 0, 0) != 0)) {
func_80086F60(arg0);
func_80072428(arg0);
@@ -4724,8 +4724,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800799A8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_80040EE0(void *, ?, ?, s32); // extern
s32 func_80040F2C(void *, ?, ?, s32); // extern
s32 f32_step_up_towards(void *, ?, ?, s32); // extern
s32 f32_step_down_towards(void *, ?, ?, s32); // extern
? func_80086F60(s32); // extern
? func_80086FD4(s32, s32); // extern
extern ? D_80165C18;
@@ -4747,14 +4747,14 @@ void func_80079A5C(s32 arg0, ? arg1) {
return;
}
arg0 = temp_a3;
if (func_80040EE0(temp_a0, 0x42C80000, 0x3F800000, temp_a3) != 0) {
if (f32_step_up_towards(temp_a0, 0x42C80000, 0x3F800000, temp_a3) != 0) {
func_80086F60(arg0);
}
// Duplicate return node #10. Try simplifying control flow for better match
return;
}
arg0 = temp_a3;
if (func_80040F2C(temp_v0 + 0x2C, 0x40A00000, 0x3F800000, temp_a3) != 0) {
if (f32_step_down_towards(temp_v0 + 0x2C, 0x40A00000, 0x3F800000, temp_a3) != 0) {
func_80086F60(arg0);
return;
}
@@ -5796,8 +5796,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B254.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_80040FD8(s16 *, ?, ?); /* extern */
s32 func_8004106C(s16 *, ?, ?); /* extern */
? s16_step_up_towards(s16 *, ?, ?); /* extern */
s32 s16_step_down_towards(s16 *, ?, ?); /* extern */
? func_800722CC(s32, ?); /* extern */
s32 func_80072320(s32, ?); /* extern */
s32 func_80072354(s32, ?); /* extern */
@@ -5936,7 +5936,7 @@ void func_8007B34C(s32 playerId) {
if (temp_v0 == 0) {
temp_v1 = &D_8018CA70[playerId];
sp28 = temp_v1;
func_80040FD8(&temp_v1->slideItemBoxY, 0x40, 4);
s16_step_up_towards(&temp_v1->slideItemBoxY, 0x40, 4);
if (temp_v1->slideItemBoxY == 0x40) {
func_80072488(temp_s0);
}
@@ -5944,14 +5944,14 @@ void func_8007B34C(s32 playerId) {
if ((playerId == 0) || (playerId == 2)) {
temp_v1_2 = &D_8018CA70[playerId];
sp28 = temp_v1_2;
func_80040FD8(&temp_v1_2->slideItemBoxX, 0x80, 8);
s16_step_up_towards(&temp_v1_2->slideItemBoxX, 0x80, 8);
if (temp_v1_2->slideItemBoxX == 0x80) {
func_80072488(temp_s0);
}
} else {
temp_v1_3 = &D_8018CA70[playerId];
sp28 = temp_v1_3;
func_8004106C(&temp_v1_3->slideItemBoxX, -0x80, 8);
s16_step_down_towards(&temp_v1_3->slideItemBoxX, -0x80, 8);
if (temp_v1_3->slideItemBoxX == -0x80) {
func_80072488(temp_s0);
}
@@ -5959,7 +5959,7 @@ void func_8007B34C(s32 playerId) {
} else {
temp_v1_4 = &D_8018CA70[playerId];
sp28 = temp_v1_4;
func_80040FD8(&temp_v1_4->slideItemBoxX, 0x80, 8);
s16_step_up_towards(&temp_v1_4->slideItemBoxX, 0x80, 8);
if (temp_v1_4->slideItemBoxX == 0x80) {
func_80072488(temp_s0);
}
@@ -5998,26 +5998,26 @@ void func_8007B34C(s32 playerId) {
case 11:
temp_v0_2 = gActiveScreenMode;
if (temp_v0_2 == 0) {
if (func_8004106C((playerId * 0x84) + 0x48 + D_8018CA70, 0, 4) != 0) {
if (s16_step_down_towards((playerId * 0x84) + 0x48 + D_8018CA70, 0, 4) != 0) {
func_80072488(temp_s0);
}
} else if (temp_v0_2 == 3) {
if ((playerId == 0) || (playerId == 2)) {
temp_v1_5 = &D_8018CA70[playerId];
sp28 = temp_v1_5;
func_8004106C(&temp_v1_5->slideItemBoxX, 0, 8);
s16_step_down_towards(&temp_v1_5->slideItemBoxX, 0, 8);
if (temp_v1_5->slideItemBoxX == 0) {
func_80072488(temp_s0);
}
} else {
temp_v1_6 = &D_8018CA70[playerId];
sp28 = temp_v1_6;
func_80040FD8(&temp_v1_6->slideItemBoxX, 0, 8);
s16_step_up_towards(&temp_v1_6->slideItemBoxX, 0, 8);
if (temp_v1_6->slideItemBoxX == 0) {
func_80072488(temp_s0);
}
}
} else if (func_8004106C((playerId * 0x84) + 0x46 + D_8018CA70, 0, 8) != 0) {
} else if (s16_step_down_towards((playerId * 0x84) + 0x46 + D_8018CA70, 0, 8) != 0) {
func_80072488(temp_s0);
}
break;
@@ -6328,8 +6328,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BEC8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_80040FD8(void *, ?, ?); /* extern */
s32 func_80041028(void *, ?, u16); /* extern */
? s16_step_up_towards(void *, ?, ?); /* extern */
s32 u16_step_up_towards(void *, ?, u16); /* extern */
? func_800721E8(s32, ?); /* extern */
? func_80074344(s32, void *, ?, ?, f32, s32, s32); /* extern */
? func_80086F60(s32); /* extern */
@@ -6367,7 +6367,7 @@ block_26:
if (temp_s0->unkBE >= 0xA01) {
temp_s0->unk92 = temp_s0->unk92 - 4;
}
if (func_80041028(temp_s0 + 0xBE, 0xC00, temp_s0->unk92) != 0) {
if (u16_step_up_towards(temp_s0 + 0xBE, 0xC00, temp_s0->unk92) != 0) {
func_80086FD4(arg0);
}
goto block_26;
@@ -6383,7 +6383,7 @@ block_26:
temp_s0->unk34 = temp_f0 + 0.0002;
}
temp_s0->unk0 = temp_s0->unk0 + temp_s0->unk34;
func_80040FD8(temp_s0 + 0x92, 0x100, 0x10);
s16_step_up_towards(temp_s0 + 0x92, 0x100, 0x10);
temp_s0->unkBE = temp_s0->unkBE - temp_s0->unk92;
if (func_80087060(arg0, 0x35) != 0) {
func_80086FD4(arg0);
@@ -7858,8 +7858,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E59C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_80040EE0(void *, f32, ?); /* extern */
s32 func_80040F2C(void *, ?, ?); /* extern */
s32 f32_step_up_towards(void *, f32, ?); /* extern */
s32 f32_step_down_towards(void *, ?, ?); /* extern */
? func_800721C0(s32, ?); /* extern */
? func_800721E8(s32, ?); /* extern */
s32 func_8007223C(s32, ?); /* extern */
@@ -7923,14 +7923,14 @@ void func_8007E63C(s32 arg0) {
func_8007278C(arg0, 0x1E);
return;
case 0x66: /* switch 1 */
if (func_80040EE0(temp_v1 + 0x2C, 20.0f, 0x3FC00000) != 0) {
if (f32_step_up_towards(temp_v1 + 0x2C, 20.0f, 0x3FC00000) != 0) {
func_80072488(arg0);
return;
}
/* Duplicate return node #68. Try simplifying control flow for better match */
return;
case 0x67: /* switch 1 */
if (func_80040F2C(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) {
if (f32_step_down_towards(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) {
if (func_8007223C(arg0, 0x20000) != 0) {
func_800722A4(arg0, 0x10);
if (func_8007223C(arg0, 0x40000) != 0) {
@@ -7943,7 +7943,7 @@ void func_8007E63C(s32 arg0) {
/* Duplicate return node #68. Try simplifying control flow for better match */
return;
case 0x68: /* switch 1 */
if (func_80040EE0(temp_v1 + 0x2C, 12.0f, 0x3FC00000) != 0) {
if (f32_step_up_towards(temp_v1 + 0x2C, 12.0f, 0x3FC00000) != 0) {
func_80072488(arg0);
return;
}
@@ -7951,7 +7951,7 @@ void func_8007E63C(s32 arg0) {
return;
case 0x69: /* switch 1 */
sp28 = temp_v1;
if (func_80040F2C(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) {
if (f32_step_down_towards(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) {
sp28 = temp_v1;
if (func_8007223C(arg0, 0x20000) != 0) {
sp28 = temp_v1;
@@ -7990,7 +7990,7 @@ void func_8007E63C(s32 arg0) {
sp28 = temp_v1;
func_800730BC(arg0, 3, 5, 1, 6, -1);
}
if (func_80040EE0(temp_t6 + &D_80165C18 + 0x2C, (temp_t6 + &D_80165C18)->unk20, 0x3F000000) != 0) {
if (f32_step_up_towards(temp_t6 + &D_80165C18 + 0x2C, (temp_t6 + &D_80165C18)->unk20, 0x3F000000) != 0) {
func_80072388(arg0, 0);
func_80072488(arg0);
return;
@@ -8010,7 +8010,7 @@ void func_8007E63C(s32 arg0) {
} else {
switch (temp_v0) { /* switch 2 */
case 0x32: /* switch 2 */
if (func_80040EE0(temp_v1 + 0x2C, temp_v1->unk20 + 15.0, 0x3FC00000) != 0) {
if (f32_step_up_towards(temp_v1 + 0x2C, temp_v1->unk20 + 15.0, 0x3FC00000) != 0) {
func_800721C0(arg0, 0x200);
func_800722A4(arg0, 1);
func_800722CC(arg0, 2);
@@ -8022,7 +8022,7 @@ void func_8007E63C(s32 arg0) {
return;
case 0x33: /* switch 2 */
sp28 = temp_v1;
if (func_80040F2C(temp_v1 + 0x2C, 0, 0x40000000) != 0) {
if (f32_step_down_towards(temp_v1 + 0x2C, 0, 0x40000000) != 0) {
temp_f0_2 = temp_v1->unk2C;
if (temp_f0_2 >= 16.0f) {
temp_v1->unkD2 = 0;
@@ -8060,7 +8060,7 @@ void func_8007E63C(s32 arg0) {
} else if (temp_f0_3 >= 18.0f) {
temp_v1->unkD2 = 1;
}
if (func_80040EE0(temp_v1 + 0x2C, temp_v1->unk20, 0x3F000000) != 0) {
if (f32_step_up_towards(temp_v1 + 0x2C, temp_v1->unk20, 0x3F000000) != 0) {
func_800721E8(arg0, 0x200);
func_8007266C(arg0);
return;
@@ -8215,9 +8215,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EE5C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_80040EE0(void *, ?, ?); /* extern */
s32 func_80040F2C(void *, ?, ?); /* extern */
s32 func_800413B8(void *, f32, ?); /* extern */
s32 f32_step_up_towards(void *, ?, ?); /* extern */
s32 f32_step_down_towards(void *, ?, ?); /* extern */
s32 f32_step_towards(void *, f32, ?); /* extern */
? func_800726CC(s32, ?); /* extern */
s32 func_80073E18(s32, void *, ?, ?); /* extern */
? func_80086FD4(s32); /* extern */
@@ -8242,7 +8242,7 @@ void func_8007EFBC(s32 arg0) {
default:
return;
case 2:
if (func_800413B8(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) {
if (f32_step_towards(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8264,7 +8264,7 @@ void func_8007EFBC(s32 arg0) {
/* Duplicate return node #27. Try simplifying control flow for better match */
return;
case 6:
if (func_80040F2C(temp_v1 + 0x30, 0xC2C80000, 0x40000000) != 0) {
if (f32_step_down_towards(temp_v1 + 0x30, 0xC2C80000, 0x40000000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8286,7 +8286,7 @@ void func_8007EFBC(s32 arg0) {
/* Duplicate return node #27. Try simplifying control flow for better match */
return;
case 10:
if (func_800413B8(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) {
if (f32_step_towards(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8308,7 +8308,7 @@ void func_8007EFBC(s32 arg0) {
/* Duplicate return node #27. Try simplifying control flow for better match */
return;
case 14:
if (func_80040EE0(temp_v1 + 0x30, 0, 0x40000000) != 0) {
if (f32_step_up_towards(temp_v1 + 0x30, 0, 0x40000000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8334,9 +8334,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EFBC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_80040EE0(void *, ?, ?); /* extern */
s32 func_80040F2C(void *, ?, ?); /* extern */
s32 func_800413B8(void *, f32, ?); /* extern */
s32 f32_step_up_towards(void *, ?, ?); /* extern */
s32 f32_step_down_towards(void *, ?, ?); /* extern */
s32 f32_step_towards(void *, f32, ?); /* extern */
? func_800726CC(s32, ?); /* extern */
s32 func_80073E18(s32, void *, ?, ?); /* extern */
? func_80086FD4(s32); /* extern */
@@ -8361,7 +8361,7 @@ void func_8007F280(s32 arg0) {
default:
return;
case 2:
if (func_800413B8(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) {
if (f32_step_towards(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8383,7 +8383,7 @@ void func_8007F280(s32 arg0) {
/* Duplicate return node #27. Try simplifying control flow for better match */
return;
case 6:
if (func_80040EE0(temp_v1 + 0x30, 0x42C80000, 0x40000000) != 0) {
if (f32_step_up_towards(temp_v1 + 0x30, 0x42C80000, 0x40000000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8405,7 +8405,7 @@ void func_8007F280(s32 arg0) {
/* Duplicate return node #27. Try simplifying control flow for better match */
return;
case 10:
if (func_800413B8(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) {
if (f32_step_towards(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8427,7 +8427,7 @@ void func_8007F280(s32 arg0) {
/* Duplicate return node #27. Try simplifying control flow for better match */
return;
case 14:
if (func_80040F2C(temp_v1 + 0x30, 0, 0x40000000) != 0) {
if (f32_step_down_towards(temp_v1 + 0x30, 0, 0x40000000) != 0) {
func_80086FD4(arg0);
return;
}
@@ -8692,7 +8692,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FA08.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800413B8(void *, ?, ?); /* extern */
? f32_step_towards(void *, ?, ?); /* extern */
? func_800722CC(s32, ?); /* extern */
? func_800726CC(s32, ?); /* extern */
? func_80086FD4(s32, void *); /* extern */
@@ -8780,8 +8780,8 @@ block_20:
return;
case 4:
sp18 = temp_v1;
func_800413B8(temp_v1 + 0x30, 0, 0x40000000);
func_800413B8(temp_v1 + 0x28, 0, 0x40A00000);
f32_step_towards(temp_v1 + 0x30, 0, 0x40000000);
f32_step_towards(temp_v1 + 0x28, 0, 0x40A00000);
if ((temp_v1->unk30 + temp_v1->unk28) == 0.0) {
func_80086FD4(arg0);
return;
@@ -8809,7 +8809,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FB48.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800413B8(void *, s32, ?); // extern
s32 f32_step_towards(void *, s32, ?); // extern
? func_800722CC(s32, ?); // extern
? func_800726CC(s32, ?); // extern
? func_80086FD4(s32); // extern
@@ -8827,7 +8827,7 @@ void func_8007FEA4(s32 arg0) {
if (temp_v0 != 3) {
return;
}
if (func_800413B8(temp_v1 + 0x28, 0, 0x40A00000) != 0) {
if (f32_step_towards(temp_v1 + 0x28, 0, 0x40A00000) != 0) {
func_80086FD4(arg0);
func_800722CC(arg0, 8);
}
@@ -8837,7 +8837,7 @@ void func_8007FEA4(s32 arg0) {
// Duplicate return node #9. Try simplifying control flow for better match
return;
}
if (func_800413B8(temp_v1 + 0x28, temp_v1->unk1C, 0x40A00000) != 0) {
if (f32_step_towards(temp_v1 + 0x28, temp_v1->unk1C, 0x40A00000) != 0) {
func_800726CC(arg0, 3);
func_80086FD4(arg0);
return;
@@ -9173,7 +9173,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080524.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800413B8(void *, ?, f32, s32); // extern
s32 f32_step_towards(void *, ?, f32, s32); // extern
? func_80086FD4(s32); // extern
? func_8008701C(s32, ?); // extern
extern ? D_80165C18;
@@ -9194,7 +9194,7 @@ void func_800806BC(s32 arg0) {
}
sp18 = temp_v1;
arg0 = temp_a3;
if (func_800413B8(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) {
if (f32_step_towards(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) {
temp_v1->unk40 = -temp_v1->unk40;
func_8008701C(arg0, 1);
}
@@ -9203,7 +9203,7 @@ void func_800806BC(s32 arg0) {
}
sp18 = temp_v1;
arg0 = temp_a3;
if (func_800413B8(temp_v1 + 0x30, 0x437A0000, temp_v1->unk40, temp_a3) != 0) {
if (f32_step_towards(temp_v1 + 0x30, 0x437A0000, temp_v1->unk40, temp_a3) != 0) {
temp_v1->unk40 = -temp_v1->unk40;
func_80086FD4(arg0);
return;
@@ -9217,7 +9217,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800806BC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800413B8(void *, ?, f32, s32); // extern
s32 f32_step_towards(void *, ?, f32, s32); // extern
? func_80086FD4(s32); // extern
? func_8008701C(s32, ?); // extern
extern ? D_80165C18;
@@ -9238,7 +9238,7 @@ void func_8008078C(s32 arg0) {
}
sp18 = temp_v1;
arg0 = temp_a3;
if (func_800413B8(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) {
if (f32_step_towards(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) {
temp_v1->unk40 = -temp_v1->unk40;
func_8008701C(arg0, 1);
}
@@ -9247,7 +9247,7 @@ void func_8008078C(s32 arg0) {
}
sp18 = temp_v1;
arg0 = temp_a3;
if (func_800413B8(temp_v1 + 0x30, 0xC37A0000, temp_v1->unk40, temp_a3) != 0) {
if (f32_step_towards(temp_v1 + 0x30, 0xC37A0000, temp_v1->unk40, temp_a3) != 0) {
temp_v1->unk40 = -temp_v1->unk40;
func_80086FD4(arg0);
return;
@@ -9628,7 +9628,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081080.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80040EE0(void *, ?, ?); // extern
? f32_step_up_towards(void *, ?, ?); // extern
? func_80072428(s32); // extern
? func_80072488(s32); // extern
s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); // extern
@@ -9657,7 +9657,7 @@ void func_800810F4(s32 arg0) {
} else {
sp30 = temp_v1;
func_8008775C(arg0);
func_80040EE0(sp30 + 0x2C, 0x41600000, 0x3F000000);
f32_step_up_towards(sp30 + 0x2C, 0x41600000, 0x3F000000);
func_8007415C(arg0, sp30, 0x3E800000, 0x3F400000, D_800EF0C8, 1, 0);
if (func_80073B00(arg0, sp30 + 0xA0, 0xFF, 0, 4, 0, 0) != 0) {
func_80072488(arg0);
@@ -10012,8 +10012,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081848.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_80040EE0(void *, ?, ?); /* extern */
s32 func_80040F2C(void *, ?, ?); /* extern */
s32 f32_step_up_towards(void *, ?, ?); /* extern */
s32 f32_step_down_towards(void *, ?, ?); /* extern */
? func_80086F60(s32); /* extern */
? func_80086FD4(s32); /* extern */
? func_800871AC(s32, ?); /* extern */
@@ -10031,7 +10031,7 @@ void func_80081924(s32 arg0) {
temp_t8 = temp_v0->unkAE;
switch (temp_t8) {
case 1:
if (func_80040EE0(temp_v0 + 0x2C, 0x41100000, 0x3F333333) != 0) {
if (f32_step_up_towards(temp_v0 + 0x2C, 0x41100000, 0x3F333333) != 0) {
func_80086FD4(arg0);
return;
}
@@ -10041,7 +10041,7 @@ void func_80081924(s32 arg0) {
func_800871AC(arg0, 0xA);
return;
case 3:
if (func_80040F2C(temp_v0 + 0x2C, 0x40400000, 0x3F800000) != 0) {
if (f32_step_down_towards(temp_v0 + 0x2C, 0x40400000, 0x3F800000) != 0) {
func_80086F60(arg0);
return;
}
@@ -11290,7 +11290,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083868.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_80040EE0(void *, ?, ?); /* extern */
s32 f32_step_up_towards(void *, ?, ?); /* extern */
? func_80073800(s32, ?); /* extern */
? func_80073D0C(s32, void *, ?, ?, s32, s32, s32); /* extern */
? func_80086FD4(s32); /* extern */
@@ -11324,7 +11324,7 @@ void func_80083948(s32 arg0) {
func_80087D24(arg0, 0, 0x3E4CCCCD, 0xC0E00000);
break;
case 20:
if (func_80040EE0(temp_s1 + 0x2C, 0, 0x3E4CCCCD) != 0) {
if (f32_step_up_towards(temp_s1 + 0x2C, 0, 0x3E4CCCCD) != 0) {
func_80073800(arg0, 0);
func_8008701C(arg0, 1);
}
@@ -12020,7 +12020,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80084B7C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s16 func_80004EAC(? *, s32); /* extern */
? func_800413B8(void *, f32, ?); /* extern */
? f32_step_towards(void *, f32, ?); /* extern */
? func_800722A4(s32, ?); /* extern */
? func_800722CC(s32, ?); /* extern */
s32 func_80072354(s32, ?); /* extern */
@@ -12054,7 +12054,7 @@ void func_80084D2C(s32 arg0, s32 arg1) {
}
break;
case 2:
func_800413B8(temp_s0 + 0x34, 0.8f, 0x3CA3D70A);
f32_step_towards(temp_s0 + 0x34, 0.8f, 0x3CA3D70A);
if (func_80087060(arg0, 0xF) != 0) {
func_800722A4(arg0, 1);
func_800722A4(arg0, 2);
@@ -12087,7 +12087,7 @@ void func_80084D2C(s32 arg0, s32 arg1) {
} else {
sp24 = 1.0f;
}
func_800413B8(temp_s0 + 0x34, sp24, 0x3E19999A);
f32_step_towards(temp_s0 + 0x34, sp24, 0x3E19999A);
if ((func_80072354(arg0, 2) != 0) && (sp24 == temp_s0->unk34)) {
func_80086FD4(arg0);
}
@@ -12099,7 +12099,7 @@ void func_80084D2C(s32 arg0, s32 arg1) {
}
break;
case 5:
func_800413B8(temp_s0 + 0x34, 0.4f, 0x3E4CCCCD);
f32_step_towards(temp_s0 + 0x34, 0.4f, 0x3E4CCCCD);
if (func_80087060(arg0, 0xA) != 0) {
func_800722A4(arg0, 2);
temp_s0->unkD8 = 2;
@@ -12320,7 +12320,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800853DC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800413B8(void *, ?, ?); /* extern */
? f32_step_towards(void *, ?, ?); /* extern */
? func_80086FD4(s32); /* extern */
? func_8008701C(s32, ?); /* extern */
s32 func_80087060(s32, ?); /* extern */
@@ -12341,7 +12341,7 @@ void func_80085534(s32 arg0) {
}
break;
case 2:
func_800413B8(temp_s0 + 0x3C, 0, 0x3D4CCCCD);
f32_step_towards(temp_s0 + 0x3C, 0, 0x3D4CCCCD);
if (temp_s0->unk3C == 0.0) {
func_80086FD4(arg0);
}
@@ -12350,7 +12350,7 @@ void func_80085534(s32 arg0) {
func_800871AC(arg0, 1);
break;
case 4:
func_800413B8(temp_s0 + 0x3C, 0x3F800000, 0x3D4CCCCD);
f32_step_towards(temp_s0 + 0x3C, 0x3F800000, 0x3D4CCCCD);
if (temp_s0->unk3C == 1.0) {
func_80086FD4(arg0);
}
@@ -12359,13 +12359,13 @@ void func_80085534(s32 arg0) {
func_800871AC(arg0, 0x5A);
break;
case 6:
func_800413B8(temp_s0 + 0x3C, 0, 0x3D4CCCCD);
f32_step_towards(temp_s0 + 0x3C, 0, 0x3D4CCCCD);
if (temp_s0->unk3C == 0.0) {
func_80086FD4(arg0);
}
break;
case 7:
func_800413B8(temp_s0 + 0x3C, 0xBF800000, 0x3D4CCCCD);
f32_step_towards(temp_s0 + 0x3C, 0xBF800000, 0x3D4CCCCD);
if (temp_s0->unk3C == -1.0) {
func_80086FD4(arg0);
}
@@ -12374,7 +12374,7 @@ void func_80085534(s32 arg0) {
func_800871AC(arg0, 0x5A);
break;
case 9:
func_800413B8(temp_s0 + 0x3C, 0, 0x3D4CCCCD);
f32_step_towards(temp_s0 + 0x3C, 0, 0x3D4CCCCD);
if (func_80087060(arg0, 0x5A) != 0) {
func_8008701C(arg0, 3);
}
@@ -13172,7 +13172,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086700.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800413B8(void *, ?, ?); /* extern */
? f32_step_towards(void *, ?, ?); /* extern */
? func_80086F60(s32); /* extern */
? func_80086FD4(s32); /* extern */
? func_8008701C(s32, ?); /* extern */
@@ -13195,7 +13195,7 @@ void func_80086940(s32 arg0) {
func_80086FD4(arg0);
break;
case 2:
func_800413B8(temp_s0, 0x3CCCCCCD, 0x3A83126F);
f32_step_towards(temp_s0, 0x3CCCCCCD, 0x3A83126F);
func_80087C48(arg0, 0x40C00000, 0x3DCCCCCD, 0xC8);
if (temp_s0->unk3C <= 0.0) {
func_8008701C(arg0, 3);
@@ -13225,7 +13225,7 @@ void func_80086940(s32 arg0) {
break;
case 5:
if (temp_s0->unk2C <= 8.0) {
func_800413B8(temp_s0 + 0x3C, 0xBDCCCCCD, 0xBC23D70A);
f32_step_towards(temp_s0 + 0x3C, 0xBDCCCCCD, 0xBC23D70A);
}
func_800877C4(arg0);
if (temp_s0->unk2C <= 0.0) {
src/code_80071F00.h
+2 -2
View File
@@ -3,8 +3,8 @@
#include "common_structs.h"
s32 func_80040EE0(f32*, f32, f32);
s32 func_8004106C(s16*, s16, s16);
s32 f32_step_up_towards(f32*, f32, f32);
s32 s16_step_down_towards(s16*, s16, s16);
void func_80041480(s16*, s16, s16, s16*);
s32 func_80072044(s32*, s32*, s32);
void func_800721C0(s32, s32);
src/code_80086E70.c
+2 -2
View File
@@ -1223,7 +1223,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088FF0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800413B8(f32, f32 *, f32, f32, f32 *); // extern
? f32_step_towards(f32, f32 *, f32, f32, f32 *); // extern
extern f32 D_800EF4A0;
extern f32 D_800EF4A4;
extern f32 D_800EF4A8;
@@ -1301,7 +1301,7 @@ void func_80089020(s32 arg0, f32 *arg1) {
phi_f0 = D_800EF4D0;
}
}
func_800413B8(0.0f, arg1, 0.0f, phi_f0, arg1);
f32_step_towards(0.0f, arg1, 0.0f, phi_f0, arg1);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089020.s")