diff --git a/asm/non_matchings/code_80071F00/func_8007E1AC.s b/asm/non_matchings/code_80071F00/func_8007E1AC.s deleted file mode 100644 index 04a593d5a9..0000000000 --- a/asm/non_matchings/code_80071F00/func_8007E1AC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8007E1AC -/* 07EDAC 8007E1AC 3C048018 */ lui $a0, %hi(D_80183EA4) # $a0, 0x8018 -/* 07EDB0 8007E1B0 8C843EA4 */ lw $a0, %lo(D_80183EA4)($a0) -/* 07EDB4 8007E1B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07EDB8 8007E1B8 AFBF0014 */ sw $ra, 0x14($sp) -/* 07EDBC 8007E1BC 0C01F803 */ jal func_8007E00C -/* 07EDC0 8007E1C0 AFA4001C */ sw $a0, 0x1c($sp) -/* 07EDC4 8007E1C4 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 07EDC8 8007E1C8 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 07EDCC 8007E1CC 24010001 */ li $at, 1 -/* 07EDD0 8007E1D0 8FA4001C */ lw $a0, 0x1c($sp) -/* 07EDD4 8007E1D4 51C10004 */ beql $t6, $at, .L8007E1E8 -/* 07EDD8 8007E1D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 07EDDC 8007E1DC 0C01F770 */ jal func_8007DDC0 -/* 07EDE0 8007E1E0 00000000 */ nop -/* 07EDE4 8007E1E4 8FBF0014 */ lw $ra, 0x14($sp) -.L8007E1E8: -/* 07EDE8 8007E1E8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07EDEC 8007E1EC 03E00008 */ jr $ra -/* 07EDF0 8007E1F0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80086604.s b/asm/non_matchings/code_80071F00/func_80086604.s deleted file mode 100644 index f0454ed1a9..0000000000 --- a/asm/non_matchings/code_80071F00/func_80086604.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80086604 -/* 087204 80086604 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 087208 80086608 3C0E8016 */ lui $t6, %hi(D_8016347C) # $t6, 0x8016 -/* 08720C 8008660C 85CE347C */ lh $t6, %lo(D_8016347C)($t6) -/* 087210 80086610 AFBF002C */ sw $ra, 0x2c($sp) -/* 087214 80086614 AFB50028 */ sw $s5, 0x28($sp) -/* 087218 80086618 AFB40024 */ sw $s4, 0x24($sp) -/* 08721C 8008661C AFB30020 */ sw $s3, 0x20($sp) -/* 087220 80086620 AFB2001C */ sw $s2, 0x1c($sp) -/* 087224 80086624 AFB10018 */ sw $s1, 0x18($sp) -/* 087228 80086628 11C00016 */ beqz $t6, .L80086684 -/* 08722C 8008662C AFB00014 */ sw $s0, 0x14($sp) -/* 087230 80086630 3C0F8028 */ lui $t7, %hi(D_802874D8+0x1D) # $t7, 0x8028 -/* 087234 80086634 81EF74F5 */ lb $t7, %lo(D_802874D8+0x1D)($t7) -/* 087238 80086638 3C138016 */ lui $s3, %hi(D_801658C6) # $s3, 0x8016 -/* 08723C 8008663C 267358C6 */ addiu $s3, %lo(D_801658C6) # addiu $s3, $s3, 0x58c6 -/* 087240 80086640 29E10003 */ slti $at, $t7, 3 -/* 087244 80086644 1020000F */ beqz $at, .L80086684 -/* 087248 80086648 00000000 */ nop -/* 08724C 8008664C 82780000 */ lb $t8, ($s3) -/* 087250 80086650 3C118018 */ lui $s1, %hi(D_80183EA0) # $s1, 0x8018 -/* 087254 80086654 26313EA0 */ addiu $s1, %lo(D_80183EA0) # addiu $s1, $s1, 0x3ea0 -/* 087258 80086658 1700000A */ bnez $t8, .L80086684 -/* 08725C 8008665C 3C128018 */ lui $s2, %hi(D_80183EAC) # $s2, 0x8018 -/* 087260 80086660 26523EAC */ addiu $s2, %lo(D_80183EAC) # addiu $s2, $s2, 0x3eac -/* 087264 80086664 8E240000 */ lw $a0, ($s1) -.L80086668: -/* 087268 80086668 0C01C8E9 */ jal func_800723A4 -/* 08726C 8008666C 00002825 */ move $a1, $zero -/* 087270 80086670 26310004 */ addiu $s1, $s1, 4 -/* 087274 80086674 5632FFFC */ bnel $s1, $s2, .L80086668 -/* 087278 80086678 8E240000 */ lw $a0, ($s1) -/* 08727C 8008667C 24190001 */ li $t9, 1 -/* 087280 80086680 A2790000 */ sb $t9, ($s3) -.L80086684: -/* 087284 80086684 3C118018 */ lui $s1, %hi(D_80183EA0) # $s1, 0x8018 -/* 087288 80086688 3C138016 */ lui $s3, %hi(gObjectList) # $s3, 0x8016 -/* 08728C 8008668C 26735C18 */ addiu $s3, %lo(gObjectList) # addiu $s3, $s3, 0x5c18 -/* 087290 80086690 26313EA0 */ addiu $s1, %lo(D_80183EA0) # addiu $s1, $s1, 0x3ea0 -/* 087294 80086694 00009025 */ move $s2, $zero -/* 087298 80086698 24150003 */ li $s5, 3 -/* 08729C 8008669C 241400E0 */ li $s4, 224 -.L800866A0: -/* 0872A0 800866A0 8E300000 */ lw $s0, ($s1) -/* 0872A4 800866A4 02140019 */ multu $s0, $s4 -/* 0872A8 800866A8 02002025 */ move $a0, $s0 -/* 0872AC 800866AC 00004012 */ mflo $t0 -/* 0872B0 800866B0 02684821 */ addu $t1, $s3, $t0 -/* 0872B4 800866B4 852A00A6 */ lh $t2, 0xa6($t1) -/* 0872B8 800866B8 51400006 */ beql $t2, $zero, .L800866D4 -/* 0872BC 800866BC 26520001 */ addiu $s2, $s2, 1 -/* 0872C0 800866C0 0C02194A */ jal func_80086528 -/* 0872C4 800866C4 02402825 */ move $a1, $s2 -/* 0872C8 800866C8 0C021909 */ jal func_80086424 -/* 0872CC 800866CC 02002025 */ move $a0, $s0 -/* 0872D0 800866D0 26520001 */ addiu $s2, $s2, 1 -.L800866D4: -/* 0872D4 800866D4 1655FFF2 */ bne $s2, $s5, .L800866A0 -/* 0872D8 800866D8 26310004 */ addiu $s1, $s1, 4 -/* 0872DC 800866DC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0872E0 800866E0 8FB00014 */ lw $s0, 0x14($sp) -/* 0872E4 800866E4 8FB10018 */ lw $s1, 0x18($sp) -/* 0872E8 800866E8 8FB2001C */ lw $s2, 0x1c($sp) -/* 0872EC 800866EC 8FB30020 */ lw $s3, 0x20($sp) -/* 0872F0 800866F0 8FB40024 */ lw $s4, 0x24($sp) -/* 0872F4 800866F4 8FB50028 */ lw $s5, 0x28($sp) -/* 0872F8 800866F8 03E00008 */ jr $ra -/* 0872FC 800866FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 2752371332..beac9e4d76 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) { diff --git a/src/code_80071F00.h b/src/code_80071F00.h index 1510e50b8d..ba28b1b932 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -242,6 +242,7 @@ void func_8007DA74(s32); void func_8007DAF8(s32, s32); void func_8007DDC0(s32); void init_bb_trash_bin(s32); +void func_8007E1AC(); void func_8007E1F4(s32); void func_8007E358(s32); void func_8007E3EC(s32); @@ -379,12 +380,15 @@ extern u16 D_801657A2; extern s8 D_801658CE; extern s32 D_80162DF8; +extern s16 D_8016347C; extern s32 D_80165598; extern s16 D_80165740; extern s8 D_801657B4; extern Vec3su D_8016582C; +extern s8 D_801658C6; extern s8 D_801658F4; extern s32 D_80183D5C; +extern s32 D_80183EA4; extern s16 D_8018CFE8; extern f32 D_8018D01C; extern s32 D_8018D140;