From bf106ede73cc78538d98877e40ba73d5a45c5351 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Wed, 6 Jul 2022 01:07:55 -0600 Subject: [PATCH] Decomp every func under 500 bytes (except audio) (#237) --- .../code_80005FD0/func_8000F2BC.s | 9 - .../code_80005FD0/func_8001968C.s | 5 - .../code_80005FD0/func_80019DE4.s | 5 - .../code_80005FD0/func_8001ABE0.s | 4 - .../code_80005FD0/func_8001ABEC.s | 12 - .../code_80071F00/func_80072388.s | 8 - .../code_80071F00/func_800724DC.s | 8 - .../code_80071F00/func_8007266C.s | 25 -- .../code_80071F00/func_800726CC.s | 53 ---- .../code_80071F00/func_80072950.s | 30 -- .../code_80071F00/func_800729B4.s | 8 - .../code_80071F00/func_800729D0.s | 8 - .../code_80071F00/func_8007369C.s | 18 -- .../code_80071F00/func_800736E0.s | 17 -- .../code_80071F00/func_80073720.s | 16 - .../code_80071F00/func_80073800.s | 8 - .../code_80071F00/func_80073844.s | 17 -- .../code_80071F00/func_80073F90.s | 8 - .../code_80071F00/func_80073FD4.s | 20 -- .../code_80071F00/func_8007BB9C.s | 9 - .../code_80071F00/func_8007C340.s | 9 - .../code_80071F00/func_80081208.s | 3 - .../code_80071F00/func_80083060.s | 9 - .../code_80071F00/func_80083BE4.s | 9 - .../code_80086E70/func_80086EF0.s | 9 - .../code_80091750/func_8009969C.s | 9 - .../code_80091750/func_80099A70.s | 11 - .../code_80091750/func_80099E54.s | 4 - .../code_80091750/func_8009CDDC.s | 9 - .../code_80091750/func_8009CDFC.s | 9 - .../code_80091750/func_8009CE1C.s | 21 -- .../code_80091750/func_8009D958.s | 9 - .../code_80091750/func_8009D978.s | 9 - .../code_80091750/func_8009DF4C.s | 9 - .../code_80091750/func_8009DF6C.s | 9 - .../code_80091750/func_8009DFE0.s | 9 - .../code_80091750/func_8009E000.s | 9 - .../code_80091750/func_8009E1C0.s | 10 - .../code_80091750/func_8009E1E4.s | 10 - .../code_80091750/func_8009E208.s | 11 - .../code_80091750/func_8009E230.s | 11 - .../code_80091750/func_8009E258.s | 11 - .../code_80091750/func_8009E5BC.s | 18 -- .../code_80091750/func_8009E5FC.s | 10 - .../code_80091750/func_800A8230.s | 9 - .../code_80091750/func_800A8250.s | 9 - src/code_80005FD0.c | 48 +-- src/code_80071F00.c | 279 +++++++----------- src/code_80071F00.h | 4 +- src/code_80086E70.c | 7 - src/code_80091750.c | 216 +++----------- 51 files changed, 152 insertions(+), 945 deletions(-) delete mode 100644 asm/non_matchings/code_80005FD0/func_8000F2BC.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8001968C.s delete mode 100644 asm/non_matchings/code_80005FD0/func_80019DE4.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8001ABE0.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8001ABEC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80072388.s delete mode 100644 asm/non_matchings/code_80071F00/func_800724DC.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007266C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800726CC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80072950.s delete mode 100644 asm/non_matchings/code_80071F00/func_800729B4.s delete mode 100644 asm/non_matchings/code_80071F00/func_800729D0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007369C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800736E0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80073720.s delete mode 100644 asm/non_matchings/code_80071F00/func_80073800.s delete mode 100644 asm/non_matchings/code_80071F00/func_80073844.s delete mode 100644 asm/non_matchings/code_80071F00/func_80073F90.s delete mode 100644 asm/non_matchings/code_80071F00/func_80073FD4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007BB9C.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C340.s delete mode 100644 asm/non_matchings/code_80071F00/func_80081208.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083060.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083BE4.s delete mode 100644 asm/non_matchings/code_80086E70/func_80086EF0.s delete mode 100644 asm/non_matchings/code_80091750/func_8009969C.s delete mode 100644 asm/non_matchings/code_80091750/func_80099A70.s delete mode 100644 asm/non_matchings/code_80091750/func_80099E54.s delete mode 100644 asm/non_matchings/code_80091750/func_8009CDDC.s delete mode 100644 asm/non_matchings/code_80091750/func_8009CDFC.s delete mode 100644 asm/non_matchings/code_80091750/func_8009CE1C.s delete mode 100644 asm/non_matchings/code_80091750/func_8009D958.s delete mode 100644 asm/non_matchings/code_80091750/func_8009D978.s delete mode 100644 asm/non_matchings/code_80091750/func_8009DF4C.s delete mode 100644 asm/non_matchings/code_80091750/func_8009DF6C.s delete mode 100644 asm/non_matchings/code_80091750/func_8009DFE0.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E000.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E1C0.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E1E4.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E208.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E230.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E258.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E5BC.s delete mode 100644 asm/non_matchings/code_80091750/func_8009E5FC.s delete mode 100644 asm/non_matchings/code_80091750/func_800A8230.s delete mode 100644 asm/non_matchings/code_80091750/func_800A8250.s diff --git a/asm/non_matchings/code_80005FD0/func_8000F2BC.s b/asm/non_matchings/code_80005FD0/func_8000F2BC.s deleted file mode 100644 index 64d82922b..000000000 --- a/asm/non_matchings/code_80005FD0/func_8000F2BC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8000F2BC -/* 00FEBC 8000F2BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00FEC0 8000F2C0 AFBF0014 */ sw $ra, 0x14($sp) -/* 00FEC4 8000F2C4 0C033698 */ jal bzero -/* 00FEC8 8000F2C8 000528C0 */ sll $a1, $a1, 3 -/* 00FECC 8000F2CC 8FBF0014 */ lw $ra, 0x14($sp) -/* 00FED0 8000F2D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 00FED4 8000F2D4 03E00008 */ jr $ra -/* 00FED8 8000F2D8 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_8001968C.s b/asm/non_matchings/code_80005FD0/func_8001968C.s deleted file mode 100644 index 8878c18f5..000000000 --- a/asm/non_matchings/code_80005FD0/func_8001968C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8001968C -/* 01A28C 8001968C 240E0003 */ li $t6, 3 -/* 01A290 80019690 3C018016 */ lui $at, %hi(D_80164678) # 0x8016 -/* 01A294 80019694 03E00008 */ jr $ra -/* 01A298 80019698 A42E4678 */ sh $t6, %lo(D_80164678)($at) # 0x4678($at) diff --git a/asm/non_matchings/code_80005FD0/func_80019DE4.s b/asm/non_matchings/code_80005FD0/func_80019DE4.s deleted file mode 100644 index a683bbd23..000000000 --- a/asm/non_matchings/code_80005FD0/func_80019DE4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80019DE4 -/* 01A9E4 80019DE4 240E0001 */ li $t6, 1 -/* 01A9E8 80019DE8 3C018016 */ lui $at, %hi(D_801646CC) # 0x8016 -/* 01A9EC 80019DEC 03E00008 */ jr $ra -/* 01A9F0 80019DF0 A42E46CC */ sh $t6, %lo(D_801646CC)($at) # 0x46cc($at) diff --git a/asm/non_matchings/code_80005FD0/func_8001ABE0.s b/asm/non_matchings/code_80005FD0/func_8001ABE0.s deleted file mode 100644 index 885dd0189..000000000 --- a/asm/non_matchings/code_80005FD0/func_8001ABE0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8001ABE0 -/* 01B7E0 8001ABE0 AFA40000 */ sw $a0, ($sp) -/* 01B7E4 8001ABE4 03E00008 */ jr $ra -/* 01B7E8 8001ABE8 AFA50004 */ sw $a1, 4($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8001ABEC.s b/asm/non_matchings/code_80005FD0/func_8001ABEC.s deleted file mode 100644 index 36c91c193..000000000 --- a/asm/non_matchings/code_80005FD0/func_8001ABEC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8001ABEC -/* 01B7EC 8001ABEC 84820002 */ lh $v0, 2($a0) -/* 01B7F0 8001ABF0 04400003 */ bltz $v0, .L8001AC00 -/* 01B7F4 8001ABF4 28410064 */ slti $at, $v0, 0x64 -/* 01B7F8 8001ABF8 14200003 */ bnez $at, .L8001AC08 -/* 01B7FC 8001ABFC 00000000 */ nop -.L8001AC00: -/* 01B800 8001AC00 A4800000 */ sh $zero, ($a0) -/* 01B804 8001AC04 A4800004 */ sh $zero, 4($a0) -.L8001AC08: -/* 01B808 8001AC08 03E00008 */ jr $ra -/* 01B80C 8001AC0C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80072388.s b/asm/non_matchings/code_80071F00/func_80072388.s deleted file mode 100644 index c776322c1..000000000 --- a/asm/non_matchings/code_80071F00/func_80072388.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80072388 -/* 072F88 80072388 000470C0 */ sll $t6, $a0, 3 -/* 072F8C 8007238C 01C47023 */ subu $t6, $t6, $a0 -/* 072F90 80072390 000E7140 */ sll $t6, $t6, 5 -/* 072F94 80072394 3C018016 */ lui $at, %hi(D_80165CE3) # 0x8016 -/* 072F98 80072398 002E0821 */ addu $at, $at, $t6 -/* 072F9C 8007239C 03E00008 */ jr $ra -/* 072FA0 800723A0 A0255CE3 */ sb $a1, %lo(D_80165CE3)($at) # 0x5ce3($at) diff --git a/asm/non_matchings/code_80071F00/func_800724DC.s b/asm/non_matchings/code_80071F00/func_800724DC.s deleted file mode 100644 index c34a4ce86..000000000 --- a/asm/non_matchings/code_80071F00/func_800724DC.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800724DC -/* 0730DC 800724DC 000470C0 */ sll $t6, $a0, 3 -/* 0730E0 800724E0 01C47023 */ subu $t6, $t6, $a0 -/* 0730E4 800724E4 000E7140 */ sll $t6, $t6, 5 -/* 0730E8 800724E8 3C018016 */ lui $at, %hi(D_80165CEF) # 0x8016 -/* 0730EC 800724EC 002E0821 */ addu $at, $at, $t6 -/* 0730F0 800724F0 03E00008 */ jr $ra -/* 0730F4 800724F4 A0205CEF */ sb $zero, %lo(D_80165CEF)($at) # 0x5cef($at) diff --git a/asm/non_matchings/code_80071F00/func_8007266C.s b/asm/non_matchings/code_80071F00/func_8007266C.s deleted file mode 100644 index 5ea8fdad5..000000000 --- a/asm/non_matchings/code_80071F00/func_8007266C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8007266C -/* 07326C 8007266C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 073270 80072670 AFBF001C */ sw $ra, 0x1c($sp) -/* 073274 80072674 AFB00018 */ sw $s0, 0x18($sp) -/* 073278 80072678 00808025 */ move $s0, $a0 -/* 07327C 8007267C 0C01C8E2 */ jal func_80072388 -/* 073280 80072680 00002825 */ move $a1, $zero -/* 073284 80072684 02002025 */ move $a0, $s0 -/* 073288 80072688 0C01C87A */ jal func_800721E8 -/* 07328C 8007268C 24052000 */ li $a1, 8192 -/* 073290 80072690 02002025 */ move $a0, $s0 -/* 073294 80072694 0C01C87A */ jal func_800721E8 -/* 073298 80072698 24050008 */ li $a1, 8 -/* 07329C 8007269C 0C01C94C */ jal func_80072530 -/* 0732A0 800726A0 02002025 */ move $a0, $s0 -/* 0732A4 800726A4 001070C0 */ sll $t6, $s0, 3 -/* 0732A8 800726A8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0732AC 800726AC 01D07023 */ subu $t6, $t6, $s0 -/* 0732B0 800726B0 000E7140 */ sll $t6, $t6, 5 -/* 0732B4 800726B4 3C018016 */ lui $at, %hi(D_80165CBE) # 0x8016 -/* 0732B8 800726B8 002E0821 */ addu $at, $at, $t6 -/* 0732BC 800726BC 8FB00018 */ lw $s0, 0x18($sp) -/* 0732C0 800726C0 A4225CBE */ sh $v0, %lo(D_80165CBE)($at) # 0x5cbe($at) -/* 0732C4 800726C4 03E00008 */ jr $ra -/* 0732C8 800726C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80071F00/func_800726CC.s b/asm/non_matchings/code_80071F00/func_800726CC.s deleted file mode 100644 index b84257f40..000000000 --- a/asm/non_matchings/code_80071F00/func_800726CC.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_800726CC -/* 0732CC 800726CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0732D0 800726D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 0732D4 800726D4 AFA5001C */ sw $a1, 0x1c($sp) -/* 0732D8 800726D8 AFA40018 */ sw $a0, 0x18($sp) -/* 0732DC 800726DC 0C01C8E2 */ jal func_80072388 -/* 0732E0 800726E0 00002825 */ move $a1, $zero -/* 0732E4 800726E4 8FA40018 */ lw $a0, 0x18($sp) -/* 0732E8 800726E8 0C01C87A */ jal func_800721E8 -/* 0732EC 800726EC 24052000 */ li $a1, 8192 -/* 0732F0 800726F0 8FAF0018 */ lw $t7, 0x18($sp) -/* 0732F4 800726F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0732F8 800726F8 8FAE001C */ lw $t6, 0x1c($sp) -/* 0732FC 800726FC 000FC0C0 */ sll $t8, $t7, 3 -/* 073300 80072700 030FC023 */ subu $t8, $t8, $t7 -/* 073304 80072704 0018C140 */ sll $t8, $t8, 5 -/* 073308 80072708 3C018016 */ lui $at, %hi(D_80165CBE) # 0x8016 -/* 07330C 8007270C 00380821 */ addu $at, $at, $t8 -/* 073310 80072710 27BD0018 */ addiu $sp, $sp, 0x18 -/* 073314 80072714 03E00008 */ jr $ra -/* 073318 80072718 A42E5CBE */ sh $t6, %lo(D_80165CBE)($at) # 0x5cbe($at) - -/* 07331C 8007271C 000470C0 */ sll $t6, $a0, 3 -/* 073320 80072720 01C47023 */ subu $t6, $t6, $a0 -/* 073324 80072724 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 073328 80072728 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07332C 8007272C 000E7140 */ sll $t6, $t6, 5 -/* 073330 80072730 01CF1021 */ addu $v0, $t6, $t7 -/* 073334 80072734 805800CB */ lb $t8, 0xcb($v0) -/* 073338 80072738 17000002 */ bnez $t8, .L80072744 -/* 07333C 8007273C 00000000 */ nop -/* 073340 80072740 A44500A6 */ sh $a1, 0xa6($v0) -.L80072744: -/* 073344 80072744 03E00008 */ jr $ra -/* 073348 80072748 00000000 */ nop - -/* 07334C 8007274C 000470C0 */ sll $t6, $a0, 3 -/* 073350 80072750 01C47023 */ subu $t6, $t6, $a0 -/* 073354 80072754 000E7140 */ sll $t6, $t6, 5 -/* 073358 80072758 3C0F8016 */ lui $t7, %hi(D_80165CE3) # 0x8016 -/* 07335C 8007275C 01EE7821 */ addu $t7, $t7, $t6 -/* 073360 80072760 81EF5CE3 */ lb $t7, %lo(D_80165CE3)($t7) # 0x5ce3($t7) -/* 073364 80072764 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 073368 80072768 AFBF0014 */ sw $ra, 0x14($sp) -/* 07336C 8007276C 55E00004 */ bnel $t7, $zero, .L80072780 -/* 073370 80072770 8FBF0014 */ lw $ra, 0x14($sp) -/* 073374 80072774 0C01C922 */ jal func_80072488 -/* 073378 80072778 00000000 */ nop -/* 07337C 8007277C 8FBF0014 */ lw $ra, 0x14($sp) -.L80072780: -/* 073380 80072780 27BD0018 */ addiu $sp, $sp, 0x18 -/* 073384 80072784 03E00008 */ jr $ra -/* 073388 80072788 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80072950.s b/asm/non_matchings/code_80071F00/func_80072950.s deleted file mode 100644 index c61e24a10..000000000 --- a/asm/non_matchings/code_80071F00/func_80072950.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80072950 -/* 073550 80072950 14A60006 */ bne $a1, $a2, .L8007296C -/* 073554 80072954 000470C0 */ sll $t6, $a0, 3 -/* 073558 80072958 01C47023 */ subu $t6, $t6, $a0 -/* 07355C 8007295C 000E7140 */ sll $t6, $t6, 5 -/* 073560 80072960 3C018016 */ lui $at, %hi(D_80165CBE) # 0x8016 -/* 073564 80072964 002E0821 */ addu $at, $at, $t6 -/* 073568 80072968 A4275CBE */ sh $a3, %lo(D_80165CBE)($at) # 0x5cbe($at) -.L8007296C: -/* 07356C 8007296C 03E00008 */ jr $ra -/* 073570 80072970 00000000 */ nop - -/* 073574 80072974 10A60006 */ beq $a1, $a2, .L80072990 -/* 073578 80072978 000470C0 */ sll $t6, $a0, 3 -/* 07357C 8007297C 01C47023 */ subu $t6, $t6, $a0 -/* 073580 80072980 000E7140 */ sll $t6, $t6, 5 -/* 073584 80072984 3C018016 */ lui $at, %hi(D_80165CBE) # 0x8016 -/* 073588 80072988 002E0821 */ addu $at, $at, $t6 -/* 07358C 8007298C A4275CBE */ sh $a3, %lo(D_80165CBE)($at) # 0x5cbe($at) -.L80072990: -/* 073590 80072990 03E00008 */ jr $ra -/* 073594 80072994 00000000 */ nop - -/* 073598 80072998 000470C0 */ sll $t6, $a0, 3 -/* 07359C 8007299C 01C47023 */ subu $t6, $t6, $a0 -/* 0735A0 800729A0 000E7140 */ sll $t6, $t6, 5 -/* 0735A4 800729A4 3C018016 */ lui $at, %hi(D_80165CE4) # 0x8016 -/* 0735A8 800729A8 002E0821 */ addu $at, $at, $t6 -/* 0735AC 800729AC 03E00008 */ jr $ra -/* 0735B0 800729B0 A0205CE4 */ sb $zero, %lo(D_80165CE4)($at) # 0x5ce4($at) diff --git a/asm/non_matchings/code_80071F00/func_800729B4.s b/asm/non_matchings/code_80071F00/func_800729B4.s deleted file mode 100644 index d2763eebf..000000000 --- a/asm/non_matchings/code_80071F00/func_800729B4.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800729B4 -/* 0735B4 800729B4 000470C0 */ sll $t6, $a0, 3 -/* 0735B8 800729B8 01C47023 */ subu $t6, $t6, $a0 -/* 0735BC 800729BC 000E7140 */ sll $t6, $t6, 5 -/* 0735C0 800729C0 3C018016 */ lui $at, %hi(D_80165CBA) # 0x8016 -/* 0735C4 800729C4 002E0821 */ addu $at, $at, $t6 -/* 0735C8 800729C8 03E00008 */ jr $ra -/* 0735CC 800729CC A4255CBA */ sh $a1, %lo(D_80165CBA)($at) # 0x5cba($at) diff --git a/asm/non_matchings/code_80071F00/func_800729D0.s b/asm/non_matchings/code_80071F00/func_800729D0.s deleted file mode 100644 index 5022c4a23..000000000 --- a/asm/non_matchings/code_80071F00/func_800729D0.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800729D0 -/* 0735D0 800729D0 000470C0 */ sll $t6, $a0, 3 -/* 0735D4 800729D4 01C47023 */ subu $t6, $t6, $a0 -/* 0735D8 800729D8 000E7140 */ sll $t6, $t6, 5 -/* 0735DC 800729DC 3C018016 */ lui $at, %hi(D_80165CBC) # 0x8016 -/* 0735E0 800729E0 002E0821 */ addu $at, $at, $t6 -/* 0735E4 800729E4 03E00008 */ jr $ra -/* 0735E8 800729E8 A4255CBC */ sh $a1, %lo(D_80165CBC)($at) # 0x5cbc($at) diff --git a/asm/non_matchings/code_80071F00/func_8007369C.s b/asm/non_matchings/code_80071F00/func_8007369C.s deleted file mode 100644 index 52a7c7f1a..000000000 --- a/asm/non_matchings/code_80071F00/func_8007369C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8007369C -/* 07429C 8007369C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0742A0 800736A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 0742A4 800736A4 AFA5001C */ sw $a1, 0x1c($sp) -/* 0742A8 800736A8 AFA40018 */ sw $a0, 0x18($sp) -/* 0742AC 800736AC 0C01C87A */ jal func_800721E8 -/* 0742B0 800736B0 34058000 */ li $a1, 32768 -/* 0742B4 800736B4 8FAF0018 */ lw $t7, 0x18($sp) -/* 0742B8 800736B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0742BC 800736BC 8FAE001C */ lw $t6, 0x1c($sp) -/* 0742C0 800736C0 000FC0C0 */ sll $t8, $t7, 3 -/* 0742C4 800736C4 030FC023 */ subu $t8, $t8, $t7 -/* 0742C8 800736C8 0018C140 */ sll $t8, $t8, 5 -/* 0742CC 800736CC 3C018016 */ lui $at, %hi(D_80165CEE) # 0x8016 -/* 0742D0 800736D0 00380821 */ addu $at, $at, $t8 -/* 0742D4 800736D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0742D8 800736D8 03E00008 */ jr $ra -/* 0742DC 800736DC A02E5CEE */ sb $t6, %lo(D_80165CEE)($at) # 0x5cee($at) diff --git a/asm/non_matchings/code_80071F00/func_800736E0.s b/asm/non_matchings/code_80071F00/func_800736E0.s deleted file mode 100644 index 944cfca85..000000000 --- a/asm/non_matchings/code_80071F00/func_800736E0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800736E0 -/* 0742E0 800736E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0742E4 800736E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0742E8 800736E8 AFA40018 */ sw $a0, 0x18($sp) -/* 0742EC 800736EC 0C01C87A */ jal func_800721E8 -/* 0742F0 800736F0 34058000 */ li $a1, 32768 -/* 0742F4 800736F4 8FAF0018 */ lw $t7, 0x18($sp) -/* 0742F8 800736F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0742FC 800736FC 3C018016 */ lui $at, %hi(D_80165CEE) # 0x8016 -/* 074300 80073700 000FC0C0 */ sll $t8, $t7, 3 -/* 074304 80073704 030FC023 */ subu $t8, $t8, $t7 -/* 074308 80073708 0018C140 */ sll $t8, $t8, 5 -/* 07430C 8007370C 00380821 */ addu $at, $at, $t8 -/* 074310 80073710 240E0001 */ li $t6, 1 -/* 074314 80073714 A02E5CEE */ sb $t6, %lo(D_80165CEE)($at) # 0x5cee($at) -/* 074318 80073718 03E00008 */ jr $ra -/* 07431C 8007371C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80071F00/func_80073720.s b/asm/non_matchings/code_80071F00/func_80073720.s deleted file mode 100644 index ed0286018..000000000 --- a/asm/non_matchings/code_80071F00/func_80073720.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80073720 -/* 074320 80073720 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 074324 80073724 AFBF0014 */ sw $ra, 0x14($sp) -/* 074328 80073728 AFA40018 */ sw $a0, 0x18($sp) -/* 07432C 8007372C 0C01C87A */ jal func_800721E8 -/* 074330 80073730 34058000 */ li $a1, 32768 -/* 074334 80073734 8FAE0018 */ lw $t6, 0x18($sp) -/* 074338 80073738 8FBF0014 */ lw $ra, 0x14($sp) -/* 07433C 8007373C 3C018016 */ lui $at, %hi(D_80165CEE) # 0x8016 -/* 074340 80073740 000E78C0 */ sll $t7, $t6, 3 -/* 074344 80073744 01EE7823 */ subu $t7, $t7, $t6 -/* 074348 80073748 000F7940 */ sll $t7, $t7, 5 -/* 07434C 8007374C 002F0821 */ addu $at, $at, $t7 -/* 074350 80073750 A0205CEE */ sb $zero, %lo(D_80165CEE)($at) # 0x5cee($at) -/* 074354 80073754 03E00008 */ jr $ra -/* 074358 80073758 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80071F00/func_80073800.s b/asm/non_matchings/code_80071F00/func_80073800.s deleted file mode 100644 index ac7bf0d84..000000000 --- a/asm/non_matchings/code_80071F00/func_80073800.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80073800 -/* 074400 80073800 000470C0 */ sll $t6, $a0, 3 -/* 074404 80073804 01C47023 */ subu $t6, $t6, $a0 -/* 074408 80073808 000E7140 */ sll $t6, $t6, 5 -/* 07440C 8007380C 3C018016 */ lui $at, %hi(D_80165CE7) # 0x8016 -/* 074410 80073810 002E0821 */ addu $at, $at, $t6 -/* 074414 80073814 03E00008 */ jr $ra -/* 074418 80073818 A0255CE7 */ sb $a1, %lo(D_80165CE7)($at) # 0x5ce7($at) diff --git a/asm/non_matchings/code_80071F00/func_80073844.s b/asm/non_matchings/code_80071F00/func_80073844.s deleted file mode 100644 index 988084654..000000000 --- a/asm/non_matchings/code_80071F00/func_80073844.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80073844 -/* 074444 80073844 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 074448 80073848 AFBF0014 */ sw $ra, 0x14($sp) -/* 07444C 8007384C AFA40018 */ sw $a0, 0x18($sp) -/* 074450 80073850 0C01CE00 */ jal func_80073800 -/* 074454 80073854 00002825 */ move $a1, $zero -/* 074458 80073858 8FAF0018 */ lw $t7, 0x18($sp) -/* 07445C 8007385C 8FBF0014 */ lw $ra, 0x14($sp) -/* 074460 80073860 3C018016 */ lui $at, %hi(D_80165CF4) # 0x8016 -/* 074464 80073864 000FC0C0 */ sll $t8, $t7, 3 -/* 074468 80073868 030FC023 */ subu $t8, $t8, $t7 -/* 07446C 8007386C 0018C140 */ sll $t8, $t8, 5 -/* 074470 80073870 00380821 */ addu $at, $at, $t8 -/* 074474 80073874 240E0001 */ li $t6, 1 -/* 074478 80073878 A02E5CF4 */ sb $t6, %lo(D_80165CF4)($at) # 0x5cf4($at) -/* 07447C 8007387C 03E00008 */ jr $ra -/* 074480 80073880 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80071F00/func_80073F90.s b/asm/non_matchings/code_80071F00/func_80073F90.s deleted file mode 100644 index 6cfe666a9..000000000 --- a/asm/non_matchings/code_80071F00/func_80073F90.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80073F90 -/* 074B90 80073F90 000470C0 */ sll $t6, $a0, 3 -/* 074B94 80073F94 01C47023 */ subu $t6, $t6, $a0 -/* 074B98 80073F98 000E7140 */ sll $t6, $t6, 5 -/* 074B9C 80073F9C 3C018016 */ lui $at, %hi(D_80165CE5) # 0x8016 -/* 074BA0 80073FA0 002E0821 */ addu $at, $at, $t6 -/* 074BA4 80073FA4 03E00008 */ jr $ra -/* 074BA8 80073FA8 A0255CE5 */ sb $a1, %lo(D_80165CE5)($at) # 0x5ce5($at) diff --git a/asm/non_matchings/code_80071F00/func_80073FD4.s b/asm/non_matchings/code_80071F00/func_80073FD4.s deleted file mode 100644 index f4a110ee9..000000000 --- a/asm/non_matchings/code_80071F00/func_80073FD4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80073FD4 -/* 074BD4 80073FD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 074BD8 80073FD8 AFBF0014 */ sw $ra, 0x14($sp) -/* 074BDC 80073FDC AFA40018 */ sw $a0, 0x18($sp) -/* 074BE0 80073FE0 0C01CFE4 */ jal func_80073F90 -/* 074BE4 80073FE4 00002825 */ move $a1, $zero -/* 074BE8 80073FE8 8FAF0018 */ lw $t7, 0x18($sp) -/* 074BEC 80073FEC 8FBF0014 */ lw $ra, 0x14($sp) -/* 074BF0 80073FF0 3C018016 */ lui $at, %hi(D_80165CF3) # 0x8016 -/* 074BF4 80073FF4 000FC0C0 */ sll $t8, $t7, 3 -/* 074BF8 80073FF8 030FC023 */ subu $t8, $t8, $t7 -/* 074BFC 80073FFC 0018C140 */ sll $t8, $t8, 5 -/* 074C00 80074000 00380821 */ addu $at, $at, $t8 -/* 074C04 80074004 240E0001 */ li $t6, 1 -/* 074C08 80074008 A02E5CF3 */ sb $t6, %lo(D_80165CF3)($at) # 0x5cf3($at) -/* 074C0C 8007400C 03E00008 */ jr $ra -/* 074C10 80074010 27BD0018 */ addiu $sp, $sp, 0x18 - -/* 074C14 80074014 03E00008 */ jr $ra -/* 074C18 80074018 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007BB9C.s b/asm/non_matchings/code_80071F00/func_8007BB9C.s deleted file mode 100644 index 3d67e0442..000000000 --- a/asm/non_matchings/code_80071F00/func_8007BB9C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8007BB9C -/* 07C79C 8007BB9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07C7A0 8007BBA0 AFBF0014 */ sw $ra, 0x14($sp) -/* 07C7A4 8007BBA4 0C01ECD3 */ jal func_8007B34C -/* 07C7A8 8007BBA8 00000000 */ nop -/* 07C7AC 8007BBAC 8FBF0014 */ lw $ra, 0x14($sp) -/* 07C7B0 8007BBB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 07C7B4 8007BBB4 03E00008 */ jr $ra -/* 07C7B8 8007BBB8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007C340.s b/asm/non_matchings/code_80071F00/func_8007C340.s deleted file mode 100644 index d8e64ae7a..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C340.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8007C340 -/* 07CF40 8007C340 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07CF44 8007C344 AFBF0014 */ sw $ra, 0x14($sp) -/* 07CF48 8007C348 0C01F300 */ jal func_8007CC00 -/* 07CF4C 8007C34C 00000000 */ nop -/* 07CF50 8007C350 8FBF0014 */ lw $ra, 0x14($sp) -/* 07CF54 8007C354 27BD0018 */ addiu $sp, $sp, 0x18 -/* 07CF58 8007C358 03E00008 */ jr $ra -/* 07CF5C 8007C35C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80081208.s b/asm/non_matchings/code_80071F00/func_80081208.s deleted file mode 100644 index d62992c8a..000000000 --- a/asm/non_matchings/code_80071F00/func_80081208.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80081208 -/* 081E08 80081208 03E00008 */ jr $ra -/* 081E0C 8008120C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80083060.s b/asm/non_matchings/code_80071F00/func_80083060.s deleted file mode 100644 index 81acbd2d7..000000000 --- a/asm/non_matchings/code_80071F00/func_80083060.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80083060 -/* 083C60 80083060 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 083C64 80083064 AFBF0014 */ sw $ra, 0x14($sp) -/* 083C68 80083068 0C022FC6 */ jal func_8008BF18 -/* 083C6C 8008306C 00000000 */ nop -/* 083C70 80083070 8FBF0014 */ lw $ra, 0x14($sp) -/* 083C74 80083074 27BD0018 */ addiu $sp, $sp, 0x18 -/* 083C78 80083078 03E00008 */ jr $ra -/* 083C7C 8008307C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80083BE4.s b/asm/non_matchings/code_80071F00/func_80083BE4.s deleted file mode 100644 index b656de484..000000000 --- a/asm/non_matchings/code_80071F00/func_80083BE4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80083BE4 -/* 0847E4 80083BE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0847E8 80083BE8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0847EC 80083BEC 0C022FC6 */ jal func_8008BF18 -/* 0847F0 80083BF0 00000000 */ nop -/* 0847F4 80083BF4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0847F8 80083BF8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0847FC 80083BFC 03E00008 */ jr $ra -/* 084800 80083C00 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_80086EF0.s b/asm/non_matchings/code_80086E70/func_80086EF0.s deleted file mode 100644 index 9d7cbfef7..000000000 --- a/asm/non_matchings/code_80086E70/func_80086EF0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80086EF0 -/* 087AF0 80086EF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 087AF4 80086EF4 AFBF0014 */ sw $ra, 0x14($sp) -/* 087AF8 80086EF8 0C021B9C */ jal func_80086E70 -/* 087AFC 80086EFC 00000000 */ nop -/* 087B00 80086F00 8FBF0014 */ lw $ra, 0x14($sp) -/* 087B04 80086F04 27BD0018 */ addiu $sp, $sp, 0x18 -/* 087B08 80086F08 03E00008 */ jr $ra -/* 087B0C 80086F0C 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009969C.s b/asm/non_matchings/code_80091750/func_8009969C.s deleted file mode 100644 index d7d613d87..000000000 --- a/asm/non_matchings/code_80091750/func_8009969C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009969C -/* 09A29C 8009969C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09A2A0 800996A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 09A2A4 800996A4 0C0265AF */ jal func_800996BC -/* 09A2A8 800996A8 24050001 */ li $a1, 1 -/* 09A2AC 800996AC 8FBF0014 */ lw $ra, 0x14($sp) -/* 09A2B0 800996B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09A2B4 800996B4 03E00008 */ jr $ra -/* 09A2B8 800996B8 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_80099A70.s b/asm/non_matchings/code_80091750/func_80099A70.s deleted file mode 100644 index 154bbb373..000000000 --- a/asm/non_matchings/code_80091750/func_80099A70.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80099A70 -/* 09A670 80099A70 3C018019 */ lui $at, %hi(D_8018E060) # $at, 0x8019 -/* 09A674 80099A74 AC20E060 */ sw $zero, %lo(D_8018E060)($at) -/* 09A678 80099A78 00001025 */ move $v0, $zero -/* 09A67C 80099A7C 24030010 */ li $v1, 16 -/* 09A680 80099A80 24420004 */ addiu $v0, $v0, 4 -.L80099A84: -/* 09A684 80099A84 5443FFFF */ bnel $v0, $v1, .L80099A84 -/* 09A688 80099A88 24420004 */ addiu $v0, $v0, 4 -/* 09A68C 80099A8C 03E00008 */ jr $ra -/* 09A690 80099A90 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_80099E54.s b/asm/non_matchings/code_80091750/func_80099E54.s deleted file mode 100644 index d4c118dd0..000000000 --- a/asm/non_matchings/code_80091750/func_80099E54.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80099E54 -/* 09AA54 80099E54 3C018019 */ lui $at, %hi(D_8018E0E8) -/* 09AA58 80099E58 03E00008 */ jr $ra -/* 09AA5C 80099E5C AC20E0E8 */ sw $zero, %lo(D_8018E0E8)($at) diff --git a/asm/non_matchings/code_80091750/func_8009CDDC.s b/asm/non_matchings/code_80091750/func_8009CDDC.s deleted file mode 100644 index a030ef80c..000000000 --- a/asm/non_matchings/code_80091750/func_8009CDDC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009CDDC -/* 09D9DC 8009CDDC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09D9E0 8009CDE0 AFBF0014 */ sw $ra, 0x14($sp) -/* 09D9E4 8009CDE4 0C0272F9 */ jal func_8009CBE4 -/* 09D9E8 8009CDE8 00003025 */ move $a2, $zero -/* 09D9EC 8009CDEC 8FBF0014 */ lw $ra, 0x14($sp) -/* 09D9F0 8009CDF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09D9F4 8009CDF4 03E00008 */ jr $ra -/* 09D9F8 8009CDF8 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009CDFC.s b/asm/non_matchings/code_80091750/func_8009CDFC.s deleted file mode 100644 index 93717a271..000000000 --- a/asm/non_matchings/code_80091750/func_8009CDFC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009CDFC -/* 09D9FC 8009CDFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09DA00 8009CE00 AFBF0014 */ sw $ra, 0x14($sp) -/* 09DA04 8009CE04 0C0272F9 */ jal func_8009CBE4 -/* 09DA08 8009CE08 24060001 */ li $a2, 1 -/* 09DA0C 8009CE0C 8FBF0014 */ lw $ra, 0x14($sp) -/* 09DA10 8009CE10 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09DA14 8009CE14 03E00008 */ jr $ra -/* 09DA18 8009CE18 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009CE1C.s b/asm/non_matchings/code_80091750/func_8009CE1C.s deleted file mode 100644 index 0a0523829..000000000 --- a/asm/non_matchings/code_80091750/func_8009CE1C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8009CE1C -/* 09DA1C 8009CE1C 3C0E8019 */ lui $t6, %hi(gSoundMode) # $t6, 0x8019 -/* 09DA20 8009CE20 91CEEDF2 */ lbu $t6, %lo(gSoundMode)($t6) -/* 09DA24 8009CE24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09DA28 8009CE28 24010003 */ li $at, 3 -/* 09DA2C 8009CE2C 11C10009 */ beq $t6, $at, .L8009CE54 -/* 09DA30 8009CE30 AFBF0014 */ sw $ra, 0x14($sp) -/* 09DA34 8009CE34 3C0F800E */ lui $t7, %hi(gPlayerCountSelection1) # $t7, 0x800e -/* 09DA38 8009CE38 8DEFC538 */ lw $t7, %lo(gPlayerCountSelection1)($t7) -/* 09DA3C 8009CE3C 3C04E000 */ lui $a0, (0xE0000002 >> 16) # lui $a0, 0xe000 -/* 09DA40 8009CE40 29E10002 */ slti $at, $t7, 2 -/* 09DA44 8009CE44 54200004 */ bnel $at, $zero, .L8009CE58 -/* 09DA48 8009CE48 8FBF0014 */ lw $ra, 0x14($sp) -/* 09DA4C 8009CE4C 0C030D12 */ jal func_800C3448 -/* 09DA50 8009CE50 34840002 */ ori $a0, (0xE0000002 & 0xFFFF) # ori $a0, $a0, 2 -.L8009CE54: -/* 09DA54 8009CE54 8FBF0014 */ lw $ra, 0x14($sp) -.L8009CE58: -/* 09DA58 8009CE58 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09DA5C 8009CE5C 03E00008 */ jr $ra -/* 09DA60 8009CE60 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009D958.s b/asm/non_matchings/code_80091750/func_8009D958.s deleted file mode 100644 index b9d141abb..000000000 --- a/asm/non_matchings/code_80091750/func_8009D958.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009D958 -/* 09E558 8009D958 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09E55C 8009D95C AFBF0014 */ sw $ra, 0x14($sp) -/* 09E560 8009D960 0C0275DF */ jal func_8009D77C -/* 09E564 8009D964 00003025 */ move $a2, $zero -/* 09E568 8009D968 8FBF0014 */ lw $ra, 0x14($sp) -/* 09E56C 8009D96C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09E570 8009D970 03E00008 */ jr $ra -/* 09E574 8009D974 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009D978.s b/asm/non_matchings/code_80091750/func_8009D978.s deleted file mode 100644 index 30d844d45..000000000 --- a/asm/non_matchings/code_80091750/func_8009D978.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009D978 -/* 09E578 8009D978 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09E57C 8009D97C AFBF0014 */ sw $ra, 0x14($sp) -/* 09E580 8009D980 0C0275DF */ jal func_8009D77C -/* 09E584 8009D984 24060001 */ li $a2, 1 -/* 09E588 8009D988 8FBF0014 */ lw $ra, 0x14($sp) -/* 09E58C 8009D98C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09E590 8009D990 03E00008 */ jr $ra -/* 09E594 8009D994 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009DF4C.s b/asm/non_matchings/code_80091750/func_8009DF4C.s deleted file mode 100644 index 4bfc44ad8..000000000 --- a/asm/non_matchings/code_80091750/func_8009DF4C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009DF4C -/* 09EB4C 8009DF4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EB50 8009DF50 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EB54 8009DF54 0C0277BE */ jal func_8009DEF8 -/* 09EB58 8009DF58 24050001 */ li $a1, 1 -/* 09EB5C 8009DF5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EB60 8009DF60 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09EB64 8009DF64 03E00008 */ jr $ra -/* 09EB68 8009DF68 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009DF6C.s b/asm/non_matchings/code_80091750/func_8009DF6C.s deleted file mode 100644 index d3d91a3f1..000000000 --- a/asm/non_matchings/code_80091750/func_8009DF6C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009DF6C -/* 09EB6C 8009DF6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EB70 8009DF70 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EB74 8009DF74 0C0277BE */ jal func_8009DEF8 -/* 09EB78 8009DF78 24050008 */ li $a1, 8 -/* 09EB7C 8009DF7C 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EB80 8009DF80 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09EB84 8009DF84 03E00008 */ jr $ra -/* 09EB88 8009DF88 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009DFE0.s b/asm/non_matchings/code_80091750/func_8009DFE0.s deleted file mode 100644 index b7c8d1739..000000000 --- a/asm/non_matchings/code_80091750/func_8009DFE0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009DFE0 -/* 09EBE0 8009DFE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EBE4 8009DFE4 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EBE8 8009DFE8 0C0277E3 */ jal func_8009DF8C -/* 09EBEC 8009DFEC 24050002 */ li $a1, 2 -/* 09EBF0 8009DFF0 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EBF4 8009DFF4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09EBF8 8009DFF8 03E00008 */ jr $ra -/* 09EBFC 8009DFFC 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009E000.s b/asm/non_matchings/code_80091750/func_8009E000.s deleted file mode 100644 index e7facb291..000000000 --- a/asm/non_matchings/code_80091750/func_8009E000.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8009E000 -/* 09EC00 8009E000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EC04 8009E004 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EC08 8009E008 0C0277E3 */ jal func_8009DF8C -/* 09EC0C 8009E00C 24050007 */ li $a1, 7 -/* 09EC10 8009E010 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EC14 8009E014 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09EC18 8009E018 03E00008 */ jr $ra -/* 09EC1C 8009E01C 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_8009E1C0.s b/asm/non_matchings/code_80091750/func_8009E1C0.s deleted file mode 100644 index 6142c3339..000000000 --- a/asm/non_matchings/code_80091750/func_8009E1C0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8009E1C0 -/* 09EDC0 8009E1C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EDC4 8009E1C4 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EDC8 8009E1C8 0C0277F8 */ jal func_8009DFE0 -/* 09EDCC 8009E1CC 2404000A */ li $a0, 10 -/* 09EDD0 8009E1D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EDD4 8009E1D4 3C018019 */ lui $at, %hi(D_8018EDE0) # $at, 0x8019 -/* 09EDD8 8009E1D8 AC20EDE0 */ sw $zero, %lo(D_8018EDE0)($at) -/* 09EDDC 8009E1DC 03E00008 */ jr $ra -/* 09EDE0 8009E1E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80091750/func_8009E1E4.s b/asm/non_matchings/code_80091750/func_8009E1E4.s deleted file mode 100644 index 54383e3c2..000000000 --- a/asm/non_matchings/code_80091750/func_8009E1E4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8009E1E4 -/* 09EDE4 8009E1E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EDE8 8009E1E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EDEC 8009E1EC 0C027800 */ jal func_8009E000 -/* 09EDF0 8009E1F0 2404000A */ li $a0, 10 -/* 09EDF4 8009E1F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EDF8 8009E1F8 3C018019 */ lui $at, %hi(D_8018EDE0) # $at, 0x8019 -/* 09EDFC 8009E1FC AC20EDE0 */ sw $zero, %lo(D_8018EDE0)($at) -/* 09EE00 8009E200 03E00008 */ jr $ra -/* 09EE04 8009E204 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80091750/func_8009E208.s b/asm/non_matchings/code_80091750/func_8009E208.s deleted file mode 100644 index 763884448..000000000 --- a/asm/non_matchings/code_80091750/func_8009E208.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009E208 -/* 09EE08 8009E208 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EE0C 8009E20C AFBF0014 */ sw $ra, 0x14($sp) -/* 09EE10 8009E210 0C0277F8 */ jal func_8009DFE0 -/* 09EE14 8009E214 2404000A */ li $a0, 10 -/* 09EE18 8009E218 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EE1C 8009E21C 240E0001 */ li $t6, 1 -/* 09EE20 8009E220 3C018019 */ lui $at, %hi(D_8018EDE0) # $at, 0x8019 -/* 09EE24 8009E224 AC2EEDE0 */ sw $t6, %lo(D_8018EDE0)($at) -/* 09EE28 8009E228 03E00008 */ jr $ra -/* 09EE2C 8009E22C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80091750/func_8009E230.s b/asm/non_matchings/code_80091750/func_8009E230.s deleted file mode 100644 index 28c3add49..000000000 --- a/asm/non_matchings/code_80091750/func_8009E230.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009E230 -/* 09EE30 8009E230 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EE34 8009E234 AFBF0014 */ sw $ra, 0x14($sp) -/* 09EE38 8009E238 0C0277F8 */ jal func_8009DFE0 -/* 09EE3C 8009E23C 2404000A */ li $a0, 10 -/* 09EE40 8009E240 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EE44 8009E244 240E0002 */ li $t6, 2 -/* 09EE48 8009E248 3C018019 */ lui $at, %hi(D_8018EDE0) # $at, 0x8019 -/* 09EE4C 8009E24C AC2EEDE0 */ sw $t6, %lo(D_8018EDE0)($at) -/* 09EE50 8009E250 03E00008 */ jr $ra -/* 09EE54 8009E254 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80091750/func_8009E258.s b/asm/non_matchings/code_80091750/func_8009E258.s deleted file mode 100644 index a04e44653..000000000 --- a/asm/non_matchings/code_80091750/func_8009E258.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009E258 -/* 09EE58 8009E258 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09EE5C 8009E25C AFBF0014 */ sw $ra, 0x14($sp) -/* 09EE60 8009E260 0C0277F8 */ jal func_8009DFE0 -/* 09EE64 8009E264 2404000A */ li $a0, 10 -/* 09EE68 8009E268 8FBF0014 */ lw $ra, 0x14($sp) -/* 09EE6C 8009E26C 240E0003 */ li $t6, 3 -/* 09EE70 8009E270 3C018019 */ lui $at, %hi(D_8018EDE0) # $at, 0x8019 -/* 09EE74 8009E274 AC2EEDE0 */ sw $t6, %lo(D_8018EDE0)($at) -/* 09EE78 8009E278 03E00008 */ jr $ra -/* 09EE7C 8009E27C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80091750/func_8009E5BC.s b/asm/non_matchings/code_80091750/func_8009E5BC.s deleted file mode 100644 index df1234564..000000000 --- a/asm/non_matchings/code_80091750/func_8009E5BC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8009E5BC -/* 09F1BC 8009E5BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 09F1C0 8009E5C0 AFB10018 */ sw $s1, 0x18($sp) -/* 09F1C4 8009E5C4 AFB00014 */ sw $s0, 0x14($sp) -/* 09F1C8 8009E5C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 09F1CC 8009E5CC 00008025 */ move $s0, $zero -/* 09F1D0 8009E5D0 24110004 */ li $s1, 4 -.L8009E5D4: -/* 09F1D4 8009E5D4 0C02797F */ jal func_8009E5FC -/* 09F1D8 8009E5D8 02002025 */ move $a0, $s0 -/* 09F1DC 8009E5DC 26100001 */ addiu $s0, $s0, 1 -/* 09F1E0 8009E5E0 1611FFFC */ bne $s0, $s1, .L8009E5D4 -/* 09F1E4 8009E5E4 00000000 */ nop -/* 09F1E8 8009E5E8 8FBF001C */ lw $ra, 0x1c($sp) -/* 09F1EC 8009E5EC 8FB00014 */ lw $s0, 0x14($sp) -/* 09F1F0 8009E5F0 8FB10018 */ lw $s1, 0x18($sp) -/* 09F1F4 8009E5F4 03E00008 */ jr $ra -/* 09F1F8 8009E5F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80091750/func_8009E5FC.s b/asm/non_matchings/code_80091750/func_8009E5FC.s deleted file mode 100644 index f2327881b..000000000 --- a/asm/non_matchings/code_80091750/func_8009E5FC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8009E5FC -/* 09F1FC 8009E5FC 3C018019 */ lui $at, %hi(D_8018E838) -/* 09F200 8009E600 00240821 */ addu $at, $at, $a0 -/* 09F204 8009E604 240E0001 */ li $t6, 1 -/* 09F208 8009E608 A02EE838 */ sb $t6, %lo(D_8018E838)($at) -/* 09F20C 8009E60C 3C018019 */ lui $at, %hi(D_8018E840) -/* 09F210 8009E610 00047880 */ sll $t7, $a0, 2 -/* 09F214 8009E614 002F0821 */ addu $at, $at, $t7 -/* 09F218 8009E618 03E00008 */ jr $ra -/* 09F21C 8009E61C AC20E840 */ sw $zero, %lo(D_8018E840)($at) diff --git a/asm/non_matchings/code_80091750/func_800A8230.s b/asm/non_matchings/code_80091750/func_800A8230.s deleted file mode 100644 index 8748a3955..000000000 --- a/asm/non_matchings/code_80091750/func_800A8230.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800A8230 -/* 0A8E30 800A8230 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0A8E34 800A8234 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A8E38 800A8238 0C029E93 */ jal func_800A7A4C -/* 0A8E3C 800A823C 00002025 */ move $a0, $zero -/* 0A8E40 800A8240 8FBF0014 */ lw $ra, 0x14($sp) -/* 0A8E44 800A8244 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0A8E48 800A8248 03E00008 */ jr $ra -/* 0A8E4C 800A824C 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800A8250.s b/asm/non_matchings/code_80091750/func_800A8250.s deleted file mode 100644 index 246e34530..000000000 --- a/asm/non_matchings/code_80091750/func_800A8250.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800A8250 -/* 0A8E50 800A8250 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0A8E54 800A8254 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A8E58 800A8258 0C029E93 */ jal func_800A7A4C -/* 0A8E5C 800A825C 24040001 */ li $a0, 1 -/* 0A8E60 800A8260 8FBF0014 */ lw $ra, 0x14($sp) -/* 0A8E64 800A8264 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0A8E68 800A8268 03E00008 */ jr $ra -/* 0A8E6C 800A826C 00000000 */ nop diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 23a3b06f6..fd733dc0d 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -4890,14 +4890,10 @@ block_20: GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000F124.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8000F2BC(void *arg0, s32 arg1) { - bzero(arg0, arg1 * 8); +// Delete track waypoints +void func_8000F2BC(struct TrackWayPoint *arg0, s32 arg1) { + bzero(arg0, arg1 << 3); } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000F2BC.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 @@ -10547,16 +10543,11 @@ block_8: GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001933C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s16 D_80164678; void func_8001968C(void) { D_80164678 = 3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001968C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -10862,16 +10853,11 @@ void func_80019D2C(void *arg0, void *arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019D2C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s16 D_801646CC; void func_80019DE4(void) { D_801646CC = 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019DE4.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -11524,29 +11510,25 @@ void func_8001AB74(s32 arg0, s16 *arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001AB74.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8001ABE0(s32 arg0, ? arg1) { +void func_8001ABE0(s32 arg0, s32 arg1) { } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001ABE0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8001ABEC(void *arg0) { - s16 temp_v0; +struct struct_801642D8 { + /* 0x0 */ u16 unk0; + /* 0x2 */ s16 ffff; + /* 0x4 */ s16 timer; // confirm? + /* 0x6 */ s16 laps; // confirm? + /* 0x8 */ s32 blank; + /* 0xC */ s32 unkC; +}; - temp_v0 = arg0->unk2; - if ((temp_v0 < 0) || (temp_v0 >= 0x64)) { +void func_8001ABEC(struct struct_801642D8 *arg0) { + if ((arg0->ffff < 0) || (arg0->ffff >= 100)) { arg0->unk0 = 0; - arg0->unk4 = 0; + arg0->timer = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001ABEC.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 diff --git a/src/code_80071F00.c b/src/code_80071F00.c index e1a6e71ed..08879f87c 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -256,16 +256,26 @@ extern ? D_80165C70; GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072354.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CE3; +// maybe struct_80165C18_entry (same size) +// However, unk_000 needs to be s32. Could be an onion? +struct struct_E0 { + union { + s8 s8; + s16 s16; + }; + s16 unk2; + s8 unk4[0xDC]; +}; // Size 0xE0 -void func_80072388(s32 arg0, s8 arg1) { - *(&D_80165CE3 + (arg0 * 0xE0)) = arg1; +extern struct struct_E0 D_80165CE3[]; + +/** + * The s8's in this file are possibly just one big array + * (includes D_80165CE3, D_80165CEF) + **/ +void func_80072388(s32 arg0, s32 arg1) { + D_80165CE3[arg0].s8 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072388.s") -#endif void func_800723A4(s32 arg0, s32 arg1) { D_80165C18[arg0].unk_054 = 0; @@ -298,16 +308,11 @@ void func_80072488(s32 arg0) { ++D_80165C18[arg0].unk_0A6; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CEF; +extern struct struct_E0 D_80165CEF[]; void func_800724DC(s32 arg0) { - *(&D_80165CEF + (arg0 * 0xE0)) = 0; + D_80165CEF[arg0].s8 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800724DC.s") -#endif void func_800724F8(s32 arg0, s32 arg1) { D_80165C18[arg0].unk_084[D_80165C18[arg0].unk_0D7] = arg1; @@ -337,37 +342,33 @@ void func_800725E8(s32 arg0, s32 arg1, s32 arg2) { D_80165C18[arg0].unk_0A6 = arg1; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800721E8(s32, ?); // extern -? func_80072388(?); // extern s16 func_80072530(s32); // extern -extern ? D_80165CBE; +extern struct struct_E0 D_80165CBE[]; void func_8007266C(s32 arg0) { - func_80072388(0); + func_80072388(arg0, 0); func_800721E8(arg0, 0x2000); func_800721E8(arg0, 8); - *(&D_80165CBE + (arg0 * 0xE0)) = func_80072530(arg0); + D_80165CBE[arg0].s16 = func_80072530(arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007266C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800721E8(s32, ?); // extern -? func_80072388(?); // extern -extern ? D_80165CBE; void func_800726CC(s32 arg0, s32 arg1) { - func_80072388(0); + func_80072388(arg0, 0); func_800721E8(arg0, 0x2000); - *(&D_80165CBE + (arg0 * 0xE0)) = arg1; + D_80165CBE[arg0].s16 = arg1; +} + +UNUSED void func_8007271C(s32 arg0, s32 arg1) { + if (D_80165C18[arg0].unk_0CB == 0) { + D_80165C18[arg0].unk_0A6 = arg1; + } +} + +UNUSED void func_80007274C(s32 arg0) { + if (D_80165CE3[arg0].s8 == 0) { + func_80072488(arg0); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800726CC.s") -#endif s32 func_8007278C(s32 arg0, s32 arg1) { s32 phi_v1; @@ -426,40 +427,35 @@ UNUSED s32 func_800728B0(s32 arg0, s32 arg1, s32 arg2) { return phi_a3; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CBE; - -void func_80072950(s32 arg0, s32 arg1, s32 arg2, s16 arg3) { +void func_80072950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { if (arg1 == arg2) { - *(&D_80165CBE + (arg0 * 0xE0)) = arg3; + D_80165CBE[arg0].s16 = arg3; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072950.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CBA; - -void func_800729B4(s32 arg0, s16 arg1) { - *(&D_80165CBA + (arg0 * 0xE0)) = arg1; +UNUSED void func_80072974(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { + if (arg1 != arg2) { + D_80165CBE[arg0].s16 = arg3; + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800729B4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CBC; +extern struct struct_E0 D_80165CE4[]; -void func_800729D0(s32 arg0, s16 arg1) { - *(&D_80165CBC + (arg0 * 0xE0)) = arg1; +UNUSED void func_80072998(s32 arg0) { + D_80165CE4[arg0].s8 = 0; +} + +extern struct struct_E0 D_80165CBA[]; + +void func_800729B4(s32 arg0, s32 arg1) { + D_80165CBA[arg0].s16 = arg1; +} + +extern struct struct_E0 D_80165CBC[]; + +void func_800729D0(s32 arg0, s32 arg1) { + D_80165CBC[arg0].s16 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800729D0.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -814,21 +810,16 @@ UNUSED void func_80073568() { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165C18; +//extern struct struct_E0 D_80165C18[]; extern s32 D_8018D1EC; // separated from asm in code_80071F00/func_80073514.s UNUSED void func_80073570(s32 arg0) { - s16 *temp_v0; - s32 temp_t7; - - temp_t7 = D_8018D1EC + 1; - D_8018D1EC = temp_t7; - if (temp_t7 == 5) { + D_8018D1EC++; + if (D_8018D1EC == 5) { D_8018D1EC = 0; } - temp_v0 = (arg0 * 0xE0) + 0xA6 + &D_80165C18; - *temp_v0 = (s16) (*temp_v0 + 1); + D_80165C18[arg0].unk_0A6++; } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073570.s") @@ -853,45 +844,24 @@ void func_80073654(s32 arg0) { ++D_80165C18[arg0].unk_0D6; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800721E8(?); // extern -extern ? D_80165CEE; +extern struct struct_E0 D_80165CEE[]; -// separated from asm in code_80071F00/func_80073654.s UNUSED void func_8007369C(s32 arg0, s32 arg1) { - func_800721E8(0x8000); - *(&D_80165CEE + (arg0 * 0xE0)) = (s8) arg1; + func_800721E8(arg0, 0x8000); + D_80165CEE[arg0].s8 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007369C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800721E8(?); // extern -extern ? D_80165CEE; +extern struct struct_E0 D_80165CEE[]; void func_800736E0(s32 arg0) { - func_800721E8(0x8000); - *(&D_80165CEE + (arg0 * 0xE0)) = 1; + func_800721E8(arg0, 0x8000); + D_80165CEE[arg0].s8 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800736E0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800721E8(?); // extern -extern ? D_80165CEE; void func_80073720(s32 arg0) { - func_800721E8(0x8000); - *(&D_80165CEE + (arg0 * 0xE0)) = 0; + func_800721E8(arg0, 0x8000); + D_80165CEE[arg0].s8 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073720.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -926,33 +896,22 @@ s32 func_8007375C(s32 arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007375C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CE7; +extern struct struct_E0 D_80165CE7[]; -void func_80073800(s32 arg0, s8 arg1) { - *(&D_80165CE7 + (arg0 * 0xE0)) = arg1; +void func_80073800(s32 arg0, s32 arg1) { + D_80165CE7[arg0].s8 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073800.s") -#endif void func_8007381C(s32 arg0) { ++D_80165C18[arg0].unk_0DC; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80073800(?); // extern -extern ? D_80165CF4; +extern struct struct_E0 D_80165CF4[]; void func_80073844(s32 arg0) { - func_80073800(0); - *(&D_80165CF4 + (arg0 * 0xE0)) = 1; + func_80073800(arg0, 0); + D_80165CF4[arg0].s8 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073844.s") -#endif void func_80073884(s32 arg0) { D_80165C18[arg0].unk_0DC = 0; @@ -1161,33 +1120,26 @@ UNUSED s32 func_80073ED4(s32 arg0, u16* arg1, u16 arg2, s32 arg3) { return phi_t0; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80165CE5; +extern struct struct_E0 D_80165CE5[]; -void func_80073F90(s32 arg0, s8 arg1) { - *(&D_80165CE5 + (arg0 * 0xE0)) = arg1; +void func_80073F90(s32 arg0, s32 arg1) { + D_80165CE5[arg0].s8 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073F90.s") -#endif void func_80073FAC(s32 arg0) { ++D_80165C18[arg0].unk_0DB; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80073F90(?); // extern -extern ? D_80165CF3; +extern struct struct_E0 D_80165CF3[]; void func_80073FD4(s32 arg0) { - func_80073F90(0); - *(&D_80165CF3 + (arg0 * 0xE0)) = 1; + func_80073F90(arg0, 0); + D_80165CF3[arg0].s8 = 1; +} + +UNUSED void func_80074014(void) { + } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073FD4.s") -#endif s32 func_8007401C(s32 arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { s32 phi_a3; @@ -1324,19 +1276,19 @@ void func_800744CC(void) { } } -void func_80074510(void* arg0, void* arg1, s32 arg2) { +void func_80074510(uintptr_t devAddr, void * vaddr, size_t nbytes) { func_800744CC(); - osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, (uintptr_t) arg0, arg1, arg2, &gDmaMesgQueue); + osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, devAddr, vaddr, nbytes, &gDmaMesgQueue); D_8018D224 = 1; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80074510(void *, s32); // extern -extern ? _other_texturesSegmentRomStart; +#ifdef NON_MATCHING -void func_80074574(s32 arg0, u16 arg2, s32 arg3) { - func_80074510((arg0 & 0xFFFFFF) + &_other_texturesSegmentRomStart, arg2 * (arg3 & 0xFFFF)); +extern s8 _other_texturesSegmentRomStart[]; + +void func_80074574(s32 arg0, u8 *arg1, u16 arg2, u16 arg3) { + if (1); + func_80074510(&_other_texturesSegmentRomStart[arg0 & 0xFFFFFF], (void *) (arg2 * arg3), arg3); } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074574.s") @@ -1420,7 +1372,7 @@ void func_800747F0(s32 arg0) { if (temp_v0 != temp_v1->unkD3) { sp1C = temp_v1; sp24 = (temp_v0 * temp_v1->unkD9 * temp_v1->unkDA) + temp_v1->unk6C; - func_80074574(sp24, func_80074790(), temp_v1->unkD9, temp_v1->unkDA); + func_80074574(sp24, func_80074790(), temp_v1->unkD9, func_80074574->unkDA); temp_v1->unkD3 = temp_v1->unkD2; func_80074478(arg0); } @@ -6109,16 +6061,9 @@ void func_8007B34C(s32 playerId) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B34C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007B34C(); // extern - void func_8007BB9C(void) { func_8007B34C(); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BB9C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6449,16 +6394,9 @@ void func_8007C2F8(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C2F8.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007CC00(); // extern - void func_8007C340(void) { func_8007CC00(); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C340.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -9657,14 +9595,9 @@ void func_800810F4(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800810F4.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void func_80081208(void) { } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081208.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 @@ -10913,16 +10846,9 @@ void func_80083018(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083018.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8008BF18(); // extern - -void func_80083060(void) { - func_8008BF18(); +void func_80083060(s32 arg0) { + func_8008BF18(arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083060.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -11387,16 +11313,9 @@ void func_80083B0C(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083B0C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8008BF18(); // extern - -void func_80083BE4(void) { - func_8008BF18(); +void func_80083BE4(s32 arg0) { + func_8008BF18(arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083BE4.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 diff --git a/src/code_80071F00.h b/src/code_80071F00.h index bc7019ee3..ea2c33eb0 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -16,13 +16,13 @@ void func_80072428(s32); void func_80072488(s32); void func_800724F8(s32, s32); s32 func_8007278C(s32, s32); -void func_80073800(s32, s8); +void func_80073800(s32, s32); void func_8007381C(s32); s32 func_800738A8(s32, s16*, s32, s32, s32, s32, s32); s32 func_80073A10(s32, s16*, s32, s32, s32, s32, s32); s32 func_80073B00(s32, s16*, s32, s32, s32, s32, s32); s32 func_80073B78(s32, s32, s16*, s32, s32, s32, s32, s32); -void func_80073F90(s32, s8); +void func_80073F90(s32, s32); void func_80073FAC(s32); s32 func_8007401C(s32, f32*, f32, f32, f32, s32, s32); s32 func_8007415C(s32, f32*, f32, f32, f32, s32, s32); diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 000061563..ae217d272 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -33,16 +33,9 @@ void func_80086EAC(s32 arg0, s8 arg1, s16 arg2) { GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086EAC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80086E70(); // extern - void func_80086EF0(void) { func_80086E70(); } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086EF0.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 diff --git a/src/code_80091750.c b/src/code_80091750.c index 650306c9d..3e4e1c21b 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -3981,16 +3981,9 @@ loop_4: GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099184.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800996BC(?); // extern - -void func_8009969C(void) { - func_800996BC(1); +void func_8009969C(s32 arg0) { + func_800996BC(arg0, 1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009969C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9 @@ -4126,24 +4119,14 @@ void func_80099958(MkTexture *arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099958.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s32 D_8018E060; +// Possibly a debug print function? void func_80099A70(void) { - s32 temp_v0; - s32 phi_v0; - + s32 i; D_8018E060 = 0; - phi_v0 = 0; - do { - temp_v0 = phi_v0 + 4; - phi_v0 = temp_v0; - } while (temp_v0 != 0x10); + for (i = 0; i < 16; i++) { } } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099A70.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda @@ -4287,16 +4270,11 @@ loop_9: GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099AEC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s32 D_8018E0E8; void func_80099E54(void) { D_8018E0E8 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099E54.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda @@ -5935,31 +5913,14 @@ void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CBE4.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009CBE4(?); // extern - -void func_8009CDDC(void) { - func_8009CBE4(0); +void func_8009CDDC(s32 arg0, s32 arg1) { + func_8009CBE4(arg0, arg1, 0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CDDC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009CBE4(?); // extern - -void func_8009CDFC(void) { - func_8009CBE4(1); +void func_8009CDFC(s32 arg0, s32 arg1) { + func_8009CBE4(arg0, arg1, 1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CDFC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800C3448(?); // extern extern u8 gSoundMode; void func_8009CE1C(void) { @@ -5967,9 +5928,6 @@ void func_8009CE1C(void) { func_800C3448(0xE0000002); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CE1C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 @@ -6453,28 +6411,13 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D77C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009D77C(?); // extern - -void func_8009D958(void) { - func_8009D77C(0); +void func_8009D958(s32 arg0, s32 arg1) { + func_8009D77C(arg0, arg1, 0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D958.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009D77C(?); // extern - -void func_8009D978(void) { - func_8009D77C(1); +void func_8009D978(s32 arg0, s32 arg1) { + func_8009D77C(arg0, arg1, 1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D978.s") -#endif - #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 draw_box(s32, s32, s32, s32, s32, s32, s32, s32, s32); // extern @@ -6713,27 +6656,13 @@ void func_8009DEF8(u32 arg0, s8 arg1) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DEF8.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DEF8(?); // extern - -void func_8009DF4C(void) { - func_8009DEF8(1); +void func_8009DF4C(s32 arg0) { + func_8009DEF8(arg0, 1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DF4C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DEF8(?); // extern - -void func_8009DF6C(void) { - func_8009DEF8(8); +void func_8009DF6C(s32 arg0) { + func_8009DEF8(arg0, 8); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DF6C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6763,27 +6692,13 @@ void func_8009DF8C(u32 arg0, s8 arg1) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DF8C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DF8C(?); // extern - -void func_8009DFE0(void) { - func_8009DF8C(2); +void func_8009DFE0(s32 arg0) { + func_8009DF8C(arg0, 2); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DFE0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DF8C(?); // extern - -void func_8009E000(void) { - func_8009DF8C(7); +void func_8009E000(s32 arg0) { + func_8009DF8C(arg0, 7); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E000.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6886,70 +6801,40 @@ void func_8009E0F0(u32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E0F0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DFE0(?); // extern extern s32 D_8018EDE0; void func_8009E1C0(void) { - func_8009DFE0(0xA); + func_8009DFE0(10); D_8018EDE0 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E1C0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009E000(?); // extern extern s32 D_8018EDE0; void func_8009E1E4(void) { - func_8009E000(0xA); + func_8009E000(10); D_8018EDE0 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E1E4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DFE0(?); // extern extern s32 D_8018EDE0; void func_8009E208(void) { - func_8009DFE0(0xA); + func_8009DFE0(10); D_8018EDE0 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E208.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DFE0(?); // extern extern s32 D_8018EDE0; void func_8009E230(void) { - func_8009DFE0(0xA); + func_8009DFE0(10); D_8018EDE0 = 2; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E230.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009DFE0(?); // extern extern s32 D_8018EDE0; void func_8009E258(void) { - func_8009DFE0(0xA); + func_8009DFE0(10); D_8018EDE0 = 3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E258.s") -#endif void func_8009DFE0(s32); extern s32 D_8018EDE0; //bss @@ -7069,37 +6954,21 @@ void func_8009E2F0(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E2F0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009E5FC(s32); // extern - +void func_8009E5FC(s32); void func_8009E5BC(void) { - s32 temp_s0; - s32 phi_s0; - - phi_s0 = 0; - do { - func_8009E5FC(phi_s0); - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - } while (temp_s0 != 4); + s32 i; + for (i = 0; i < 4; i++) { + func_8009E5FC(i); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E5BC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_8018E838; -extern ? D_8018E840; +extern s8 D_8018E838[]; +extern s32 D_8018E840[]; void func_8009E5FC(s32 arg0) { - *(&D_8018E838 + arg0) = 1; - *(&D_8018E840 + (arg0 * 4)) = 0; + D_8018E838[arg0] = 1; + D_8018E840[arg0] = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E5FC.s") -#endif void func_8009E620(void) { s32 index; @@ -12706,27 +12575,14 @@ block_119: GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A7A4C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800A7A4C(?); // extern - void func_800A8230(void) { func_800A7A4C(0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A8230.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800A7A4C(?); // extern void func_800A8250(void) { func_800A7A4C(1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A8250.s") -#endif + #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda