From c124377253e88ae0d69883ef912849283d1511a9 Mon Sep 17 00:00:00 2001 From: Joshua Peisach Date: Sat, 19 Aug 2023 23:33:59 -0400 Subject: [PATCH] Push more matching! Primarily audio (#372) * Push more matching! Primarily audio --- .../audio/external/func_800C54B8.s | 22 -- .../audio/external/func_800C550C.s | 29 -- .../audio/external/func_800C59C4.s | 33 -- .../audio/external/func_800C5BD0.s | 31 -- .../audio/external/func_800C8C7C.s | 21 -- .../audio/external/func_800C9018.s | 19 -- .../audio/external/func_800C9060.s | 40 --- .../audio/external/func_800C9250.s | 32 -- .../audio/external/func_800C97C4.s | 62 ---- .../audio/external/func_800C99E0.s | 46 --- .../audio/external/func_800CA984.s | 87 ----- .../audio/external/func_800CAC08.s | 24 -- .../audio/external/func_800CB064.s | 56 --- .../audio/port_eu/func_800CBC24.s | 37 -- .../code_80086E70/func_80088228.s | 35 -- .../code_80086E70/func_8008B78C.s | 21 -- src/audio/external.c | 322 ++++++------------ src/audio/external.h | 2 +- src/audio/port_eu.c | 34 +- src/code_80086E70.c | 55 ++- 20 files changed, 140 insertions(+), 868 deletions(-) delete mode 100644 asm/non_matchings/audio/external/func_800C54B8.s delete mode 100644 asm/non_matchings/audio/external/func_800C550C.s delete mode 100644 asm/non_matchings/audio/external/func_800C59C4.s delete mode 100644 asm/non_matchings/audio/external/func_800C5BD0.s delete mode 100644 asm/non_matchings/audio/external/func_800C8C7C.s delete mode 100644 asm/non_matchings/audio/external/func_800C9018.s delete mode 100644 asm/non_matchings/audio/external/func_800C9060.s delete mode 100644 asm/non_matchings/audio/external/func_800C9250.s delete mode 100644 asm/non_matchings/audio/external/func_800C97C4.s delete mode 100644 asm/non_matchings/audio/external/func_800C99E0.s delete mode 100644 asm/non_matchings/audio/external/func_800CA984.s delete mode 100644 asm/non_matchings/audio/external/func_800CAC08.s delete mode 100644 asm/non_matchings/audio/external/func_800CB064.s delete mode 100644 asm/non_matchings/audio/port_eu/func_800CBC24.s delete mode 100644 asm/non_matchings/code_80086E70/func_80088228.s delete mode 100644 asm/non_matchings/code_80086E70/func_8008B78C.s diff --git a/asm/non_matchings/audio/external/func_800C54B8.s b/asm/non_matchings/audio/external/func_800C54B8.s deleted file mode 100644 index fd6cdbb81..000000000 --- a/asm/non_matchings/audio/external/func_800C54B8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800C54B8 -/* 0C60B8 800C54B8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 0C60BC 800C54BC AFBF002C */ sw $ra, 0x2c($sp) -/* 0C60C0 800C54C0 AFBE0028 */ sw $fp, 0x28($sp) -/* 0C60C4 800C54C4 AFA40060 */ sw $a0, 0x60($sp) -/* 0C60C8 800C54C8 03A0F025 */ move $fp, $sp -/* 0C60CC 800C54CC AFA50064 */ sw $a1, 0x64($sp) -/* 0C60D0 800C54D0 0C0314E1 */ jal func_800C5384 -/* 0C60D4 800C54D4 93A40063 */ lbu $a0, 0x63($sp) -/* 0C60D8 800C54D8 93CE0063 */ lbu $t6, 0x63($fp) -/* 0C60DC 800C54DC 8FD80064 */ lw $t8, 0x64($fp) -/* 0C60E0 800C54E0 24040001 */ li $a0, 1 -/* 0C60E4 800C54E4 000E7F00 */ sll $t7, $t6, 0x1c -/* 0C60E8 800C54E8 AFCF0054 */ sw $t7, 0x54($fp) -/* 0C60EC 800C54EC 27C50030 */ addiu $a1, $fp, 0x30 -/* 0C60F0 800C54F0 0C031073 */ jal func_800C41CC -/* 0C60F4 800C54F4 AFD80030 */ sw $t8, 0x30($fp) -/* 0C60F8 800C54F8 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C60FC 800C54FC 03C0E825 */ move $sp, $fp -/* 0C6100 800C5500 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C6104 800C5504 03E00008 */ jr $ra -/* 0C6108 800C5508 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/non_matchings/audio/external/func_800C550C.s b/asm/non_matchings/audio/external/func_800C550C.s deleted file mode 100644 index d241fc093..000000000 --- a/asm/non_matchings/audio/external/func_800C550C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800C550C -/* 0C610C 800C550C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 0C6110 800C5510 AFBE0030 */ sw $fp, 0x30($sp) -/* 0C6114 800C5514 AFB1002C */ sw $s1, 0x2c($sp) -/* 0C6118 800C5518 AFB00028 */ sw $s0, 0x28($sp) -/* 0C611C 800C551C 00808825 */ move $s1, $a0 -/* 0C6120 800C5520 03A0F025 */ move $fp, $sp -/* 0C6124 800C5524 AFBF0034 */ sw $ra, 0x34($sp) -/* 0C6128 800C5528 00008025 */ move $s0, $zero -.L800C552C: -/* 0C612C 800C552C 320400FF */ andi $a0, $s0, 0xff -/* 0C6130 800C5530 0C0314E1 */ jal func_800C5384 -/* 0C6134 800C5534 02202825 */ move $a1, $s1 -/* 0C6138 800C5538 26100001 */ addiu $s0, $s0, 1 -/* 0C613C 800C553C 320E00FF */ andi $t6, $s0, 0xff -/* 0C6140 800C5540 29C10006 */ slti $at, $t6, 6 -/* 0C6144 800C5544 1420FFF9 */ bnez $at, .L800C552C -/* 0C6148 800C5548 01C08025 */ move $s0, $t6 -/* 0C614C 800C554C AFD1003C */ sw $s1, 0x3c($fp) -/* 0C6150 800C5550 24040002 */ li $a0, 2 -/* 0C6154 800C5554 0C031073 */ jal func_800C41CC -/* 0C6158 800C5558 27C5003C */ addiu $a1, $fp, 0x3c -/* 0C615C 800C555C 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C6160 800C5560 03C0E825 */ move $sp, $fp -/* 0C6164 800C5564 8FD00028 */ lw $s0, 0x28($fp) -/* 0C6168 800C5568 8FD1002C */ lw $s1, 0x2c($fp) -/* 0C616C 800C556C 8FDE0030 */ lw $fp, 0x30($fp) -/* 0C6170 800C5570 03E00008 */ jr $ra -/* 0C6174 800C5574 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/non_matchings/audio/external/func_800C59C4.s b/asm/non_matchings/audio/external/func_800C59C4.s deleted file mode 100644 index 58c1a635f..000000000 --- a/asm/non_matchings/audio/external/func_800C59C4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800C59C4 -/* 0C65C4 800C59C4 3C0F803B */ lui $t7, %hi(D_803B17D0) # $t7, 0x803b -/* 0C65C8 800C59C8 8DEF17D0 */ lw $t7, %lo(D_803B17D0)($t7) -/* 0C65CC 800C59CC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0C65D0 800C59D0 3C0E803B */ lui $t6, %hi(gSequenceChannelNone) # $t6, 0x803b -/* 0C65D4 800C59D4 AFBE0028 */ sw $fp, 0x28($sp) -/* 0C65D8 800C59D8 25CE5EF0 */ addiu $t6, %lo(gSequenceChannelNone) # addiu $t6, $t6, 0x5ef0 -/* 0C65DC 800C59DC 03A0F025 */ move $fp, $sp -/* 0C65E0 800C59E0 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C65E4 800C59E4 11CF000F */ beq $t6, $t7, .L800C5A24 -/* 0C65E8 800C59E8 AFB00024 */ sw $s0, 0x24($sp) -/* 0C65EC 800C59EC 3C018019 */ lui $at, %hi(D_80192C38) # $at, 0x8019 -/* 0C65F0 800C59F0 A0202C38 */ sb $zero, %lo(D_80192C38)($at) -/* 0C65F4 800C59F4 00008025 */ move $s0, $zero -.L800C59F8: -/* 0C65F8 800C59F8 0C031222 */ jal func_800C4888 -/* 0C65FC 800C59FC 320400FF */ andi $a0, $s0, 0xff -/* 0C6600 800C5A00 0C0313F9 */ jal func_800C4FE4 -/* 0C6604 800C5A04 320400FF */ andi $a0, $s0, 0xff -/* 0C6608 800C5A08 0C03165A */ jal func_800C5968 -/* 0C660C 800C5A0C 320400FF */ andi $a0, $s0, 0xff -/* 0C6610 800C5A10 26100001 */ addiu $s0, $s0, 1 -/* 0C6614 800C5A14 321800FF */ andi $t8, $s0, 0xff -/* 0C6618 800C5A18 2B010006 */ slti $at, $t8, 6 -/* 0C661C 800C5A1C 1420FFF6 */ bnez $at, .L800C59F8 -/* 0C6620 800C5A20 03008025 */ move $s0, $t8 -.L800C5A24: -/* 0C6624 800C5A24 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C6628 800C5A28 03C0E825 */ move $sp, $fp -/* 0C662C 800C5A2C 8FD00024 */ lw $s0, 0x24($fp) -/* 0C6630 800C5A30 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C6634 800C5A34 03E00008 */ jr $ra -/* 0C6638 800C5A38 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/audio/external/func_800C5BD0.s b/asm/non_matchings/audio/external/func_800C5BD0.s deleted file mode 100644 index 9da4eeb2e..000000000 --- a/asm/non_matchings/audio/external/func_800C5BD0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800C5BD0 -/* 0C67D0 800C5BD0 3C0E800F */ lui $t6, %hi(D_800EA1C0) # $t6, 0x800f -/* 0C67D4 800C5BD4 91CEA1C0 */ lbu $t6, %lo(D_800EA1C0)($t6) -/* 0C67D8 800C5BD8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0C67DC 800C5BDC AFBE0028 */ sw $fp, 0x28($sp) -/* 0C67E0 800C5BE0 03A0F025 */ move $fp, $sp -/* 0C67E4 800C5BE4 15C0000D */ bnez $t6, .L800C5C1C -/* 0C67E8 800C5BE8 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C67EC 800C5BEC 3C0F800F */ lui $t7, %hi(gPlayers+0x254) # $t7, 0x800f -/* 0C67F0 800C5BF0 95EF6BE4 */ lhu $t7, %lo(gPlayers+0x254)($t7) -/* 0C67F4 800C5BF4 3C04800F */ lui $a0, %hi(D_800EA154) -/* 0C67F8 800C5BF8 3C01F300 */ lui $at, 0xf300 -/* 0C67FC 800C5BFC 008F2021 */ addu $a0, $a0, $t7 -/* 0C6800 800C5C00 9098A154 */ lbu $t8, %lo(D_800EA154)($a0) -/* 0C6804 800C5C04 00002825 */ move $a1, $zero -/* 0C6808 800C5C08 0018CA00 */ sll $t9, $t8, 8 -/* 0C680C 800C5C0C 0C032EFA */ jal func_800CBBE8 -/* 0C6810 800C5C10 03212025 */ or $a0, $t9, $at -/* 0C6814 800C5C14 10000006 */ b .L800C5C30 -/* 0C6818 800C5C18 8FDF002C */ lw $ra, 0x2c($fp) -.L800C5C1C: -/* 0C681C 800C5C1C 3C04F300 */ lui $a0, (0xF3004D00 >> 16) # lui $a0, 0xf300 -/* 0C6820 800C5C20 34844D00 */ ori $a0, (0xF3004D00 & 0xFFFF) # ori $a0, $a0, 0x4d00 -/* 0C6824 800C5C24 0C032EFA */ jal func_800CBBE8 -/* 0C6828 800C5C28 00002825 */ move $a1, $zero -/* 0C682C 800C5C2C 8FDF002C */ lw $ra, 0x2c($fp) -.L800C5C30: -/* 0C6830 800C5C30 03C0E825 */ move $sp, $fp -/* 0C6834 800C5C34 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C6838 800C5C38 03E00008 */ jr $ra -/* 0C683C 800C5C3C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/audio/external/func_800C8C7C.s b/asm/non_matchings/audio/external/func_800C8C7C.s deleted file mode 100644 index f5f265135..000000000 --- a/asm/non_matchings/audio/external/func_800C8C7C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800C8C7C -/* 0C987C 800C8C7C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C9880 800C8C80 44812000 */ mtc1 $at, $f4 -/* 0C9884 800C8C84 308E00FF */ andi $t6, $a0, 0xff -/* 0C9888 800C8C88 000E1080 */ sll $v0, $t6, 2 -/* 0C988C 800C8C8C 3C01800F */ lui $at, %hi(D_800E9F54) -/* 0C9890 800C8C90 00220821 */ addu $at, $at, $v0 -/* 0C9894 800C8C94 C4269F54 */ lwc1 $f6, %lo(D_800E9F54)($at) -/* 0C9898 800C8C98 3C01800F */ lui $at, %hi(D_800EA130) -/* 0C989C 800C8C9C 00220821 */ addu $at, $at, $v0 -/* 0C98A0 800C8CA0 46062201 */ sub.s $f8, $f4, $f6 -/* 0C98A4 800C8CA4 C42AA130 */ lwc1 $f10, %lo(D_800EA130)($at) -/* 0C98A8 800C8CA8 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 0C98AC 800C8CAC 3C01800F */ lui $at, %hi(D_800EA06C + 8) -/* 0C98B0 800C8CB0 460A4401 */ sub.s $f16, $f8, $f10 -/* 0C98B4 800C8CB4 000E7900 */ sll $t7, $t6, 4 -/* 0C98B8 800C8CB8 AFA40010 */ sw $a0, 0x10($sp) -/* 0C98BC 800C8CBC 002F0821 */ addu $at, $at, $t7 -/* 0C98C0 800C8CC0 E430A074 */ swc1 $f16, %lo(D_800EA06C + 8)($at) -/* 0C98C4 800C8CC4 03E00008 */ jr $ra -/* 0C98C8 800C8CC8 27BD0010 */ addiu $sp, $sp, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C9018.s b/asm/non_matchings/audio/external/func_800C9018.s deleted file mode 100644 index c3cf29276..000000000 --- a/asm/non_matchings/audio/external/func_800C9018.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800C9018 -/* 0C9C18 800C9018 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0C9C1C 800C901C 308600FF */ andi $a2, $a0, 0xff -/* 0C9C20 800C9020 00067100 */ sll $t6, $a2, 4 -/* 0C9C24 800C9024 01C67023 */ subu $t6, $t6, $a2 -/* 0C9C28 800C9028 3C0F800F */ lui $t7, %hi(D_800E9F7C) # $t7, 0x800f -/* 0C9C2C 800C902C AFBF002C */ sw $ra, 0x2c($sp) -/* 0C9C30 800C9030 AFBE0028 */ sw $fp, 0x28($sp) -/* 0C9C34 800C9034 AFA40030 */ sw $a0, 0x30($sp) -/* 0C9C38 800C9038 25EF9F7C */ addiu $t7, %lo(D_800E9F7C) # addiu $t7, $t7, -0x6084 -/* 0C9C3C 800C903C 000E7080 */ sll $t6, $t6, 2 -/* 0C9C40 800C9040 03A0F025 */ move $fp, $sp -/* 0C9C44 800C9044 0C03155E */ jal func_800C5578 -/* 0C9C48 800C9048 01CF2021 */ addu $a0, $t6, $t7 -/* 0C9C4C 800C904C 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C9C50 800C9050 03C0E825 */ move $sp, $fp -/* 0C9C54 800C9054 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C9C58 800C9058 03E00008 */ jr $ra -/* 0C9C5C 800C905C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/audio/external/func_800C9060.s b/asm/non_matchings/audio/external/func_800C9060.s deleted file mode 100644 index 7ee97308c..000000000 --- a/asm/non_matchings/audio/external/func_800C9060.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800C9060 -/* 0C9C60 800C9060 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0C9C64 800C9064 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0C9C68 800C9068 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0C9C6C 800C906C AFBE0030 */ sw $fp, 0x30($sp) -/* 0C9C70 800C9070 03A0F025 */ move $fp, $sp -/* 0C9C74 800C9074 AFBF0034 */ sw $ra, 0x34($sp) -/* 0C9C78 800C9078 AFA40038 */ sw $a0, 0x38($sp) -/* 0C9C7C 800C907C AFA5003C */ sw $a1, 0x3c($sp) -/* 0C9C80 800C9080 15C00017 */ bnez $t6, .L800C90E0 -/* 0C9C84 800C9084 308600FF */ andi $a2, $a0, 0xff -/* 0C9C88 800C9088 3C0F800F */ lui $t7, %hi(D_800EA0EC) # $t7, 0x800f -/* 0C9C8C 800C908C 25EFA0EC */ addiu $t7, %lo(D_800EA0EC) # addiu $t7, $t7, -0x5f14 -/* 0C9C90 800C9090 00CF1821 */ addu $v1, $a2, $t7 -/* 0C9C94 800C9094 90620000 */ lbu $v0, ($v1) -/* 0C9C98 800C9098 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C9C9C 800C909C 24010002 */ li $at, 2 -/* 0C9CA0 800C90A0 10400004 */ beqz $v0, .L800C90B4 -/* 0C9CA4 800C90A4 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C9CA8 800C90A8 1441000D */ bne $v0, $at, .L800C90E0 -/* 0C9CAC 800C90AC 24180001 */ li $t8, 1 -/* 0C9CB0 800C90B0 A0780000 */ sb $t8, ($v1) -.L800C90B4: -/* 0C9CB4 800C90B4 0006C900 */ sll $t9, $a2, 4 -/* 0C9CB8 800C90B8 0326C823 */ subu $t9, $t9, $a2 -/* 0C9CBC 800C90BC 3C08800F */ lui $t0, %hi(D_800E9F7C) # $t0, 0x800f -/* 0C9CC0 800C90C0 25089F7C */ addiu $t0, %lo(D_800E9F7C) # addiu $t0, $t0, -0x6084 -/* 0C9CC4 800C90C4 0019C880 */ sll $t9, $t9, 2 -/* 0C9CC8 800C90C8 03282821 */ addu $a1, $t9, $t0 -/* 0C9CCC 800C90CC 24A90014 */ addiu $t1, $a1, 0x14 -/* 0C9CD0 800C90D0 8FC4003C */ lw $a0, 0x3c($fp) -/* 0C9CD4 800C90D4 AFA90014 */ sw $t1, 0x14($sp) -/* 0C9CD8 800C90D8 0C031052 */ jal play_sound -/* 0C9CDC 800C90DC AFA70010 */ sw $a3, 0x10($sp) -.L800C90E0: -/* 0C9CE0 800C90E0 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C9CE4 800C90E4 03C0E825 */ move $sp, $fp -/* 0C9CE8 800C90E8 8FDE0030 */ lw $fp, 0x30($fp) -/* 0C9CEC 800C90EC 03E00008 */ jr $ra -/* 0C9CF0 800C90F0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/external/func_800C9250.s b/asm/non_matchings/audio/external/func_800C9250.s deleted file mode 100644 index 037791edb..000000000 --- a/asm/non_matchings/audio/external/func_800C9250.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800C9250 -/* 0C9E50 800C9250 308E00FF */ andi $t6, $a0, 0xff -/* 0C9E54 800C9254 000E78C0 */ sll $t7, $t6, 3 -/* 0C9E58 800C9258 01EE7823 */ subu $t7, $t7, $t6 -/* 0C9E5C 800C925C 000F7900 */ sll $t7, $t7, 4 -/* 0C9E60 800C9260 01EE7823 */ subu $t7, $t7, $t6 -/* 0C9E64 800C9264 000F7880 */ sll $t7, $t7, 2 -/* 0C9E68 800C9268 01EE7823 */ subu $t7, $t7, $t6 -/* 0C9E6C 800C926C 000F78C0 */ sll $t7, $t7, 3 -/* 0C9E70 800C9270 3C18800F */ lui $t8, %hi(gPlayers+0x254) -/* 0C9E74 800C9274 030FC021 */ addu $t8, $t8, $t7 -/* 0C9E78 800C9278 3C08803B */ lui $t0, %hi(gAudioRandom) # $t0, 0x803b -/* 0C9E7C 800C927C 8D087194 */ lw $t0, %lo(gAudioRandom)($t0) -/* 0C9E80 800C9280 97186BE4 */ lhu $t8, %lo(gPlayers+0x254)($t8) -/* 0C9E84 800C9284 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0C9E88 800C9288 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 -/* 0C9E8C 800C928C 31090001 */ andi $t1, $t0, 1 -/* 0C9E90 800C9290 0018C900 */ sll $t9, $t8, 4 -/* 0C9E94 800C9294 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C9E98 800C9298 AFBE0028 */ sw $fp, 0x28($sp) -/* 0C9E9C 800C929C AFA40030 */ sw $a0, 0x30($sp) -/* 0C9EA0 800C92A0 03292821 */ addu $a1, $t9, $t1 -/* 0C9EA4 800C92A4 34218001 */ ori $at, (0x29008001 & 0xFFFF) # ori $at, $at, 0x8001 -/* 0C9EA8 800C92A8 01C02025 */ move $a0, $t6 -/* 0C9EAC 800C92AC 03A0F025 */ move $fp, $sp -/* 0C9EB0 800C92B0 0C03243D */ jal func_800C90F4 -/* 0C9EB4 800C92B4 00A12821 */ addu $a1, $a1, $at -/* 0C9EB8 800C92B8 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C9EBC 800C92BC 03C0E825 */ move $sp, $fp -/* 0C9EC0 800C92C0 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C9EC4 800C92C4 03E00008 */ jr $ra -/* 0C9EC8 800C92C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/audio/external/func_800C97C4.s b/asm/non_matchings/audio/external/func_800C97C4.s deleted file mode 100644 index f27b8baa5..000000000 --- a/asm/non_matchings/audio/external/func_800C97C4.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_800C97C4 -/* 0CA3C4 800C97C4 308600FF */ andi $a2, $a0, 0xff -/* 0CA3C8 800C97C8 0006C0C0 */ sll $t8, $a2, 3 -/* 0CA3CC 800C97CC 0306C023 */ subu $t8, $t8, $a2 -/* 0CA3D0 800C97D0 0018C100 */ sll $t8, $t8, 4 -/* 0CA3D4 800C97D4 0306C023 */ subu $t8, $t8, $a2 -/* 0CA3D8 800C97D8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0CA3DC 800C97DC 0018C080 */ sll $t8, $t8, 2 -/* 0CA3E0 800C97E0 0306C023 */ subu $t8, $t8, $a2 -/* 0CA3E4 800C97E4 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f -/* 0CA3E8 800C97E8 AFB1002C */ sw $s1, 0x2c($sp) -/* 0CA3EC 800C97EC 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 -/* 0CA3F0 800C97F0 0018C0C0 */ sll $t8, $t8, 3 -/* 0CA3F4 800C97F4 00067100 */ sll $t6, $a2, 4 -/* 0CA3F8 800C97F8 01C67023 */ subu $t6, $t6, $a2 -/* 0CA3FC 800C97FC 03198821 */ addu $s1, $t8, $t9 -/* 0CA400 800C9800 3C0F800F */ lui $t7, %hi(D_800E9F7C) # $t7, 0x800f -/* 0CA404 800C9804 96250254 */ lhu $a1, 0x254($s1) -/* 0CA408 800C9808 AFB00028 */ sw $s0, 0x28($sp) -/* 0CA40C 800C980C 25EF9F7C */ addiu $t7, %lo(D_800E9F7C) # addiu $t7, $t7, -0x6084 -/* 0CA410 800C9810 000E7080 */ sll $t6, $t6, 2 -/* 0CA414 800C9814 3C010104 */ lui $at, (0x0104FF00 >> 16) # lui $at, 0x104 -/* 0CA418 800C9818 AFBF0034 */ sw $ra, 0x34($sp) -/* 0CA41C 800C981C AFBE0030 */ sw $fp, 0x30($sp) -/* 0CA420 800C9820 AFA40038 */ sw $a0, 0x38($sp) -/* 0CA424 800C9824 3421FF00 */ ori $at, (0x0104FF00 & 0xFFFF) # ori $at, $at, 0xff00 -/* 0CA428 800C9828 01CF8021 */ addu $s0, $t6, $t7 -/* 0CA42C 800C982C 03A0F025 */ move $fp, $sp -/* 0CA430 800C9830 02002025 */ move $a0, $s0 -/* 0CA434 800C9834 0C03155E */ jal func_800C5578 -/* 0CA438 800C9838 00A12821 */ addu $a1, $a1, $at -/* 0CA43C 800C983C 96250254 */ lhu $a1, 0x254($s1) -/* 0CA440 800C9840 3C010104 */ lui $at, (0x0104FF14 >> 16) # lui $at, 0x104 -/* 0CA444 800C9844 3421FF14 */ ori $at, (0x0104FF14 & 0xFFFF) # ori $at, $at, 0xff14 -/* 0CA448 800C9848 02002025 */ move $a0, $s0 -/* 0CA44C 800C984C 0C03155E */ jal func_800C5578 -/* 0CA450 800C9850 00A12821 */ addu $a1, $a1, $at -/* 0CA454 800C9854 96250254 */ lhu $a1, 0x254($s1) -/* 0CA458 800C9858 3C010104 */ lui $at, (0x0104FF2E >> 16) # lui $at, 0x104 -/* 0CA45C 800C985C 3421FF2E */ ori $at, (0x0104FF2E & 0xFFFF) # ori $at, $at, 0xff2e -/* 0CA460 800C9860 02002025 */ move $a0, $s0 -/* 0CA464 800C9864 0C03155E */ jal func_800C5578 -/* 0CA468 800C9868 00A12821 */ addu $a1, $a1, $at -/* 0CA46C 800C986C 96250254 */ lhu $a1, 0x254($s1) -/* 0CA470 800C9870 3C010104 */ lui $at, (0x0104FF36 >> 16) # lui $at, 0x104 -/* 0CA474 800C9874 3421FF36 */ ori $at, (0x0104FF36 & 0xFFFF) # ori $at, $at, 0xff36 -/* 0CA478 800C9878 02002025 */ move $a0, $s0 -/* 0CA47C 800C987C 0C03155E */ jal func_800C5578 -/* 0CA480 800C9880 00A12821 */ addu $a1, $a1, $at -/* 0CA484 800C9884 96250254 */ lhu $a1, 0x254($s1) -/* 0CA488 800C9888 3C010104 */ lui $at, (0x0104FF3E >> 16) # lui $at, 0x104 -/* 0CA48C 800C988C 3421FF3E */ ori $at, (0x0104FF3E & 0xFFFF) # ori $at, $at, 0xff3e -/* 0CA490 800C9890 02002025 */ move $a0, $s0 -/* 0CA494 800C9894 0C03155E */ jal func_800C5578 -/* 0CA498 800C9898 00A12821 */ addu $a1, $a1, $at -/* 0CA49C 800C989C 8FDF0034 */ lw $ra, 0x34($fp) -/* 0CA4A0 800C98A0 03C0E825 */ move $sp, $fp -/* 0CA4A4 800C98A4 8FD00028 */ lw $s0, 0x28($fp) -/* 0CA4A8 800C98A8 8FD1002C */ lw $s1, 0x2c($fp) -/* 0CA4AC 800C98AC 8FDE0030 */ lw $fp, 0x30($fp) -/* 0CA4B0 800C98B0 03E00008 */ jr $ra -/* 0CA4B4 800C98B4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/external/func_800C99E0.s b/asm/non_matchings/audio/external/func_800C99E0.s deleted file mode 100644 index c9293e81b..000000000 --- a/asm/non_matchings/audio/external/func_800C99E0.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_800C99E0 -/* 0CA5E0 800C99E0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0CA5E4 800C99E4 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CA5E8 800C99E8 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CA5EC 800C99EC AFBE0038 */ sw $fp, 0x38($sp) -/* 0CA5F0 800C99F0 AFB20030 */ sw $s2, 0x30($sp) -/* 0CA5F4 800C99F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 0CA5F8 800C99F8 00A08825 */ move $s1, $a1 -/* 0CA5FC 800C99FC 00809025 */ move $s2, $a0 -/* 0CA600 800C9A00 03A0F025 */ move $fp, $sp -/* 0CA604 800C9A04 AFBF003C */ sw $ra, 0x3c($sp) -/* 0CA608 800C9A08 AFB30034 */ sw $s3, 0x34($sp) -/* 0CA60C 800C9A0C 15C00015 */ bnez $t6, .L800C9A64 -/* 0CA610 800C9A10 AFB00028 */ sw $s0, 0x28($sp) -/* 0CA614 800C9A14 3C13800F */ lui $s3, %hi(D_800EA1C0) # $s3, 0x800f -/* 0CA618 800C9A18 2673A1C0 */ addiu $s3, %lo(D_800EA1C0) # addiu $s3, $s3, -0x5e40 -/* 0CA61C 800C9A1C 926F0000 */ lbu $t7, ($s3) -/* 0CA620 800C9A20 00008025 */ move $s0, $zero -/* 0CA624 800C9A24 25F80001 */ addiu $t8, $t7, 1 -/* 0CA628 800C9A28 1B00000E */ blez $t8, .L800C9A64 -.L800C9A2C: -/* 0CA62C 800C9A2C 02402025 */ move $a0, $s2 -/* 0CA630 800C9A30 0C03087A */ jal func_800C21E8 -/* 0CA634 800C9A34 02202825 */ move $a1, $s1 -/* 0CA638 800C9A38 10400003 */ beqz $v0, .L800C9A48 -/* 0CA63C 800C9A3C 00402025 */ move $a0, $v0 -/* 0CA640 800C9A40 0C03155E */ jal func_800C5578 -/* 0CA644 800C9A44 02202825 */ move $a1, $s1 -.L800C9A48: -/* 0CA648 800C9A48 92680000 */ lbu $t0, ($s3) -/* 0CA64C 800C9A4C 26100001 */ addiu $s0, $s0, 1 -/* 0CA650 800C9A50 321900FF */ andi $t9, $s0, 0xff -/* 0CA654 800C9A54 25090001 */ addiu $t1, $t0, 1 -/* 0CA658 800C9A58 0329082A */ slt $at, $t9, $t1 -/* 0CA65C 800C9A5C 1420FFF3 */ bnez $at, .L800C9A2C -/* 0CA660 800C9A60 03208025 */ move $s0, $t9 -.L800C9A64: -/* 0CA664 800C9A64 8FDF003C */ lw $ra, 0x3c($fp) -/* 0CA668 800C9A68 03C0E825 */ move $sp, $fp -/* 0CA66C 800C9A6C 8FD00028 */ lw $s0, 0x28($fp) -/* 0CA670 800C9A70 8FD1002C */ lw $s1, 0x2c($fp) -/* 0CA674 800C9A74 8FD20030 */ lw $s2, 0x30($fp) -/* 0CA678 800C9A78 8FD30034 */ lw $s3, 0x34($fp) -/* 0CA67C 800C9A7C 8FDE0038 */ lw $fp, 0x38($fp) -/* 0CA680 800C9A80 03E00008 */ jr $ra -/* 0CA684 800C9A84 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/audio/external/func_800CA984.s b/asm/non_matchings/audio/external/func_800CA984.s deleted file mode 100644 index 62cd182d6..000000000 --- a/asm/non_matchings/audio/external/func_800CA984.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800CA984 -/* 0CB584 800CA984 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 0CB588 800CA988 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CB58C 800CA98C 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CB590 800CA990 AFBE0050 */ sw $fp, 0x50($sp) -/* 0CB594 800CA994 AFB50044 */ sw $s5, 0x44($sp) -/* 0CB598 800CA998 309500FF */ andi $s5, $a0, 0xff -/* 0CB59C 800CA99C 03A0F025 */ move $fp, $sp -/* 0CB5A0 800CA9A0 AFBF0054 */ sw $ra, 0x54($sp) -/* 0CB5A4 800CA9A4 AFB7004C */ sw $s7, 0x4c($sp) -/* 0CB5A8 800CA9A8 AFB60048 */ sw $s6, 0x48($sp) -/* 0CB5AC 800CA9AC AFB40040 */ sw $s4, 0x40($sp) -/* 0CB5B0 800CA9B0 AFB3003C */ sw $s3, 0x3c($sp) -/* 0CB5B4 800CA9B4 AFB20038 */ sw $s2, 0x38($sp) -/* 0CB5B8 800CA9B8 AFB10034 */ sw $s1, 0x34($sp) -/* 0CB5BC 800CA9BC AFB00030 */ sw $s0, 0x30($sp) -/* 0CB5C0 800CA9C0 15C00035 */ bnez $t6, .L800CAA98 -/* 0CB5C4 800CA9C4 AFA40058 */ sw $a0, 0x58($sp) -/* 0CB5C8 800CA9C8 3C0F800F */ lui $t7, %hi(D_800EA0F0) # $t7, 0x800f -/* 0CB5CC 800CA9CC 91EFA0F0 */ lbu $t7, %lo(D_800EA0F0)($t7) -/* 0CB5D0 800CA9D0 3C18800F */ lui $t8, %hi(D_800EA1C0) # $t8, 0x800f -/* 0CB5D4 800CA9D4 55E00031 */ bnel $t7, $zero, .L800CAA9C -/* 0CB5D8 800CA9D8 8FDF0054 */ lw $ra, 0x54($fp) -/* 0CB5DC 800CA9DC 9318A1C0 */ lbu $t8, %lo(D_800EA1C0)($t8) -/* 0CB5E0 800CA9E0 001540C0 */ sll $t0, $s5, 3 -/* 0CB5E4 800CA9E4 01154023 */ subu $t0, $t0, $s5 -/* 0CB5E8 800CA9E8 27190001 */ addiu $t9, $t8, 1 -/* 0CB5EC 800CA9EC 1B20002A */ blez $t9, .L800CAA98 -/* 0CB5F0 800CA9F0 00008025 */ move $s0, $zero -/* 0CB5F4 800CA9F4 00084100 */ sll $t0, $t0, 4 -/* 0CB5F8 800CA9F8 01154023 */ subu $t0, $t0, $s5 -/* 0CB5FC 800CA9FC 00084080 */ sll $t0, $t0, 2 -/* 0CB600 800CAA00 01154023 */ subu $t0, $t0, $s5 -/* 0CB604 800CAA04 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f -/* 0CB608 800CAA08 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 -/* 0CB60C 800CAA0C 000840C0 */ sll $t0, $t0, 3 -/* 0CB610 800CAA10 01091021 */ addu $v0, $t0, $t1 -/* 0CB614 800CAA14 3C14800F */ lui $s4, %hi(D_800EA1DC) # $s4, 0x800f -/* 0CB618 800CAA18 3C13800F */ lui $s3, %hi(D_800EA1C8) # $s3, 0x800f -/* 0CB61C 800CAA1C 3C12800F */ lui $s2, %hi(D_800EA1D4) # $s2, 0x800f -/* 0CB620 800CAA20 3C113102 */ lui $s1, (0x31029008 >> 16) # lui $s1, 0x3102 -/* 0CB624 800CAA24 36319008 */ ori $s1, (0x31029008 & 0xFFFF) # ori $s1, $s1, 0x9008 -/* 0CB628 800CAA28 2652A1D4 */ addiu $s2, %lo(D_800EA1D4) # addiu $s2, $s2, -0x5e2c -/* 0CB62C 800CAA2C 2673A1C8 */ addiu $s3, %lo(D_800EA1C8) # addiu $s3, $s3, -0x5e38 -/* 0CB630 800CAA30 2694A1DC */ addiu $s4, %lo(D_800EA1DC) # addiu $s4, $s4, -0x5e24 -/* 0CB634 800CAA34 24560014 */ addiu $s6, $v0, 0x14 -/* 0CB638 800CAA38 24570098 */ addiu $s7, $v0, 0x98 -.L800CAA3C: -/* 0CB63C 800CAA3C 32A400FF */ andi $a0, $s5, 0xff -/* 0CB640 800CAA40 02C02825 */ move $a1, $s6 -/* 0CB644 800CAA44 02603025 */ move $a2, $s3 -/* 0CB648 800CAA48 02E03825 */ move $a3, $s7 -/* 0CB64C 800CAA4C AFB00010 */ sw $s0, 0x10($sp) -/* 0CB650 800CAA50 0C030722 */ jal func_800C1C88 -/* 0CB654 800CAA54 AFB10014 */ sw $s1, 0x14($sp) -/* 0CB658 800CAA58 10400007 */ beqz $v0, .L800CAA78 -/* 0CB65C 800CAA5C 02202025 */ move $a0, $s1 -/* 0CB660 800CAA60 24450018 */ addiu $a1, $v0, 0x18 -/* 0CB664 800CAA64 320600FF */ andi $a2, $s0, 0xff -/* 0CB668 800CAA68 02403825 */ move $a3, $s2 -/* 0CB66C 800CAA6C AFB20010 */ sw $s2, 0x10($sp) -/* 0CB670 800CAA70 0C031052 */ jal play_sound -/* 0CB674 800CAA74 AFB40014 */ sw $s4, 0x14($sp) -.L800CAA78: -/* 0CB678 800CAA78 3C0B800F */ lui $t3, %hi(D_800EA1C0) # $t3, 0x800f -/* 0CB67C 800CAA7C 916BA1C0 */ lbu $t3, %lo(D_800EA1C0)($t3) -/* 0CB680 800CAA80 26100001 */ addiu $s0, $s0, 1 -/* 0CB684 800CAA84 320A00FF */ andi $t2, $s0, 0xff -/* 0CB688 800CAA88 256C0001 */ addiu $t4, $t3, 1 -/* 0CB68C 800CAA8C 014C082A */ slt $at, $t2, $t4 -/* 0CB690 800CAA90 1420FFEA */ bnez $at, .L800CAA3C -/* 0CB694 800CAA94 01408025 */ move $s0, $t2 -.L800CAA98: -/* 0CB698 800CAA98 8FDF0054 */ lw $ra, 0x54($fp) -.L800CAA9C: -/* 0CB69C 800CAA9C 03C0E825 */ move $sp, $fp -/* 0CB6A0 800CAAA0 8FD00030 */ lw $s0, 0x30($fp) -/* 0CB6A4 800CAAA4 8FD10034 */ lw $s1, 0x34($fp) -/* 0CB6A8 800CAAA8 8FD20038 */ lw $s2, 0x38($fp) -/* 0CB6AC 800CAAAC 8FD3003C */ lw $s3, 0x3c($fp) -/* 0CB6B0 800CAAB0 8FD40040 */ lw $s4, 0x40($fp) -/* 0CB6B4 800CAAB4 8FD50044 */ lw $s5, 0x44($fp) -/* 0CB6B8 800CAAB8 8FD60048 */ lw $s6, 0x48($fp) -/* 0CB6BC 800CAABC 8FD7004C */ lw $s7, 0x4c($fp) -/* 0CB6C0 800CAAC0 8FDE0050 */ lw $fp, 0x50($fp) -/* 0CB6C4 800CAAC4 03E00008 */ jr $ra -/* 0CB6C8 800CAAC8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/audio/external/func_800CAC08.s b/asm/non_matchings/audio/external/func_800CAC08.s deleted file mode 100644 index f5564b5a0..000000000 --- a/asm/non_matchings/audio/external/func_800CAC08.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800CAC08 -/* 0CB808 800CAC08 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CB80C 800CAC0C 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CB810 800CAC10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0CB814 800CAC14 AFBE0020 */ sw $fp, 0x20($sp) -/* 0CB818 800CAC18 03A0F025 */ move $fp, $sp -/* 0CB81C 800CAC1C 15C0000B */ bnez $t6, .L800CAC4C -/* 0CB820 800CAC20 AFBF0024 */ sw $ra, 0x24($sp) -/* 0CB824 800CAC24 00002025 */ move $a0, $zero -/* 0CB828 800CAC28 24050001 */ li $a1, 1 -/* 0CB82C 800CAC2C 2406007F */ li $a2, 127 -/* 0CB830 800CAC30 0C030DB1 */ jal func_800C36C4 -/* 0CB834 800CAC34 24070019 */ li $a3, 25 -/* 0CB838 800CAC38 3C045101 */ lui $a0, (0x5101C00C >> 16) # lui $a0, 0x5101 -/* 0CB83C 800CAC3C 0C0315BC */ jal func_800C56F0 -/* 0CB840 800CAC40 3484C00C */ ori $a0, (0x5101C00C & 0xFFFF) # ori $a0, $a0, 0xc00c -/* 0CB844 800CAC44 3C01800F */ lui $at, %hi(D_800EA168) # $at, 0x800f -/* 0CB848 800CAC48 A020A168 */ sb $zero, %lo(D_800EA168)($at) -.L800CAC4C: -/* 0CB84C 800CAC4C 8FDF0024 */ lw $ra, 0x24($fp) -/* 0CB850 800CAC50 03C0E825 */ move $sp, $fp -/* 0CB854 800CAC54 8FDE0020 */ lw $fp, 0x20($fp) -/* 0CB858 800CAC58 03E00008 */ jr $ra -/* 0CB85C 800CAC5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/audio/external/func_800CB064.s b/asm/non_matchings/audio/external/func_800CB064.s deleted file mode 100644 index 27ea8988e..000000000 --- a/asm/non_matchings/audio/external/func_800CB064.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_800CB064 -/* 0CBC64 800CB064 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CBC68 800CB068 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CBC6C 800CB06C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0CBC70 800CB070 AFBE0028 */ sw $fp, 0x28($sp) -/* 0CBC74 800CB074 03A0F025 */ move $fp, $sp -/* 0CBC78 800CB078 AFBF002C */ sw $ra, 0x2c($sp) -/* 0CBC7C 800CB07C 15C00028 */ bnez $t6, .L800CB120 -/* 0CBC80 800CB080 AFA40038 */ sw $a0, 0x38($sp) -/* 0CBC84 800CB084 93AF003B */ lbu $t7, 0x3b($sp) -/* 0CBC88 800CB088 3C18800F */ lui $t8, %hi(D_800EA170) # $t8, 0x800f -/* 0CBC8C 800CB08C 2718A170 */ addiu $t8, %lo(D_800EA170) # addiu $t8, $t8, -0x5e90 -/* 0CBC90 800CB090 01F8C821 */ addu $t9, $t7, $t8 -/* 0CBC94 800CB094 AFB90034 */ sw $t9, 0x34($sp) -/* 0CBC98 800CB098 93280000 */ lbu $t0, ($t9) -/* 0CBC9C 800CB09C 24010001 */ li $at, 1 -/* 0CBCA0 800CB0A0 3C09800F */ lui $t1, %hi(D_800EA168) # $t1, 0x800f -/* 0CBCA4 800CB0A4 5501001F */ bnel $t0, $at, .L800CB124 -/* 0CBCA8 800CB0A8 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CBCAC 800CB0AC 9129A168 */ lbu $t1, %lo(D_800EA168)($t1) -/* 0CBCB0 800CB0B0 00002025 */ move $a0, $zero -/* 0CBCB4 800CB0B4 24050001 */ li $a1, 1 -/* 0CBCB8 800CB0B8 15200003 */ bnez $t1, .L800CB0C8 -/* 0CBCBC 800CB0BC 2406007F */ li $a2, 127 -/* 0CBCC0 800CB0C0 0C030DB1 */ jal func_800C36C4 -/* 0CBCC4 800CB0C4 24070019 */ li $a3, 25 -.L800CB0C8: -/* 0CBCC8 800CB0C8 93C4003B */ lbu $a0, 0x3b($fp) -/* 0CBCCC 800CB0CC 3C05800F */ lui $a1, %hi(gPlayers+0x254) -/* 0CBCD0 800CB0D0 3C012900 */ lui $at, (0x29008008 >> 16) # lui $at, 0x2900 -/* 0CBCD4 800CB0D4 000458C0 */ sll $t3, $a0, 3 -/* 0CBCD8 800CB0D8 01645823 */ subu $t3, $t3, $a0 -/* 0CBCDC 800CB0DC 000B5900 */ sll $t3, $t3, 4 -/* 0CBCE0 800CB0E0 01645823 */ subu $t3, $t3, $a0 -/* 0CBCE4 800CB0E4 000B5880 */ sll $t3, $t3, 2 -/* 0CBCE8 800CB0E8 01645823 */ subu $t3, $t3, $a0 -/* 0CBCEC 800CB0EC 000B58C0 */ sll $t3, $t3, 3 -/* 0CBCF0 800CB0F0 00AB2821 */ addu $a1, $a1, $t3 -/* 0CBCF4 800CB0F4 94A56BE4 */ lhu $a1, %lo(gPlayers+0x254)($a1) -/* 0CBCF8 800CB0F8 34218008 */ ori $at, (0x29008008 & 0xFFFF) # ori $at, $at, 0x8008 -/* 0CBCFC 800CB0FC 00056100 */ sll $t4, $a1, 4 -/* 0CBD00 800CB100 0C03243D */ jal func_800C90F4 -/* 0CBD04 800CB104 01812821 */ addu $a1, $t4, $at -/* 0CBD08 800CB108 3C050100 */ lui $a1, (0x0100FA4C >> 16) # lui $a1, 0x100 -/* 0CBD0C 800CB10C 34A5FA4C */ ori $a1, (0x0100FA4C & 0xFFFF) # ori $a1, $a1, 0xfa4c -/* 0CBD10 800CB110 0C032406 */ jal func_800C9018 -/* 0CBD14 800CB114 93C4003B */ lbu $a0, 0x3b($fp) -/* 0CBD18 800CB118 8FCD0034 */ lw $t5, 0x34($fp) -/* 0CBD1C 800CB11C A1A00000 */ sb $zero, ($t5) -.L800CB120: -/* 0CBD20 800CB120 8FDF002C */ lw $ra, 0x2c($fp) -.L800CB124: -/* 0CBD24 800CB124 03C0E825 */ move $sp, $fp -/* 0CBD28 800CB128 8FDE0028 */ lw $fp, 0x28($fp) -/* 0CBD2C 800CB12C 03E00008 */ jr $ra -/* 0CBD30 800CB130 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/port_eu/func_800CBC24.s b/asm/non_matchings/audio/port_eu/func_800CBC24.s deleted file mode 100644 index d99d8f622..000000000 --- a/asm/non_matchings/audio/port_eu/func_800CBC24.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800CBC24 -/* 0CC824 800CBC24 3C02800F */ lui $v0, %hi(D_800EA3A0) # $v0, 0x800f -/* 0CC828 800CBC28 3C03800F */ lui $v1, %hi(D_800EA3A4) # $v1, 0x800f -/* 0CC82C 800CBC2C 9063A3A4 */ lbu $v1, %lo(D_800EA3A4)($v1) -/* 0CC830 800CBC30 9042A3A0 */ lbu $v0, %lo(D_800EA3A0)($v0) -/* 0CC834 800CBC34 3C0F800F */ lui $t7, %hi(D_800EA4A4) # $t7, 0x800f -/* 0CC838 800CBC38 8DEFA4A4 */ lw $t7, %lo(D_800EA4A4)($t7) -/* 0CC83C 800CBC3C 00432023 */ subu $a0, $v0, $v1 -/* 0CC840 800CBC40 24840100 */ addiu $a0, $a0, 0x100 -/* 0CC844 800CBC44 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0CC848 800CBC48 308E00FF */ andi $t6, $a0, 0xff -/* 0CC84C 800CBC4C AFBE0028 */ sw $fp, 0x28($sp) -/* 0CC850 800CBC50 01EE082A */ slt $at, $t7, $t6 -/* 0CC854 800CBC54 03A0F025 */ move $fp, $sp -/* 0CC858 800CBC58 10200003 */ beqz $at, .L800CBC68 -/* 0CC85C 800CBC5C AFBF002C */ sw $ra, 0x2c($sp) -/* 0CC860 800CBC60 3C01800F */ lui $at, %hi(D_800EA4A4) # $at, 0x800f -/* 0CC864 800CBC64 AC2EA4A4 */ sw $t6, %lo(D_800EA4A4)($at) -.L800CBC68: -/* 0CC868 800CBC68 307800FF */ andi $t8, $v1, 0xff -/* 0CC86C 800CBC6C 0018CA00 */ sll $t9, $t8, 8 -/* 0CC870 800CBC70 304800FF */ andi $t0, $v0, 0xff -/* 0CC874 800CBC74 3C04800F */ lui $a0, %hi(D_800EA3AC) # $a0, 0x800f -/* 0CC878 800CBC78 03282825 */ or $a1, $t9, $t0 -/* 0CC87C 800CBC7C 8C84A3AC */ lw $a0, %lo(D_800EA3AC)($a0) -/* 0CC880 800CBC80 0C033630 */ jal osSendMesg -/* 0CC884 800CBC84 00003025 */ move $a2, $zero -/* 0CC888 800CBC88 3C09800F */ lui $t1, %hi(D_800EA3A0) # $t1, 0x800f -/* 0CC88C 800CBC8C 9129A3A0 */ lbu $t1, %lo(D_800EA3A0)($t1) -/* 0CC890 800CBC90 3C01800F */ lui $at, %hi(D_800EA3A4) # $at, 0x800f -/* 0CC894 800CBC94 03C0E825 */ move $sp, $fp -/* 0CC898 800CBC98 A029A3A4 */ sb $t1, %lo(D_800EA3A4)($at) -/* 0CC89C 800CBC9C 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CC8A0 800CBCA0 8FDE0028 */ lw $fp, 0x28($fp) -/* 0CC8A4 800CBCA4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0CC8A8 800CBCA8 03E00008 */ jr $ra -/* 0CC8AC 800CBCAC 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_80088228.s b/asm/non_matchings/code_80086E70/func_80088228.s deleted file mode 100644 index d8bb281f6..000000000 --- a/asm/non_matchings/code_80086E70/func_80088228.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80088228 -/* 088E28 80088228 000470C0 */ sll $t6, $a0, 3 -/* 088E2C 8008822C 01C47023 */ subu $t6, $t6, $a0 -/* 088E30 80088230 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 088E34 80088234 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 088E38 80088238 000E7140 */ sll $t6, $t6, 5 -/* 088E3C 8008823C 01CF1021 */ addu $v0, $t6, $t7 -/* 088E40 80088240 8C430080 */ lw $v1, 0x80($v0) -/* 088E44 80088244 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 088E48 80088248 AFBF0014 */ sw $ra, 0x14($sp) -/* 088E4C 8008824C 24630002 */ addiu $v1, $v1, 2 -/* 088E50 80088250 A4400096 */ sh $zero, 0x96($v0) -/* 088E54 80088254 AC43007C */ sw $v1, 0x7c($v0) -/* 088E58 80088258 8478FFFE */ lh $t8, -2($v1) -/* 088E5C 8008825C A4580094 */ sh $t8, 0x94($v0) -/* 088E60 80088260 84790000 */ lh $t9, ($v1) -/* 088E64 80088264 44992000 */ mtc1 $t9, $f4 -/* 088E68 80088268 00000000 */ nop -/* 088E6C 8008826C 468021A0 */ cvt.s.w $f6, $f4 -/* 088E70 80088270 E4460028 */ swc1 $f6, 0x28($v0) -/* 088E74 80088274 84680002 */ lh $t0, 2($v1) -/* 088E78 80088278 44884000 */ mtc1 $t0, $f8 -/* 088E7C 8008827C 00000000 */ nop -/* 088E80 80088280 468042A0 */ cvt.s.w $f10, $f8 -/* 088E84 80088284 E44A002C */ swc1 $f10, 0x2c($v0) -/* 088E88 80088288 84690004 */ lh $t1, 4($v1) -/* 088E8C 8008828C 44898000 */ mtc1 $t1, $f16 -/* 088E90 80088290 00000000 */ nop -/* 088E94 80088294 468084A0 */ cvt.s.w $f18, $f16 -/* 088E98 80088298 0C021BF5 */ jal func_80086FD4 -/* 088E9C 8008829C E4520030 */ swc1 $f18, 0x30($v0) -/* 088EA0 800882A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 088EA4 800882A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 088EA8 800882A8 03E00008 */ jr $ra -/* 088EAC 800882AC 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_8008B78C.s b/asm/non_matchings/code_80086E70/func_8008B78C.s deleted file mode 100644 index 86a5563ce..000000000 --- a/asm/non_matchings/code_80086E70/func_8008B78C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8008B78C -/* 08C38C 8008B78C 000470C0 */ sll $t6, $a0, 3 -/* 08C390 8008B790 01C47023 */ subu $t6, $t6, $a0 -/* 08C394 8008B794 000E7140 */ sll $t6, $t6, 5 -/* 08C398 8008B798 3C028016 */ lui $v0, %hi(D_80165CC6) # 0x8016 -/* 08C39C 8008B79C 004E1021 */ addu $v0, $v0, $t6 -/* 08C3A0 8008B7A0 84425CC6 */ lh $v0, %lo(D_80165CC6)($v0) # 0x5cc6($v0) -/* 08C3A4 8008B7A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08C3A8 8008B7A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 08C3AC 8008B7AC 10400005 */ beqz $v0, .L8008B7C4 -/* 08C3B0 8008B7B0 24010001 */ li $at, 1 -/* 08C3B4 8008B7B4 54410004 */ bnel $v0, $at, .L8008B7C8 -/* 08C3B8 8008B7B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 08C3BC 8008B7BC 0C022DA9 */ jal func_8008B6A4 -/* 08C3C0 8008B7C0 00000000 */ nop -.L8008B7C4: -/* 08C3C4 8008B7C4 8FBF0014 */ lw $ra, 0x14($sp) -.L8008B7C8: -/* 08C3C8 8008B7C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08C3CC 8008B7CC 03E00008 */ jr $ra -/* 08C3D0 8008B7D0 00000000 */ nop diff --git a/src/audio/external.c b/src/audio/external.c index 0a0d1cabc..f03787fbc 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -2287,44 +2287,39 @@ void func_800C5384(s32 arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5384.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_800C5384(u8); /* extern */ +extern void func_800C5384(u8, s32); -void func_800C54B8(u8 bank, struct Unk_80191420 *arg1) { - s32 sp54; - struct Unk_80191420 *sp30; +struct UnkStruct { + s32 unk0; + char filler4[0x20]; + s32 unk24; + char filler28[0x8]; +}; - func_800C5384(bank); - sp54 = bank << 0x1C; - sp30 = arg1; - func_800C41CC(1U, (struct Unk_80191420 *) &sp30); +void func_800C54B8(u8 arg0, s32 arg1) { + struct UnkStruct unk; + func_800C5384(arg0, arg1); + unk.unk24 = arg0 << 0x1C; + unk.unk0 = arg1; + func_800C41CC(1, (void*)&unk); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C54B8.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C5384(s32, s32); /* extern */ +extern void func_800C5384(u8, s32); /* extern */ + void func_800C550C(s32 arg0) { + UNUSED s32 pad[11]; + u8 i; s32 sp3C; - s32 temp_t6; - s32 var_s0; - var_s0 = 0; - do { - func_800C5384(var_s0 & 0xFF, arg0); - temp_t6 = (var_s0 + 1) & 0xFF; - var_s0 = temp_t6; - } while (temp_t6 < 6); + for(i = 0; i < 6; i++) { + func_800C5384(i, arg0); + } + sp3C = arg0; - func_800C41CC(2U, (struct Unk_80191420 *) &sp3C); + func_800C41CC(2U, (struct Unk_80191420*) &sp3C); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C550C.s") -#endif + #ifdef MIPS_TO_C //generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 @@ -2484,33 +2479,26 @@ void func_800C5968(s32 arg0) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5968.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C4888(s32); /* extern */ -? func_800C4FE4(s32); /* extern */ -? func_800C5968(s32); /* extern */ + +extern void func_800C4888(u8); /* extern */ +extern void func_800C4FE4(u8); /* extern */ +extern void func_800C5968(u8); /* extern */ extern s8 D_80192C38; extern s32 D_803B17D0; void func_800C59C4(void) { - s32 temp_t8; - s32 var_s0; - if (&gSequenceChannelNone != D_803B17D0) { + u8 i; + + if (D_803B17D0 != (u32) &gSequenceChannelNone) { D_80192C38 = 0; - var_s0 = 0; - do { - func_800C4888(var_s0 & 0xFF); - func_800C4FE4(var_s0 & 0xFF); - func_800C5968(var_s0 & 0xFF); - temp_t8 = (var_s0 + 1) & 0xFF; - var_s0 = temp_t8; - } while (temp_t8 < 6); - } + for(i = 0; i < 6; i++) { + func_800C4888(i); + func_800C4FE4(i); + func_800C5968(i); + } + } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C59C4.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c @@ -2611,21 +2599,16 @@ loop_8: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5A3C.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -static ? D_800EA154; /* unable to generate initializer */ -u8 D_800EA1C0 = 0; +extern u8 D_800EA154[]; void func_800C5BD0(void) { if (D_800EA1C0 == 0) { - func_800CBBE8((*(&D_800EA154 + gPlayers->characterId) << 8) | 0xF3000000, 0); - return; + func_800CBBE8(((D_800EA154[gPlayers->characterId] & 0xFFFF) << 8) | 0xF3000000, 0); + } else { + func_800CBBE8(0xF3004D00, 0); } - func_800CBBE8(0xF3004D00U, 0); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5BD0.s") -#endif + void func_800C2474(); void func_800C284C(u8, u8, u8, s32); @@ -3971,21 +3954,11 @@ block_25: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8AE4.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -f32 D_800E9F54[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; -struct Unk_800EA06C D_800EA06C[8]; /* unable to generate initializer */ -static f32 D_800EA130[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800EA130; -void func_800C8C7C(s32 arg0) { - s32 temp_t6; - - temp_t6 = arg0 & 0xFF; - *(&D_800EA06C->unk00[2] + (temp_t6 * 0x10)) = (1.0f - D_800E9F54[temp_t6]) - D_800EA130[temp_t6]; +void func_800C8C7C(u8 arg0) { + *(&D_800EA06C[arg0].unk00[2]) = (1.0f - D_800E9F54[arg0]) - (&D_800EA130)[arg0]; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8C7C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 @@ -4110,61 +4083,27 @@ block_4: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F80.s") #endif -#ifdef NON_MATCHING -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//void func_800C5578(void *, s32); // extern - -typedef struct { - Vec3f unk0[0x14]; // 0x14 -} UnkStruct_800E9F7C; - -extern UnkStruct_800E9F7C D_800E9F7C[]; - +extern struct Unk_8018EFD8 D_800E9F7C[]; void func_800C9018(u8 arg0, s32 arg1) { - UNUSED s32 a = arg0; - func_800C5578(D_800E9F7C->unk0[arg0], arg1); + func_800C5578((f32*) &D_800E9F7C[arg0], arg1); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9018.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -static ? D_800E9F7C; /* unable to generate initializer */ -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA108 = 0; -f32 D_800EA1D4[3]; /* unable to generate initializer */ void func_800C9060(u8 arg0, u32 arg1) { - f32 *temp_a1; - u8 *temp_v1; - u8 temp_a2; - u8 temp_v0; - - temp_a2 = arg0 & 0xFF; if (D_800EA108 == 0) { - temp_v1 = &D_800EA0EC[temp_a2]; - temp_v0 = *temp_v1; - if (temp_v0 != 0) { - if (temp_v0 == 2) { - *temp_v1 = 1; - goto block_4; + switch(D_800EA0EC[arg0]) { + case 2: + D_800EA0EC[arg0] = 1; + case 0: + play_sound(arg1, (f32*) &D_800E9F7C[arg0].posX, arg0, D_800EA1D4, D_800EA1D4, (u8*) &D_800E9F7C[arg0].velZ); + break; } - } else { -block_4: - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; - play_sound(arg1, temp_a1, temp_a2, D_800EA1D4, D_800EA1D4, temp_a1 + 0x14); - } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9060.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 u8 D_800E9F2C[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; -static ? D_800E9F7C; /* unable to generate initializer */ +static u8 D_800E9F7C; /* unable to generate initializer */ u8 D_800EA0EC[1] = { 0 }; u8 D_800EA108 = 0; static f32 D_800EA150 = 1.4f; @@ -4208,17 +4147,11 @@ block_4: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C90F4.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -void func_800C9250(u8 arg0) { - u8 temp_t6; - - temp_t6 = arg0 & 0xFF; - func_800C90F4(temp_t6, (*(&gPlayers->characterId + (temp_t6 * 0xDD8)) * 0x10) + (gAudioRandom & 1) + 0x29008001); +void func_800C9250(u8 arg0) +{ + func_800C90F4(arg0, (gPlayers[arg0].characterId * 0x10) + (gAudioRandom & 1) + 0x29008001); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9250.s") -#endif + #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c @@ -4387,27 +4320,14 @@ block_11: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C94A4.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -static ? D_800E9F7C; /* unable to generate initializer */ - -void func_800C97C4(s32 arg0) { - Player *temp_s1; - f32 *temp_s0; - s32 temp_a2; - - temp_a2 = arg0 & 0xFF; - temp_s1 = &gPlayers[temp_a2]; - temp_s0 = (temp_a2 * 0x3C) + &D_800E9F7C; - func_800C5578(temp_s0, temp_s1->characterId + 0x0104FF00); - func_800C5578(temp_s0, temp_s1->characterId + 0x0104FF14); - func_800C5578(temp_s0, temp_s1->characterId + 0x0104FF2E); - func_800C5578(temp_s0, temp_s1->characterId + 0x0104FF36); - func_800C5578(temp_s0, temp_s1->characterId + 0x0104FF3E); +void func_800C97C4(u8 arg0) { + func_800C5578((f32* ) &D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF00); + func_800C5578((f32* ) &D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF14); + func_800C5578((f32* ) &D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF2E); + func_800C5578((f32* ) &D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF36); + func_800C5578((f32* ) &D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF3E); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C97C4.s") -#endif + #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c @@ -4441,33 +4361,20 @@ void func_800C98B8(f32 *position, f32 *velocity, u32 soundBits) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C98B8.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -u8 D_800EA108 = 0; -u8 D_800EA1C0 = 0; - -void func_800C99E0(f32 *arg0, s32 arg1) { - f32 *temp_v0; - s32 temp_t9; - s32 var_s0; +void func_800C99E0(Vec3f arg0, s32 arg1) { + f32* temp_v0; + u8 temp_t9; if (D_800EA108 == 0) { - var_s0 = 0; - if ((D_800EA1C0 + 1) > 0) { - do { - temp_v0 = func_800C21E8(arg0, (u32) arg1); - if (temp_v0 != NULL) { - func_800C5578(temp_v0, (u32) arg1); - } - temp_t9 = (var_s0 + 1) & 0xFF; - var_s0 = temp_t9; - } while (temp_t9 < (D_800EA1C0 + 1)); + for(temp_t9 = 0; temp_t9 < D_800EA1C0 + 1; temp_t9++) { + temp_v0 = func_800C21E8(arg0, arg1); + if (temp_v0 != 0x0) { + func_800C5578(temp_v0, arg1); + } } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C99E0.s") -#endif + void func_800C9A88(u8 playerId) { u8 var_s0; @@ -4859,38 +4766,20 @@ void func_800CA730(u8 playerId) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA730.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static u8 D_800EA0F0 = 0; /* const */ -static u8 D_800EA1C0 = 0; /* const */ -s8 D_800EA108 = 0; /* const */ +void func_800CA984(u8 arg0) { + u8 i; + struct Unk_8018EFD8* temp_v0_2; -void func_800CA984(s32 arg0) { - Player *temp_v0; - s32 temp_s5; - s32 temp_t2; - s32 var_s0; - struct Unk_8018EFD8 *temp_v0_2; - - temp_s5 = arg0 & 0xFF; - if (((u8) D_800EA108 == 0) && (D_800EA0F0 == 0)) { - var_s0 = 0; - if ((D_800EA1C0 + 1) > 0) { - temp_v0 = &gPlayers[temp_s5]; - do { - temp_v0_2 = func_800C1C88(temp_s5 & 0xFF, temp_v0->pos, &D_800EA1C8, &temp_v0->unk_098, (u8) var_s0, 0x31029008U); - if (temp_v0_2 != NULL) { - play_sound(SOUND_ITEM_STAR, temp_v0_2->unk18, var_s0 & 0xFF, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC); - } - temp_t2 = (var_s0 + 1) & 0xFF; - var_s0 = temp_t2; - } while (temp_t2 < (D_800EA1C0 + 1)); + if ((D_800EA108 == 0) && (D_800EA0F0 == 0)) { + for (i = 0; i < D_800EA1C0 + 1; i++) { + temp_v0_2 = func_800C1C88(arg0, &gPlayers[arg0].pos, D_800EA1C8, &gPlayers[arg0].unk_098, (u8) i, 0x31029008U); + if (temp_v0_2) { + play_sound(0x31029008U, temp_v0_2->unk18, i, D_800EA1D4, D_800EA1D4, &D_800EA1DC); + } } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA984.s") -#endif + void func_800CAACC(u8 playerId) { if ((u8) D_800EA108 == 0) { @@ -4932,22 +4821,16 @@ block_4: GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAB4C.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C56F0(?); /* extern */ -u8 D_800EA108 = 0; -static s8 D_800EA168 = 0; +extern u8 D_800EA108; +extern s8 D_800EA168; -void func_800CAC08(void) { +void func_800CAC08() { if (D_800EA108 == 0) { func_800C36C4(0, 1U, 0x7FU, 0x19); func_800C56F0(0x5101C00C); D_800EA168 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAC08.s") -#endif extern u8 D_800EA10C[]; extern s8 D_800EA168; @@ -4964,7 +4847,7 @@ void func_800CAC60(UNUSED s32 arg0) { } -extern u8 func_800C56F0(); /* extern */ +extern int func_800C56F0(); /* extern */ extern s8 D_800EA168; extern u8 D_800EA170[]; @@ -5089,32 +4972,23 @@ void func_800CAFC0(u8 arg0) { } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -u8 D_800EA108 = 0; -static u8 D_800EA168 = 0; -static ? D_800EA170; /* unable to generate initializer */ - -void func_800CB064(u8 arg0) { - u8 *sp34; - u8 *temp_t9; - - if (D_800EA108 == 0) { - temp_t9 = arg0 + &D_800EA170; - sp34 = temp_t9; - if (*temp_t9 == 1) { - if (D_800EA168 == 0) { +void func_800CB064(u8 arg0) +{ + if (D_800EA108 == 0) + { + if (D_800EA170[arg0] == 1) + { + if ((u8) D_800EA168 == 0) + { func_800C36C4(0, 1U, 0x7FU, 0x19); } - func_800C90F4(arg0, (*(&gPlayers->characterId + (arg0 * 0xDD8)) * 0x10) + 0x29008008); + func_800C90F4(arg0, gPlayers[arg0].characterId * 0x10 + 0x29008008); func_800C9018(arg0, 0x0100FA4C); - *sp34 = 0; + D_800EA170[arg0] = 0; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB064.s") -#endif + void func_800CB134() { D_800EA174 = 1; diff --git a/src/audio/external.h b/src/audio/external.h index 5f934d4de..98f3aeb3f 100644 --- a/src/audio/external.h +++ b/src/audio/external.h @@ -95,7 +95,7 @@ void func_800CB14C(void); void func_800C8F80(u8, s32); void func_800C9018(u8, s32); void func_800C9D0C(s32); -void func_800C97C4(s32); +void func_800C97C4(u8); void func_800C13F0(); void func_800C13FC(OSMesg); f32 func_800C1480(u8, u8); diff --git a/src/audio/port_eu.c b/src/audio/port_eu.c index fa2106895..d61c709c2 100644 --- a/src/audio/port_eu.c +++ b/src/audio/port_eu.c @@ -298,30 +298,28 @@ void func_800CBBE8(u32 arg0, s8 arg1) { func_800CBB48(arg0, &sp34); } -#ifdef MIPS_TO_C -// link of progress : https://decomp.me/scratch/1N93O -extern OSMesgQueue *D_800EA3A8[4]; -extern s32 D_800EA4A4; - +// TODO: clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100 void func_800CBC24(void) { s32 temp_t6; - s8 temp_v0; - s8 temp_v1; - u32 tmp; - temp_t6 = ((D_800EA3A0 - D_800EA3A4) + 0x100) & 0xFF; - if (D_800EA4A4 < temp_t6) + s32 test; + OSMesg thing; + temp_t6 = D_800EA3A0[0] - D_800EA3A4[0]; + test = (u8) temp_t6; + test = (test + 0x100) & 0xFF; + do { - D_800EA4A4 = temp_t6; } - - tmp = ((D_800EA3A0 & 0xFF) << 8) | (D_800EA3A4 & 0xFF); - osSendMesg(D_800EA3A8[1], tmp, 0); - D_800EA3A4 = D_800EA3A0; + while (0); + if (D_800EA4A4 < test) + { + D_800EA4A4 = test; + } + thing = (OSMesg) ((D_800EA3A0[0] & 0xFF) | ((D_800EA3A4[0] & 0xFF) << 8)); + osSendMesg(D_800EA3AC, thing, 0); + D_800EA3A4[0] = D_800EA3A0[0]; } -#else -GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CBC24.s") -#endif + #ifdef MIPS_TO_C //generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 83144e176..9aee57451 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -434,25 +434,23 @@ void func_80088178(s32 objectIndex, s32 arg1) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80088228(s32 objectIndex) { - s32 temp_v1; - struct_80165C18_entry *temp_v0; - - temp_v0 = &D_80165C18[objectIndex]; - temp_v1 = temp_v0->unk_080 + 2; - temp_v0->unk_084[9] = 0; - temp_v0->unk_07C = temp_v1; - temp_v0->unk_084[8] = temp_v1->unk-2; - temp_v0->unk_028[0] = (f32) temp_v1->unk0; - temp_v0->unk_028[1] = (f32) temp_v1->unk2; - temp_v0->unk_028[2] = (f32) temp_v1->unk4; - func_80086FD4(objectIndex); +// if the code is too ugly for you, then go fix it without tampering with the register allocations +void func_80088228(s32 objectIndex) +{ + s16 *temp_v1; + struct_80165C18_entry *temp_v0; + temp_v0 = &D_80165C18[objectIndex]; + temp_v1 = temp_v0->unk_080[0]; + temp_v1 = &temp_v0->unk_080[0][1]; + (&D_80165C18[objectIndex])->unk_084[9] = 0; + (&D_80165C18[objectIndex])->unk_07C = (s16 (*)[4]) temp_v1; + (&D_80165C18[objectIndex])->unk_084[8] = temp_v1[-1]; + (&D_80165C18[objectIndex])->unk_028[0] = temp_v1[0]; + (&D_80165C18[objectIndex])->unk_028[1] = temp_v1[1]; + temp_v0->unk_028[2] = temp_v1[2]; + func_80086FD4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088228.s") -#endif + s32 func_800882B0(s32 objectIndex, s32 arg1) { s32 temp_f0; @@ -1787,22 +1785,19 @@ void func_8008B724(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B724.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8008B6A4(); // extern -extern ? D_80165CC6; +extern void func_8008B6A4(s32); /* extern */ + +typedef struct { + s16 a[0x70]; +} asdf; + +extern asdf D_80165CC6[0x70]; void func_8008B78C(s32 arg0) { - s16 temp_v0; - - temp_v0 = *(&D_80165CC6 + (arg0 * 0xE0)); - if ((temp_v0 != 0) && (temp_v0 == 1)) { - func_8008B6A4(); + if ((D_80165CC6[arg0].a[0] != 0) && (D_80165CC6[arg0].a[0] == 1)) { + func_8008B6A4(arg0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B78C.s") -#endif void func_8008B7D4(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { D_80165C18[arg0].unk_010[0] = arg1;