summaryrefslogtreecommitdiff
path: root/src/code_80071F00.c
diff options
context:
space:
mode:
authorJoshua Peisach <itzswirlz2020@outlook.com>2023-11-24 21:11:37 -0500
committerGitHub <noreply@github.com>2023-11-24 19:11:37 -0700
commita4b64d540c7e28b6942e26d2b7f32cf3187fd2d2 (patch)
tree776f5efc019fe57fa72c77688b709213d10c62aa /src/code_80071F00.c
parent97522fb89950d4f46dc40e0a801169f138f81034 (diff)
Import some code_80071F00 matches (#495)
* Import some code_80071F00 matches
Diffstat (limited to 'src/code_80071F00.c')
-rw-r--r--src/code_80071F00.c53
1 files changed, 13 insertions, 40 deletions
diff --git a/src/code_80071F00.c b/src/code_80071F00.c
index 275237133..beac9e4d7 100644
--- a/src/code_80071F00.c
+++ b/src/code_80071F00.c
@@ -5247,26 +5247,15 @@ void func_8007E00C(s32 objectIndex) {
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E00C.s")
#endif
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_8007DDC0(s32); // extern
-void func_8007E00C(s32); // extern
-extern s32 D_80183EA4;
-
-void func_8007E1AC(void) {
- s32 sp1C;
+void func_8007E1AC() {
s32 temp_a0;
temp_a0 = D_80183EA4;
- sp1C = temp_a0;
func_8007E00C(temp_a0);
if (gModeSelection != TIME_TRIALS) {
func_8007DDC0(temp_a0);
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E1AC.s")
-#endif
void func_8007E1F4(s32 objectIndex) {
f32 sp2C;
@@ -8342,43 +8331,27 @@ void func_80086528(s32 objectIndex, s32 arg1) {
}
}
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-extern s16 D_8016347C;
-extern s8 D_801658C6;
-extern ? D_80183EAC;
-
void func_80086604(void) {
- s32 *var_s1;
- s32 *var_s1_2;
- s32 temp_s0;
- s32 var_s2;
+ s32 objectIndex;
+ s32 var_s1;
if ((D_8016347C != 0) && (D_802874D8.unk1D < 3)) {
- var_s1 = D_80183EA0;
if (D_801658C6 == 0) {
- do {
- func_800723A4(*var_s1, 0);
- var_s1 += 4;
- } while (var_s1 != &D_80183EAC);
+ for(var_s1 = 0; var_s1 < 3; var_s1++) {
+ objectIndex = D_80183EA0[var_s1];
+ func_800723A4(objectIndex, 0);
+ }
D_801658C6 = 1;
}
}
- var_s1_2 = D_80183EA0;
- var_s2 = 0;
- do {
- temp_s0 = *var_s1_2;
- if (gObjectList[temp_s0].state != 0) {
- func_80086528(temp_s0, var_s2);
- func_80086424(temp_s0);
+ for(var_s1 = 0; var_s1 != 3; var_s1++) {
+ objectIndex = D_80183EA0[var_s1];
+ if (gObjectList[objectIndex].state != 0) {
+ func_80086528(objectIndex, var_s1);
+ func_80086424(objectIndex);
}
- var_s2 += 1;
- var_s1_2 += 4;
- } while (var_s2 != 3);
+ }
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086604.s")
-#endif
void func_80086700(s32 objectIndex) {
if (gCCSelection < CC_150) {