From ccfe6047195d51778ced273b1dcdd020bafac203 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Sun, 10 Sep 2023 01:50:03 -0400 Subject: [PATCH] Assorted matches in audio/external (#413) Signed-off-by: Taggerung --- .../audio/external/func_800C41CC.s | 137 -- .../audio/external/func_800C5D04.s | 84 - .../audio/external/func_800C5E38.s | 197 -- .../audio/external/func_800C6108.s | 272 --- .../audio/external/func_800C64A0.s | 225 --- .../audio/external/func_800C683C.s | 586 ------ .../audio/external/func_800C70A8.s | 496 ------ .../audio/external/func_800C847C.s | 158 -- .../audio/external/func_800C90F4.s | 94 - .../audio/external/func_800C92CC.s | 124 -- .../audio/external/func_800C94A4.s | 324 ---- .../audio/external/func_800CA118.s | 83 - .../audio/external/func_800CA59C.s | 109 -- .../audio/external/func_800CAB4C.s | 51 - .../audio/external/func_800CB14C.s | 104 -- data/data_0DD0A0_2_1_1.s | 52 +- src/audio/external.c | 1585 ++++++----------- src/audio/external.h | 94 +- 18 files changed, 657 insertions(+), 4118 deletions(-) delete mode 100644 asm/non_matchings/audio/external/func_800C41CC.s delete mode 100644 asm/non_matchings/audio/external/func_800C5D04.s delete mode 100644 asm/non_matchings/audio/external/func_800C5E38.s delete mode 100644 asm/non_matchings/audio/external/func_800C6108.s delete mode 100644 asm/non_matchings/audio/external/func_800C64A0.s delete mode 100644 asm/non_matchings/audio/external/func_800C683C.s delete mode 100644 asm/non_matchings/audio/external/func_800C70A8.s delete mode 100644 asm/non_matchings/audio/external/func_800C847C.s delete mode 100644 asm/non_matchings/audio/external/func_800C90F4.s delete mode 100644 asm/non_matchings/audio/external/func_800C92CC.s delete mode 100644 asm/non_matchings/audio/external/func_800C94A4.s delete mode 100644 asm/non_matchings/audio/external/func_800CA118.s delete mode 100644 asm/non_matchings/audio/external/func_800CA59C.s delete mode 100644 asm/non_matchings/audio/external/func_800CAB4C.s delete mode 100644 asm/non_matchings/audio/external/func_800CB14C.s diff --git a/asm/non_matchings/audio/external/func_800C41CC.s b/asm/non_matchings/audio/external/func_800C41CC.s deleted file mode 100644 index 2e2e41e0c..000000000 --- a/asm/non_matchings/audio/external/func_800C41CC.s +++ /dev/null @@ -1,137 +0,0 @@ -.section .late_rodata - -glabel D_800F3648 -.float 100000.0 - -glabel jpt_800F364C -.word L800C423C, L800C4268, L800C42A4, L800C42C8 -.word L800C42FC, L800C4330 - -.section .text - -glabel func_800C41CC -/* 0C4DCC 800C41CC 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C4DD0 800C41D0 ADA40010 */ sw $a0, 0x10($t5) -/* 0C4DD4 800C41D4 3C07800F */ lui $a3, %hi(sSoundRequestCount) # $a3, 0x800f -/* 0C4DD8 800C41D8 24E7A1B8 */ addiu $a3, %lo(sSoundRequestCount) # addiu $a3, $a3, -0x5e48 -/* 0C4DDC 800C41DC 3C02800F */ lui $v0, %hi(sNumProcessedSoundRequests) # $v0, 0x800f -/* 0C4DE0 800C41E0 9042A1BC */ lbu $v0, %lo(sNumProcessedSoundRequests)($v0) -/* 0C4DE4 800C41E4 90EF0000 */ lbu $t7, ($a3) -/* 0C4DE8 800C41E8 308E00FF */ andi $t6, $a0, 0xff -/* 0C4DEC 800C41EC 00A03025 */ move $a2, $a1 -/* 0C4DF0 800C41F0 11E20066 */ beq $t7, $v0, .L800C438C -/* 0C4DF4 800C41F4 01C02825 */ move $a1, $t6 -/* 0C4DF8 800C41F8 3C01800F */ lui $at, %hi(D_800F3648) # $at, 0x800f -/* 0C4DFC 800C41FC 3C0B800F */ lui $t3, %hi(D_800EA1C8) # $t3, 0x800f -/* 0C4E00 800C4200 3C098019 */ lui $t1, %hi(sSoundRequests) # $t1, 0x8019 -/* 0C4E04 800C4204 2529FC20 */ addiu $t1, %lo(sSoundRequests) # addiu $t1, $t1, -0x3e0 -/* 0C4E08 800C4208 256BA1C8 */ addiu $t3, %lo(D_800EA1C8) # addiu $t3, $t3, -0x5e38 -/* 0C4E0C 800C420C C4203648 */ lwc1 $f0, %lo(D_800F3648)($at) -/* 0C4E10 800C4210 240A0018 */ li $t2, 24 -/* 0C4E14 800C4214 3C08F000 */ lui $t0, 0xf000 -.L800C4218: -/* 0C4E18 800C4218 2CA10006 */ sltiu $at, $a1, 6 -/* 0C4E1C 800C421C 1020004C */ beqz $at, .L800C4350 -/* 0C4E20 800C4220 00001825 */ move $v1, $zero -/* 0C4E24 800C4224 0005C080 */ sll $t8, $a1, 2 -/* 0C4E28 800C4228 3C01800F */ lui $at, %hi(jpt_800F364C) -/* 0C4E2C 800C422C 00380821 */ addu $at, $at, $t8 -/* 0C4E30 800C4230 8C38364C */ lw $t8, %lo(jpt_800F364C)($at) -/* 0C4E34 800C4234 03000008 */ jr $t8 -/* 0C4E38 800C4238 00000000 */ nop -glabel L800C423C -/* 0C4E3C 800C423C 004A0019 */ multu $v0, $t2 -/* 0C4E40 800C4240 8CD90024 */ lw $t9, 0x24($a2) -/* 0C4E44 800C4244 03286024 */ and $t4, $t9, $t0 -/* 0C4E48 800C4248 00007012 */ mflo $t6 -/* 0C4E4C 800C424C 012E7821 */ addu $t7, $t1, $t6 -/* 0C4E50 800C4250 8DF80000 */ lw $t8, ($t7) -/* 0C4E54 800C4254 0308C824 */ and $t9, $t8, $t0 -/* 0C4E58 800C4258 1599003D */ bne $t4, $t9, .L800C4350 -/* 0C4E5C 800C425C 00000000 */ nop -/* 0C4E60 800C4260 1000003B */ b .L800C4350 -/* 0C4E64 800C4264 24030001 */ li $v1, 1 -glabel L800C4268 -/* 0C4E68 800C4268 004A0019 */ multu $v0, $t2 -/* 0C4E6C 800C426C 8CCF0024 */ lw $t7, 0x24($a2) -/* 0C4E70 800C4270 01E8C024 */ and $t8, $t7, $t0 -/* 0C4E74 800C4274 00007012 */ mflo $t6 -/* 0C4E78 800C4278 012E2021 */ addu $a0, $t1, $t6 -/* 0C4E7C 800C427C 8C8C0000 */ lw $t4, ($a0) -/* 0C4E80 800C4280 0188C824 */ and $t9, $t4, $t0 -/* 0C4E84 800C4284 17190032 */ bne $t8, $t9, .L800C4350 -/* 0C4E88 800C4288 00000000 */ nop -/* 0C4E8C 800C428C 8CCE0000 */ lw $t6, ($a2) -/* 0C4E90 800C4290 8C8F0004 */ lw $t7, 4($a0) -/* 0C4E94 800C4294 15CF002E */ bne $t6, $t7, .L800C4350 -/* 0C4E98 800C4298 00000000 */ nop -/* 0C4E9C 800C429C 1000002C */ b .L800C4350 -/* 0C4EA0 800C42A0 24030001 */ li $v1, 1 -glabel L800C42A4 -/* 0C4EA4 800C42A4 004A0019 */ multu $v0, $t2 -/* 0C4EA8 800C42A8 8CCC0000 */ lw $t4, ($a2) -/* 0C4EAC 800C42AC 0000C012 */ mflo $t8 -/* 0C4EB0 800C42B0 0138C821 */ addu $t9, $t1, $t8 -/* 0C4EB4 800C42B4 8F2E0004 */ lw $t6, 4($t9) -/* 0C4EB8 800C42B8 158E0025 */ bne $t4, $t6, .L800C4350 -/* 0C4EBC 800C42BC 00000000 */ nop -/* 0C4EC0 800C42C0 10000023 */ b .L800C4350 -/* 0C4EC4 800C42C4 24030001 */ li $v1, 1 -glabel L800C42C8 -/* 0C4EC8 800C42C8 004A0019 */ multu $v0, $t2 -/* 0C4ECC 800C42CC 8CD80000 */ lw $t8, ($a2) -/* 0C4ED0 800C42D0 00007812 */ mflo $t7 -/* 0C4ED4 800C42D4 012F2021 */ addu $a0, $t1, $t7 -/* 0C4ED8 800C42D8 8C990004 */ lw $t9, 4($a0) -/* 0C4EDC 800C42DC 1719001C */ bne $t8, $t9, .L800C4350 -/* 0C4EE0 800C42E0 00000000 */ nop -/* 0C4EE4 800C42E4 8CCC0024 */ lw $t4, 0x24($a2) -/* 0C4EE8 800C42E8 8C8E0000 */ lw $t6, ($a0) -/* 0C4EEC 800C42EC 158E0018 */ bne $t4, $t6, .L800C4350 -/* 0C4EF0 800C42F0 00000000 */ nop -/* 0C4EF4 800C42F4 10000016 */ b .L800C4350 -/* 0C4EF8 800C42F8 24030001 */ li $v1, 1 -glabel L800C42FC -/* 0C4EFC 800C42FC 004A0019 */ multu $v0, $t2 -/* 0C4F00 800C4300 90D8000C */ lbu $t8, 0xc($a2) -/* 0C4F04 800C4304 00007812 */ mflo $t7 -/* 0C4F08 800C4308 012F2021 */ addu $a0, $t1, $t7 -/* 0C4F0C 800C430C 90990008 */ lbu $t9, 8($a0) -/* 0C4F10 800C4310 1719000F */ bne $t8, $t9, .L800C4350 -/* 0C4F14 800C4314 00000000 */ nop -/* 0C4F18 800C4318 8CCC0024 */ lw $t4, 0x24($a2) -/* 0C4F1C 800C431C 8C8E0000 */ lw $t6, ($a0) -/* 0C4F20 800C4320 158E000B */ bne $t4, $t6, .L800C4350 -/* 0C4F24 800C4324 00000000 */ nop -/* 0C4F28 800C4328 10000009 */ b .L800C4350 -/* 0C4F2C 800C432C 24030001 */ li $v1, 1 -glabel L800C4330 -/* 0C4F30 800C4330 004A0019 */ multu $v0, $t2 -/* 0C4F34 800C4334 8CCF0024 */ lw $t7, 0x24($a2) -/* 0C4F38 800C4338 0000C012 */ mflo $t8 -/* 0C4F3C 800C433C 0138C821 */ addu $t9, $t1, $t8 -/* 0C4F40 800C4340 8F2C0000 */ lw $t4, ($t9) -/* 0C4F44 800C4344 15EC0002 */ bne $t7, $t4, .L800C4350 -/* 0C4F48 800C4348 00000000 */ nop -/* 0C4F4C 800C434C 24030001 */ li $v1, 1 -.L800C4350: -/* 0C4F50 800C4350 5060000A */ beql $v1, $zero, .L800C437C -/* 0C4F54 800C4354 90F90000 */ lbu $t9, ($a3) -/* 0C4F58 800C4358 004A0019 */ multu $v0, $t2 -/* 0C4F5C 800C435C 00007012 */ mflo $t6 -/* 0C4F60 800C4360 012E2021 */ addu $a0, $t1, $t6 -/* 0C4F64 800C4364 8C830004 */ lw $v1, 4($a0) -/* 0C4F68 800C4368 AC800000 */ sw $zero, ($a0) -/* 0C4F6C 800C436C 51630003 */ beql $t3, $v1, .L800C437C -/* 0C4F70 800C4370 90F90000 */ lbu $t9, ($a3) -/* 0C4F74 800C4374 E4600004 */ swc1 $f0, 4($v1) -/* 0C4F78 800C4378 90F90000 */ lbu $t9, ($a3) -.L800C437C: -/* 0C4F7C 800C437C 24420001 */ addiu $v0, $v0, 1 -/* 0C4F80 800C4380 305800FF */ andi $t8, $v0, 0xff -/* 0C4F84 800C4384 1738FFA4 */ bne $t9, $t8, .L800C4218 -/* 0C4F88 800C4388 03001025 */ move $v0, $t8 -.L800C438C: -/* 0C4F8C 800C438C 01A0E825 */ move $sp, $t5 -/* 0C4F90 800C4390 03E00008 */ jr $ra -/* 0C4F94 800C4394 25BD0010 */ addiu $sp, $t5, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C5D04.s b/asm/non_matchings/audio/external/func_800C5D04.s deleted file mode 100644 index 946556ab8..000000000 --- a/asm/non_matchings/audio/external/func_800C5D04.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_800C5D04 -/* 0C6904 800C5D04 308500FF */ andi $a1, $a0, 0xff -/* 0C6908 800C5D08 000570C0 */ sll $t6, $a1, 3 -/* 0C690C 800C5D0C 01C57023 */ subu $t6, $t6, $a1 -/* 0C6910 800C5D10 000E7100 */ sll $t6, $t6, 4 -/* 0C6914 800C5D14 01C57023 */ subu $t6, $t6, $a1 -/* 0C6918 800C5D18 000E7080 */ sll $t6, $t6, 2 -/* 0C691C 800C5D1C 01C57023 */ subu $t6, $t6, $a1 -/* 0C6920 800C5D20 000E70C0 */ sll $t6, $t6, 3 -/* 0C6924 800C5D24 3C0F800F */ lui $t7, %hi(gPlayers+0x44) -/* 0C6928 800C5D28 01EE7821 */ addu $t7, $t7, $t6 -/* 0C692C 800C5D2C 85EF69D4 */ lh $t7, %lo(gPlayers+0x44)($t7) -/* 0C6930 800C5D30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0C6934 800C5D34 AFBE0028 */ sw $fp, 0x28($sp) -/* 0C6938 800C5D38 24010020 */ li $at, 32 -/* 0C693C 800C5D3C 31F80020 */ andi $t8, $t7, 0x20 -/* 0C6940 800C5D40 03A0F025 */ move $fp, $sp -/* 0C6944 800C5D44 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C6948 800C5D48 17010025 */ bne $t8, $at, .L800C5DE0 -/* 0C694C 800C5D4C AFA40030 */ sw $a0, 0x30($sp) -/* 0C6950 800C5D50 00051080 */ sll $v0, $a1, 2 -/* 0C6954 800C5D54 3C01800F */ lui $at, %hi(D_800E9E34) -/* 0C6958 800C5D58 3C19800F */ lui $t9, %hi(D_800E9E24) # $t9, 0x800f -/* 0C695C 800C5D5C 00220821 */ addu $at, $at, $v0 -/* 0C6960 800C5D60 27399E24 */ addiu $t9, %lo(D_800E9E24) # addiu $t9, $t9, -0x61dc -/* 0C6964 800C5D64 AC209E34 */ sw $zero, %lo(D_800E9E34)($at) -/* 0C6968 800C5D68 00592021 */ addu $a0, $v0, $t9 -/* 0C696C 800C5D6C 8C830000 */ lw $v1, ($a0) -/* 0C6970 800C5D70 3C0A800F */ lui $t2, %hi(D_800EA0EC) # $t2, 0x800f -/* 0C6974 800C5D74 3C08800F */ lui $t0, %hi(D_800EA16C) # $t0, 0x800f -/* 0C6978 800C5D78 28614E20 */ slti $at, $v1, 0x4e20 -/* 0C697C 800C5D7C 10200007 */ beqz $at, .L800C5D9C -/* 0C6980 800C5D80 254AA0EC */ addiu $t2, %lo(D_800EA0EC) # addiu $t2, $t2, -0x5f14 -/* 0C6984 800C5D84 9108A16C */ lbu $t0, %lo(D_800EA16C)($t0) -/* 0C6988 800C5D88 24690001 */ addiu $t1, $v1, 1 -/* 0C698C 800C5D8C 55000004 */ bnel $t0, $zero, .L800C5DA0 -/* 0C6990 800C5D90 24010001 */ li $at, 1 -/* 0C6994 800C5D94 AC890000 */ sw $t1, ($a0) -/* 0C6998 800C5D98 01201825 */ move $v1, $t1 -.L800C5D9C: -/* 0C699C 800C5D9C 24010001 */ li $at, 1 -.L800C5DA0: -/* 0C69A0 800C5DA0 14610020 */ bne $v1, $at, .L800C5E24 -/* 0C69A4 800C5DA4 00AA1821 */ addu $v1, $a1, $t2 -/* 0C69A8 800C5DA8 90620000 */ lbu $v0, ($v1) -/* 0C69AC 800C5DAC 24010002 */ li $at, 2 -/* 0C69B0 800C5DB0 30A400FF */ andi $a0, $a1, 0xff -/* 0C69B4 800C5DB4 10400004 */ beqz $v0, .L800C5DC8 -/* 0C69B8 800C5DB8 00000000 */ nop -/* 0C69BC 800C5DBC 14410019 */ bne $v0, $at, .L800C5E24 -/* 0C69C0 800C5DC0 240B0001 */ li $t3, 1 -/* 0C69C4 800C5DC4 A06B0000 */ sb $t3, ($v1) -.L800C5DC8: -/* 0C69C8 800C5DC8 0C0325F1 */ jal func_800C97C4 -/* 0C69CC 800C5DCC A3C50033 */ sb $a1, 0x33($fp) -/* 0C69D0 800C5DD0 0C032529 */ jal func_800C94A4 -/* 0C69D4 800C5DD4 93C40033 */ lbu $a0, 0x33($fp) -/* 0C69D8 800C5DD8 10000013 */ b .L800C5E28 -/* 0C69DC 800C5DDC 8FDF002C */ lw $ra, 0x2c($fp) -.L800C5DE0: -/* 0C69E0 800C5DE0 00051080 */ sll $v0, $a1, 2 -/* 0C69E4 800C5DE4 3C01800F */ lui $at, %hi(D_800E9E24) -/* 0C69E8 800C5DE8 3C0C800F */ lui $t4, %hi(D_800E9E34) # $t4, 0x800f -/* 0C69EC 800C5DEC 00220821 */ addu $at, $at, $v0 -/* 0C69F0 800C5DF0 258C9E34 */ addiu $t4, %lo(D_800E9E34) # addiu $t4, $t4, -0x61cc -/* 0C69F4 800C5DF4 AC209E24 */ sw $zero, %lo(D_800E9E24)($at) -/* 0C69F8 800C5DF8 004C1821 */ addu $v1, $v0, $t4 -/* 0C69FC 800C5DFC 8C640000 */ lw $a0, ($v1) -/* 0C6A00 800C5E00 3C0D800F */ lui $t5, %hi(D_800EA16C) # $t5, 0x800f -/* 0C6A04 800C5E04 28814E20 */ slti $at, $a0, 0x4e20 -/* 0C6A08 800C5E08 50200007 */ beql $at, $zero, .L800C5E28 -/* 0C6A0C 800C5E0C 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C6A10 800C5E10 91ADA16C */ lbu $t5, %lo(D_800EA16C)($t5) -/* 0C6A14 800C5E14 248E0001 */ addiu $t6, $a0, 1 -/* 0C6A18 800C5E18 55A00003 */ bnel $t5, $zero, .L800C5E28 -/* 0C6A1C 800C5E1C 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C6A20 800C5E20 AC6E0000 */ sw $t6, ($v1) -.L800C5E24: -/* 0C6A24 800C5E24 8FDF002C */ lw $ra, 0x2c($fp) -.L800C5E28: -/* 0C6A28 800C5E28 03C0E825 */ move $sp, $fp -/* 0C6A2C 800C5E2C 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C6A30 800C5E30 03E00008 */ jr $ra -/* 0C6A34 800C5E34 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/audio/external/func_800C5E38.s b/asm/non_matchings/audio/external/func_800C5E38.s deleted file mode 100644 index dbdc8348a..000000000 --- a/asm/non_matchings/audio/external/func_800C5E38.s +++ /dev/null @@ -1,197 +0,0 @@ -.section .late_rodata - -glabel D_800F3674 -.float 0.6 - -.section .text - -glabel func_800C5E38 -/* 0C6A38 800C5E38 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0C6A3C 800C5E3C 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0C6A40 800C5E40 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0C6A44 800C5E44 AFBE0030 */ sw $fp, 0x30($sp) -/* 0C6A48 800C5E48 03A0F025 */ move $fp, $sp -/* 0C6A4C 800C5E4C AFBF0034 */ sw $ra, 0x34($sp) -/* 0C6A50 800C5E50 AFA40048 */ sw $a0, 0x48($sp) -/* 0C6A54 800C5E54 15C000A7 */ bnez $t6, .L800C60F4 -/* 0C6A58 800C5E58 308600FF */ andi $a2, $a0, 0xff -/* 0C6A5C 800C5E5C 000678C0 */ sll $t7, $a2, 3 -/* 0C6A60 800C5E60 01E67823 */ subu $t7, $t7, $a2 -/* 0C6A64 800C5E64 000F7900 */ sll $t7, $t7, 4 -/* 0C6A68 800C5E68 01E67823 */ subu $t7, $t7, $a2 -/* 0C6A6C 800C5E6C 000F7880 */ sll $t7, $t7, 2 -/* 0C6A70 800C5E70 01E67823 */ subu $t7, $t7, $a2 -/* 0C6A74 800C5E74 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f -/* 0C6A78 800C5E78 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 -/* 0C6A7C 800C5E7C 000F78C0 */ sll $t7, $t7, 3 -/* 0C6A80 800C5E80 01F83821 */ addu $a3, $t7, $t8 -/* 0C6A84 800C5E84 84F90044 */ lh $t9, 0x44($a3) -/* 0C6A88 800C5E88 24010020 */ li $at, 32 -/* 0C6A8C 800C5E8C 00061080 */ sll $v0, $a2, 2 -/* 0C6A90 800C5E90 33290020 */ andi $t1, $t9, 0x20 -/* 0C6A94 800C5E94 1121005C */ beq $t1, $at, .L800C6008 -/* 0C6A98 800C5E98 3C19800F */ lui $t9, %hi(D_800E9E24) -/* 0C6A9C 800C5E9C 3C0143C8 */ li $at, 0x43C80000 # 400.000000 -/* 0C6AA0 800C5EA0 44812000 */ mtc1 $at, $f4 -/* 0C6AA4 800C5EA4 C4E60098 */ lwc1 $f6, 0x98($a3) -/* 0C6AA8 800C5EA8 3C0A800F */ lui $t2, %hi(D_800EA0EC) # $t2, 0x800f -/* 0C6AAC 800C5EAC 254AA0EC */ addiu $t2, %lo(D_800EA0EC) # addiu $t2, $t2, -0x5f14 -/* 0C6AB0 800C5EB0 4606203C */ c.lt.s $f4, $f6 -/* 0C6AB4 800C5EB4 24040001 */ li $a0, 1 -/* 0C6AB8 800C5EB8 3C01800F */ lui $at, %hi(D_800E9E14) -/* 0C6ABC 800C5EBC 00CA4021 */ addu $t0, $a2, $t2 -/* 0C6AC0 800C5EC0 45000051 */ bc1f .L800C6008 -/* 0C6AC4 800C5EC4 00066100 */ sll $t4, $a2, 4 -/* 0C6AC8 800C5EC8 00061080 */ sll $v0, $a2, 2 -/* 0C6ACC 800C5ECC 00220821 */ addu $at, $at, $v0 -/* 0C6AD0 800C5ED0 AC249E14 */ sw $a0, %lo(D_800E9E14)($at) -/* 0C6AD4 800C5ED4 91030000 */ lbu $v1, ($t0) -/* 0C6AD8 800C5ED8 01866023 */ subu $t4, $t4, $a2 -/* 0C6ADC 800C5EDC 000C6080 */ sll $t4, $t4, 2 -/* 0C6AE0 800C5EE0 1460000D */ bnez $v1, .L800C5F18 -/* 0C6AE4 800C5EE4 3C0D800F */ lui $t5, %hi(D_800E9F7C) # $t5, 0x800f -/* 0C6AE8 800C5EE8 3C01800F */ lui $at, %hi(D_800F3674) # $at, 0x800f -/* 0C6AEC 800C5EEC C4283674 */ lwc1 $f8, %lo(D_800F3674)($at) -/* 0C6AF0 800C5EF0 3C01800F */ lui $at, %hi(D_800E9F54) -/* 0C6AF4 800C5EF4 00220821 */ addu $at, $at, $v0 -/* 0C6AF8 800C5EF8 C42A9F54 */ lwc1 $f10, %lo(D_800E9F54)($at) -/* 0C6AFC 800C5EFC 00065900 */ sll $t3, $a2, 4 -/* 0C6B00 800C5F00 01665823 */ subu $t3, $t3, $a2 -/* 0C6B04 800C5F04 460A4401 */ sub.s $f16, $f8, $f10 -/* 0C6B08 800C5F08 000B5880 */ sll $t3, $t3, 2 -/* 0C6B0C 800C5F0C 3C01800F */ lui $at, %hi(D_800E9F8C) -/* 0C6B10 800C5F10 002B0821 */ addu $at, $at, $t3 -/* 0C6B14 800C5F14 E4309F8C */ swc1 $f16, %lo(D_800E9F8C)($at) -.L800C5F18: -/* 0C6B18 800C5F18 25AD9F7C */ addiu $t5, %lo(D_800E9F7C) # addiu $t5, $t5, -0x6084 -/* 0C6B1C 800C5F1C 018D2821 */ addu $a1, $t4, $t5 -/* 0C6B20 800C5F20 C4B20030 */ lwc1 $f18, 0x30($a1) -/* 0C6B24 800C5F24 3C01800F */ lui $at, %hi(D_800E9DC4) -/* 0C6B28 800C5F28 00220821 */ addu $at, $at, $v0 -/* 0C6B2C 800C5F2C 3C0E800F */ lui $t6, %hi(D_800E9E34) -/* 0C6B30 800C5F30 01C27021 */ addu $t6, $t6, $v0 -/* 0C6B34 800C5F34 E4329DC4 */ swc1 $f18, %lo(D_800E9DC4)($at) -/* 0C6B38 800C5F38 8DCE9E34 */ lw $t6, %lo(D_800E9E34)($t6) -/* 0C6B3C 800C5F3C C4A40024 */ lwc1 $f4, 0x24($a1) -/* 0C6B40 800C5F40 3C01800F */ lui $at, %hi(D_800E9DD4) -/* 0C6B44 800C5F44 00220821 */ addu $at, $at, $v0 -/* 0C6B48 800C5F48 148E006A */ bne $a0, $t6, .L800C60F4 -/* 0C6B4C 800C5F4C E4249DD4 */ swc1 $f4, %lo(D_800E9DD4)($at) -/* 0C6B50 800C5F50 3C0F800F */ lui $t7, %hi(D_800EA16C) # $t7, 0x800f -/* 0C6B54 800C5F54 91EFA16C */ lbu $t7, %lo(D_800EA16C)($t7) -/* 0C6B58 800C5F58 55E00067 */ bnel $t7, $zero, .L800C60F8 -/* 0C6B5C 800C5F5C 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C6B60 800C5F60 10600004 */ beqz $v1, .L800C5F74 -/* 0C6B64 800C5F64 24010002 */ li $at, 2 -/* 0C6B68 800C5F68 14610062 */ bne $v1, $at, .L800C60F4 -/* 0C6B6C 800C5F6C 24180001 */ li $t8, 1 -/* 0C6B70 800C5F70 A1180000 */ sb $t8, ($t0) -.L800C5F74: -/* 0C6B74 800C5F74 3C19800F */ lui $t9, %hi(D_800E9F74) -/* 0C6B78 800C5F78 0326C821 */ addu $t9, $t9, $a2 -/* 0C6B7C 800C5F7C 93399F74 */ lbu $t9, %lo(D_800E9F74)($t9) -/* 0C6B80 800C5F80 5720005D */ bnel $t9, $zero, .L800C60F8 -/* 0C6B84 800C5F84 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C6B88 800C5F88 94E90254 */ lhu $t1, 0x254($a3) -/* 0C6B8C 800C5F8C 24010003 */ li $at, 3 -/* 0C6B90 800C5F90 3C0A800F */ lui $t2, %hi(D_800EA1C0) # $t2, 0x800f -/* 0C6B94 800C5F94 51210058 */ beql $t1, $at, .L800C60F8 -/* 0C6B98 800C5F98 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C6B9C 800C5F9C 914AA1C0 */ lbu $t2, %lo(D_800EA1C0)($t2) -/* 0C6BA0 800C5FA0 3C040100 */ lui $a0, (0x01008026 >> 16) # lui $a0, 0x100 -/* 0C6BA4 800C5FA4 34848026 */ ori $a0, (0x01008026 & 0xFFFF) # ori $a0, $a0, 0x8026 -/* 0C6BA8 800C5FA8 29410002 */ slti $at, $t2, 2 -/* 0C6BAC 800C5FAC 1020000D */ beqz $at, .L800C5FE4 -/* 0C6BB0 800C5FB0 24A70038 */ addiu $a3, $a1, 0x38 -/* 0C6BB4 800C5FB4 3C0B800F */ lui $t3, %hi(D_800E9F04) # $t3, 0x800f -/* 0C6BB8 800C5FB8 256B9F04 */ addiu $t3, %lo(D_800E9F04) # addiu $t3, $t3, -0x60fc -/* 0C6BBC 800C5FBC 004B6021 */ addu $t4, $v0, $t3 -/* 0C6BC0 800C5FC0 3C040100 */ lui $a0, (0x0100F926 >> 16) # lui $a0, 0x100 -/* 0C6BC4 800C5FC4 24AD0014 */ addiu $t5, $a1, 0x14 -/* 0C6BC8 800C5FC8 AFAD0014 */ sw $t5, 0x14($sp) -/* 0C6BCC 800C5FCC 3484F926 */ ori $a0, (0x0100F926 & 0xFFFF) # ori $a0, $a0, 0xf926 -/* 0C6BD0 800C5FD0 AFAC0010 */ sw $t4, 0x10($sp) -/* 0C6BD4 800C5FD4 0C031052 */ jal play_sound -/* 0C6BD8 800C5FD8 24A70038 */ addiu $a3, $a1, 0x38 -/* 0C6BDC 800C5FDC 10000046 */ b .L800C60F8 -/* 0C6BE0 800C5FE0 8FDF0034 */ lw $ra, 0x34($fp) -.L800C5FE4: -/* 0C6BE4 800C5FE4 3C0E800F */ lui $t6, %hi(D_800E9F04) # $t6, 0x800f -/* 0C6BE8 800C5FE8 25CE9F04 */ addiu $t6, %lo(D_800E9F04) # addiu $t6, $t6, -0x60fc -/* 0C6BEC 800C5FEC 004E7821 */ addu $t7, $v0, $t6 -/* 0C6BF0 800C5FF0 24B80014 */ addiu $t8, $a1, 0x14 -/* 0C6BF4 800C5FF4 AFB80014 */ sw $t8, 0x14($sp) -/* 0C6BF8 800C5FF8 0C031052 */ jal play_sound -/* 0C6BFC 800C5FFC AFAF0010 */ sw $t7, 0x10($sp) -/* 0C6C00 800C6000 1000003D */ b .L800C60F8 -/* 0C6C04 800C6004 8FDF0034 */ lw $ra, 0x34($fp) -.L800C6008: -/* 0C6C08 800C6008 0322C821 */ addu $t9, $t9, $v0 -/* 0C6C0C 800C600C 8F399E24 */ lw $t9, %lo(D_800E9E24)($t9) -/* 0C6C10 800C6010 2401000A */ li $at, 10 -/* 0C6C14 800C6014 3C09800F */ lui $t1, %hi(D_800EA1C0) # $t1, 0x800f -/* 0C6C18 800C6018 17210015 */ bne $t9, $at, .L800C6070 -/* 0C6C1C 800C601C 00000000 */ nop -/* 0C6C20 800C6020 9129A1C0 */ lbu $t1, %lo(D_800EA1C0)($t1) -/* 0C6C24 800C6024 3C050100 */ lui $a1, (0x01008026 >> 16) # lui $a1, 0x100 -/* 0C6C28 800C6028 34A58026 */ ori $a1, (0x01008026 & 0xFFFF) # ori $a1, $a1, 0x8026 -/* 0C6C2C 800C602C 29210002 */ slti $at, $t1, 2 -/* 0C6C30 800C6030 1020000A */ beqz $at, .L800C605C -/* 0C6C34 800C6034 30C400FF */ andi $a0, $a2, 0xff -/* 0C6C38 800C6038 3C050100 */ lui $a1, (0x0100F926 >> 16) # lui $a1, 0x100 -/* 0C6C3C 800C603C 34A5F926 */ ori $a1, (0x0100F926 & 0xFFFF) # ori $a1, $a1, 0xf926 -/* 0C6C40 800C6040 30C400FF */ andi $a0, $a2, 0xff -/* 0C6C44 800C6044 AFC2003C */ sw $v0, 0x3c($fp) -/* 0C6C48 800C6048 0C032406 */ jal func_800C9018 -/* 0C6C4C 800C604C A3C6004B */ sb $a2, 0x4b($fp) -/* 0C6C50 800C6050 8FC2003C */ lw $v0, 0x3c($fp) -/* 0C6C54 800C6054 10000006 */ b .L800C6070 -/* 0C6C58 800C6058 93C6004B */ lbu $a2, 0x4b($fp) -.L800C605C: -/* 0C6C5C 800C605C AFC2003C */ sw $v0, 0x3c($fp) -/* 0C6C60 800C6060 0C032406 */ jal func_800C9018 -/* 0C6C64 800C6064 A3C6004B */ sb $a2, 0x4b($fp) -/* 0C6C68 800C6068 8FC2003C */ lw $v0, 0x3c($fp) -/* 0C6C6C 800C606C 93C6004B */ lbu $a2, 0x4b($fp) -.L800C6070: -/* 0C6C70 800C6070 3C01800F */ lui $at, %hi(D_800E9E14) -/* 0C6C74 800C6074 00220821 */ addu $at, $at, $v0 -/* 0C6C78 800C6078 AC209E14 */ sw $zero, %lo(D_800E9E14)($at) -/* 0C6C7C 800C607C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C6C80 800C6080 44813000 */ mtc1 $at, $f6 -/* 0C6C84 800C6084 3C01800F */ lui $at, %hi(D_800E9F54) -/* 0C6C88 800C6088 00220821 */ addu $at, $at, $v0 -/* 0C6C8C 800C608C C4289F54 */ lwc1 $f8, %lo(D_800E9F54)($at) -/* 0C6C90 800C6090 3C01800F */ lui $at, %hi(D_800EA130) -/* 0C6C94 800C6094 00220821 */ addu $at, $at, $v0 -/* 0C6C98 800C6098 46083001 */ sub.s $f0, $f6, $f8 -/* 0C6C9C 800C609C C422A130 */ lwc1 $f2, %lo(D_800EA130)($at) -/* 0C6CA0 800C60A0 00065100 */ sll $t2, $a2, 4 -/* 0C6CA4 800C60A4 01465023 */ subu $t2, $t2, $a2 -/* 0C6CA8 800C60A8 4602003C */ c.lt.s $f0, $f2 -/* 0C6CAC 800C60AC 3C0B800F */ lui $t3, %hi(D_800E9F7C) # $t3, 0x800f -/* 0C6CB0 800C60B0 46020281 */ sub.s $f10, $f0, $f2 -/* 0C6CB4 800C60B4 256B9F7C */ addiu $t3, %lo(D_800E9F7C) # addiu $t3, $t3, -0x6084 -/* 0C6CB8 800C60B8 000A5080 */ sll $t2, $t2, 2 -/* 0C6CBC 800C60BC 014B2821 */ addu $a1, $t2, $t3 -/* 0C6CC0 800C60C0 45000004 */ bc1f .L800C60D4 -/* 0C6CC4 800C60C4 E4AA0010 */ swc1 $f10, 0x10($a1) -/* 0C6CC8 800C60C8 44808000 */ mtc1 $zero, $f16 -/* 0C6CCC 800C60CC 00000000 */ nop -/* 0C6CD0 800C60D0 E4B00010 */ swc1 $f16, 0x10($a1) -.L800C60D4: -/* 0C6CD4 800C60D4 C4B2002C */ lwc1 $f18, 0x2c($a1) -/* 0C6CD8 800C60D8 3C01800F */ lui $at, %hi(D_800E9DC4) -/* 0C6CDC 800C60DC 00220821 */ addu $at, $at, $v0 -/* 0C6CE0 800C60E0 E4329DC4 */ swc1 $f18, %lo(D_800E9DC4)($at) -/* 0C6CE4 800C60E4 C4A40020 */ lwc1 $f4, 0x20($a1) -/* 0C6CE8 800C60E8 3C01800F */ lui $at, %hi(D_800E9DD4) -/* 0C6CEC 800C60EC 00220821 */ addu $at, $at, $v0 -/* 0C6CF0 800C60F0 E4249DD4 */ swc1 $f4, %lo(D_800E9DD4)($at) -.L800C60F4: -/* 0C6CF4 800C60F4 8FDF0034 */ lw $ra, 0x34($fp) -.L800C60F8: -/* 0C6CF8 800C60F8 03C0E825 */ move $sp, $fp -/* 0C6CFC 800C60FC 8FDE0030 */ lw $fp, 0x30($fp) -/* 0C6D00 800C6100 03E00008 */ jr $ra -/* 0C6D04 800C6104 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/audio/external/func_800C6108.s b/asm/non_matchings/audio/external/func_800C6108.s deleted file mode 100644 index 43a6592b9..000000000 --- a/asm/non_matchings/audio/external/func_800C6108.s +++ /dev/null @@ -1,272 +0,0 @@ -.section .late_rodata - -glabel D_800F3678 -.float 0.4 - -glabel D_800F367C -.float 0.005000 - -glabel D_800F3680 -.float 0.01 - -glabel D_800F3684 -.float 12000.0 - -glabel D_800F3688 -.float 0.03 - -glabel D_800F368C -.float 0.03 - -glabel D_800F3690 -.float 0.4 - -.section .text - -glabel func_800C6108 -/* 0C6D08 800C6108 308600FF */ andi $a2, $a0, 0xff -/* 0C6D0C 800C610C 000678C0 */ sll $t7, $a2, 3 -/* 0C6D10 800C6110 01E67823 */ subu $t7, $t7, $a2 -/* 0C6D14 800C6114 000F7900 */ sll $t7, $t7, 4 -/* 0C6D18 800C6118 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C6D1C 800C611C 01E67823 */ subu $t7, $t7, $a2 -/* 0C6D20 800C6120 00061080 */ sll $v0, $a2, 2 -/* 0C6D24 800C6124 3C01800F */ lui $at, %hi(D_800E9DD4) -/* 0C6D28 800C6128 ADA40010 */ sw $a0, 0x10($t5) -/* 0C6D2C 800C612C 00220821 */ addu $at, $at, $v0 -/* 0C6D30 800C6130 000F7880 */ sll $t7, $t7, 2 -/* 0C6D34 800C6134 C4249DD4 */ lwc1 $f4, %lo(D_800E9DD4)($at) -/* 0C6D38 800C6138 01E67823 */ subu $t7, $t7, $a2 -/* 0C6D3C 800C613C 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f -/* 0C6D40 800C6140 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 -/* 0C6D44 800C6144 000F78C0 */ sll $t7, $t7, 3 -/* 0C6D48 800C6148 3C01800F */ lui $at, %hi(D_800E9DC4) -/* 0C6D4C 800C614C 00220821 */ addu $at, $at, $v0 -/* 0C6D50 800C6150 01F81821 */ addu $v1, $t7, $t8 -/* 0C6D54 800C6154 C4600098 */ lwc1 $f0, 0x98($v1) -/* 0C6D58 800C6158 C4269DC4 */ lwc1 $f6, %lo(D_800E9DC4)($at) -/* 0C6D5C 800C615C 3C0144E1 */ li $at, 0x44E10000 # 1800.000000 -/* 0C6D60 800C6160 44818000 */ mtc1 $at, $f16 -/* 0C6D64 800C6164 46060203 */ div.s $f8, $f0, $f6 -/* 0C6D68 800C6168 3C0E800F */ lui $t6, %hi(D_800E9E64) # $t6, 0x800f -/* 0C6D6C 800C616C 25CE9E64 */ addiu $t6, %lo(D_800E9E64) # addiu $t6, $t6, -0x619c -/* 0C6D70 800C6170 004E3821 */ addu $a3, $v0, $t6 -/* 0C6D74 800C6174 4610003C */ c.lt.s $f0, $f16 -/* 0C6D78 800C6178 46082280 */ add.s $f10, $f4, $f8 -/* 0C6D7C 800C617C 45000010 */ bc1f .L800C61C0 -/* 0C6D80 800C6180 E4EA0000 */ swc1 $f10, ($a3) -/* 0C6D84 800C6184 84790044 */ lh $t9, 0x44($v1) -/* 0C6D88 800C6188 24010020 */ li $at, 32 -/* 0C6D8C 800C618C 00066100 */ sll $t4, $a2, 4 -/* 0C6D90 800C6190 332B0020 */ andi $t3, $t9, 0x20 -/* 0C6D94 800C6194 1161000A */ beq $t3, $at, .L800C61C0 -/* 0C6D98 800C6198 01866023 */ subu $t4, $t4, $a2 -/* 0C6D9C 800C619C 3C0E800F */ lui $t6, %hi(D_800E9F7C) # $t6, 0x800f -/* 0C6DA0 800C61A0 25CE9F7C */ addiu $t6, %lo(D_800E9F7C) # addiu $t6, $t6, -0x6084 -/* 0C6DA4 800C61A4 000C6080 */ sll $t4, $t4, 2 -/* 0C6DA8 800C61A8 018E2821 */ addu $a1, $t4, $t6 -/* 0C6DAC 800C61AC C4A60034 */ lwc1 $f6, 0x34($a1) -/* 0C6DB0 800C61B0 C4B20028 */ lwc1 $f18, 0x28($a1) -/* 0C6DB4 800C61B4 46060103 */ div.s $f4, $f0, $f6 -/* 0C6DB8 800C61B8 46049200 */ add.s $f8, $f18, $f4 -/* 0C6DBC 800C61BC E4E80000 */ swc1 $f8, ($a3) -.L800C61C0: -/* 0C6DC0 800C61C0 3C014098 */ li $at, 0x40980000 # 4.750000 -/* 0C6DC4 800C61C4 44815000 */ mtc1 $at, $f10 -/* 0C6DC8 800C61C8 C4700094 */ lwc1 $f16, 0x94($v1) -/* 0C6DCC 800C61CC 00067900 */ sll $t7, $a2, 4 -/* 0C6DD0 800C61D0 01E67823 */ subu $t7, $t7, $a2 -/* 0C6DD4 800C61D4 4610503C */ c.lt.s $f10, $f16 -/* 0C6DD8 800C61D8 3C18800F */ lui $t8, %hi(D_800E9F7C) # $t8, 0x800f -/* 0C6DDC 800C61DC 27189F7C */ addiu $t8, %lo(D_800E9F7C) # addiu $t8, $t8, -0x6084 -/* 0C6DE0 800C61E0 000F7880 */ sll $t7, $t7, 2 -/* 0C6DE4 800C61E4 45000017 */ bc1f .L800C6244 -/* 0C6DE8 800C61E8 01F82821 */ addu $a1, $t7, $t8 -/* 0C6DEC 800C61EC 3C01800F */ lui $at, %hi(D_800F3678) # $at, 0x800f -/* 0C6DF0 800C61F0 C4243678 */ lwc1 $f4, %lo(D_800F3678)($at) -/* 0C6DF4 800C61F4 C4B20018 */ lwc1 $f18, 0x18($a1) -/* 0C6DF8 800C61F8 3C19800F */ lui $t9, %hi(D_800E9EB4) # $t9, 0x800f -/* 0C6DFC 800C61FC 27399EB4 */ addiu $t9, %lo(D_800E9EB4) # addiu $t9, $t9, -0x614c -/* 0C6E00 800C6200 46049200 */ add.s $f8, $f18, $f4 -/* 0C6E04 800C6204 00592021 */ addu $a0, $v0, $t9 -/* 0C6E08 800C6208 C4860000 */ lwc1 $f6, ($a0) -/* 0C6E0C 800C620C 3C0B800F */ lui $t3, %hi(D_800E9DE4) # $t3, 0x800f -/* 0C6E10 800C6210 256B9DE4 */ addiu $t3, %lo(D_800E9DE4) # addiu $t3, $t3, -0x621c -/* 0C6E14 800C6214 4608303C */ c.lt.s $f6, $f8 -/* 0C6E18 800C6218 3C0C800F */ lui $t4, %hi(D_800E9DE4) # $t4, 0x800f -/* 0C6E1C 800C621C 258C9DE4 */ addiu $t4, %lo(D_800E9DE4) # addiu $t4, $t4, -0x621c -/* 0C6E20 800C6220 004B4021 */ addu $t0, $v0, $t3 -/* 0C6E24 800C6224 45000005 */ bc1f .L800C623C -/* 0C6E28 800C6228 3C01800F */ lui $at, %hi(D_800F367C) # $at, 0x800f -/* 0C6E2C 800C622C C50A0000 */ lwc1 $f10, ($t0) -/* 0C6E30 800C6230 C430367C */ lwc1 $f16, %lo(D_800F367C)($at) -/* 0C6E34 800C6234 46105480 */ add.s $f18, $f10, $f16 -/* 0C6E38 800C6238 E5120000 */ swc1 $f18, ($t0) -.L800C623C: -/* 0C6E3C 800C623C 10000009 */ b .L800C6264 -/* 0C6E40 800C6240 004C4021 */ addu $t0, $v0, $t4 -.L800C6244: -/* 0C6E44 800C6244 44802000 */ mtc1 $zero, $f4 -/* 0C6E48 800C6248 3C0E800F */ lui $t6, %hi(D_800E9DE4) # $t6, 0x800f -/* 0C6E4C 800C624C 25CE9DE4 */ addiu $t6, %lo(D_800E9DE4) # addiu $t6, $t6, -0x621c -/* 0C6E50 800C6250 3C0F800F */ lui $t7, %hi(D_800E9EB4) # $t7, 0x800f -/* 0C6E54 800C6254 25EF9EB4 */ addiu $t7, %lo(D_800E9EB4) # addiu $t7, $t7, -0x614c -/* 0C6E58 800C6258 004E4021 */ addu $t0, $v0, $t6 -/* 0C6E5C 800C625C 004F2021 */ addu $a0, $v0, $t7 -/* 0C6E60 800C6260 E5040000 */ swc1 $f4, ($t0) -.L800C6264: -/* 0C6E64 800C6264 846900C0 */ lh $t1, 0xc0($v1) -/* 0C6E68 800C6268 3C0F800F */ lui $t7, %hi(D_800E9F78) -/* 0C6E6C 800C626C 01E67821 */ addu $t7, $t7, $a2 -/* 0C6E70 800C6270 19200008 */ blez $t1, .L800C6294 -/* 0C6E74 800C6274 00095823 */ negu $t3, $t1 -/* 0C6E78 800C6278 44893000 */ mtc1 $t1, $f6 -/* 0C6E7C 800C627C 3C18800F */ lui $t8, %hi(D_800E9E54) # $t8, 0x800f -/* 0C6E80 800C6280 27189E54 */ addiu $t8, %lo(D_800E9E54) # addiu $t8, $t8, -0x61ac -/* 0C6E84 800C6284 46803220 */ cvt.s.w $f8, $f6 -/* 0C6E88 800C6288 00585021 */ addu $t2, $v0, $t8 -/* 0C6E8C 800C628C 10000007 */ b .L800C62AC -/* 0C6E90 800C6290 E5480000 */ swc1 $f8, ($t2) -.L800C6294: -/* 0C6E94 800C6294 448B5000 */ mtc1 $t3, $f10 -/* 0C6E98 800C6298 3C19800F */ lui $t9, %hi(D_800E9E54) # $t9, 0x800f -/* 0C6E9C 800C629C 27399E54 */ addiu $t9, %lo(D_800E9E54) # addiu $t9, $t9, -0x61ac -/* 0C6EA0 800C62A0 46805420 */ cvt.s.w $f16, $f10 -/* 0C6EA4 800C62A4 00595021 */ addu $t2, $v0, $t9 -/* 0C6EA8 800C62A8 E5500000 */ swc1 $f16, ($t2) -.L800C62AC: -/* 0C6EAC 800C62AC 8C6C00BC */ lw $t4, 0xbc($v1) -/* 0C6EB0 800C62B0 24010010 */ li $at, 16 -/* 0C6EB4 800C62B4 3C03800F */ lui $v1, %hi(D_800E9F74) -/* 0C6EB8 800C62B8 318E0010 */ andi $t6, $t4, 0x10 -/* 0C6EBC 800C62BC 15C10006 */ bne $t6, $at, .L800C62D8 -/* 0C6EC0 800C62C0 00661821 */ addu $v1, $v1, $a2 -/* 0C6EC4 800C62C4 C5120000 */ lwc1 $f18, ($t0) -/* 0C6EC8 800C62C8 C4E40000 */ lwc1 $f4, ($a3) -/* 0C6ECC 800C62CC 46049180 */ add.s $f6, $f18, $f4 -/* 0C6ED0 800C62D0 10000010 */ b .L800C6314 -/* 0C6ED4 800C62D4 E4860000 */ swc1 $f6, ($a0) -.L800C62D8: -/* 0C6ED8 800C62D8 3C01800F */ lui $at, %hi(D_800F3680) # $at, 0x800f -/* 0C6EDC 800C62DC C4223680 */ lwc1 $f2, %lo(D_800F3680)($at) -/* 0C6EE0 800C62E0 3C01800F */ lui $at, %hi(D_800F3684) # $at, 0x800f -/* 0C6EE4 800C62E4 C4243684 */ lwc1 $f4, %lo(D_800F3684)($at) -/* 0C6EE8 800C62E8 C5520000 */ lwc1 $f18, ($t2) -/* 0C6EEC 800C62EC C4E80000 */ lwc1 $f8, ($a3) -/* 0C6EF0 800C62F0 C50A0000 */ lwc1 $f10, ($t0) -/* 0C6EF4 800C62F4 46049183 */ div.s $f6, $f18, $f4 -/* 0C6EF8 800C62F8 460A4400 */ add.s $f16, $f8, $f10 -/* 0C6EFC 800C62FC 46068001 */ sub.s $f0, $f16, $f6 -/* 0C6F00 800C6300 4602003C */ c.lt.s $f0, $f2 -/* 0C6F04 800C6304 E4800000 */ swc1 $f0, ($a0) -/* 0C6F08 800C6308 45000002 */ bc1f .L800C6314 -/* 0C6F0C 800C630C 00000000 */ nop -/* 0C6F10 800C6310 E4820000 */ swc1 $f2, ($a0) -.L800C6314: -/* 0C6F14 800C6314 90639F74 */ lbu $v1, %lo(D_800E9F74)($v1) -/* 0C6F18 800C6318 3C18800F */ lui $t8, %hi(D_800E9F78) # $t8, 0x800f -/* 0C6F1C 800C631C 27189F78 */ addiu $t8, %lo(D_800E9F78) # addiu $t8, $t8, -0x6088 -/* 0C6F20 800C6320 14600004 */ bnez $v1, .L800C6334 -/* 0C6F24 800C6324 00D83821 */ addu $a3, $a2, $t8 -/* 0C6F28 800C6328 91EF9F78 */ lbu $t7, %lo(D_800E9F78)($t7) -/* 0C6F2C 800C632C 11E00021 */ beqz $t7, .L800C63B4 -/* 0C6F30 800C6330 00000000 */ nop -.L800C6334: -/* 0C6F34 800C6334 1060000E */ beqz $v1, .L800C6370 -/* 0C6F38 800C6338 90E80000 */ lbu $t0, ($a3) -/* 0C6F3C 800C633C 2901000F */ slti $at, $t0, 0xf -/* 0C6F40 800C6340 10200016 */ beqz $at, .L800C639C -/* 0C6F44 800C6344 25190001 */ addiu $t9, $t0, 1 -/* 0C6F48 800C6348 3C0B800F */ lui $t3, %hi(D_800E9DF4) # $t3, 0x800f -/* 0C6F4C 800C634C 256B9DF4 */ addiu $t3, %lo(D_800E9DF4) # addiu $t3, $t3, -0x620c -/* 0C6F50 800C6350 A0F90000 */ sb $t9, ($a3) -/* 0C6F54 800C6354 004B1821 */ addu $v1, $v0, $t3 -/* 0C6F58 800C6358 3C01800F */ lui $at, %hi(D_800F3688) # $at, 0x800f -/* 0C6F5C 800C635C C42A3688 */ lwc1 $f10, %lo(D_800F3688)($at) -/* 0C6F60 800C6360 C4680000 */ lwc1 $f8, ($v1) -/* 0C6F64 800C6364 460A4480 */ add.s $f18, $f8, $f10 -/* 0C6F68 800C6368 1000000C */ b .L800C639C -/* 0C6F6C 800C636C E4720000 */ swc1 $f18, ($v1) -.L800C6370: -/* 0C6F70 800C6370 1100000A */ beqz $t0, .L800C639C -/* 0C6F74 800C6374 250CFFFF */ addiu $t4, $t0, -1 -/* 0C6F78 800C6378 3C0E800F */ lui $t6, %hi(D_800E9DF4) # $t6, 0x800f -/* 0C6F7C 800C637C 25CE9DF4 */ addiu $t6, %lo(D_800E9DF4) # addiu $t6, $t6, -0x620c -/* 0C6F80 800C6380 A0EC0000 */ sb $t4, ($a3) -/* 0C6F84 800C6384 004E1821 */ addu $v1, $v0, $t6 -/* 0C6F88 800C6388 3C01800F */ lui $at, %hi(D_800F368C) # $at, 0x800f -/* 0C6F8C 800C638C C430368C */ lwc1 $f16, %lo(D_800F368C)($at) -/* 0C6F90 800C6390 C4640000 */ lwc1 $f4, ($v1) -/* 0C6F94 800C6394 46102181 */ sub.s $f6, $f4, $f16 -/* 0C6F98 800C6398 E4660000 */ swc1 $f6, ($v1) -.L800C639C: -/* 0C6F9C 800C639C 3C01800F */ lui $at, %hi(D_800E9DF4) -/* 0C6FA0 800C63A0 00220821 */ addu $at, $at, $v0 -/* 0C6FA4 800C63A4 C42A9DF4 */ lwc1 $f10, %lo(D_800E9DF4)($at) -/* 0C6FA8 800C63A8 C4880000 */ lwc1 $f8, ($a0) -/* 0C6FAC 800C63AC 460A4481 */ sub.s $f18, $f8, $f10 -/* 0C6FB0 800C63B0 E4920000 */ swc1 $f18, ($a0) -.L800C63B4: -/* 0C6FB4 800C63B4 3C18800F */ lui $t8, %hi(D_800E9EC4) # $t8, 0x800f -/* 0C6FB8 800C63B8 27189EC4 */ addiu $t8, %lo(D_800E9EC4) # addiu $t8, $t8, -0x613c -/* 0C6FBC 800C63BC 00583021 */ addu $a2, $v0, $t8 -/* 0C6FC0 800C63C0 C4C20000 */ lwc1 $f2, ($a2) -/* 0C6FC4 800C63C4 C4800000 */ lwc1 $f0, ($a0) -/* 0C6FC8 800C63C8 3C013F00 */ li $at, 0x3F000000 # 0.500000 -/* 0C6FCC 800C63CC 44817000 */ mtc1 $at, $f14 -/* 0C6FD0 800C63D0 46020301 */ sub.s $f12, $f0, $f2 -/* 0C6FD4 800C63D4 3C0F800F */ lui $t7, %hi(D_800E9EE4) # $t7, 0x800f -/* 0C6FD8 800C63D8 25EF9EE4 */ addiu $t7, %lo(D_800E9EE4) # addiu $t7, $t7, -0x611c -/* 0C6FDC 800C63DC 004F1821 */ addu $v1, $v0, $t7 -/* 0C6FE0 800C63E0 460C703C */ c.lt.s $f14, $f12 -/* 0C6FE4 800C63E4 E46C0000 */ swc1 $f12, ($v1) -/* 0C6FE8 800C63E8 3C013E80 */ li $at, 0x3E800000 # 0.250000 -/* 0C6FEC 800C63EC 45030007 */ bc1tl .L800C640C -/* 0C6FF0 800C63F0 C4700000 */ lwc1 $f16, ($v1) -/* 0C6FF4 800C63F4 C4640000 */ lwc1 $f4, ($v1) -/* 0C6FF8 800C63F8 460E203C */ c.lt.s $f4, $f14 -/* 0C6FFC 800C63FC 00000000 */ nop -/* 0C7000 800C6400 4500000E */ bc1f .L800C643C -/* 0C7004 800C6404 00000000 */ nop -/* 0C7008 800C6408 C4700000 */ lwc1 $f16, ($v1) -.L800C640C: -/* 0C700C 800C640C 44813000 */ mtc1 $at, $f6 -/* 0C7010 800C6410 3C01800F */ lui $at, %hi(D_800E9ED4) -/* 0C7014 800C6414 00220821 */ addu $at, $at, $v0 -/* 0C7018 800C6418 46068002 */ mul.s $f0, $f16, $f6 -/* 0C701C 800C641C E4209ED4 */ swc1 $f0, %lo(D_800E9ED4)($at) -/* 0C7020 800C6420 3C01800F */ lui $at, %hi(D_800E9F34) -/* 0C7024 800C6424 46001280 */ add.s $f10, $f2, $f0 -/* 0C7028 800C6428 00220821 */ addu $at, $at, $v0 -/* 0C702C 800C642C C4289F34 */ lwc1 $f8, %lo(D_800E9F34)($at) -/* 0C7030 800C6430 460A4480 */ add.s $f18, $f8, $f10 -/* 0C7034 800C6434 10000006 */ b .L800C6450 -/* 0C7038 800C6438 E4B2000C */ swc1 $f18, 0xc($a1) -.L800C643C: -/* 0C703C 800C643C 3C01800F */ lui $at, %hi(D_800E9F34) -/* 0C7040 800C6440 00220821 */ addu $at, $at, $v0 -/* 0C7044 800C6444 C4249F34 */ lwc1 $f4, %lo(D_800E9F34)($at) -/* 0C7048 800C6448 46002400 */ add.s $f16, $f4, $f0 -/* 0C704C 800C644C E4B0000C */ swc1 $f16, 0xc($a1) -.L800C6450: -/* 0C7050 800C6450 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 0C7054 800C6454 44811000 */ mtc1 $at, $f2 -/* 0C7058 800C6458 C4A0000C */ lwc1 $f0, 0xc($a1) -/* 0C705C 800C645C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 0C7060 800C6460 44813000 */ mtc1 $at, $f6 -/* 0C7064 800C6464 4600103C */ c.lt.s $f2, $f0 -/* 0C7068 800C6468 00000000 */ nop -/* 0C706C 800C646C 45020004 */ bc1fl .L800C6480 -/* 0C7070 800C6470 46060203 */ div.s $f8, $f0, $f6 -/* 0C7074 800C6474 E4A2000C */ swc1 $f2, 0xc($a1) -/* 0C7078 800C6478 C4A0000C */ lwc1 $f0, 0xc($a1) -/* 0C707C 800C647C 46060203 */ div.s $f8, $f0, $f6 -.L800C6480: -/* 0C7080 800C6480 E4C00000 */ swc1 $f0, ($a2) -/* 0C7084 800C6484 3C01800F */ lui $at, %hi(D_800F3690) # $at, 0x800f -/* 0C7088 800C6488 C42A3690 */ lwc1 $f10, %lo(D_800F3690)($at) -/* 0C708C 800C648C 01A0E825 */ move $sp, $t5 -/* 0C7090 800C6490 25BD0010 */ addiu $sp, $t5, 0x10 -/* 0C7094 800C6494 460A4480 */ add.s $f18, $f8, $f10 -/* 0C7098 800C6498 03E00008 */ jr $ra -/* 0C709C 800C649C E4B20038 */ swc1 $f18, 0x38($a1) diff --git a/asm/non_matchings/audio/external/func_800C64A0.s b/asm/non_matchings/audio/external/func_800C64A0.s deleted file mode 100644 index 24cb90dbc..000000000 --- a/asm/non_matchings/audio/external/func_800C64A0.s +++ /dev/null @@ -1,225 +0,0 @@ -.section .late_rodata - -glabel jpt_800F3694 -.word L800C6544, L800C6618, L800C64E4, L800C65B8 -.word L800C65B8, L800C65B8, L800C65B8, L800C65B8 -.word L800C65B8, L800C65B8, L800C65B8, L800C65B8 -.word L800C6544, L800C6544, L800C6618, L800C6618 -.word L800C6544, L800C6618, L800C6618, L800C6618 -.word L800C6618, L800C65B8, L800C65B8, L800C65B8 -.word L800C6618, L800C6618, L800C6618, L800C6618 -.word L800C65B8, L800C65B8, L800C65B8 - -glabel D_800F3710 -.float 0.2 - -glabel D_800F3714 -.float 3500.0 - -glabel D_800F3718 -.float 3000.0 - -glabel D_800F371C -.float 0.4 - -glabel D_800F3720 -.float 0.2 - -glabel D_800F3724 -.float 0.06 - -glabel D_800F3728 -.float 0.56 - -glabel D_800F372C -.float 0.9 - -.section .text - -glabel func_800C64A0 -/* 0C70A0 800C64A0 308E00FF */ andi $t6, $a0, 0xff -/* 0C70A4 800C64A4 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C70A8 800C64A8 000E1080 */ sll $v0, $t6, 2 -/* 0C70AC 800C64AC 3C0F800F */ lui $t7, %hi(D_800E9E74) -/* 0C70B0 800C64B0 ADA40010 */ sw $a0, 0x10($t5) -/* 0C70B4 800C64B4 01E27821 */ addu $t7, $t7, $v0 -/* 0C70B8 800C64B8 8DEF9E74 */ lw $t7, %lo(D_800E9E74)($t7) -/* 0C70BC 800C64BC 01C02025 */ move $a0, $t6 -/* 0C70C0 800C64C0 25F8FFFF */ addiu $t8, $t7, -1 -/* 0C70C4 800C64C4 2F01001F */ sltiu $at, $t8, 0x1f -/* 0C70C8 800C64C8 10200053 */ beqz $at, .L800C6618 -/* 0C70CC 800C64CC 0018C080 */ sll $t8, $t8, 2 -/* 0C70D0 800C64D0 3C01800F */ lui $at, %hi(jpt_800F3694) -/* 0C70D4 800C64D4 00380821 */ addu $at, $at, $t8 -/* 0C70D8 800C64D8 8C383694 */ lw $t8, %lo(jpt_800F3694)($at) -/* 0C70DC 800C64DC 03000008 */ jr $t8 -/* 0C70E0 800C64E0 00000000 */ nop -glabel L800C64E4 -/* 0C70E4 800C64E4 000440C0 */ sll $t0, $a0, 3 -/* 0C70E8 800C64E8 01044023 */ subu $t0, $t0, $a0 -/* 0C70EC 800C64EC 00084100 */ sll $t0, $t0, 4 -/* 0C70F0 800C64F0 01044023 */ subu $t0, $t0, $a0 -/* 0C70F4 800C64F4 00084080 */ sll $t0, $t0, 2 -/* 0C70F8 800C64F8 01044023 */ subu $t0, $t0, $a0 -/* 0C70FC 800C64FC 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f -/* 0C7100 800C6500 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 -/* 0C7104 800C6504 000840C0 */ sll $t0, $t0, 3 -/* 0C7108 800C6508 01092821 */ addu $a1, $t0, $t1 -/* 0C710C 800C650C 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 0C7110 800C6510 44813000 */ mtc1 $at, $f6 -/* 0C7114 800C6514 C4A40094 */ lwc1 $f4, 0x94($a1) -/* 0C7118 800C6518 3C01800F */ lui $at, %hi(D_800F3710) # $at, 0x800f -/* 0C711C 800C651C C42A3710 */ lwc1 $f10, %lo(D_800F3710)($at) -/* 0C7120 800C6520 46062203 */ div.s $f8, $f4, $f6 -/* 0C7124 800C6524 3C19800F */ lui $t9, %hi(D_800E9EF4) # $t9, 0x800f -/* 0C7128 800C6528 27399EF4 */ addiu $t9, %lo(D_800E9EF4) # addiu $t9, $t9, -0x610c -/* 0C712C 800C652C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C7130 800C6530 00591821 */ addu $v1, $v0, $t9 -/* 0C7134 800C6534 44811000 */ mtc1 $at, $f2 -/* 0C7138 800C6538 460A4400 */ add.s $f16, $f8, $f10 -/* 0C713C 800C653C 10000046 */ b .L800C6658 -/* 0C7140 800C6540 E4700000 */ swc1 $f16, ($v1) -glabel L800C6544 -/* 0C7144 800C6544 3C01800F */ lui $at, %hi(D_800E9E54) -/* 0C7148 800C6548 00220821 */ addu $at, $at, $v0 -/* 0C714C 800C654C C4329E54 */ lwc1 $f18, %lo(D_800E9E54)($at) -/* 0C7150 800C6550 3C01800F */ lui $at, %hi(D_800F3714) # $at, 0x800f -/* 0C7154 800C6554 C4243714 */ lwc1 $f4, %lo(D_800F3714)($at) -/* 0C7158 800C6558 3C01800F */ lui $at, %hi(D_800F3718) # $at, 0x800f -/* 0C715C 800C655C C4283718 */ lwc1 $f8, %lo(D_800F3718)($at) -/* 0C7160 800C6560 46049181 */ sub.s $f6, $f18, $f4 -/* 0C7164 800C6564 3C01800F */ lui $at, %hi(D_800F371C) # $at, 0x800f -/* 0C7168 800C6568 000458C0 */ sll $t3, $a0, 3 -/* 0C716C 800C656C C430371C */ lwc1 $f16, %lo(D_800F371C)($at) -/* 0C7170 800C6570 46083283 */ div.s $f10, $f6, $f8 -/* 0C7174 800C6574 01645823 */ subu $t3, $t3, $a0 -/* 0C7178 800C6578 000B5900 */ sll $t3, $t3, 4 -/* 0C717C 800C657C 01645823 */ subu $t3, $t3, $a0 -/* 0C7180 800C6580 3C0A800F */ lui $t2, %hi(D_800E9EF4) # $t2, 0x800f -/* 0C7184 800C6584 000B5880 */ sll $t3, $t3, 2 -/* 0C7188 800C6588 254A9EF4 */ addiu $t2, %lo(D_800E9EF4) # addiu $t2, $t2, -0x610c -/* 0C718C 800C658C 01645823 */ subu $t3, $t3, $a0 -/* 0C7190 800C6590 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C7194 800C6594 3C0C800F */ lui $t4, %hi(gPlayers) # $t4, 0x800f -/* 0C7198 800C6598 004A1821 */ addu $v1, $v0, $t2 -/* 0C719C 800C659C 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 -/* 0C71A0 800C65A0 44811000 */ mtc1 $at, $f2 -/* 0C71A4 800C65A4 000B58C0 */ sll $t3, $t3, 3 -/* 0C71A8 800C65A8 016C2821 */ addu $a1, $t3, $t4 -/* 0C71AC 800C65AC 46105480 */ add.s $f18, $f10, $f16 -/* 0C71B0 800C65B0 10000029 */ b .L800C6658 -/* 0C71B4 800C65B4 E4720000 */ swc1 $f18, ($v1) -glabel L800C65B8 -/* 0C71B8 800C65B8 000478C0 */ sll $t7, $a0, 3 -/* 0C71BC 800C65BC 01E47823 */ subu $t7, $t7, $a0 -/* 0C71C0 800C65C0 000F7900 */ sll $t7, $t7, 4 -/* 0C71C4 800C65C4 01E47823 */ subu $t7, $t7, $a0 -/* 0C71C8 800C65C8 000F7880 */ sll $t7, $t7, 2 -/* 0C71CC 800C65CC 01E47823 */ subu $t7, $t7, $a0 -/* 0C71D0 800C65D0 3C18800F */ lui $t8, %hi(gPlayers) # $t8, 0x800f -/* 0C71D4 800C65D4 27186990 */ addiu $t8, %lo(gPlayers) # addiu $t8, $t8, 0x6990 -/* 0C71D8 800C65D8 000F78C0 */ sll $t7, $t7, 3 -/* 0C71DC 800C65DC 01F82821 */ addu $a1, $t7, $t8 -/* 0C71E0 800C65E0 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 0C71E4 800C65E4 44813000 */ mtc1 $at, $f6 -/* 0C71E8 800C65E8 C4A40094 */ lwc1 $f4, 0x94($a1) -/* 0C71EC 800C65EC 3C01800F */ lui $at, %hi(D_800F3720) # $at, 0x800f -/* 0C71F0 800C65F0 C42A3720 */ lwc1 $f10, %lo(D_800F3720)($at) -/* 0C71F4 800C65F4 46062203 */ div.s $f8, $f4, $f6 -/* 0C71F8 800C65F8 3C0E800F */ lui $t6, %hi(D_800E9EF4) # $t6, 0x800f -/* 0C71FC 800C65FC 25CE9EF4 */ addiu $t6, %lo(D_800E9EF4) # addiu $t6, $t6, -0x610c -/* 0C7200 800C6600 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C7204 800C6604 004E1821 */ addu $v1, $v0, $t6 -/* 0C7208 800C6608 44811000 */ mtc1 $at, $f2 -/* 0C720C 800C660C 460A4400 */ add.s $f16, $f8, $f10 -/* 0C7210 800C6610 10000011 */ b .L800C6658 -/* 0C7214 800C6614 E4700000 */ swc1 $f16, ($v1) -.L800C6618: -glabel L800C6618 -/* 0C7218 800C6618 000440C0 */ sll $t0, $a0, 3 -/* 0C721C 800C661C 01044023 */ subu $t0, $t0, $a0 -/* 0C7220 800C6620 00084100 */ sll $t0, $t0, 4 -/* 0C7224 800C6624 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C7228 800C6628 01044023 */ subu $t0, $t0, $a0 -/* 0C722C 800C662C 44811000 */ mtc1 $at, $f2 -/* 0C7230 800C6630 3C19800F */ lui $t9, %hi(D_800E9EF4) # $t9, 0x800f -/* 0C7234 800C6634 00084080 */ sll $t0, $t0, 2 -/* 0C7238 800C6638 27399EF4 */ addiu $t9, %lo(D_800E9EF4) # addiu $t9, $t9, -0x610c -/* 0C723C 800C663C 01044023 */ subu $t0, $t0, $a0 -/* 0C7240 800C6640 3C09800F */ lui $t1, %hi(gPlayers) # $t1, 0x800f -/* 0C7244 800C6644 00591821 */ addu $v1, $v0, $t9 -/* 0C7248 800C6648 25296990 */ addiu $t1, %lo(gPlayers) # addiu $t1, $t1, 0x6990 -/* 0C724C 800C664C 000840C0 */ sll $t0, $t0, 3 -/* 0C7250 800C6650 01092821 */ addu $a1, $t0, $t1 -/* 0C7254 800C6654 E4620000 */ swc1 $f2, ($v1) -.L800C6658: -/* 0C7258 800C6658 C4600000 */ lwc1 $f0, ($v1) -/* 0C725C 800C665C 3C18800F */ lui $t8, %hi(D_800E9E34) -/* 0C7260 800C6660 3C19800F */ lui $t9, %hi(D_800E9F24) -/* 0C7264 800C6664 4600103C */ c.lt.s $f2, $f0 -/* 0C7268 800C6668 3C0E800F */ lui $t6, %hi(D_800E9E24) -/* 0C726C 800C666C 0302C021 */ addu $t8, $t8, $v0 -/* 0C7270 800C6670 0324C821 */ addu $t9, $t9, $a0 -/* 0C7274 800C6674 45000003 */ bc1f .L800C6684 -/* 0C7278 800C6678 01A0E825 */ move $sp, $t5 -/* 0C727C 800C667C E4620000 */ swc1 $f2, ($v1) -/* 0C7280 800C6680 C4600000 */ lwc1 $f0, ($v1) -.L800C6684: -/* 0C7284 800C6684 44801000 */ mtc1 $zero, $f2 -/* 0C7288 800C6688 01C27021 */ addu $t6, $t6, $v0 -/* 0C728C 800C668C 4602003C */ c.lt.s $f0, $f2 -/* 0C7290 800C6690 00000000 */ nop -/* 0C7294 800C6694 45020003 */ bc1fl .L800C66A4 -/* 0C7298 800C6698 84AA0044 */ lh $t2, 0x44($a1) -/* 0C729C 800C669C E4620000 */ swc1 $f2, ($v1) -/* 0C72A0 800C66A0 84AA0044 */ lh $t2, 0x44($a1) -.L800C66A4: -/* 0C72A4 800C66A4 24010020 */ li $at, 32 -/* 0C72A8 800C66A8 314B0020 */ andi $t3, $t2, 0x20 -/* 0C72AC 800C66AC 1561000F */ bne $t3, $at, .L800C66EC -/* 0C72B0 800C66B0 00000000 */ nop -/* 0C72B4 800C66B4 8DCE9E24 */ lw $t6, %lo(D_800E9E24)($t6) -/* 0C72B8 800C66B8 3C01800F */ lui $at, %hi(D_800F3724) # $at, 0x800f -/* 0C72BC 800C66BC C4263724 */ lwc1 $f6, %lo(D_800F3724)($at) -/* 0C72C0 800C66C0 448E9000 */ mtc1 $t6, $f18 -/* 0C72C4 800C66C4 3C01800F */ lui $at, %hi(D_800F3728) # $at, 0x800f -/* 0C72C8 800C66C8 C42A3728 */ lwc1 $f10, %lo(D_800F3728)($at) -/* 0C72CC 800C66CC 46809120 */ cvt.s.w $f4, $f18 -/* 0C72D0 800C66D0 3C0C800F */ lui $t4, %hi(D_800E9F04) # $t4, 0x800f -/* 0C72D4 800C66D4 258C9F04 */ addiu $t4, %lo(D_800E9F04) # addiu $t4, $t4, -0x60fc -/* 0C72D8 800C66D8 004C1821 */ addu $v1, $v0, $t4 -/* 0C72DC 800C66DC 46062202 */ mul.s $f8, $f4, $f6 -/* 0C72E0 800C66E0 46085401 */ sub.s $f16, $f10, $f8 -/* 0C72E4 800C66E4 1000000E */ b .L800C6720 -/* 0C72E8 800C66E8 E4700000 */ swc1 $f16, ($v1) -.L800C66EC: -/* 0C72EC 800C66EC 8F189E34 */ lw $t8, %lo(D_800E9E34)($t8) -/* 0C72F0 800C66F0 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 0C72F4 800C66F4 44813000 */ mtc1 $at, $f6 -/* 0C72F8 800C66F8 44989000 */ mtc1 $t8, $f18 -/* 0C72FC 800C66FC 3C013E80 */ li $at, 0x3E800000 # 0.250000 -/* 0C7300 800C6700 44814000 */ mtc1 $at, $f8 -/* 0C7304 800C6704 46809120 */ cvt.s.w $f4, $f18 -/* 0C7308 800C6708 3C0F800F */ lui $t7, %hi(D_800E9F04) # $t7, 0x800f -/* 0C730C 800C670C 25EF9F04 */ addiu $t7, %lo(D_800E9F04) # addiu $t7, $t7, -0x60fc -/* 0C7310 800C6710 004F1821 */ addu $v1, $v0, $t7 -/* 0C7314 800C6714 46062283 */ div.s $f10, $f4, $f6 -/* 0C7318 800C6718 46085400 */ add.s $f16, $f10, $f8 -/* 0C731C 800C671C E4700000 */ swc1 $f16, ($v1) -.L800C6720: -/* 0C7320 800C6720 93399F24 */ lbu $t9, %lo(D_800E9F24)($t9) -/* 0C7324 800C6724 3C01800F */ lui $at, %hi(D_800F372C) # $at, 0x800f -/* 0C7328 800C6728 13200002 */ beqz $t9, .L800C6734 -/* 0C732C 800C672C 00000000 */ nop -/* 0C7330 800C6730 E4620000 */ swc1 $f2, ($v1) -.L800C6734: -/* 0C7334 800C6734 C420372C */ lwc1 $f0, %lo(D_800F372C)($at) -/* 0C7338 800C6738 C4720000 */ lwc1 $f18, ($v1) -/* 0C733C 800C673C 4612003C */ c.lt.s $f0, $f18 -/* 0C7340 800C6740 00000000 */ nop -/* 0C7344 800C6744 45000002 */ bc1f .L800C6750 -/* 0C7348 800C6748 00000000 */ nop -/* 0C734C 800C674C E4600000 */ swc1 $f0, ($v1) -.L800C6750: -/* 0C7350 800C6750 03E00008 */ jr $ra -/* 0C7354 800C6754 25BD0010 */ addiu $sp, $t5, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C683C.s b/asm/non_matchings/audio/external/func_800C683C.s deleted file mode 100644 index 804fc224d..000000000 --- a/asm/non_matchings/audio/external/func_800C683C.s +++ /dev/null @@ -1,586 +0,0 @@ -.section .late_rodata - -glabel jpt_800F373C -.word L800C69C8, L800C6A0C, L800C6910, L800C6C74 -.word L800C6CB8, L800C6CFC, L800C6D40, L800C6D84 -.word L800C6DC8, L800C6E0C, L800C6E50, L800C6E94 -.word L800C6FA4, L800C6E0C, L800C6A98, L800C6ADC -.word L800C6A50, L800C6958, L800C6990, L800C6B20 -.word L800C7070, L800C6FA4, L800C6FE8, L800C702C -.word L800C6B64, L800C6BA8, L800C6BEC, L800C6C30 -.word L800C6ED8, L800C6F1C, L800C6F60 - -.section .text - -glabel func_800C683C -/* 0C743C 800C683C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 0C7440 800C6840 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0C7444 800C6844 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0C7448 800C6848 AFBE0038 */ sw $fp, 0x38($sp) -/* 0C744C 800C684C 03A0F025 */ move $fp, $sp -/* 0C7450 800C6850 AFBF003C */ sw $ra, 0x3c($sp) -/* 0C7454 800C6854 AFB20034 */ sw $s2, 0x34($sp) -/* 0C7458 800C6858 AFB10030 */ sw $s1, 0x30($sp) -/* 0C745C 800C685C AFB0002C */ sw $s0, 0x2c($sp) -/* 0C7460 800C6860 AFA40050 */ sw $a0, 0x50($sp) -/* 0C7464 800C6864 15C00208 */ bnez $t6, .L800C7088 -/* 0C7468 800C6868 308600FF */ andi $a2, $a0, 0xff -/* 0C746C 800C686C 3C0F800F */ lui $t7, %hi(D_800EA0EC) -/* 0C7470 800C6870 01E67821 */ addu $t7, $t7, $a2 -/* 0C7474 800C6874 91EFA0EC */ lbu $t7, %lo(D_800EA0EC)($t7) -/* 0C7478 800C6878 3C18800F */ lui $t8, %hi(D_800E9E74) # $t8, 0x800f -/* 0C747C 800C687C 27189E74 */ addiu $t8, %lo(D_800E9E74) # addiu $t8, $t8, -0x618c -/* 0C7480 800C6880 15E00201 */ bnez $t7, .L800C7088 -/* 0C7484 800C6884 00061080 */ sll $v0, $a2, 2 -/* 0C7488 800C6888 3C19800F */ lui $t9, %hi(D_800E9E84) # $t9, 0x800f -/* 0C748C 800C688C 27399E84 */ addiu $t9, %lo(D_800E9E84) # addiu $t9, $t9, -0x617c -/* 0C7490 800C6890 00594021 */ addu $t0, $v0, $t9 -/* 0C7494 800C6894 AFA80040 */ sw $t0, 0x40($sp) -/* 0C7498 800C6898 00589021 */ addu $s2, $v0, $t8 -/* 0C749C 800C689C 8E430000 */ lw $v1, ($s2) -/* 0C74A0 800C68A0 8D0A0000 */ lw $t2, ($t0) -/* 0C74A4 800C68A4 00065900 */ sll $t3, $a2, 4 -/* 0C74A8 800C68A8 01665823 */ subu $t3, $t3, $a2 -/* 0C74AC 800C68AC 106A01F4 */ beq $v1, $t2, .L800C7080 -/* 0C74B0 800C68B0 000B5880 */ sll $t3, $t3, 2 -/* 0C74B4 800C68B4 3C0C800F */ lui $t4, %hi(D_800E9F7C) # $t4, 0x800f -/* 0C74B8 800C68B8 3C0D800F */ lui $t5, %hi(D_800E9E94) # $t5, 0x800f -/* 0C74BC 800C68BC 25AD9E94 */ addiu $t5, %lo(D_800E9E94) # addiu $t5, $t5, -0x616c -/* 0C74C0 800C68C0 258C9F7C */ addiu $t4, %lo(D_800E9F7C) # addiu $t4, $t4, -0x6084 -/* 0C74C4 800C68C4 016C8021 */ addu $s0, $t3, $t4 -/* 0C74C8 800C68C8 004D8821 */ addu $s1, $v0, $t5 -/* 0C74CC 800C68CC 8E250000 */ lw $a1, ($s1) -/* 0C74D0 800C68D0 02002025 */ move $a0, $s0 -/* 0C74D4 800C68D4 AFA2004C */ sw $v0, 0x4c($sp) -/* 0C74D8 800C68D8 0C03155E */ jal func_800C5578 -/* 0C74DC 800C68DC A3A60053 */ sb $a2, 0x53($sp) -/* 0C74E0 800C68E0 8E4E0000 */ lw $t6, ($s2) -/* 0C74E4 800C68E4 8FC2004C */ lw $v0, 0x4c($fp) -/* 0C74E8 800C68E8 93C60053 */ lbu $a2, 0x53($fp) -/* 0C74EC 800C68EC 25CFFFFF */ addiu $t7, $t6, -1 -/* 0C74F0 800C68F0 2DE1001F */ sltiu $at, $t7, 0x1f -/* 0C74F4 800C68F4 102001DE */ beqz $at, .L800C7070 -/* 0C74F8 800C68F8 000F7880 */ sll $t7, $t7, 2 -/* 0C74FC 800C68FC 3C01800F */ lui $at, %hi(jpt_800F373C) -/* 0C7500 800C6900 002F0821 */ addu $at, $at, $t7 -/* 0C7504 800C6904 8C2F373C */ lw $t7, %lo(jpt_800F373C)($at) -/* 0C7508 800C6908 01E00008 */ jr $t7 -/* 0C750C 800C690C 00000000 */ nop -glabel L800C6910 -/* 0C7510 800C6910 3C19800F */ lui $t9, %hi(D_800E9EF4) # $t9, 0x800f -/* 0C7514 800C6914 27399EF4 */ addiu $t9, %lo(D_800E9EF4) # addiu $t9, $t9, -0x610c -/* 0C7518 800C6918 3C18800F */ lui $t8, %hi(D_800E9F14) # $t8, 0x800f -/* 0C751C 800C691C 27189F14 */ addiu $t8, %lo(D_800E9F14) # addiu $t8, $t8, -0x60ec -/* 0C7520 800C6920 00594021 */ addu $t0, $v0, $t9 -/* 0C7524 800C6924 3C040100 */ lui $a0, (0x0100F908 >> 16) # lui $a0, 0x100 -/* 0C7528 800C6928 26090014 */ addiu $t1, $s0, 0x14 -/* 0C752C 800C692C AFA90014 */ sw $t1, 0x14($sp) -/* 0C7530 800C6930 3484F908 */ ori $a0, (0x0100F908 & 0xFFFF) # ori $a0, $a0, 0xf908 -/* 0C7534 800C6934 AFA80010 */ sw $t0, 0x10($sp) -/* 0C7538 800C6938 00583821 */ addu $a3, $v0, $t8 -/* 0C753C 800C693C 0C031052 */ jal play_sound -/* 0C7540 800C6940 02002825 */ move $a1, $s0 -/* 0C7544 800C6944 3C0A0100 */ lui $t2, (0x0100F908 >> 16) # lui $t2, 0x100 -/* 0C7548 800C6948 354AF908 */ ori $t2, (0x0100F908 & 0xFFFF) # ori $t2, $t2, 0xf908 -/* 0C754C 800C694C AE2A0000 */ sw $t2, ($s1) -/* 0C7550 800C6950 100001CB */ b .L800C7080 -/* 0C7554 800C6954 8E430000 */ lw $v1, ($s2) -glabel L800C6958 -/* 0C7558 800C6958 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C755C 800C695C 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7560 800C6960 3C040100 */ lui $a0, (0x0100F81D >> 16) # lui $a0, 0x100 -/* 0C7564 800C6964 260B0014 */ addiu $t3, $s0, 0x14 -/* 0C7568 800C6968 AFAB0014 */ sw $t3, 0x14($sp) -/* 0C756C 800C696C 3484F81D */ ori $a0, (0x0100F81D & 0xFFFF) # ori $a0, $a0, 0xf81d -/* 0C7570 800C6970 AFA70010 */ sw $a3, 0x10($sp) -/* 0C7574 800C6974 0C031052 */ jal play_sound -/* 0C7578 800C6978 02002825 */ move $a1, $s0 -/* 0C757C 800C697C 3C0C0100 */ lui $t4, (0x0100F81D >> 16) # lui $t4, 0x100 -/* 0C7580 800C6980 358CF81D */ ori $t4, (0x0100F81D & 0xFFFF) # ori $t4, $t4, 0xf81d -/* 0C7584 800C6984 AE2C0000 */ sw $t4, ($s1) -/* 0C7588 800C6988 100001BD */ b .L800C7080 -/* 0C758C 800C698C 8E430000 */ lw $v1, ($s2) -glabel L800C6990 -/* 0C7590 800C6990 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7594 800C6994 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7598 800C6998 3C040100 */ lui $a0, (0x0100F822 >> 16) # lui $a0, 0x100 -/* 0C759C 800C699C 260D0014 */ addiu $t5, $s0, 0x14 -/* 0C75A0 800C69A0 AFAD0014 */ sw $t5, 0x14($sp) -/* 0C75A4 800C69A4 3484F822 */ ori $a0, (0x0100F822 & 0xFFFF) # ori $a0, $a0, 0xf822 -/* 0C75A8 800C69A8 AFA70010 */ sw $a3, 0x10($sp) -/* 0C75AC 800C69AC 0C031052 */ jal play_sound -/* 0C75B0 800C69B0 02002825 */ move $a1, $s0 -/* 0C75B4 800C69B4 3C0E0100 */ lui $t6, (0x0100F822 >> 16) # lui $t6, 0x100 -/* 0C75B8 800C69B8 35CEF822 */ ori $t6, (0x0100F822 & 0xFFFF) # ori $t6, $t6, 0xf822 -/* 0C75BC 800C69BC AE2E0000 */ sw $t6, ($s1) -/* 0C75C0 800C69C0 100001AF */ b .L800C7080 -/* 0C75C4 800C69C4 8E430000 */ lw $v1, ($s2) -glabel L800C69C8 -/* 0C75C8 800C69C8 3C0F800F */ lui $t7, %hi(D_800E9EF4) # $t7, 0x800f -/* 0C75CC 800C69CC 25EF9EF4 */ addiu $t7, %lo(D_800E9EF4) # addiu $t7, $t7, -0x610c -/* 0C75D0 800C69D0 004FC021 */ addu $t8, $v0, $t7 -/* 0C75D4 800C69D4 3C040100 */ lui $a0, (0x0100F009 >> 16) # lui $a0, 0x100 -/* 0C75D8 800C69D8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C75DC 800C69DC 26190014 */ addiu $t9, $s0, 0x14 -/* 0C75E0 800C69E0 AFB90014 */ sw $t9, 0x14($sp) -/* 0C75E4 800C69E4 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C75E8 800C69E8 3484F009 */ ori $a0, (0x0100F009 & 0xFFFF) # ori $a0, $a0, 0xf009 -/* 0C75EC 800C69EC AFB80010 */ sw $t8, 0x10($sp) -/* 0C75F0 800C69F0 0C031052 */ jal play_sound -/* 0C75F4 800C69F4 02002825 */ move $a1, $s0 -/* 0C75F8 800C69F8 3C080100 */ lui $t0, (0x0100F009 >> 16) # lui $t0, 0x100 -/* 0C75FC 800C69FC 3508F009 */ ori $t0, (0x0100F009 & 0xFFFF) # ori $t0, $t0, 0xf009 -/* 0C7600 800C6A00 AE280000 */ sw $t0, ($s1) -/* 0C7604 800C6A04 1000019E */ b .L800C7080 -/* 0C7608 800C6A08 8E430000 */ lw $v1, ($s2) -glabel L800C6A0C -/* 0C760C 800C6A0C 3C09800F */ lui $t1, %hi(D_800E9F14) # $t1, 0x800f -/* 0C7610 800C6A10 3C0A800F */ lui $t2, %hi(D_800EA1D4) # $t2, 0x800f -/* 0C7614 800C6A14 254AA1D4 */ addiu $t2, %lo(D_800EA1D4) # addiu $t2, $t2, -0x5e2c -/* 0C7618 800C6A18 25299F14 */ addiu $t1, %lo(D_800E9F14) # addiu $t1, $t1, -0x60ec -/* 0C761C 800C6A1C 3C040100 */ lui $a0, (0x0100F40A >> 16) # lui $a0, 0x100 -/* 0C7620 800C6A20 260B0014 */ addiu $t3, $s0, 0x14 -/* 0C7624 800C6A24 AFAB0014 */ sw $t3, 0x14($sp) -/* 0C7628 800C6A28 3484F40A */ ori $a0, (0x0100F40A & 0xFFFF) # ori $a0, $a0, 0xf40a -/* 0C762C 800C6A2C 00493821 */ addu $a3, $v0, $t1 -/* 0C7630 800C6A30 AFAA0010 */ sw $t2, 0x10($sp) -/* 0C7634 800C6A34 0C031052 */ jal play_sound -/* 0C7638 800C6A38 02002825 */ move $a1, $s0 -/* 0C763C 800C6A3C 3C0C0100 */ lui $t4, (0x0100F40A >> 16) # lui $t4, 0x100 -/* 0C7640 800C6A40 358CF40A */ ori $t4, (0x0100F40A & 0xFFFF) # ori $t4, $t4, 0xf40a -/* 0C7644 800C6A44 AE2C0000 */ sw $t4, ($s1) -/* 0C7648 800C6A48 1000018D */ b .L800C7080 -/* 0C764C 800C6A4C 8E430000 */ lw $v1, ($s2) -glabel L800C6A50 -/* 0C7650 800C6A50 3C0E800F */ lui $t6, %hi(D_800E9EF4) # $t6, 0x800f -/* 0C7654 800C6A54 25CE9EF4 */ addiu $t6, %lo(D_800E9EF4) # addiu $t6, $t6, -0x610c -/* 0C7658 800C6A58 3C0D800F */ lui $t5, %hi(D_800E9F14) # $t5, 0x800f -/* 0C765C 800C6A5C 25AD9F14 */ addiu $t5, %lo(D_800E9F14) # addiu $t5, $t5, -0x60ec -/* 0C7660 800C6A60 004E7821 */ addu $t7, $v0, $t6 -/* 0C7664 800C6A64 3C040100 */ lui $a0, (0x0100F01E >> 16) # lui $a0, 0x100 -/* 0C7668 800C6A68 26180014 */ addiu $t8, $s0, 0x14 -/* 0C766C 800C6A6C AFB80014 */ sw $t8, 0x14($sp) -/* 0C7670 800C6A70 3484F01E */ ori $a0, (0x0100F01E & 0xFFFF) # ori $a0, $a0, 0xf01e -/* 0C7674 800C6A74 AFAF0010 */ sw $t7, 0x10($sp) -/* 0C7678 800C6A78 004D3821 */ addu $a3, $v0, $t5 -/* 0C767C 800C6A7C 0C031052 */ jal play_sound -/* 0C7680 800C6A80 02002825 */ move $a1, $s0 -/* 0C7684 800C6A84 3C190100 */ lui $t9, (0x0100F01E >> 16) # lui $t9, 0x100 -/* 0C7688 800C6A88 3739F01E */ ori $t9, (0x0100F01E & 0xFFFF) # ori $t9, $t9, 0xf01e -/* 0C768C 800C6A8C AE390000 */ sw $t9, ($s1) -/* 0C7690 800C6A90 1000017B */ b .L800C7080 -/* 0C7694 800C6A94 8E430000 */ lw $v1, ($s2) -glabel L800C6A98 -/* 0C7698 800C6A98 3C08800F */ lui $t0, %hi(D_800E9F14) # $t0, 0x800f -/* 0C769C 800C6A9C 3C09800F */ lui $t1, %hi(D_800EA1D4) # $t1, 0x800f -/* 0C76A0 800C6AA0 2529A1D4 */ addiu $t1, %lo(D_800EA1D4) # addiu $t1, $t1, -0x5e2c -/* 0C76A4 800C6AA4 25089F14 */ addiu $t0, %lo(D_800E9F14) # addiu $t0, $t0, -0x60ec -/* 0C76A8 800C6AA8 3C040100 */ lui $a0, (0x0100F01F >> 16) # lui $a0, 0x100 -/* 0C76AC 800C6AAC 260A0014 */ addiu $t2, $s0, 0x14 -/* 0C76B0 800C6AB0 AFAA0014 */ sw $t2, 0x14($sp) -/* 0C76B4 800C6AB4 3484F01F */ ori $a0, (0x0100F01F & 0xFFFF) # ori $a0, $a0, 0xf01f -/* 0C76B8 800C6AB8 00483821 */ addu $a3, $v0, $t0 -/* 0C76BC 800C6ABC AFA90010 */ sw $t1, 0x10($sp) -/* 0C76C0 800C6AC0 0C031052 */ jal play_sound -/* 0C76C4 800C6AC4 02002825 */ move $a1, $s0 -/* 0C76C8 800C6AC8 3C0B0100 */ lui $t3, (0x0100F01F >> 16) # lui $t3, 0x100 -/* 0C76CC 800C6ACC 356BF01F */ ori $t3, (0x0100F01F & 0xFFFF) # ori $t3, $t3, 0xf01f -/* 0C76D0 800C6AD0 AE2B0000 */ sw $t3, ($s1) -/* 0C76D4 800C6AD4 1000016A */ b .L800C7080 -/* 0C76D8 800C6AD8 8E430000 */ lw $v1, ($s2) -glabel L800C6ADC -/* 0C76DC 800C6ADC 3C0C800F */ lui $t4, %hi(D_800E9F14) # $t4, 0x800f -/* 0C76E0 800C6AE0 3C0D800F */ lui $t5, %hi(D_800EA1D4) # $t5, 0x800f -/* 0C76E4 800C6AE4 25ADA1D4 */ addiu $t5, %lo(D_800EA1D4) # addiu $t5, $t5, -0x5e2c -/* 0C76E8 800C6AE8 258C9F14 */ addiu $t4, %lo(D_800E9F14) # addiu $t4, $t4, -0x60ec -/* 0C76EC 800C6AEC 3C040100 */ lui $a0, (0x0100F021 >> 16) # lui $a0, 0x100 -/* 0C76F0 800C6AF0 260E0014 */ addiu $t6, $s0, 0x14 -/* 0C76F4 800C6AF4 AFAE0014 */ sw $t6, 0x14($sp) -/* 0C76F8 800C6AF8 3484F021 */ ori $a0, (0x0100F021 & 0xFFFF) # ori $a0, $a0, 0xf021 -/* 0C76FC 800C6AFC 004C3821 */ addu $a3, $v0, $t4 -/* 0C7700 800C6B00 AFAD0010 */ sw $t5, 0x10($sp) -/* 0C7704 800C6B04 0C031052 */ jal play_sound -/* 0C7708 800C6B08 02002825 */ move $a1, $s0 -/* 0C770C 800C6B0C 3C0F0100 */ lui $t7, (0x0100F021 >> 16) # lui $t7, 0x100 -/* 0C7710 800C6B10 35EFF021 */ ori $t7, (0x0100F021 & 0xFFFF) # ori $t7, $t7, 0xf021 -/* 0C7714 800C6B14 AE2F0000 */ sw $t7, ($s1) -/* 0C7718 800C6B18 10000159 */ b .L800C7080 -/* 0C771C 800C6B1C 8E430000 */ lw $v1, ($s2) -glabel L800C6B20 -/* 0C7720 800C6B20 3C18800F */ lui $t8, %hi(D_800E9F14) # $t8, 0x800f -/* 0C7724 800C6B24 3C19800F */ lui $t9, %hi(D_800EA1D4) # $t9, 0x800f -/* 0C7728 800C6B28 2739A1D4 */ addiu $t9, %lo(D_800EA1D4) # addiu $t9, $t9, -0x5e2c -/* 0C772C 800C6B2C 27189F14 */ addiu $t8, %lo(D_800E9F14) # addiu $t8, $t8, -0x60ec -/* 0C7730 800C6B30 3C040100 */ lui $a0, (0x0100F027 >> 16) # lui $a0, 0x100 -/* 0C7734 800C6B34 26080014 */ addiu $t0, $s0, 0x14 -/* 0C7738 800C6B38 AFA80014 */ sw $t0, 0x14($sp) -/* 0C773C 800C6B3C 3484F027 */ ori $a0, (0x0100F027 & 0xFFFF) # ori $a0, $a0, 0xf027 -/* 0C7740 800C6B40 00583821 */ addu $a3, $v0, $t8 -/* 0C7744 800C6B44 AFB90010 */ sw $t9, 0x10($sp) -/* 0C7748 800C6B48 0C031052 */ jal play_sound -/* 0C774C 800C6B4C 02002825 */ move $a1, $s0 -/* 0C7750 800C6B50 3C090100 */ lui $t1, (0x0100F027 >> 16) # lui $t1, 0x100 -/* 0C7754 800C6B54 3529F027 */ ori $t1, (0x0100F027 & 0xFFFF) # ori $t1, $t1, 0xf027 -/* 0C7758 800C6B58 AE290000 */ sw $t1, ($s1) -/* 0C775C 800C6B5C 10000148 */ b .L800C7080 -/* 0C7760 800C6B60 8E430000 */ lw $v1, ($s2) -glabel L800C6B64 -/* 0C7764 800C6B64 3C0A800F */ lui $t2, %hi(D_800E9F14) # $t2, 0x800f -/* 0C7768 800C6B68 3C0B800F */ lui $t3, %hi(D_800EA1D4) # $t3, 0x800f -/* 0C776C 800C6B6C 256BA1D4 */ addiu $t3, %lo(D_800EA1D4) # addiu $t3, $t3, -0x5e2c -/* 0C7770 800C6B70 254A9F14 */ addiu $t2, %lo(D_800E9F14) # addiu $t2, $t2, -0x60ec -/* 0C7774 800C6B74 3C040100 */ lui $a0, (0x0100F020 >> 16) # lui $a0, 0x100 -/* 0C7778 800C6B78 260C0014 */ addiu $t4, $s0, 0x14 -/* 0C777C 800C6B7C AFAC0014 */ sw $t4, 0x14($sp) -/* 0C7780 800C6B80 3484F020 */ ori $a0, (0x0100F020 & 0xFFFF) # ori $a0, $a0, 0xf020 -/* 0C7784 800C6B84 004A3821 */ addu $a3, $v0, $t2 -/* 0C7788 800C6B88 AFAB0010 */ sw $t3, 0x10($sp) -/* 0C778C 800C6B8C 0C031052 */ jal play_sound -/* 0C7790 800C6B90 02002825 */ move $a1, $s0 -/* 0C7794 800C6B94 3C0D0100 */ lui $t5, (0x0100F020 >> 16) # lui $t5, 0x100 -/* 0C7798 800C6B98 35ADF020 */ ori $t5, (0x0100F020 & 0xFFFF) # ori $t5, $t5, 0xf020 -/* 0C779C 800C6B9C AE2D0000 */ sw $t5, ($s1) -/* 0C77A0 800C6BA0 10000137 */ b .L800C7080 -/* 0C77A4 800C6BA4 8E430000 */ lw $v1, ($s2) -glabel L800C6BA8 -/* 0C77A8 800C6BA8 3C0E800F */ lui $t6, %hi(D_800E9F14) # $t6, 0x800f -/* 0C77AC 800C6BAC 3C0F800F */ lui $t7, %hi(D_800EA1D4) # $t7, 0x800f -/* 0C77B0 800C6BB0 25EFA1D4 */ addiu $t7, %lo(D_800EA1D4) # addiu $t7, $t7, -0x5e2c -/* 0C77B4 800C6BB4 25CE9F14 */ addiu $t6, %lo(D_800E9F14) # addiu $t6, $t6, -0x60ec -/* 0C77B8 800C6BB8 3C040100 */ lui $a0, (0x0100F023 >> 16) # lui $a0, 0x100 -/* 0C77BC 800C6BBC 26180014 */ addiu $t8, $s0, 0x14 -/* 0C77C0 800C6BC0 AFB80014 */ sw $t8, 0x14($sp) -/* 0C77C4 800C6BC4 3484F023 */ ori $a0, (0x0100F023 & 0xFFFF) # ori $a0, $a0, 0xf023 -/* 0C77C8 800C6BC8 004E3821 */ addu $a3, $v0, $t6 -/* 0C77CC 800C6BCC AFAF0010 */ sw $t7, 0x10($sp) -/* 0C77D0 800C6BD0 0C031052 */ jal play_sound -/* 0C77D4 800C6BD4 02002825 */ move $a1, $s0 -/* 0C77D8 800C6BD8 3C190100 */ lui $t9, (0x0100F023 >> 16) # lui $t9, 0x100 -/* 0C77DC 800C6BDC 3739F023 */ ori $t9, (0x0100F023 & 0xFFFF) # ori $t9, $t9, 0xf023 -/* 0C77E0 800C6BE0 AE390000 */ sw $t9, ($s1) -/* 0C77E4 800C6BE4 10000126 */ b .L800C7080 -/* 0C77E8 800C6BE8 8E430000 */ lw $v1, ($s2) -glabel L800C6BEC -/* 0C77EC 800C6BEC 3C08800F */ lui $t0, %hi(D_800E9F14) # $t0, 0x800f -/* 0C77F0 800C6BF0 3C09800F */ lui $t1, %hi(D_800EA1D4) # $t1, 0x800f -/* 0C77F4 800C6BF4 2529A1D4 */ addiu $t1, %lo(D_800EA1D4) # addiu $t1, $t1, -0x5e2c -/* 0C77F8 800C6BF8 25089F14 */ addiu $t0, %lo(D_800E9F14) # addiu $t0, $t0, -0x60ec -/* 0C77FC 800C6BFC 3C040100 */ lui $a0, (0x01008046 >> 16) # lui $a0, 0x100 -/* 0C7800 800C6C00 260A0014 */ addiu $t2, $s0, 0x14 -/* 0C7804 800C6C04 AFAA0014 */ sw $t2, 0x14($sp) -/* 0C7808 800C6C08 34848046 */ ori $a0, (0x01008046 & 0xFFFF) # ori $a0, $a0, 0x8046 -/* 0C780C 800C6C0C 00483821 */ addu $a3, $v0, $t0 -/* 0C7810 800C6C10 AFA90010 */ sw $t1, 0x10($sp) -/* 0C7814 800C6C14 0C031052 */ jal play_sound -/* 0C7818 800C6C18 02002825 */ move $a1, $s0 -/* 0C781C 800C6C1C 3C0B0100 */ lui $t3, (0x01008046 >> 16) # lui $t3, 0x100 -/* 0C7820 800C6C20 356B8046 */ ori $t3, (0x01008046 & 0xFFFF) # ori $t3, $t3, 0x8046 -/* 0C7824 800C6C24 AE2B0000 */ sw $t3, ($s1) -/* 0C7828 800C6C28 10000115 */ b .L800C7080 -/* 0C782C 800C6C2C 8E430000 */ lw $v1, ($s2) -glabel L800C6C30 -/* 0C7830 800C6C30 3C0C800F */ lui $t4, %hi(D_800E9F14) # $t4, 0x800f -/* 0C7834 800C6C34 3C0D800F */ lui $t5, %hi(D_800EA1D4) # $t5, 0x800f -/* 0C7838 800C6C38 25ADA1D4 */ addiu $t5, %lo(D_800EA1D4) # addiu $t5, $t5, -0x5e2c -/* 0C783C 800C6C3C 258C9F14 */ addiu $t4, %lo(D_800E9F14) # addiu $t4, $t4, -0x60ec -/* 0C7840 800C6C40 3C040100 */ lui $a0, (0x0100F025 >> 16) # lui $a0, 0x100 -/* 0C7844 800C6C44 260E0014 */ addiu $t6, $s0, 0x14 -/* 0C7848 800C6C48 AFAE0014 */ sw $t6, 0x14($sp) -/* 0C784C 800C6C4C 3484F025 */ ori $a0, (0x0100F025 & 0xFFFF) # ori $a0, $a0, 0xf025 -/* 0C7850 800C6C50 004C3821 */ addu $a3, $v0, $t4 -/* 0C7854 800C6C54 AFAD0010 */ sw $t5, 0x10($sp) -/* 0C7858 800C6C58 0C031052 */ jal play_sound -/* 0C785C 800C6C5C 02002825 */ move $a1, $s0 -/* 0C7860 800C6C60 3C0F0100 */ lui $t7, (0x0100F025 >> 16) # lui $t7, 0x100 -/* 0C7864 800C6C64 35EFF025 */ ori $t7, (0x0100F025 & 0xFFFF) # ori $t7, $t7, 0xf025 -/* 0C7868 800C6C68 AE2F0000 */ sw $t7, ($s1) -/* 0C786C 800C6C6C 10000104 */ b .L800C7080 -/* 0C7870 800C6C70 8E430000 */ lw $v1, ($s2) -glabel L800C6C74 -/* 0C7874 800C6C74 3C18800F */ lui $t8, %hi(D_800E9EF4) # $t8, 0x800f -/* 0C7878 800C6C78 27189EF4 */ addiu $t8, %lo(D_800E9EF4) # addiu $t8, $t8, -0x610c -/* 0C787C 800C6C7C 0058C821 */ addu $t9, $v0, $t8 -/* 0C7880 800C6C80 3C040100 */ lui $a0, (0x0100F00B >> 16) # lui $a0, 0x100 -/* 0C7884 800C6C84 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7888 800C6C88 26080014 */ addiu $t0, $s0, 0x14 -/* 0C788C 800C6C8C AFA80014 */ sw $t0, 0x14($sp) -/* 0C7890 800C6C90 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7894 800C6C94 3484F00B */ ori $a0, (0x0100F00B & 0xFFFF) # ori $a0, $a0, 0xf00b -/* 0C7898 800C6C98 AFB90010 */ sw $t9, 0x10($sp) -/* 0C789C 800C6C9C 0C031052 */ jal play_sound -/* 0C78A0 800C6CA0 02002825 */ move $a1, $s0 -/* 0C78A4 800C6CA4 3C090100 */ lui $t1, (0x0100F00B >> 16) # lui $t1, 0x100 -/* 0C78A8 800C6CA8 3529F00B */ ori $t1, (0x0100F00B & 0xFFFF) # ori $t1, $t1, 0xf00b -/* 0C78AC 800C6CAC AE290000 */ sw $t1, ($s1) -/* 0C78B0 800C6CB0 100000F3 */ b .L800C7080 -/* 0C78B4 800C6CB4 8E430000 */ lw $v1, ($s2) -glabel L800C6CB8 -/* 0C78B8 800C6CB8 3C0A800F */ lui $t2, %hi(D_800E9EF4) # $t2, 0x800f -/* 0C78BC 800C6CBC 254A9EF4 */ addiu $t2, %lo(D_800E9EF4) # addiu $t2, $t2, -0x610c -/* 0C78C0 800C6CC0 004A5821 */ addu $t3, $v0, $t2 -/* 0C78C4 800C6CC4 3C040100 */ lui $a0, (0x0100F00C >> 16) # lui $a0, 0x100 -/* 0C78C8 800C6CC8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C78CC 800C6CCC 260C0014 */ addiu $t4, $s0, 0x14 -/* 0C78D0 800C6CD0 AFAC0014 */ sw $t4, 0x14($sp) -/* 0C78D4 800C6CD4 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C78D8 800C6CD8 3484F00C */ ori $a0, (0x0100F00C & 0xFFFF) # ori $a0, $a0, 0xf00c -/* 0C78DC 800C6CDC AFAB0010 */ sw $t3, 0x10($sp) -/* 0C78E0 800C6CE0 0C031052 */ jal play_sound -/* 0C78E4 800C6CE4 02002825 */ move $a1, $s0 -/* 0C78E8 800C6CE8 3C0D0100 */ lui $t5, (0x0100F00C >> 16) # lui $t5, 0x100 -/* 0C78EC 800C6CEC 35ADF00C */ ori $t5, (0x0100F00C & 0xFFFF) # ori $t5, $t5, 0xf00c -/* 0C78F0 800C6CF0 AE2D0000 */ sw $t5, ($s1) -/* 0C78F4 800C6CF4 100000E2 */ b .L800C7080 -/* 0C78F8 800C6CF8 8E430000 */ lw $v1, ($s2) -glabel L800C6CFC -/* 0C78FC 800C6CFC 3C0E800F */ lui $t6, %hi(D_800E9EF4) # $t6, 0x800f -/* 0C7900 800C6D00 25CE9EF4 */ addiu $t6, %lo(D_800E9EF4) # addiu $t6, $t6, -0x610c -/* 0C7904 800C6D04 004E7821 */ addu $t7, $v0, $t6 -/* 0C7908 800C6D08 3C040100 */ lui $a0, (0x0100F00D >> 16) # lui $a0, 0x100 -/* 0C790C 800C6D0C 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7910 800C6D10 26180014 */ addiu $t8, $s0, 0x14 -/* 0C7914 800C6D14 AFB80014 */ sw $t8, 0x14($sp) -/* 0C7918 800C6D18 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C791C 800C6D1C 3484F00D */ ori $a0, (0x0100F00D & 0xFFFF) # ori $a0, $a0, 0xf00d -/* 0C7920 800C6D20 AFAF0010 */ sw $t7, 0x10($sp) -/* 0C7924 800C6D24 0C031052 */ jal play_sound -/* 0C7928 800C6D28 02002825 */ move $a1, $s0 -/* 0C792C 800C6D2C 3C190100 */ lui $t9, (0x0100F00D >> 16) # lui $t9, 0x100 -/* 0C7930 800C6D30 3739F00D */ ori $t9, (0x0100F00D & 0xFFFF) # ori $t9, $t9, 0xf00d -/* 0C7934 800C6D34 AE390000 */ sw $t9, ($s1) -/* 0C7938 800C6D38 100000D1 */ b .L800C7080 -/* 0C793C 800C6D3C 8E430000 */ lw $v1, ($s2) -glabel L800C6D40 -/* 0C7940 800C6D40 3C08800F */ lui $t0, %hi(D_800E9EF4) # $t0, 0x800f -/* 0C7944 800C6D44 25089EF4 */ addiu $t0, %lo(D_800E9EF4) # addiu $t0, $t0, -0x610c -/* 0C7948 800C6D48 00484821 */ addu $t1, $v0, $t0 -/* 0C794C 800C6D4C 3C040100 */ lui $a0, (0x0100F00E >> 16) # lui $a0, 0x100 -/* 0C7950 800C6D50 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7954 800C6D54 260A0014 */ addiu $t2, $s0, 0x14 -/* 0C7958 800C6D58 AFAA0014 */ sw $t2, 0x14($sp) -/* 0C795C 800C6D5C 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7960 800C6D60 3484F00E */ ori $a0, (0x0100F00E & 0xFFFF) # ori $a0, $a0, 0xf00e -/* 0C7964 800C6D64 AFA90010 */ sw $t1, 0x10($sp) -/* 0C7968 800C6D68 0C031052 */ jal play_sound -/* 0C796C 800C6D6C 02002825 */ move $a1, $s0 -/* 0C7970 800C6D70 3C0B0100 */ lui $t3, (0x0100F00E >> 16) # lui $t3, 0x100 -/* 0C7974 800C6D74 356BF00E */ ori $t3, (0x0100F00E & 0xFFFF) # ori $t3, $t3, 0xf00e -/* 0C7978 800C6D78 AE2B0000 */ sw $t3, ($s1) -/* 0C797C 800C6D7C 100000C0 */ b .L800C7080 -/* 0C7980 800C6D80 8E430000 */ lw $v1, ($s2) -glabel L800C6D84 -/* 0C7984 800C6D84 3C0C800F */ lui $t4, %hi(D_800E9EF4) # $t4, 0x800f -/* 0C7988 800C6D88 258C9EF4 */ addiu $t4, %lo(D_800E9EF4) # addiu $t4, $t4, -0x610c -/* 0C798C 800C6D8C 004C6821 */ addu $t5, $v0, $t4 -/* 0C7990 800C6D90 3C040100 */ lui $a0, (0x0100F00F >> 16) # lui $a0, 0x100 -/* 0C7994 800C6D94 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7998 800C6D98 260E0014 */ addiu $t6, $s0, 0x14 -/* 0C799C 800C6D9C AFAE0014 */ sw $t6, 0x14($sp) -/* 0C79A0 800C6DA0 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C79A4 800C6DA4 3484F00F */ ori $a0, (0x0100F00F & 0xFFFF) # ori $a0, $a0, 0xf00f -/* 0C79A8 800C6DA8 AFAD0010 */ sw $t5, 0x10($sp) -/* 0C79AC 800C6DAC 0C031052 */ jal play_sound -/* 0C79B0 800C6DB0 02002825 */ move $a1, $s0 -/* 0C79B4 800C6DB4 3C0F0100 */ lui $t7, (0x0100F00F >> 16) # lui $t7, 0x100 -/* 0C79B8 800C6DB8 35EFF00F */ ori $t7, (0x0100F00F & 0xFFFF) # ori $t7, $t7, 0xf00f -/* 0C79BC 800C6DBC AE2F0000 */ sw $t7, ($s1) -/* 0C79C0 800C6DC0 100000AF */ b .L800C7080 -/* 0C79C4 800C6DC4 8E430000 */ lw $v1, ($s2) -glabel L800C6DC8 -/* 0C79C8 800C6DC8 3C18800F */ lui $t8, %hi(D_800E9EF4) # $t8, 0x800f -/* 0C79CC 800C6DCC 27189EF4 */ addiu $t8, %lo(D_800E9EF4) # addiu $t8, $t8, -0x610c -/* 0C79D0 800C6DD0 0058C821 */ addu $t9, $v0, $t8 -/* 0C79D4 800C6DD4 3C040100 */ lui $a0, (0x0100F010 >> 16) # lui $a0, 0x100 -/* 0C79D8 800C6DD8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C79DC 800C6DDC 26080014 */ addiu $t0, $s0, 0x14 -/* 0C79E0 800C6DE0 AFA80014 */ sw $t0, 0x14($sp) -/* 0C79E4 800C6DE4 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C79E8 800C6DE8 3484F010 */ ori $a0, (0x0100F010 & 0xFFFF) # ori $a0, $a0, 0xf010 -/* 0C79EC 800C6DEC AFB90010 */ sw $t9, 0x10($sp) -/* 0C79F0 800C6DF0 0C031052 */ jal play_sound -/* 0C79F4 800C6DF4 02002825 */ move $a1, $s0 -/* 0C79F8 800C6DF8 3C090100 */ lui $t1, (0x0100F010 >> 16) # lui $t1, 0x100 -/* 0C79FC 800C6DFC 3529F010 */ ori $t1, (0x0100F010 & 0xFFFF) # ori $t1, $t1, 0xf010 -/* 0C7A00 800C6E00 AE290000 */ sw $t1, ($s1) -/* 0C7A04 800C6E04 1000009E */ b .L800C7080 -/* 0C7A08 800C6E08 8E430000 */ lw $v1, ($s2) -glabel L800C6E0C -/* 0C7A0C 800C6E0C 3C0A800F */ lui $t2, %hi(D_800E9EF4) # $t2, 0x800f -/* 0C7A10 800C6E10 254A9EF4 */ addiu $t2, %lo(D_800E9EF4) # addiu $t2, $t2, -0x610c -/* 0C7A14 800C6E14 004A5821 */ addu $t3, $v0, $t2 -/* 0C7A18 800C6E18 3C040100 */ lui $a0, (0x0100F011 >> 16) # lui $a0, 0x100 -/* 0C7A1C 800C6E1C 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7A20 800C6E20 260C0014 */ addiu $t4, $s0, 0x14 -/* 0C7A24 800C6E24 AFAC0014 */ sw $t4, 0x14($sp) -/* 0C7A28 800C6E28 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7A2C 800C6E2C 3484F011 */ ori $a0, (0x0100F011 & 0xFFFF) # ori $a0, $a0, 0xf011 -/* 0C7A30 800C6E30 AFAB0010 */ sw $t3, 0x10($sp) -/* 0C7A34 800C6E34 0C031052 */ jal play_sound -/* 0C7A38 800C6E38 02002825 */ move $a1, $s0 -/* 0C7A3C 800C6E3C 3C0D0100 */ lui $t5, (0x0100F011 >> 16) # lui $t5, 0x100 -/* 0C7A40 800C6E40 35ADF011 */ ori $t5, (0x0100F011 & 0xFFFF) # ori $t5, $t5, 0xf011 -/* 0C7A44 800C6E44 AE2D0000 */ sw $t5, ($s1) -/* 0C7A48 800C6E48 1000008D */ b .L800C7080 -/* 0C7A4C 800C6E4C 8E430000 */ lw $v1, ($s2) -glabel L800C6E50 -/* 0C7A50 800C6E50 3C0E800F */ lui $t6, %hi(D_800E9EF4) # $t6, 0x800f -/* 0C7A54 800C6E54 25CE9EF4 */ addiu $t6, %lo(D_800E9EF4) # addiu $t6, $t6, -0x610c -/* 0C7A58 800C6E58 004E7821 */ addu $t7, $v0, $t6 -/* 0C7A5C 800C6E5C 3C040100 */ lui $a0, (0x0100F012 >> 16) # lui $a0, 0x100 -/* 0C7A60 800C6E60 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7A64 800C6E64 26180014 */ addiu $t8, $s0, 0x14 -/* 0C7A68 800C6E68 AFB80014 */ sw $t8, 0x14($sp) -/* 0C7A6C 800C6E6C 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7A70 800C6E70 3484F012 */ ori $a0, (0x0100F012 & 0xFFFF) # ori $a0, $a0, 0xf012 -/* 0C7A74 800C6E74 AFAF0010 */ sw $t7, 0x10($sp) -/* 0C7A78 800C6E78 0C031052 */ jal play_sound -/* 0C7A7C 800C6E7C 02002825 */ move $a1, $s0 -/* 0C7A80 800C6E80 3C190100 */ lui $t9, (0x0100F012 >> 16) # lui $t9, 0x100 -/* 0C7A84 800C6E84 3739F012 */ ori $t9, (0x0100F012 & 0xFFFF) # ori $t9, $t9, 0xf012 -/* 0C7A88 800C6E88 AE390000 */ sw $t9, ($s1) -/* 0C7A8C 800C6E8C 1000007C */ b .L800C7080 -/* 0C7A90 800C6E90 8E430000 */ lw $v1, ($s2) -glabel L800C6E94 -/* 0C7A94 800C6E94 3C08800F */ lui $t0, %hi(D_800E9EF4) # $t0, 0x800f -/* 0C7A98 800C6E98 25089EF4 */ addiu $t0, %lo(D_800E9EF4) # addiu $t0, $t0, -0x610c -/* 0C7A9C 800C6E9C 00484821 */ addu $t1, $v0, $t0 -/* 0C7AA0 800C6EA0 3C040100 */ lui $a0, (0x0100F013 >> 16) # lui $a0, 0x100 -/* 0C7AA4 800C6EA4 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7AA8 800C6EA8 260A0014 */ addiu $t2, $s0, 0x14 -/* 0C7AAC 800C6EAC AFAA0014 */ sw $t2, 0x14($sp) -/* 0C7AB0 800C6EB0 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7AB4 800C6EB4 3484F013 */ ori $a0, (0x0100F013 & 0xFFFF) # ori $a0, $a0, 0xf013 -/* 0C7AB8 800C6EB8 AFA90010 */ sw $t1, 0x10($sp) -/* 0C7ABC 800C6EBC 0C031052 */ jal play_sound -/* 0C7AC0 800C6EC0 02002825 */ move $a1, $s0 -/* 0C7AC4 800C6EC4 3C0B0100 */ lui $t3, (0x0100F013 >> 16) # lui $t3, 0x100 -/* 0C7AC8 800C6EC8 356BF013 */ ori $t3, (0x0100F013 & 0xFFFF) # ori $t3, $t3, 0xf013 -/* 0C7ACC 800C6ECC AE2B0000 */ sw $t3, ($s1) -/* 0C7AD0 800C6ED0 1000006B */ b .L800C7080 -/* 0C7AD4 800C6ED4 8E430000 */ lw $v1, ($s2) -glabel L800C6ED8 -/* 0C7AD8 800C6ED8 3C0C800F */ lui $t4, %hi(D_800E9EF4) # $t4, 0x800f -/* 0C7ADC 800C6EDC 258C9EF4 */ addiu $t4, %lo(D_800E9EF4) # addiu $t4, $t4, -0x610c -/* 0C7AE0 800C6EE0 004C6821 */ addu $t5, $v0, $t4 -/* 0C7AE4 800C6EE4 3C040100 */ lui $a0, (0x0100F048 >> 16) # lui $a0, 0x100 -/* 0C7AE8 800C6EE8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7AEC 800C6EEC 260E0014 */ addiu $t6, $s0, 0x14 -/* 0C7AF0 800C6EF0 AFAE0014 */ sw $t6, 0x14($sp) -/* 0C7AF4 800C6EF4 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7AF8 800C6EF8 3484F048 */ ori $a0, (0x0100F048 & 0xFFFF) # ori $a0, $a0, 0xf048 -/* 0C7AFC 800C6EFC AFAD0010 */ sw $t5, 0x10($sp) -/* 0C7B00 800C6F00 0C031052 */ jal play_sound -/* 0C7B04 800C6F04 02002825 */ move $a1, $s0 -/* 0C7B08 800C6F08 3C0F0100 */ lui $t7, (0x0100F048 >> 16) # lui $t7, 0x100 -/* 0C7B0C 800C6F0C 35EFF048 */ ori $t7, (0x0100F048 & 0xFFFF) # ori $t7, $t7, 0xf048 -/* 0C7B10 800C6F10 AE2F0000 */ sw $t7, ($s1) -/* 0C7B14 800C6F14 1000005A */ b .L800C7080 -/* 0C7B18 800C6F18 8E430000 */ lw $v1, ($s2) -glabel L800C6F1C -/* 0C7B1C 800C6F1C 3C18800F */ lui $t8, %hi(D_800E9EF4) # $t8, 0x800f -/* 0C7B20 800C6F20 27189EF4 */ addiu $t8, %lo(D_800E9EF4) # addiu $t8, $t8, -0x610c -/* 0C7B24 800C6F24 0058C821 */ addu $t9, $v0, $t8 -/* 0C7B28 800C6F28 3C040100 */ lui $a0, (0x0100F049 >> 16) # lui $a0, 0x100 -/* 0C7B2C 800C6F2C 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7B30 800C6F30 26080014 */ addiu $t0, $s0, 0x14 -/* 0C7B34 800C6F34 AFA80014 */ sw $t0, 0x14($sp) -/* 0C7B38 800C6F38 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7B3C 800C6F3C 3484F049 */ ori $a0, (0x0100F049 & 0xFFFF) # ori $a0, $a0, 0xf049 -/* 0C7B40 800C6F40 AFB90010 */ sw $t9, 0x10($sp) -/* 0C7B44 800C6F44 0C031052 */ jal play_sound -/* 0C7B48 800C6F48 02002825 */ move $a1, $s0 -/* 0C7B4C 800C6F4C 3C090100 */ lui $t1, (0x0100F049 >> 16) # lui $t1, 0x100 -/* 0C7B50 800C6F50 3529F049 */ ori $t1, (0x0100F049 & 0xFFFF) # ori $t1, $t1, 0xf049 -/* 0C7B54 800C6F54 AE290000 */ sw $t1, ($s1) -/* 0C7B58 800C6F58 10000049 */ b .L800C7080 -/* 0C7B5C 800C6F5C 8E430000 */ lw $v1, ($s2) -glabel L800C6F60 -/* 0C7B60 800C6F60 3C0A800F */ lui $t2, %hi(D_800E9EF4) # $t2, 0x800f -/* 0C7B64 800C6F64 254A9EF4 */ addiu $t2, %lo(D_800E9EF4) # addiu $t2, $t2, -0x610c -/* 0C7B68 800C6F68 004A5821 */ addu $t3, $v0, $t2 -/* 0C7B6C 800C6F6C 3C040100 */ lui $a0, (0x0100F04A >> 16) # lui $a0, 0x100 -/* 0C7B70 800C6F70 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7B74 800C6F74 260C0014 */ addiu $t4, $s0, 0x14 -/* 0C7B78 800C6F78 AFAC0014 */ sw $t4, 0x14($sp) -/* 0C7B7C 800C6F7C 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7B80 800C6F80 3484F04A */ ori $a0, (0x0100F04A & 0xFFFF) # ori $a0, $a0, 0xf04a -/* 0C7B84 800C6F84 AFAB0010 */ sw $t3, 0x10($sp) -/* 0C7B88 800C6F88 0C031052 */ jal play_sound -/* 0C7B8C 800C6F8C 02002825 */ move $a1, $s0 -/* 0C7B90 800C6F90 3C0D0100 */ lui $t5, (0x0100F04A >> 16) # lui $t5, 0x100 -/* 0C7B94 800C6F94 35ADF04A */ ori $t5, (0x0100F04A & 0xFFFF) # ori $t5, $t5, 0xf04a -/* 0C7B98 800C6F98 AE2D0000 */ sw $t5, ($s1) -/* 0C7B9C 800C6F9C 10000038 */ b .L800C7080 -/* 0C7BA0 800C6FA0 8E430000 */ lw $v1, ($s2) -glabel L800C6FA4 -/* 0C7BA4 800C6FA4 3C0E800F */ lui $t6, %hi(D_800E9EF4) # $t6, 0x800f -/* 0C7BA8 800C6FA8 25CE9EF4 */ addiu $t6, %lo(D_800E9EF4) # addiu $t6, $t6, -0x610c -/* 0C7BAC 800C6FAC 004E7821 */ addu $t7, $v0, $t6 -/* 0C7BB0 800C6FB0 3C040100 */ lui $a0, (0x0100F029 >> 16) # lui $a0, 0x100 -/* 0C7BB4 800C6FB4 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7BB8 800C6FB8 26180014 */ addiu $t8, $s0, 0x14 -/* 0C7BBC 800C6FBC AFB80014 */ sw $t8, 0x14($sp) -/* 0C7BC0 800C6FC0 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7BC4 800C6FC4 3484F029 */ ori $a0, (0x0100F029 & 0xFFFF) # ori $a0, $a0, 0xf029 -/* 0C7BC8 800C6FC8 AFAF0010 */ sw $t7, 0x10($sp) -/* 0C7BCC 800C6FCC 0C031052 */ jal play_sound -/* 0C7BD0 800C6FD0 02002825 */ move $a1, $s0 -/* 0C7BD4 800C6FD4 3C190100 */ lui $t9, (0x0100F029 >> 16) # lui $t9, 0x100 -/* 0C7BD8 800C6FD8 3739F029 */ ori $t9, (0x0100F029 & 0xFFFF) # ori $t9, $t9, 0xf029 -/* 0C7BDC 800C6FDC AE390000 */ sw $t9, ($s1) -/* 0C7BE0 800C6FE0 10000027 */ b .L800C7080 -/* 0C7BE4 800C6FE4 8E430000 */ lw $v1, ($s2) -glabel L800C6FE8 -/* 0C7BE8 800C6FE8 3C08800F */ lui $t0, %hi(D_800E9EF4) # $t0, 0x800f -/* 0C7BEC 800C6FEC 25089EF4 */ addiu $t0, %lo(D_800E9EF4) # addiu $t0, $t0, -0x610c -/* 0C7BF0 800C6FF0 00484821 */ addu $t1, $v0, $t0 -/* 0C7BF4 800C6FF4 3C040100 */ lui $a0, (0x0100F02A >> 16) # lui $a0, 0x100 -/* 0C7BF8 800C6FF8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7BFC 800C6FFC 260A0014 */ addiu $t2, $s0, 0x14 -/* 0C7C00 800C7000 AFAA0014 */ sw $t2, 0x14($sp) -/* 0C7C04 800C7004 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7C08 800C7008 3484F02A */ ori $a0, (0x0100F02A & 0xFFFF) # ori $a0, $a0, 0xf02a -/* 0C7C0C 800C700C AFA90010 */ sw $t1, 0x10($sp) -/* 0C7C10 800C7010 0C031052 */ jal play_sound -/* 0C7C14 800C7014 02002825 */ move $a1, $s0 -/* 0C7C18 800C7018 3C0B0100 */ lui $t3, (0x0100F02A >> 16) # lui $t3, 0x100 -/* 0C7C1C 800C701C 356BF02A */ ori $t3, (0x0100F02A & 0xFFFF) # ori $t3, $t3, 0xf02a -/* 0C7C20 800C7020 AE2B0000 */ sw $t3, ($s1) -/* 0C7C24 800C7024 10000016 */ b .L800C7080 -/* 0C7C28 800C7028 8E430000 */ lw $v1, ($s2) -glabel L800C702C -/* 0C7C2C 800C702C 3C0C800F */ lui $t4, %hi(D_800E9EF4) # $t4, 0x800f -/* 0C7C30 800C7030 258C9EF4 */ addiu $t4, %lo(D_800E9EF4) # addiu $t4, $t4, -0x610c -/* 0C7C34 800C7034 004C6821 */ addu $t5, $v0, $t4 -/* 0C7C38 800C7038 3C040100 */ lui $a0, (0x0100F02B >> 16) # lui $a0, 0x100 -/* 0C7C3C 800C703C 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C7C40 800C7040 260E0014 */ addiu $t6, $s0, 0x14 -/* 0C7C44 800C7044 AFAE0014 */ sw $t6, 0x14($sp) -/* 0C7C48 800C7048 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C7C4C 800C704C 3484F02B */ ori $a0, (0x0100F02B & 0xFFFF) # ori $a0, $a0, 0xf02b -/* 0C7C50 800C7050 AFAD0010 */ sw $t5, 0x10($sp) -/* 0C7C54 800C7054 0C031052 */ jal play_sound -/* 0C7C58 800C7058 02002825 */ move $a1, $s0 -/* 0C7C5C 800C705C 3C0F0100 */ lui $t7, (0x0100F02B >> 16) # lui $t7, 0x100 -/* 0C7C60 800C7060 35EFF02B */ ori $t7, (0x0100F02B & 0xFFFF) # ori $t7, $t7, 0xf02b -/* 0C7C64 800C7064 AE2F0000 */ sw $t7, ($s1) -/* 0C7C68 800C7068 10000005 */ b .L800C7080 -/* 0C7C6C 800C706C 8E430000 */ lw $v1, ($s2) -.L800C7070: -glabel L800C7070 -/* 0C7C70 800C7070 02002025 */ move $a0, $s0 -/* 0C7C74 800C7074 0C03155E */ jal func_800C5578 -/* 0C7C78 800C7078 8E250000 */ lw $a1, ($s1) -/* 0C7C7C 800C707C 8E430000 */ lw $v1, ($s2) -.L800C7080: -/* 0C7C80 800C7080 8FD80040 */ lw $t8, 0x40($fp) -/* 0C7C84 800C7084 AF030000 */ sw $v1, ($t8) -.L800C7088: -/* 0C7C88 800C7088 8FDF003C */ lw $ra, 0x3c($fp) -/* 0C7C8C 800C708C 03C0E825 */ move $sp, $fp -/* 0C7C90 800C7090 8FD0002C */ lw $s0, 0x2c($fp) -/* 0C7C94 800C7094 8FD10030 */ lw $s1, 0x30($fp) -/* 0C7C98 800C7098 8FD20034 */ lw $s2, 0x34($fp) -/* 0C7C9C 800C709C 8FDE0038 */ lw $fp, 0x38($fp) -/* 0C7CA0 800C70A0 03E00008 */ jr $ra -/* 0C7CA4 800C70A4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/audio/external/func_800C70A8.s b/asm/non_matchings/audio/external/func_800C70A8.s deleted file mode 100644 index efa4233e0..000000000 --- a/asm/non_matchings/audio/external/func_800C70A8.s +++ /dev/null @@ -1,496 +0,0 @@ -.section .late_rodata - -glabel D_800F37B8 -.float 3500.0 - -glabel jpt_800F37BC -.word L800C718C, L800C7198, L800C71B0, L800C71BC -.word L800C71A4, L800C71F4, L800C71F4, L800C71C8 -.word L800C71F4, L800C71F4, L800C71F4, L800C71F4 -.word L800C71EC, L800C71F4, L800C71D4, L800C71E0 - -glabel jpt_800F37FC -.word L800C7238, L800C7244, L800C725C, L800C7268 -.word L800C7250, L800C7294, L800C7294, L800C7274 -.word L800C7294, L800C7294, L800C7294, L800C7294 -.word L800C7290, L800C7294, L800C7280, L800C7288 - -glabel jpt_800F383C -.word L800C72F8, L800C72B8, L800C742C, L800C73B8 -.word L800C7378, L800C742C, L800C7338, L800C7428 -.word L800C742C, L800C7418, L800C7420 - -glabel jpt_800F3868 -.word L800C7494, L800C7454, L800C75C8, L800C7554 -.word L800C7514, L800C75C8, L800C74D4, L800C75C4 -.word L800C75C8, L800C75B4, L800C75BC - -.section .text - -glabel func_800C70A8 -/* 0C7CA8 800C70A8 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C7CAC 800C70AC 308500FF */ andi $a1, $a0, 0xff -/* 0C7CB0 800C70B0 3C0E800F */ lui $t6, %hi(D_800EA0EC) -/* 0C7CB4 800C70B4 ADA40010 */ sw $a0, 0x10($t5) -/* 0C7CB8 800C70B8 01C57021 */ addu $t6, $t6, $a1 -/* 0C7CBC 800C70BC 91CEA0EC */ lbu $t6, %lo(D_800EA0EC)($t6) -/* 0C7CC0 800C70C0 3C0F800F */ lui $t7, %hi(D_800E9E74) # $t7, 0x800f -/* 0C7CC4 800C70C4 25EF9E74 */ addiu $t7, %lo(D_800E9E74) # addiu $t7, $t7, -0x618c -/* 0C7CC8 800C70C8 15C0017A */ bnez $t6, .L800C76B4 -/* 0C7CCC 800C70CC 00051880 */ sll $v1, $a1, 2 -/* 0C7CD0 800C70D0 006F1021 */ addu $v0, $v1, $t7 -/* 0C7CD4 800C70D4 AC400000 */ sw $zero, ($v0) -/* 0C7CD8 800C70D8 3C01800F */ lui $at, %hi(D_800F37B8) # $at, 0x800f -/* 0C7CDC 800C70DC C42437B8 */ lwc1 $f4, %lo(D_800F37B8)($at) -/* 0C7CE0 800C70E0 3C01800F */ lui $at, %hi(D_800E9E54) -/* 0C7CE4 800C70E4 00230821 */ addu $at, $at, $v1 -/* 0C7CE8 800C70E8 C4269E54 */ lwc1 $f6, %lo(D_800E9E54)($at) -/* 0C7CEC 800C70EC 0005C0C0 */ sll $t8, $a1, 3 -/* 0C7CF0 800C70F0 0305C023 */ subu $t8, $t8, $a1 -/* 0C7CF4 800C70F4 4606203C */ c.lt.s $f4, $f6 -/* 0C7CF8 800C70F8 0018C100 */ sll $t8, $t8, 4 -/* 0C7CFC 800C70FC 0305C023 */ subu $t8, $t8, $a1 -/* 0C7D00 800C7100 0018C080 */ sll $t8, $t8, 2 -/* 0C7D04 800C7104 45010009 */ bc1t .L800C712C -/* 0C7D08 800C7108 0305C023 */ subu $t8, $t8, $a1 -/* 0C7D0C 800C710C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f -/* 0C7D10 800C7110 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 -/* 0C7D14 800C7114 0018C0C0 */ sll $t8, $t8, 3 -/* 0C7D18 800C7118 03191821 */ addu $v1, $t8, $t9 -/* 0C7D1C 800C711C 8C6400BC */ lw $a0, 0xbc($v1) -/* 0C7D20 800C7120 24010010 */ li $at, 16 -/* 0C7D24 800C7124 30890010 */ andi $t1, $a0, 0x10 -/* 0C7D28 800C7128 15210032 */ bne $t1, $at, .L800C71F4 -.L800C712C: -/* 0C7D2C 800C712C 000560C0 */ sll $t4, $a1, 3 -/* 0C7D30 800C7130 01856023 */ subu $t4, $t4, $a1 -/* 0C7D34 800C7134 000C6100 */ sll $t4, $t4, 4 -/* 0C7D38 800C7138 01856023 */ subu $t4, $t4, $a1 -/* 0C7D3C 800C713C 000C6080 */ sll $t4, $t4, 2 -/* 0C7D40 800C7140 01856023 */ subu $t4, $t4, $a1 -/* 0C7D44 800C7144 3C0E800F */ lui $t6, %hi(gPlayers) # $t6, 0x800f -/* 0C7D48 800C7148 25CE6990 */ addiu $t6, %lo(gPlayers) # addiu $t6, $t6, 0x6990 -/* 0C7D4C 800C714C 000C60C0 */ sll $t4, $t4, 3 -/* 0C7D50 800C7150 018E1821 */ addu $v1, $t4, $t6 -/* 0C7D54 800C7154 906F01D4 */ lbu $t7, 0x1d4($v1) -/* 0C7D58 800C7158 8C6400BC */ lw $a0, 0xbc($v1) -/* 0C7D5C 800C715C 240B0001 */ li $t3, 1 -/* 0C7D60 800C7160 25F8FFFE */ addiu $t8, $t7, -2 -/* 0C7D64 800C7164 2F010010 */ sltiu $at, $t8, 0x10 -/* 0C7D68 800C7168 AC4B0000 */ sw $t3, ($v0) -/* 0C7D6C 800C716C 10200021 */ beqz $at, .L800C71F4 -/* 0C7D70 800C7170 30890010 */ andi $t1, $a0, 0x10 -/* 0C7D74 800C7174 0018C080 */ sll $t8, $t8, 2 -/* 0C7D78 800C7178 3C01800F */ lui $at, %hi(jpt_800F37BC) -/* 0C7D7C 800C717C 00380821 */ addu $at, $at, $t8 -/* 0C7D80 800C7180 8C3837BC */ lw $t8, %lo(jpt_800F37BC)($at) -/* 0C7D84 800C7184 03000008 */ jr $t8 -/* 0C7D88 800C7188 00000000 */ nop -glabel L800C718C -/* 0C7D8C 800C718C 2419000D */ li $t9, 13 -/* 0C7D90 800C7190 10000018 */ b .L800C71F4 -/* 0C7D94 800C7194 AC590000 */ sw $t9, ($v0) -glabel L800C7198 -/* 0C7D98 800C7198 240B000E */ li $t3, 14 -/* 0C7D9C 800C719C 10000015 */ b .L800C71F4 -/* 0C7DA0 800C71A0 AC4B0000 */ sw $t3, ($v0) -glabel L800C71A4 -/* 0C7DA4 800C71A4 240C0011 */ li $t4, 17 -/* 0C7DA8 800C71A8 10000012 */ b .L800C71F4 -/* 0C7DAC 800C71AC AC4C0000 */ sw $t4, ($v0) -glabel L800C71B0 -/* 0C7DB0 800C71B0 240E000F */ li $t6, 15 -/* 0C7DB4 800C71B4 1000000F */ b .L800C71F4 -/* 0C7DB8 800C71B8 AC4E0000 */ sw $t6, ($v0) -glabel L800C71BC -/* 0C7DBC 800C71BC 240F0010 */ li $t7, 16 -/* 0C7DC0 800C71C0 1000000C */ b .L800C71F4 -/* 0C7DC4 800C71C4 AC4F0000 */ sw $t7, ($v0) -glabel L800C71C8 -/* 0C7DC8 800C71C8 24180014 */ li $t8, 20 -/* 0C7DCC 800C71CC 10000009 */ b .L800C71F4 -/* 0C7DD0 800C71D0 AC580000 */ sw $t8, ($v0) -glabel L800C71D4 -/* 0C7DD4 800C71D4 24070019 */ li $a3, 25 -/* 0C7DD8 800C71D8 10000006 */ b .L800C71F4 -/* 0C7DDC 800C71DC AC470000 */ sw $a3, ($v0) -glabel L800C71E0 -/* 0C7DE0 800C71E0 2406001A */ li $a2, 26 -/* 0C7DE4 800C71E4 10000003 */ b .L800C71F4 -/* 0C7DE8 800C71E8 AC460000 */ sw $a2, ($v0) -glabel L800C71EC -/* 0C7DEC 800C71EC 2408001B */ li $t0, 27 -/* 0C7DF0 800C71F0 AC480000 */ sw $t0, ($v0) -.L800C71F4: -glabel L800C71F4 -/* 0C7DF4 800C71F4 24010010 */ li $at, 16 -/* 0C7DF8 800C71F8 2406001A */ li $a2, 26 -/* 0C7DFC 800C71FC 24070019 */ li $a3, 25 -/* 0C7E00 800C7200 2408001B */ li $t0, 27 -/* 0C7E04 800C7204 15210023 */ bne $t1, $at, .L800C7294 -/* 0C7E08 800C7208 906A01D4 */ lbu $t2, 0x1d4($v1) -/* 0C7E0C 800C720C 254BFFFE */ addiu $t3, $t2, -2 -/* 0C7E10 800C7210 24190002 */ li $t9, 2 -/* 0C7E14 800C7214 2D610010 */ sltiu $at, $t3, 0x10 -/* 0C7E18 800C7218 1020001E */ beqz $at, .L800C7294 -/* 0C7E1C 800C721C AC590000 */ sw $t9, ($v0) -/* 0C7E20 800C7220 000B5880 */ sll $t3, $t3, 2 -/* 0C7E24 800C7224 3C01800F */ lui $at, %hi(jpt_800F37FC) -/* 0C7E28 800C7228 002B0821 */ addu $at, $at, $t3 -/* 0C7E2C 800C722C 8C2B37FC */ lw $t3, %lo(jpt_800F37FC)($at) -/* 0C7E30 800C7230 01600008 */ jr $t3 -/* 0C7E34 800C7234 00000000 */ nop -glabel L800C7238 -/* 0C7E38 800C7238 240C000D */ li $t4, 13 -/* 0C7E3C 800C723C 10000015 */ b .L800C7294 -/* 0C7E40 800C7240 AC4C0000 */ sw $t4, ($v0) -glabel L800C7244 -/* 0C7E44 800C7244 240E000E */ li $t6, 14 -/* 0C7E48 800C7248 10000012 */ b .L800C7294 -/* 0C7E4C 800C724C AC4E0000 */ sw $t6, ($v0) -glabel L800C7250 -/* 0C7E50 800C7250 240F0011 */ li $t7, 17 -/* 0C7E54 800C7254 1000000F */ b .L800C7294 -/* 0C7E58 800C7258 AC4F0000 */ sw $t7, ($v0) -glabel L800C725C -/* 0C7E5C 800C725C 2418000F */ li $t8, 15 -/* 0C7E60 800C7260 1000000C */ b .L800C7294 -/* 0C7E64 800C7264 AC580000 */ sw $t8, ($v0) -glabel L800C7268 -/* 0C7E68 800C7268 24190010 */ li $t9, 16 -/* 0C7E6C 800C726C 10000009 */ b .L800C7294 -/* 0C7E70 800C7270 AC590000 */ sw $t9, ($v0) -glabel L800C7274 -/* 0C7E74 800C7274 240B0014 */ li $t3, 20 -/* 0C7E78 800C7278 10000006 */ b .L800C7294 -/* 0C7E7C 800C727C AC4B0000 */ sw $t3, ($v0) -glabel L800C7280 -/* 0C7E80 800C7280 10000004 */ b .L800C7294 -/* 0C7E84 800C7284 AC470000 */ sw $a3, ($v0) -glabel L800C7288 -/* 0C7E88 800C7288 10000002 */ b .L800C7294 -/* 0C7E8C 800C728C AC460000 */ sw $a2, ($v0) -glabel L800C7290 -/* 0C7E90 800C7290 AC480000 */ sw $t0, ($v0) -.L800C7294: -glabel L800C7294 -/* 0C7E94 800C7294 254CFFF9 */ addiu $t4, $t2, -7 -/* 0C7E98 800C7298 2D81000B */ sltiu $at, $t4, 0xb -/* 0C7E9C 800C729C 10200063 */ beqz $at, .L800C742C -/* 0C7EA0 800C72A0 000C6080 */ sll $t4, $t4, 2 -/* 0C7EA4 800C72A4 3C01800F */ lui $at, %hi(jpt_800F383C) -/* 0C7EA8 800C72A8 002C0821 */ addu $at, $at, $t4 -/* 0C7EAC 800C72AC 8C2C383C */ lw $t4, %lo(jpt_800F383C)($at) -/* 0C7EB0 800C72B0 01800008 */ jr $t4 -/* 0C7EB4 800C72B4 00000000 */ nop -glabel L800C72B8 -/* 0C7EB8 800C72B8 8C4E0000 */ lw $t6, ($v0) -/* 0C7EBC 800C72BC 24010006 */ li $at, 6 -/* 0C7EC0 800C72C0 240F0004 */ li $t7, 4 -/* 0C7EC4 800C72C4 15C10003 */ bne $t6, $at, .L800C72D4 -/* 0C7EC8 800C72C8 3C18800F */ lui $t8, %hi(D_800EA1C0) # $t8, 0x800f -/* 0C7ECC 800C72CC 10000057 */ b .L800C742C -/* 0C7ED0 800C72D0 AC4F0000 */ sw $t7, ($v0) -.L800C72D4: -/* 0C7ED4 800C72D4 9318A1C0 */ lbu $t8, %lo(D_800EA1C0)($t8) -/* 0C7ED8 800C72D8 24190005 */ li $t9, 5 -/* 0C7EDC 800C72DC 240B0004 */ li $t3, 4 -/* 0C7EE0 800C72E0 17000003 */ bnez $t8, .L800C72F0 -/* 0C7EE4 800C72E4 00000000 */ nop -/* 0C7EE8 800C72E8 10000050 */ b .L800C742C -/* 0C7EEC 800C72EC AC590000 */ sw $t9, ($v0) -.L800C72F0: -/* 0C7EF0 800C72F0 1000004E */ b .L800C742C -/* 0C7EF4 800C72F4 AC4B0000 */ sw $t3, ($v0) -glabel L800C72F8 -/* 0C7EF8 800C72F8 8C4C0000 */ lw $t4, ($v0) -/* 0C7EFC 800C72FC 2401000C */ li $at, 12 -/* 0C7F00 800C7300 240E000A */ li $t6, 10 -/* 0C7F04 800C7304 15810003 */ bne $t4, $at, .L800C7314 -/* 0C7F08 800C7308 3C0F800F */ lui $t7, %hi(D_800EA1C0) # $t7, 0x800f -/* 0C7F0C 800C730C 10000047 */ b .L800C742C -/* 0C7F10 800C7310 AC4E0000 */ sw $t6, ($v0) -.L800C7314: -/* 0C7F14 800C7314 91EFA1C0 */ lbu $t7, %lo(D_800EA1C0)($t7) -/* 0C7F18 800C7318 2418000B */ li $t8, 11 -/* 0C7F1C 800C731C 2419000A */ li $t9, 10 -/* 0C7F20 800C7320 15E00003 */ bnez $t7, .L800C7330 -/* 0C7F24 800C7324 00000000 */ nop -/* 0C7F28 800C7328 10000040 */ b .L800C742C -/* 0C7F2C 800C732C AC580000 */ sw $t8, ($v0) -.L800C7330: -/* 0C7F30 800C7330 1000003E */ b .L800C742C -/* 0C7F34 800C7334 AC590000 */ sw $t9, ($v0) -glabel L800C7338 -/* 0C7F38 800C7338 8C4B0000 */ lw $t3, ($v0) -/* 0C7F3C 800C733C 24010018 */ li $at, 24 -/* 0C7F40 800C7340 240C0016 */ li $t4, 22 -/* 0C7F44 800C7344 15610003 */ bne $t3, $at, .L800C7354 -/* 0C7F48 800C7348 3C0E800F */ lui $t6, %hi(D_800EA1C0) # $t6, 0x800f -/* 0C7F4C 800C734C 10000037 */ b .L800C742C -/* 0C7F50 800C7350 AC4C0000 */ sw $t4, ($v0) -.L800C7354: -/* 0C7F54 800C7354 91CEA1C0 */ lbu $t6, %lo(D_800EA1C0)($t6) -/* 0C7F58 800C7358 240F0017 */ li $t7, 23 -/* 0C7F5C 800C735C 24180016 */ li $t8, 22 -/* 0C7F60 800C7360 15C00003 */ bnez $t6, .L800C7370 -/* 0C7F64 800C7364 00000000 */ nop -/* 0C7F68 800C7368 10000030 */ b .L800C742C -/* 0C7F6C 800C736C AC4F0000 */ sw $t7, ($v0) -.L800C7370: -/* 0C7F70 800C7370 1000002E */ b .L800C742C -/* 0C7F74 800C7374 AC580000 */ sw $t8, ($v0) -glabel L800C7378 -/* 0C7F78 800C7378 8C590000 */ lw $t9, ($v0) -/* 0C7F7C 800C737C 2401001F */ li $at, 31 -/* 0C7F80 800C7380 240B001D */ li $t3, 29 -/* 0C7F84 800C7384 17210003 */ bne $t9, $at, .L800C7394 -/* 0C7F88 800C7388 3C0C800F */ lui $t4, %hi(D_800EA1C0) # $t4, 0x800f -/* 0C7F8C 800C738C 10000027 */ b .L800C742C -/* 0C7F90 800C7390 AC4B0000 */ sw $t3, ($v0) -.L800C7394: -/* 0C7F94 800C7394 918CA1C0 */ lbu $t4, %lo(D_800EA1C0)($t4) -/* 0C7F98 800C7398 240E001E */ li $t6, 30 -/* 0C7F9C 800C739C 240F001D */ li $t7, 29 -/* 0C7FA0 800C73A0 15800003 */ bnez $t4, .L800C73B0 -/* 0C7FA4 800C73A4 00000000 */ nop -/* 0C7FA8 800C73A8 10000020 */ b .L800C742C -/* 0C7FAC 800C73AC AC4E0000 */ sw $t6, ($v0) -.L800C73B0: -/* 0C7FB0 800C73B0 1000001E */ b .L800C742C -/* 0C7FB4 800C73B4 AC4F0000 */ sw $t7, ($v0) -glabel L800C73B8 -/* 0C7FB8 800C73B8 3C18800F */ lui $t8, %hi(D_800E9F74) -/* 0C7FBC 800C73BC 0305C021 */ addu $t8, $t8, $a1 -/* 0C7FC0 800C73C0 93189F74 */ lbu $t8, %lo(D_800E9F74)($t8) -/* 0C7FC4 800C73C4 57000012 */ bnel $t8, $zero, .L800C7410 -/* 0C7FC8 800C73C8 2418001C */ li $t8, 28 -/* 0C7FCC 800C73CC 8C590000 */ lw $t9, ($v0) -/* 0C7FD0 800C73D0 24010009 */ li $at, 9 -/* 0C7FD4 800C73D4 240B0007 */ li $t3, 7 -/* 0C7FD8 800C73D8 17210003 */ bne $t9, $at, .L800C73E8 -/* 0C7FDC 800C73DC 3C0C800F */ lui $t4, %hi(D_800EA1C0) # $t4, 0x800f -/* 0C7FE0 800C73E0 10000012 */ b .L800C742C -/* 0C7FE4 800C73E4 AC4B0000 */ sw $t3, ($v0) -.L800C73E8: -/* 0C7FE8 800C73E8 918CA1C0 */ lbu $t4, %lo(D_800EA1C0)($t4) -/* 0C7FEC 800C73EC 240E0008 */ li $t6, 8 -/* 0C7FF0 800C73F0 240F0007 */ li $t7, 7 -/* 0C7FF4 800C73F4 15800003 */ bnez $t4, .L800C7404 -/* 0C7FF8 800C73F8 00000000 */ nop -/* 0C7FFC 800C73FC 1000000B */ b .L800C742C -/* 0C8000 800C7400 AC4E0000 */ sw $t6, ($v0) -.L800C7404: -/* 0C8004 800C7404 10000009 */ b .L800C742C -/* 0C8008 800C7408 AC4F0000 */ sw $t7, ($v0) -/* 0C800C 800C740C 2418001C */ li $t8, 28 -.L800C7410: -/* 0C8010 800C7410 10000006 */ b .L800C742C -/* 0C8014 800C7414 AC580000 */ sw $t8, ($v0) -glabel L800C7418 -/* 0C8018 800C7418 10000004 */ b .L800C742C -/* 0C801C 800C741C AC470000 */ sw $a3, ($v0) -glabel L800C7420 -/* 0C8020 800C7420 10000002 */ b .L800C742C -/* 0C8024 800C7424 AC460000 */ sw $a2, ($v0) -glabel L800C7428 -/* 0C8028 800C7428 AC480000 */ sw $t0, ($v0) -.L800C742C: -glabel L800C742C -/* 0C802C 800C742C 907901EC */ lbu $t9, 0x1ec($v1) -/* 0C8030 800C7430 272BFFF9 */ addiu $t3, $t9, -7 -/* 0C8034 800C7434 2D61000B */ sltiu $at, $t3, 0xb -/* 0C8038 800C7438 10200063 */ beqz $at, .L800C75C8 -/* 0C803C 800C743C 000B5880 */ sll $t3, $t3, 2 -/* 0C8040 800C7440 3C01800F */ lui $at, %hi(jpt_800F3868) -/* 0C8044 800C7444 002B0821 */ addu $at, $at, $t3 -/* 0C8048 800C7448 8C2B3868 */ lw $t3, %lo(jpt_800F3868)($at) -/* 0C804C 800C744C 01600008 */ jr $t3 -/* 0C8050 800C7450 00000000 */ nop -glabel L800C7454 -/* 0C8054 800C7454 8C4C0000 */ lw $t4, ($v0) -/* 0C8058 800C7458 24010005 */ li $at, 5 -/* 0C805C 800C745C 240E0004 */ li $t6, 4 -/* 0C8060 800C7460 15810003 */ bne $t4, $at, .L800C7470 -/* 0C8064 800C7464 3C0F800F */ lui $t7, %hi(D_800EA1C0) # $t7, 0x800f -/* 0C8068 800C7468 10000057 */ b .L800C75C8 -/* 0C806C 800C746C AC4E0000 */ sw $t6, ($v0) -.L800C7470: -/* 0C8070 800C7470 91EFA1C0 */ lbu $t7, %lo(D_800EA1C0)($t7) -/* 0C8074 800C7474 24180006 */ li $t8, 6 -/* 0C8078 800C7478 24190004 */ li $t9, 4 -/* 0C807C 800C747C 15E00003 */ bnez $t7, .L800C748C -/* 0C8080 800C7480 00000000 */ nop -/* 0C8084 800C7484 10000050 */ b .L800C75C8 -/* 0C8088 800C7488 AC580000 */ sw $t8, ($v0) -.L800C748C: -/* 0C808C 800C748C 1000004E */ b .L800C75C8 -/* 0C8090 800C7490 AC590000 */ sw $t9, ($v0) -glabel L800C7494 -/* 0C8094 800C7494 8C4B0000 */ lw $t3, ($v0) -/* 0C8098 800C7498 2401000B */ li $at, 11 -/* 0C809C 800C749C 240C000A */ li $t4, 10 -/* 0C80A0 800C74A0 15610003 */ bne $t3, $at, .L800C74B0 -/* 0C80A4 800C74A4 3C0E800F */ lui $t6, %hi(D_800EA1C0) # $t6, 0x800f -/* 0C80A8 800C74A8 10000047 */ b .L800C75C8 -/* 0C80AC 800C74AC AC4C0000 */ sw $t4, ($v0) -.L800C74B0: -/* 0C80B0 800C74B0 91CEA1C0 */ lbu $t6, %lo(D_800EA1C0)($t6) -/* 0C80B4 800C74B4 240F000C */ li $t7, 12 -/* 0C80B8 800C74B8 2418000A */ li $t8, 10 -/* 0C80BC 800C74BC 15C00003 */ bnez $t6, .L800C74CC -/* 0C80C0 800C74C0 00000000 */ nop -/* 0C80C4 800C74C4 10000040 */ b .L800C75C8 -/* 0C80C8 800C74C8 AC4F0000 */ sw $t7, ($v0) -.L800C74CC: -/* 0C80CC 800C74CC 1000003E */ b .L800C75C8 -/* 0C80D0 800C74D0 AC580000 */ sw $t8, ($v0) -glabel L800C74D4 -/* 0C80D4 800C74D4 8C590000 */ lw $t9, ($v0) -/* 0C80D8 800C74D8 24010017 */ li $at, 23 -/* 0C80DC 800C74DC 240B0016 */ li $t3, 22 -/* 0C80E0 800C74E0 17210003 */ bne $t9, $at, .L800C74F0 -/* 0C80E4 800C74E4 3C0C800F */ lui $t4, %hi(D_800EA1C0) # $t4, 0x800f -/* 0C80E8 800C74E8 10000037 */ b .L800C75C8 -/* 0C80EC 800C74EC AC4B0000 */ sw $t3, ($v0) -.L800C74F0: -/* 0C80F0 800C74F0 918CA1C0 */ lbu $t4, %lo(D_800EA1C0)($t4) -/* 0C80F4 800C74F4 240E0018 */ li $t6, 24 -/* 0C80F8 800C74F8 240F0016 */ li $t7, 22 -/* 0C80FC 800C74FC 15800003 */ bnez $t4, .L800C750C -/* 0C8100 800C7500 00000000 */ nop -/* 0C8104 800C7504 10000030 */ b .L800C75C8 -/* 0C8108 800C7508 AC4E0000 */ sw $t6, ($v0) -.L800C750C: -/* 0C810C 800C750C 1000002E */ b .L800C75C8 -/* 0C8110 800C7510 AC4F0000 */ sw $t7, ($v0) -glabel L800C7514 -/* 0C8114 800C7514 8C580000 */ lw $t8, ($v0) -/* 0C8118 800C7518 2401001E */ li $at, 30 -/* 0C811C 800C751C 2419001D */ li $t9, 29 -/* 0C8120 800C7520 17010003 */ bne $t8, $at, .L800C7530 -/* 0C8124 800C7524 3C0B800F */ lui $t3, %hi(D_800EA1C0) # $t3, 0x800f -/* 0C8128 800C7528 10000027 */ b .L800C75C8 -/* 0C812C 800C752C AC590000 */ sw $t9, ($v0) -.L800C7530: -/* 0C8130 800C7530 916BA1C0 */ lbu $t3, %lo(D_800EA1C0)($t3) -/* 0C8134 800C7534 240C001F */ li $t4, 31 -/* 0C8138 800C7538 240E001D */ li $t6, 29 -/* 0C813C 800C753C 15600003 */ bnez $t3, .L800C754C -/* 0C8140 800C7540 00000000 */ nop -/* 0C8144 800C7544 10000020 */ b .L800C75C8 -/* 0C8148 800C7548 AC4C0000 */ sw $t4, ($v0) -.L800C754C: -/* 0C814C 800C754C 1000001E */ b .L800C75C8 -/* 0C8150 800C7550 AC4E0000 */ sw $t6, ($v0) -glabel L800C7554 -/* 0C8154 800C7554 3C0F800F */ lui $t7, %hi(D_800E9F74) -/* 0C8158 800C7558 01E57821 */ addu $t7, $t7, $a1 -/* 0C815C 800C755C 91EF9F74 */ lbu $t7, %lo(D_800E9F74)($t7) -/* 0C8160 800C7560 55E00012 */ bnel $t7, $zero, .L800C75AC -/* 0C8164 800C7564 240F001C */ li $t7, 28 -/* 0C8168 800C7568 8C580000 */ lw $t8, ($v0) -/* 0C816C 800C756C 24010008 */ li $at, 8 -/* 0C8170 800C7570 24190007 */ li $t9, 7 -/* 0C8174 800C7574 17010003 */ bne $t8, $at, .L800C7584 -/* 0C8178 800C7578 3C0B800F */ lui $t3, %hi(D_800EA1C0) # $t3, 0x800f -/* 0C817C 800C757C 10000012 */ b .L800C75C8 -/* 0C8180 800C7580 AC590000 */ sw $t9, ($v0) -.L800C7584: -/* 0C8184 800C7584 916BA1C0 */ lbu $t3, %lo(D_800EA1C0)($t3) -/* 0C8188 800C7588 240C0009 */ li $t4, 9 -/* 0C818C 800C758C 240E0007 */ li $t6, 7 -/* 0C8190 800C7590 15600003 */ bnez $t3, .L800C75A0 -/* 0C8194 800C7594 00000000 */ nop -/* 0C8198 800C7598 1000000B */ b .L800C75C8 -/* 0C819C 800C759C AC4C0000 */ sw $t4, ($v0) -.L800C75A0: -/* 0C81A0 800C75A0 10000009 */ b .L800C75C8 -/* 0C81A4 800C75A4 AC4E0000 */ sw $t6, ($v0) -/* 0C81A8 800C75A8 240F001C */ li $t7, 28 -.L800C75AC: -/* 0C81AC 800C75AC 10000006 */ b .L800C75C8 -/* 0C81B0 800C75B0 AC4F0000 */ sw $t7, ($v0) -glabel L800C75B4 -/* 0C81B4 800C75B4 10000004 */ b .L800C75C8 -/* 0C81B8 800C75B8 AC470000 */ sw $a3, ($v0) -glabel L800C75BC -/* 0C81BC 800C75BC 10000002 */ b .L800C75C8 -/* 0C81C0 800C75C0 AC460000 */ sw $a2, ($v0) -glabel L800C75C4 -/* 0C81C4 800C75C4 AC480000 */ sw $t0, ($v0) -.L800C75C8: -glabel L800C75C8 -/* 0C81C8 800C75C8 3C013F00 */ li $at, 0x3F000000 # 0.500000 -/* 0C81CC 800C75CC 44815000 */ mtc1 $at, $f10 -/* 0C81D0 800C75D0 C4680094 */ lwc1 $f8, 0x94($v1) -/* 0C81D4 800C75D4 44808000 */ mtc1 $zero, $f16 -/* 0C81D8 800C75D8 24010008 */ li $at, 8 -/* 0C81DC 800C75DC 460A403C */ c.lt.s $f8, $f10 -/* 0C81E0 800C75E0 30980008 */ andi $t8, $a0, 8 -/* 0C81E4 800C75E4 308B4000 */ andi $t3, $a0, 0x4000 -/* 0C81E8 800C75E8 308F0800 */ andi $t7, $a0, 0x800 -/* 0C81EC 800C75EC 45030004 */ bc1tl .L800C7600 -/* 0C81F0 800C75F0 8C590000 */ lw $t9, ($v0) -/* 0C81F4 800C75F4 57010007 */ bnel $t8, $at, .L800C7614 -/* 0C81F8 800C75F8 24014000 */ li $at, 16384 -/* 0C81FC 800C75FC 8C590000 */ lw $t9, ($v0) -.L800C7600: -/* 0C8200 800C7600 2401001C */ li $at, 28 -/* 0C8204 800C7604 53210003 */ beql $t9, $at, .L800C7614 -/* 0C8208 800C7608 24014000 */ li $at, 16384 -/* 0C820C 800C760C AC400000 */ sw $zero, ($v0) -/* 0C8210 800C7610 24014000 */ li $at, 16384 -.L800C7614: -/* 0C8214 800C7614 55610006 */ bnel $t3, $at, .L800C7630 -/* 0C8218 800C7618 24010800 */ li $at, 2048 -/* 0C821C 800C761C 946C0000 */ lhu $t4, ($v1) -/* 0C8220 800C7620 24012000 */ li $at, 8192 -/* 0C8224 800C7624 318E2000 */ andi $t6, $t4, 0x2000 -/* 0C8228 800C7628 15C1000D */ bne $t6, $at, .L800C7660 -/* 0C822C 800C762C 24010800 */ li $at, 2048 -.L800C7630: -/* 0C8230 800C7630 11E1000B */ beq $t7, $at, .L800C7660 -/* 0C8234 800C7634 30980080 */ andi $t8, $a0, 0x80 -/* 0C8238 800C7638 24010080 */ li $at, 128 -/* 0C823C 800C763C 13010008 */ beq $t8, $at, .L800C7660 -/* 0C8240 800C7640 30990040 */ andi $t9, $a0, 0x40 -/* 0C8244 800C7644 24010040 */ li $at, 64 -/* 0C8248 800C7648 53210006 */ beql $t9, $at, .L800C7664 -/* 0C824C 800C764C 240E0012 */ li $t6, 18 -/* 0C8250 800C7650 846B0044 */ lh $t3, 0x44($v1) -/* 0C8254 800C7654 24014000 */ li $at, 16384 -/* 0C8258 800C7658 316C4000 */ andi $t4, $t3, 0x4000 -/* 0C825C 800C765C 15810002 */ bne $t4, $at, .L800C7668 -.L800C7660: -/* 0C8260 800C7660 240E0012 */ li $t6, 18 -.L800C7664: -/* 0C8264 800C7664 AC4E0000 */ sw $t6, ($v0) -.L800C7668: -/* 0C8268 800C7668 308F0020 */ andi $t7, $a0, 0x20 -/* 0C826C 800C766C 24010020 */ li $at, 32 -/* 0C8270 800C7670 15E10005 */ bne $t7, $at, .L800C7688 -/* 0C8274 800C7674 308B0800 */ andi $t3, $a0, 0x800 -/* 0C8278 800C7678 94780000 */ lhu $t8, ($v1) -/* 0C827C 800C767C 24012000 */ li $at, 8192 -/* 0C8280 800C7680 33192000 */ andi $t9, $t8, 0x2000 -/* 0C8284 800C7684 17210002 */ bne $t9, $at, .L800C7690 -.L800C7688: -/* 0C8288 800C7688 24010800 */ li $at, 2048 -/* 0C828C 800C768C 15610002 */ bne $t3, $at, .L800C7698 -.L800C7690: -/* 0C8290 800C7690 240C0013 */ li $t4, 19 -/* 0C8294 800C7694 AC4C0000 */ sw $t4, ($v0) -.L800C7698: -/* 0C8298 800C7698 C472020C */ lwc1 $f18, 0x20c($v1) -/* 0C829C 800C769C 240E0003 */ li $t6, 3 -/* 0C82A0 800C76A0 46128032 */ c.eq.s $f16, $f18 -/* 0C82A4 800C76A4 00000000 */ nop -/* 0C82A8 800C76A8 45030003 */ bc1tl .L800C76B8 -/* 0C82AC 800C76AC 01A0E825 */ move $sp, $t5 -/* 0C82B0 800C76B0 AC4E0000 */ sw $t6, ($v0) -.L800C76B4: -/* 0C82B4 800C76B4 01A0E825 */ move $sp, $t5 -.L800C76B8: -/* 0C82B8 800C76B8 03E00008 */ jr $ra -/* 0C82BC 800C76BC 25BD0010 */ addiu $sp, $t5, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C847C.s b/asm/non_matchings/audio/external/func_800C847C.s deleted file mode 100644 index 1d4cf4287..000000000 --- a/asm/non_matchings/audio/external/func_800C847C.s +++ /dev/null @@ -1,158 +0,0 @@ -glabel func_800C847C -/* 0C907C 800C847C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0C9080 800C8480 AFB0002C */ sw $s0, 0x2c($sp) -/* 0C9084 800C8484 309000FF */ andi $s0, $a0, 0xff -/* 0C9088 800C8488 001070C0 */ sll $t6, $s0, 3 -/* 0C908C 800C848C 01D07023 */ subu $t6, $t6, $s0 -/* 0C9090 800C8490 000E7100 */ sll $t6, $t6, 4 -/* 0C9094 800C8494 01D07023 */ subu $t6, $t6, $s0 -/* 0C9098 800C8498 000E7080 */ sll $t6, $t6, 2 -/* 0C909C 800C849C 01D07023 */ subu $t6, $t6, $s0 -/* 0C90A0 800C84A0 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f -/* 0C90A4 800C84A4 25EF6990 */ addiu $t7, %lo(gPlayers) # addiu $t7, $t7, 0x6990 -/* 0C90A8 800C84A8 000E70C0 */ sll $t6, $t6, 3 -/* 0C90AC 800C84AC 01CFC021 */ addu $t8, $t6, $t7 -/* 0C90B0 800C84B0 AFBF0034 */ sw $ra, 0x34($sp) -/* 0C90B4 800C84B4 AFBE0030 */ sw $fp, 0x30($sp) -/* 0C90B8 800C84B8 AFA40040 */ sw $a0, 0x40($sp) -/* 0C90BC 800C84BC AFB8003C */ sw $t8, 0x3c($sp) -/* 0C90C0 800C84C0 971900DE */ lhu $t9, 0xde($t8) -/* 0C90C4 800C84C4 24030001 */ li $v1, 1 -/* 0C90C8 800C84C8 03A0F025 */ move $fp, $sp -/* 0C90CC 800C84CC 33280001 */ andi $t0, $t9, 1 -/* 0C90D0 800C84D0 14680050 */ bne $v1, $t0, .L800C8614 -/* 0C90D4 800C84D4 3C09800F */ lui $t1, %hi(D_800E9F74) -/* 0C90D8 800C84D8 3C09800F */ lui $t1, %hi(D_800E9F74) # $t1, 0x800f -/* 0C90DC 800C84DC 25299F74 */ addiu $t1, %lo(D_800E9F74) # addiu $t1, $t1, -0x608c -/* 0C90E0 800C84E0 02091021 */ addu $v0, $s0, $t1 -/* 0C90E4 800C84E4 904A0000 */ lbu $t2, ($v0) -/* 0C90E8 800C84E8 3C0B800F */ lui $t3, %hi(D_800EA1C0) # $t3, 0x800f -/* 0C90EC 800C84EC 55400075 */ bnel $t2, $zero, .L800C86C4 -/* 0C90F0 800C84F0 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C90F4 800C84F4 916BA1C0 */ lbu $t3, %lo(D_800EA1C0)($t3) -/* 0C90F8 800C84F8 3C050100 */ lui $a1, (0x01008026 >> 16) # lui $a1, 0x100 -/* 0C90FC 800C84FC 34A58026 */ ori $a1, (0x01008026 & 0xFFFF) # ori $a1, $a1, 0x8026 -/* 0C9100 800C8500 29610002 */ slti $at, $t3, 2 -/* 0C9104 800C8504 10200008 */ beqz $at, .L800C8528 -/* 0C9108 800C8508 320400FF */ andi $a0, $s0, 0xff -/* 0C910C 800C850C 3C050100 */ lui $a1, (0x0100F926 >> 16) # lui $a1, 0x100 -/* 0C9110 800C8510 34A5F926 */ ori $a1, (0x0100F926 & 0xFFFF) # ori $a1, $a1, 0xf926 -/* 0C9114 800C8514 320400FF */ andi $a0, $s0, 0xff -/* 0C9118 800C8518 0C032406 */ jal func_800C9018 -/* 0C911C 800C851C AFC20038 */ sw $v0, 0x38($fp) -/* 0C9120 800C8520 10000004 */ b .L800C8534 -/* 0C9124 800C8524 8FC20038 */ lw $v0, 0x38($fp) -.L800C8528: -/* 0C9128 800C8528 0C032406 */ jal func_800C9018 -/* 0C912C 800C852C AFC20038 */ sw $v0, 0x38($fp) -/* 0C9130 800C8530 8FC20038 */ lw $v0, 0x38($fp) -.L800C8534: -/* 0C9134 800C8534 320400FF */ andi $a0, $s0, 0xff -/* 0C9138 800C8538 0C0325F1 */ jal func_800C97C4 -/* 0C913C 800C853C AFC20038 */ sw $v0, 0x38($fp) -/* 0C9140 800C8540 8FC20038 */ lw $v0, 0x38($fp) -/* 0C9144 800C8544 240C0001 */ li $t4, 1 -/* 0C9148 800C8548 320400FF */ andi $a0, $s0, 0xff -/* 0C914C 800C854C 0C032529 */ jal func_800C94A4 -/* 0C9150 800C8550 A04C0000 */ sb $t4, ($v0) -/* 0C9154 800C8554 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 0C9158 800C8558 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 0C915C 800C855C 24010001 */ li $at, 1 -/* 0C9160 800C8560 3C0D800F */ lui $t5, %hi(D_800EA0EC) -/* 0C9164 800C8564 10410014 */ beq $v0, $at, .L800C85B8 -/* 0C9168 800C8568 01B06821 */ addu $t5, $t5, $s0 -/* 0C916C 800C856C 24010002 */ li $at, 2 -/* 0C9170 800C8570 10410011 */ beq $v0, $at, .L800C85B8 -/* 0C9174 800C8574 24010003 */ li $at, 3 -/* 0C9178 800C8578 1041000F */ beq $v0, $at, .L800C85B8 -/* 0C917C 800C857C 24010004 */ li $at, 4 -/* 0C9180 800C8580 1041000D */ beq $v0, $at, .L800C85B8 -/* 0C9184 800C8584 24010005 */ li $at, 5 -/* 0C9188 800C8588 1041000B */ beq $v0, $at, .L800C85B8 -/* 0C918C 800C858C 24010006 */ li $at, 6 -/* 0C9190 800C8590 10410009 */ beq $v0, $at, .L800C85B8 -/* 0C9194 800C8594 24010007 */ li $at, 7 -/* 0C9198 800C8598 10410007 */ beq $v0, $at, .L800C85B8 -/* 0C919C 800C859C 2401000C */ li $at, 12 -/* 0C91A0 800C85A0 10410005 */ beq $v0, $at, .L800C85B8 -/* 0C91A4 800C85A4 24010012 */ li $at, 18 -/* 0C91A8 800C85A8 10410003 */ beq $v0, $at, .L800C85B8 -/* 0C91AC 800C85AC 24010013 */ li $at, 19 -/* 0C91B0 800C85B0 54410044 */ bnel $v0, $at, .L800C86C4 -/* 0C91B4 800C85B4 8FDF0034 */ lw $ra, 0x34($fp) -.L800C85B8: -/* 0C91B8 800C85B8 91ADA0EC */ lbu $t5, %lo(D_800EA0EC)($t5) -/* 0C91BC 800C85BC 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C91C0 800C85C0 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C91C4 800C85C4 15A0003E */ bnez $t5, .L800C86C0 -/* 0C91C8 800C85C8 3C012900 */ lui $at, (0x29008005 >> 16) # lui $at, 0x2900 -/* 0C91CC 800C85CC 8FCE003C */ lw $t6, 0x3c($fp) -/* 0C91D0 800C85D0 0010C100 */ sll $t8, $s0, 4 -/* 0C91D4 800C85D4 0310C023 */ subu $t8, $t8, $s0 -/* 0C91D8 800C85D8 95C40254 */ lhu $a0, 0x254($t6) -/* 0C91DC 800C85DC 3C19800F */ lui $t9, %hi(D_800E9F7C) # $t9, 0x800f -/* 0C91E0 800C85E0 27399F7C */ addiu $t9, %lo(D_800E9F7C) # addiu $t9, $t9, -0x6084 -/* 0C91E4 800C85E4 0018C080 */ sll $t8, $t8, 2 -/* 0C91E8 800C85E8 03192821 */ addu $a1, $t8, $t9 -/* 0C91EC 800C85EC 24A80014 */ addiu $t0, $a1, 0x14 -/* 0C91F0 800C85F0 34218005 */ ori $at, (0x29008005 & 0xFFFF) # ori $at, $at, 0x8005 -/* 0C91F4 800C85F4 00047900 */ sll $t7, $a0, 4 -/* 0C91F8 800C85F8 01E12021 */ addu $a0, $t7, $at -/* 0C91FC 800C85FC AFA80014 */ sw $t0, 0x14($sp) -/* 0C9200 800C8600 AFA70010 */ sw $a3, 0x10($sp) -/* 0C9204 800C8604 0C031052 */ jal play_sound -/* 0C9208 800C8608 320600FF */ andi $a2, $s0, 0xff -/* 0C920C 800C860C 1000002D */ b .L800C86C4 -/* 0C9210 800C8610 8FDF0034 */ lw $ra, 0x34($fp) -.L800C8614: -/* 0C9214 800C8614 25299F74 */ addiu $t1, $t1, %lo(D_800E9F74) -/* 0C9218 800C8618 02091021 */ addu $v0, $s0, $t1 -/* 0C921C 800C861C 904A0000 */ lbu $t2, ($v0) -/* 0C9220 800C8620 320400FF */ andi $a0, $s0, 0xff -/* 0C9224 800C8624 546A0027 */ bnel $v1, $t2, .L800C86C4 -/* 0C9228 800C8628 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C922C 800C862C 0C0325F1 */ jal func_800C97C4 -/* 0C9230 800C8630 AFC20038 */ sw $v0, 0x38($fp) -/* 0C9234 800C8634 8FC20038 */ lw $v0, 0x38($fp) -/* 0C9238 800C8638 240B0002 */ li $t3, 2 -/* 0C923C 800C863C 320400FF */ andi $a0, $s0, 0xff -/* 0C9240 800C8640 0C032529 */ jal func_800C94A4 -/* 0C9244 800C8644 A04B0000 */ sb $t3, ($v0) -/* 0C9248 800C8648 8FC20038 */ lw $v0, 0x38($fp) -/* 0C924C 800C864C 3C0C800E */ lui $t4, %hi(gCurrentCourseId) # $t4, 0x800e -/* 0C9250 800C8650 24010006 */ li $at, 6 -/* 0C9254 800C8654 A0400000 */ sb $zero, ($v0) -/* 0C9258 800C8658 858CC5A0 */ lh $t4, %lo(gCurrentCourseId)($t4) -/* 0C925C 800C865C 3C0D800F */ lui $t5, %hi(D_800EA0EC) -/* 0C9260 800C8660 01B06821 */ addu $t5, $t5, $s0 -/* 0C9264 800C8664 55810017 */ bnel $t4, $at, .L800C86C4 -/* 0C9268 800C8668 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C926C 800C866C 91ADA0EC */ lbu $t5, %lo(D_800EA0EC)($t5) -/* 0C9270 800C8670 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C9274 800C8674 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C9278 800C8678 15A00011 */ bnez $t5, .L800C86C0 -/* 0C927C 800C867C 3C012900 */ lui $at, (0x29008008 >> 16) # lui $at, 0x2900 -/* 0C9280 800C8680 8FCE003C */ lw $t6, 0x3c($fp) -/* 0C9284 800C8684 0010C100 */ sll $t8, $s0, 4 -/* 0C9288 800C8688 0310C023 */ subu $t8, $t8, $s0 -/* 0C928C 800C868C 95C40254 */ lhu $a0, 0x254($t6) -/* 0C9290 800C8690 3C19800F */ lui $t9, %hi(D_800E9F7C) # $t9, 0x800f -/* 0C9294 800C8694 27399F7C */ addiu $t9, %lo(D_800E9F7C) # addiu $t9, $t9, -0x6084 -/* 0C9298 800C8698 0018C080 */ sll $t8, $t8, 2 -/* 0C929C 800C869C 03192821 */ addu $a1, $t8, $t9 -/* 0C92A0 800C86A0 24A80014 */ addiu $t0, $a1, 0x14 -/* 0C92A4 800C86A4 34218008 */ ori $at, (0x29008008 & 0xFFFF) # ori $at, $at, 0x8008 -/* 0C92A8 800C86A8 00047900 */ sll $t7, $a0, 4 -/* 0C92AC 800C86AC 01E12021 */ addu $a0, $t7, $at -/* 0C92B0 800C86B0 AFA80014 */ sw $t0, 0x14($sp) -/* 0C92B4 800C86B4 AFA70010 */ sw $a3, 0x10($sp) -/* 0C92B8 800C86B8 0C031052 */ jal play_sound -/* 0C92BC 800C86BC 320600FF */ andi $a2, $s0, 0xff -.L800C86C0: -/* 0C92C0 800C86C0 8FDF0034 */ lw $ra, 0x34($fp) -.L800C86C4: -/* 0C92C4 800C86C4 03C0E825 */ move $sp, $fp -/* 0C92C8 800C86C8 8FD0002C */ lw $s0, 0x2c($fp) -/* 0C92CC 800C86CC 8FDE0030 */ lw $fp, 0x30($fp) -/* 0C92D0 800C86D0 03E00008 */ jr $ra -/* 0C92D4 800C86D4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/audio/external/func_800C90F4.s b/asm/non_matchings/audio/external/func_800C90F4.s deleted file mode 100644 index b94848795..000000000 --- a/asm/non_matchings/audio/external/func_800C90F4.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_800C90F4 -/* 0C9CF4 800C90F4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0C9CF8 800C90F8 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0C9CFC 800C90FC 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0C9D00 800C9100 AFBE0030 */ sw $fp, 0x30($sp) -/* 0C9D04 800C9104 03A0F025 */ move $fp, $sp -/* 0C9D08 800C9108 AFBF0034 */ sw $ra, 0x34($sp) -/* 0C9D0C 800C910C AFA40038 */ sw $a0, 0x38($sp) -/* 0C9D10 800C9110 AFA5003C */ sw $a1, 0x3c($sp) -/* 0C9D14 800C9114 15C00049 */ bnez $t6, .L800C923C -/* 0C9D18 800C9118 308600FF */ andi $a2, $a0, 0xff -/* 0C9D1C 800C911C 3C0F800F */ lui $t7, %hi(D_800EA0EC) # $t7, 0x800f -/* 0C9D20 800C9120 25EFA0EC */ addiu $t7, %lo(D_800EA0EC) # addiu $t7, $t7, -0x5f14 -/* 0C9D24 800C9124 00CF1821 */ addu $v1, $a2, $t7 -/* 0C9D28 800C9128 90620000 */ lbu $v0, ($v1) -/* 0C9D2C 800C912C 000648C0 */ sll $t1, $a2, 3 -/* 0C9D30 800C9130 24010002 */ li $at, 2 -/* 0C9D34 800C9134 10400004 */ beqz $v0, .L800C9148 -/* 0C9D38 800C9138 01264823 */ subu $t1, $t1, $a2 -/* 0C9D3C 800C913C 1441003F */ bne $v0, $at, .L800C923C -/* 0C9D40 800C9140 24180001 */ li $t8, 1 -/* 0C9D44 800C9144 A0780000 */ sb $t8, ($v1) -.L800C9148: -/* 0C9D48 800C9148 8FC2003C */ lw $v0, 0x3c($fp) -/* 0C9D4C 800C914C 2401FF0F */ li $at, -241 -/* 0C9D50 800C9150 00094900 */ sll $t1, $t1, 4 -/* 0C9D54 800C9154 0041C824 */ and $t9, $v0, $at -/* 0C9D58 800C9158 3C012900 */ lui $at, (0x29008003 >> 16) # lui $at, 0x2900 -/* 0C9D5C 800C915C 34218003 */ ori $at, (0x29008003 & 0xFFFF) # ori $at, $at, 0x8003 -/* 0C9D60 800C9160 13210007 */ beq $t9, $at, .L800C9180 -/* 0C9D64 800C9164 01264823 */ subu $t1, $t1, $a2 -/* 0C9D68 800C9168 3C012900 */ lui $at, (0x29008004 >> 16) # lui $at, 0x2900 -/* 0C9D6C 800C916C 34218004 */ ori $at, (0x29008004 & 0xFFFF) # ori $at, $at, 0x8004 -/* 0C9D70 800C9170 13210003 */ beq $t9, $at, .L800C9180 -/* 0C9D74 800C9174 3C012900 */ lui $at, (0x29008005 >> 16) # lui $at, 0x2900 -/* 0C9D78 800C9178 34218005 */ ori $at, (0x29008005 & 0xFFFF) # ori $at, $at, 0x8005 -/* 0C9D7C 800C917C 17210003 */ bne $t9, $at, .L800C918C -.L800C9180: -/* 0C9D80 800C9180 24080001 */ li $t0, 1 -/* 0C9D84 800C9184 3C01800F */ lui $at, %hi(D_800EA180) # $at, 0x800f -/* 0C9D88 800C9188 A428A180 */ sh $t0, %lo(D_800EA180)($at) -.L800C918C: -/* 0C9D8C 800C918C 00094880 */ sll $t1, $t1, 2 -/* 0C9D90 800C9190 01264823 */ subu $t1, $t1, $a2 -/* 0C9D94 800C9194 000948C0 */ sll $t1, $t1, 3 -/* 0C9D98 800C9198 3C0A800F */ lui $t2, %hi(gPlayers+0xBC) -/* 0C9D9C 800C919C 01495021 */ addu $t2, $t2, $t1 -/* 0C9DA0 800C91A0 8D4A6A4C */ lw $t2, %lo(gPlayers+0xBC)($t2) -/* 0C9DA4 800C91A4 3C024000 */ lui $v0, 0x4000 -/* 0C9DA8 800C91A8 3C0C800F */ lui $t4, %hi(D_800E9F2C) -/* 0C9DAC 800C91AC 01425824 */ and $t3, $t2, $v0 -/* 0C9DB0 800C91B0 144B0015 */ bne $v0, $t3, .L800C9208 -/* 0C9DB4 800C91B4 01866021 */ addu $t4, $t4, $a2 -/* 0C9DB8 800C91B8 918C9F2C */ lbu $t4, %lo(D_800E9F2C)($t4) -/* 0C9DBC 800C91BC 00066900 */ sll $t5, $a2, 4 -/* 0C9DC0 800C91C0 01A66823 */ subu $t5, $t5, $a2 -/* 0C9DC4 800C91C4 2981001F */ slti $at, $t4, 0x1f -/* 0C9DC8 800C91C8 1420000F */ bnez $at, .L800C9208 -/* 0C9DCC 800C91CC 000D6880 */ sll $t5, $t5, 2 -/* 0C9DD0 800C91D0 3C0E800F */ lui $t6, %hi(D_800E9F7C) # $t6, 0x800f -/* 0C9DD4 800C91D4 25CE9F7C */ addiu $t6, %lo(D_800E9F7C) # addiu $t6, $t6, -0x6084 -/* 0C9DD8 800C91D8 01AE2821 */ addu $a1, $t5, $t6 -/* 0C9DDC 800C91DC 3C0F800F */ lui $t7, %hi(D_800EA1D4) # $t7, 0x800f -/* 0C9DE0 800C91E0 25EFA1D4 */ addiu $t7, %lo(D_800EA1D4) # addiu $t7, $t7, -0x5e2c -/* 0C9DE4 800C91E4 24B80014 */ addiu $t8, $a1, 0x14 -/* 0C9DE8 800C91E8 8FC4003C */ lw $a0, 0x3c($fp) -/* 0C9DEC 800C91EC 3C07800F */ lui $a3, %hi(D_800EA150) # $a3, 0x800f -/* 0C9DF0 800C91F0 24E7A150 */ addiu $a3, %lo(D_800EA150) # addiu $a3, $a3, -0x5eb0 -/* 0C9DF4 800C91F4 AFB80014 */ sw $t8, 0x14($sp) -/* 0C9DF8 800C91F8 0C031052 */ jal play_sound -/* 0C9DFC 800C91FC AFAF0010 */ sw $t7, 0x10($sp) -/* 0C9E00 800C9200 1000000F */ b .L800C9240 -/* 0C9E04 800C9204 8FDF0034 */ lw $ra, 0x34($fp) -.L800C9208: -/* 0C9E08 800C9208 0006C900 */ sll $t9, $a2, 4 -/* 0C9E0C 800C920C 0326C823 */ subu $t9, $t9, $a2 -/* 0C9E10 800C9210 3C08800F */ lui $t0, %hi(D_800E9F7C) # $t0, 0x800f -/* 0C9E14 800C9214 25089F7C */ addiu $t0, %lo(D_800E9F7C) # addiu $t0, $t0, -0x6084 -/* 0C9E18 800C9218 0019C880 */ sll $t9, $t9, 2 -/* 0C9E1C 800C921C 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C9E20 800C9220 03282821 */ addu $a1, $t9, $t0 -/* 0C9E24 800C9224 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C9E28 800C9228 24A90014 */ addiu $t1, $a1, 0x14 -/* 0C9E2C 800C922C 8FC4003C */ lw $a0, 0x3c($fp) -/* 0C9E30 800C9230 AFA90014 */ sw $t1, 0x14($sp) -/* 0C9E34 800C9234 0C031052 */ jal play_sound -/* 0C9E38 800C9238 AFA70010 */ sw $a3, 0x10($sp) -.L800C923C: -/* 0C9E3C 800C923C 8FDF0034 */ lw $ra, 0x34($fp) -.L800C9240: -/* 0C9E40 800C9240 03C0E825 */ move $sp, $fp -/* 0C9E44 800C9244 8FDE0030 */ lw $fp, 0x30($fp) -/* 0C9E48 800C9248 03E00008 */ jr $ra -/* 0C9E4C 800C924C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/external/func_800C92CC.s b/asm/non_matchings/audio/external/func_800C92CC.s deleted file mode 100644 index ed8617eb6..000000000 --- a/asm/non_matchings/audio/external/func_800C92CC.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_800C92CC -/* 0C9ECC 800C92CC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 0C9ED0 800C92D0 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0C9ED4 800C92D4 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0C9ED8 800C92D8 AFBE0058 */ sw $fp, 0x58($sp) -/* 0C9EDC 800C92DC AFB5004C */ sw $s5, 0x4c($sp) -/* 0C9EE0 800C92E0 AFB40048 */ sw $s4, 0x48($sp) -/* 0C9EE4 800C92E4 309400FF */ andi $s4, $a0, 0xff -/* 0C9EE8 800C92E8 00A0A825 */ move $s5, $a1 -/* 0C9EEC 800C92EC 03A0F025 */ move $fp, $sp -/* 0C9EF0 800C92F0 AFBF005C */ sw $ra, 0x5c($sp) -/* 0C9EF4 800C92F4 AFB70054 */ sw $s7, 0x54($sp) -/* 0C9EF8 800C92F8 AFB60050 */ sw $s6, 0x50($sp) -/* 0C9EFC 800C92FC AFB30044 */ sw $s3, 0x44($sp) -/* 0C9F00 800C9300 AFB20040 */ sw $s2, 0x40($sp) -/* 0C9F04 800C9304 AFB1003C */ sw $s1, 0x3c($sp) -/* 0C9F08 800C9308 AFB00038 */ sw $s0, 0x38($sp) -/* 0C9F0C 800C930C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 0C9F10 800C9310 15C00056 */ bnez $t6, .L800C946C -/* 0C9F14 800C9314 AFA40078 */ sw $a0, 0x78($sp) -/* 0C9F18 800C9318 3C0F800F */ lui $t7, %hi(D_800EA0F0) # $t7, 0x800f -/* 0C9F1C 800C931C 91EFA0F0 */ lbu $t7, %lo(D_800EA0F0)($t7) -/* 0C9F20 800C9320 3C02800F */ lui $v0, %hi(D_800EA1C0) # $v0, 0x800f -/* 0C9F24 800C9324 55E00052 */ bnel $t7, $zero, .L800C9470 -/* 0C9F28 800C9328 8FDF005C */ lw $ra, 0x5c($fp) -/* 0C9F2C 800C932C 9042A1C0 */ lbu $v0, %lo(D_800EA1C0)($v0) -/* 0C9F30 800C9330 28410002 */ slti $at, $v0, 2 -/* 0C9F34 800C9334 5020004E */ beql $at, $zero, .L800C9470 -/* 0C9F38 800C9338 8FDF005C */ lw $ra, 0x5c($fp) -/* 0C9F3C 800C933C 0440004B */ bltz $v0, .L800C946C -/* 0C9F40 800C9340 00008025 */ move $s0, $zero -/* 0C9F44 800C9344 0014C0C0 */ sll $t8, $s4, 3 -/* 0C9F48 800C9348 0314C023 */ subu $t8, $t8, $s4 -/* 0C9F4C 800C934C 0018C100 */ sll $t8, $t8, 4 -/* 0C9F50 800C9350 0314C023 */ subu $t8, $t8, $s4 -/* 0C9F54 800C9354 0018C080 */ sll $t8, $t8, 2 -/* 0C9F58 800C9358 0314C023 */ subu $t8, $t8, $s4 -/* 0C9F5C 800C935C 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f -/* 0C9F60 800C9360 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 -/* 0C9F64 800C9364 0018C0C0 */ sll $t8, $t8, 3 -/* 0C9F68 800C9368 03198821 */ addu $s1, $t8, $t9 -/* 0C9F6C 800C936C 3C01432A */ li $at, 0x432A0000 # 170.000000 -/* 0C9F70 800C9370 26250014 */ addiu $a1, $s1, 0x14 -/* 0C9F74 800C9374 26260034 */ addiu $a2, $s1, 0x34 -/* 0C9F78 800C9378 3C17800F */ lui $s7, %hi(D_800E9F2C) # $s7, 0x800f -/* 0C9F7C 800C937C 3C16800F */ lui $s6, %hi(D_800EA1C8) # $s6, 0x800f -/* 0C9F80 800C9380 3C13800F */ lui $s3, %hi(D_800EA1D4) # $s3, 0x800f -/* 0C9F84 800C9384 4481A000 */ mtc1 $at, $f20 -/* 0C9F88 800C9388 2673A1D4 */ addiu $s3, %lo(D_800EA1D4) # addiu $s3, $s3, -0x5e2c -/* 0C9F8C 800C938C 26D6A1C8 */ addiu $s6, %lo(D_800EA1C8) # addiu $s6, $s6, -0x5e38 -/* 0C9F90 800C9390 26F79F2C */ addiu $s7, %lo(D_800E9F2C) # addiu $s7, $s7, -0x60d4 -/* 0C9F94 800C9394 AFA60064 */ sw $a2, 0x64($sp) -/* 0C9F98 800C9398 AFA50068 */ sw $a1, 0x68($sp) -/* 0C9F9C 800C939C 3C124000 */ lui $s2, 0x4000 -.L800C93A0: -/* 0C9FA0 800C93A0 8FC50068 */ lw $a1, 0x68($fp) -/* 0C9FA4 800C93A4 8FC60064 */ lw $a2, 0x64($fp) -/* 0C9FA8 800C93A8 AFB50014 */ sw $s5, 0x14($sp) -/* 0C9FAC 800C93AC AFB00010 */ sw $s0, 0x10($sp) -/* 0C9FB0 800C93B0 328400FF */ andi $a0, $s4, 0xff -/* 0C9FB4 800C93B4 0C030722 */ jal func_800C1C88 -/* 0C9FB8 800C93B8 02C03825 */ move $a3, $s6 -/* 0C9FBC 800C93BC 10400023 */ beqz $v0, .L800C944C -/* 0C9FC0 800C93C0 00401825 */ move $v1, $v0 -/* 0C9FC4 800C93C4 E4540034 */ swc1 $f20, 0x34($v0) -/* 0C9FC8 800C93C8 8E2C00BC */ lw $t4, 0xbc($s1) -/* 0C9FCC 800C93CC 00144900 */ sll $t1, $s4, 4 -/* 0C9FD0 800C93D0 3C0B800F */ lui $t3, %hi(D_800EA06C) # $t3, 0x800f -/* 0C9FD4 800C93D4 256BA06C */ addiu $t3, %lo(D_800EA06C) # addiu $t3, $t3, -0x5f94 -/* 0C9FD8 800C93D8 252A000C */ addiu $t2, $t1, 0xc -/* 0C9FDC 800C93DC 01926824 */ and $t5, $t4, $s2 -/* 0C9FE0 800C93E0 164D0011 */ bne $s2, $t5, .L800C9428 -/* 0C9FE4 800C93E4 014B4021 */ addu $t0, $t2, $t3 -/* 0C9FE8 800C93E8 02F47021 */ addu $t6, $s7, $s4 -/* 0C9FEC 800C93EC 91CF0000 */ lbu $t7, ($t6) -/* 0C9FF0 800C93F0 24450018 */ addiu $a1, $v0, 0x18 -/* 0C9FF4 800C93F4 320600FF */ andi $a2, $s0, 0xff -/* 0C9FF8 800C93F8 29E1001F */ slti $at, $t7, 0x1f -/* 0C9FFC 800C93FC 1420000A */ bnez $at, .L800C9428 -/* 0CA000 800C9400 3C07800F */ lui $a3, %hi(D_800EA150) # $a3, 0x800f -/* 0CA004 800C9404 96380254 */ lhu $t8, 0x254($s1) -/* 0CA008 800C9408 24E7A150 */ addiu $a3, %lo(D_800EA150) # addiu $a3, $a3, -0x5eb0 -/* 0CA00C 800C940C AFB30010 */ sw $s3, 0x10($sp) -/* 0CA010 800C9410 0018C900 */ sll $t9, $t8, 4 -/* 0CA014 800C9414 03352021 */ addu $a0, $t9, $s5 -/* 0CA018 800C9418 0C031052 */ jal play_sound -/* 0CA01C 800C941C AFA80014 */ sw $t0, 0x14($sp) -/* 0CA020 800C9420 1000000A */ b .L800C944C -/* 0CA024 800C9424 00000000 */ nop -.L800C9428: -/* 0CA028 800C9428 96290254 */ lhu $t1, 0x254($s1) -/* 0CA02C 800C942C 24650018 */ addiu $a1, $v1, 0x18 -/* 0CA030 800C9430 320600FF */ andi $a2, $s0, 0xff -/* 0CA034 800C9434 00095100 */ sll $t2, $t1, 4 -/* 0CA038 800C9438 01552021 */ addu $a0, $t2, $s5 -/* 0CA03C 800C943C 2467002C */ addiu $a3, $v1, 0x2c -/* 0CA040 800C9440 AFB30010 */ sw $s3, 0x10($sp) -/* 0CA044 800C9444 0C031052 */ jal play_sound -/* 0CA048 800C9448 AFA80014 */ sw $t0, 0x14($sp) -.L800C944C: -/* 0CA04C 800C944C 3C0C800F */ lui $t4, %hi(D_800EA1C0) # $t4, 0x800f -/* 0CA050 800C9450 918CA1C0 */ lbu $t4, %lo(D_800EA1C0)($t4) -/* 0CA054 800C9454 26100001 */ addiu $s0, $s0, 1 -/* 0CA058 800C9458 320B00FF */ andi $t3, $s0, 0xff -/* 0CA05C 800C945C 258D0001 */ addiu $t5, $t4, 1 -/* 0CA060 800C9460 016D082A */ slt $at, $t3, $t5 -/* 0CA064 800C9464 1420FFCE */ bnez $at, .L800C93A0 -/* 0CA068 800C9468 01608025 */ move $s0, $t3 -.L800C946C: -/* 0CA06C 800C946C 8FDF005C */ lw $ra, 0x5c($fp) -.L800C9470: -/* 0CA070 800C9470 03C0E825 */ move $sp, $fp -/* 0CA074 800C9474 D7D40030 */ ldc1 $f20, 0x30($fp) -/* 0CA078 800C9478 8FD00038 */ lw $s0, 0x38($fp) -/* 0CA07C 800C947C 8FD1003C */ lw $s1, 0x3c($fp) -/* 0CA080 800C9480 8FD20040 */ lw $s2, 0x40($fp) -/* 0CA084 800C9484 8FD30044 */ lw $s3, 0x44($fp) -/* 0CA088 800C9488 8FD40048 */ lw $s4, 0x48($fp) -/* 0CA08C 800C948C 8FD5004C */ lw $s5, 0x4c($fp) -/* 0CA090 800C9490 8FD60050 */ lw $s6, 0x50($fp) -/* 0CA094 800C9494 8FD70054 */ lw $s7, 0x54($fp) -/* 0CA098 800C9498 8FDE0058 */ lw $fp, 0x58($fp) -/* 0CA09C 800C949C 03E00008 */ jr $ra -/* 0CA0A0 800C94A0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/non_matchings/audio/external/func_800C94A4.s b/asm/non_matchings/audio/external/func_800C94A4.s deleted file mode 100644 index db2761d3d..000000000 --- a/asm/non_matchings/audio/external/func_800C94A4.s +++ /dev/null @@ -1,324 +0,0 @@ -.section .late_rodata - -glabel jpt_800F38B8 -.word L800C9560, L800C9560, L800C95BC, L800C9618 -.word L800C9674, L800C96D0, L800C95BC, L800C96D0 - -glabel D_800F38D8 -.float 0.35 - -glabel D_800F38DC -.float 2.800000 - -glabel D_800F38E0 -.float 3844.0 - -glabel D_800F38E4 -.float -0.8 - -glabel D_800F38E8 -.float 1568.979614 - -glabel D_800F38EC -.float 1067.777832 - -glabel D_800F38F0 -.float 2766.064941 - -glabel D_800F38F4 -.float 0.6 - -glabel D_800F38F8 -.float 3.200000 - -glabel D_800F38FC -.float 3844.0 - -glabel D_800F3900 -.float -1.700000 - -glabel D_800F3904 -.float 1478.461548 - -glabel D_800F3908 -.float 784.489807 - -glabel D_800F390C -.float 12813.334961 - -glabel D_800F3910 -.float 0.6 - -glabel D_800F3914 -.float 2.800000 - -glabel D_800F3918 -.float 3844.0 - -glabel D_800F391C -.float -0.6 - -glabel D_800F3920 -.float 1747.272827 - -glabel D_800F3924 -.float 1130.588257 - -glabel D_800F3928 -.float 3844.000977 - -glabel D_800F392C -.float 0.2 - -glabel D_800F3930 -.float 3844.0 - -glabel D_800F3934 -.float -0.4 - -glabel D_800F3938 -.float 2135.555664 - -glabel D_800F393C -.float 1601.666626 - -glabel D_800F3940 -.float 3203.333008 - -glabel D_800F3944 -.float 0.4 - -glabel D_800F3948 -.float 2.400000 - -glabel D_800F394C -.float 3844.0 - -glabel D_800F3950 -.float -0.8 - -glabel D_800F3954 -.float 1922.0 - -glabel D_800F3958 -.float 1201.250000 - -glabel D_800F395C -.float 4805.0 - -.section .text - -glabel func_800C94A4 -/* 0CA0A4 800C94A4 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CA0A8 800C94A8 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CA0AC 800C94AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0CA0B0 800C94B0 AFBE0030 */ sw $fp, 0x30($sp) -/* 0CA0B4 800C94B4 03A0F025 */ move $fp, $sp -/* 0CA0B8 800C94B8 AFBF0034 */ sw $ra, 0x34($sp) -/* 0CA0BC 800C94BC AFA40038 */ sw $a0, 0x38($sp) -/* 0CA0C0 800C94C0 15C000BB */ bnez $t6, .L800C97B0 -/* 0CA0C4 800C94C4 308600FF */ andi $a2, $a0, 0xff -/* 0CA0C8 800C94C8 3C0F800F */ lui $t7, %hi(D_800EA0EC) # $t7, 0x800f -/* 0CA0CC 800C94CC 25EFA0EC */ addiu $t7, %lo(D_800EA0EC) # addiu $t7, $t7, -0x5f14 -/* 0CA0D0 800C94D0 00CF1821 */ addu $v1, $a2, $t7 -/* 0CA0D4 800C94D4 90620000 */ lbu $v0, ($v1) -/* 0CA0D8 800C94D8 0006C900 */ sll $t9, $a2, 4 -/* 0CA0DC 800C94DC 24010002 */ li $at, 2 -/* 0CA0E0 800C94E0 10400004 */ beqz $v0, .L800C94F4 -/* 0CA0E4 800C94E4 0326C823 */ subu $t9, $t9, $a2 -/* 0CA0E8 800C94E8 144100B1 */ bne $v0, $at, .L800C97B0 -/* 0CA0EC 800C94EC 24180001 */ li $t8, 1 -/* 0CA0F0 800C94F0 A0780000 */ sb $t8, ($v1) -.L800C94F4: -/* 0CA0F4 800C94F4 000648C0 */ sll $t1, $a2, 3 -/* 0CA0F8 800C94F8 01264823 */ subu $t1, $t1, $a2 -/* 0CA0FC 800C94FC 00094900 */ sll $t1, $t1, 4 -/* 0CA100 800C9500 3C08800F */ lui $t0, %hi(D_800E9F7C) # $t0, 0x800f -/* 0CA104 800C9504 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0CA108 800C9508 01264823 */ subu $t1, $t1, $a2 -/* 0CA10C 800C950C 44812000 */ mtc1 $at, $f4 -/* 0CA110 800C9510 44803000 */ mtc1 $zero, $f6 -/* 0CA114 800C9514 25089F7C */ addiu $t0, %lo(D_800E9F7C) # addiu $t0, $t0, -0x6084 -/* 0CA118 800C9518 0019C880 */ sll $t9, $t9, 2 -/* 0CA11C 800C951C 00094880 */ sll $t1, $t1, 2 -/* 0CA120 800C9520 03282821 */ addu $a1, $t9, $t0 -/* 0CA124 800C9524 01264823 */ subu $t1, $t1, $a2 -/* 0CA128 800C9528 000948C0 */ sll $t1, $t1, 3 -/* 0CA12C 800C952C 3C03800F */ lui $v1, %hi(gPlayers+0x254) -/* 0CA130 800C9530 00691821 */ addu $v1, $v1, $t1 -/* 0CA134 800C9534 E4A4000C */ swc1 $f4, 0xc($a1) -/* 0CA138 800C9538 E4A60010 */ swc1 $f6, 0x10($a1) -/* 0CA13C 800C953C 94636BE4 */ lhu $v1, %lo(gPlayers+0x254)($v1) -/* 0CA140 800C9540 2C610008 */ sltiu $at, $v1, 8 -/* 0CA144 800C9544 10200078 */ beqz $at, .L800C9728 -/* 0CA148 800C9548 00035080 */ sll $t2, $v1, 2 -/* 0CA14C 800C954C 3C01800F */ lui $at, %hi(jpt_800F38B8) -/* 0CA150 800C9550 002A0821 */ addu $at, $at, $t2 -/* 0CA154 800C9554 8C2A38B8 */ lw $t2, %lo(jpt_800F38B8)($at) -/* 0CA158 800C9558 01400008 */ jr $t2 -/* 0CA15C 800C955C 00000000 */ nop -glabel L800C9560 -/* 0CA160 800C9560 3C01800F */ lui $at, %hi(D_800F38D8) # $at, 0x800f -/* 0CA164 800C9564 C42038D8 */ lwc1 $f0, %lo(D_800F38D8)($at) -/* 0CA168 800C9568 3C01800F */ lui $at, %hi(D_800F38DC) # $at, 0x800f -/* 0CA16C 800C956C C42838DC */ lwc1 $f8, %lo(D_800F38DC)($at) -/* 0CA170 800C9570 3C01800F */ lui $at, %hi(D_800F38E0) # $at, 0x800f -/* 0CA174 800C9574 E4A80018 */ swc1 $f8, 0x18($a1) -/* 0CA178 800C9578 C42A38E0 */ lwc1 $f10, %lo(D_800F38E0)($at) -/* 0CA17C 800C957C 3C01800F */ lui $at, %hi(D_800F38E4) # $at, 0x800f -/* 0CA180 800C9580 E4A00020 */ swc1 $f0, 0x20($a1) -/* 0CA184 800C9584 E4AA001C */ swc1 $f10, 0x1c($a1) -/* 0CA188 800C9588 C43038E4 */ lwc1 $f16, %lo(D_800F38E4)($at) -/* 0CA18C 800C958C 3C01800F */ lui $at, %hi(D_800F38E8) # $at, 0x800f -/* 0CA190 800C9590 E4A00028 */ swc1 $f0, 0x28($a1) -/* 0CA194 800C9594 E4B00024 */ swc1 $f16, 0x24($a1) -/* 0CA198 800C9598 C43238E8 */ lwc1 $f18, %lo(D_800F38E8)($at) -/* 0CA19C 800C959C 3C01800F */ lui $at, %hi(D_800F38EC) # $at, 0x800f -/* 0CA1A0 800C95A0 E4B2002C */ swc1 $f18, 0x2c($a1) -/* 0CA1A4 800C95A4 C42438EC */ lwc1 $f4, %lo(D_800F38EC)($at) -/* 0CA1A8 800C95A8 3C01800F */ lui $at, %hi(D_800F38F0) # $at, 0x800f -/* 0CA1AC 800C95AC E4A40030 */ swc1 $f4, 0x30($a1) -/* 0CA1B0 800C95B0 C42638F0 */ lwc1 $f6, %lo(D_800F38F0)($at) -/* 0CA1B4 800C95B4 1000005C */ b .L800C9728 -/* 0CA1B8 800C95B8 E4A60034 */ swc1 $f6, 0x34($a1) -glabel L800C95BC -/* 0CA1BC 800C95BC 3C01800F */ lui $at, %hi(D_800F38F4) # $at, 0x800f -/* 0CA1C0 800C95C0 C42038F4 */ lwc1 $f0, %lo(D_800F38F4)($at) -/* 0CA1C4 800C95C4 3C01800F */ lui $at, %hi(D_800F38F8) # $at, 0x800f -/* 0CA1C8 800C95C8 C42838F8 */ lwc1 $f8, %lo(D_800F38F8)($at) -/* 0CA1CC 800C95CC 3C01800F */ lui $at, %hi(D_800F38FC) # $at, 0x800f -/* 0CA1D0 800C95D0 E4A80018 */ swc1 $f8, 0x18($a1) -/* 0CA1D4 800C95D4 C42A38FC */ lwc1 $f10, %lo(D_800F38FC)($at) -/* 0CA1D8 800C95D8 3C01800F */ lui $at, %hi(D_800F3900) # $at, 0x800f -/* 0CA1DC 800C95DC E4A00020 */ swc1 $f0, 0x20($a1) -/* 0CA1E0 800C95E0 E4AA001C */ swc1 $f10, 0x1c($a1) -/* 0CA1E4 800C95E4 C4303900 */ lwc1 $f16, %lo(D_800F3900)($at) -/* 0CA1E8 800C95E8 3C01800F */ lui $at, %hi(D_800F3904) # $at, 0x800f -/* 0CA1EC 800C95EC E4A00028 */ swc1 $f0, 0x28($a1) -/* 0CA1F0 800C95F0 E4B00024 */ swc1 $f16, 0x24($a1) -/* 0CA1F4 800C95F4 C4323904 */ lwc1 $f18, %lo(D_800F3904)($at) -/* 0CA1F8 800C95F8 3C01800F */ lui $at, %hi(D_800F3908) # $at, 0x800f -/* 0CA1FC 800C95FC E4B2002C */ swc1 $f18, 0x2c($a1) -/* 0CA200 800C9600 C4243908 */ lwc1 $f4, %lo(D_800F3908)($at) -/* 0CA204 800C9604 3C01800F */ lui $at, %hi(D_800F390C) # $at, 0x800f -/* 0CA208 800C9608 E4A40030 */ swc1 $f4, 0x30($a1) -/* 0CA20C 800C960C C426390C */ lwc1 $f6, %lo(D_800F390C)($at) -/* 0CA210 800C9610 10000045 */ b .L800C9728 -/* 0CA214 800C9614 E4A60034 */ swc1 $f6, 0x34($a1) -glabel L800C9618 -/* 0CA218 800C9618 3C01800F */ lui $at, %hi(D_800F3910) # $at, 0x800f -/* 0CA21C 800C961C C4203910 */ lwc1 $f0, %lo(D_800F3910)($at) -/* 0CA220 800C9620 3C01800F */ lui $at, %hi(D_800F3914) # $at, 0x800f -/* 0CA224 800C9624 C4283914 */ lwc1 $f8, %lo(D_800F3914)($at) -/* 0CA228 800C9628 3C01800F */ lui $at, %hi(D_800F3918) # $at, 0x800f -/* 0CA22C 800C962C E4A80018 */ swc1 $f8, 0x18($a1) -/* 0CA230 800C9630 C42A3918 */ lwc1 $f10, %lo(D_800F3918)($at) -/* 0CA234 800C9634 3C01800F */ lui $at, %hi(D_800F391C) # $at, 0x800f -/* 0CA238 800C9638 E4A00020 */ swc1 $f0, 0x20($a1) -/* 0CA23C 800C963C E4AA001C */ swc1 $f10, 0x1c($a1) -/* 0CA240 800C9640 C430391C */ lwc1 $f16, %lo(D_800F391C)($at) -/* 0CA244 800C9644 3C01800F */ lui $at, %hi(D_800F3920) # $at, 0x800f -/* 0CA248 800C9648 E4A00028 */ swc1 $f0, 0x28($a1) -/* 0CA24C 800C964C E4B00024 */ swc1 $f16, 0x24($a1) -/* 0CA250 800C9650 C4323920 */ lwc1 $f18, %lo(D_800F3920)($at) -/* 0CA254 800C9654 3C01800F */ lui $at, %hi(D_800F3924) # $at, 0x800f -/* 0CA258 800C9658 E4B2002C */ swc1 $f18, 0x2c($a1) -/* 0CA25C 800C965C C4243924 */ lwc1 $f4, %lo(D_800F3924)($at) -/* 0CA260 800C9660 3C01800F */ lui $at, %hi(D_800F3928) # $at, 0x800f -/* 0CA264 800C9664 E4A40030 */ swc1 $f4, 0x30($a1) -/* 0CA268 800C9668 C4263928 */ lwc1 $f6, %lo(D_800F3928)($at) -/* 0CA26C 800C966C 1000002E */ b .L800C9728 -/* 0CA270 800C9670 E4A60034 */ swc1 $f6, 0x34($a1) -glabel L800C9674 -/* 0CA274 800C9674 3C01800F */ lui $at, %hi(D_800F392C) # $at, 0x800f -/* 0CA278 800C9678 C420392C */ lwc1 $f0, %lo(D_800F392C)($at) -/* 0CA27C 800C967C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0CA280 800C9680 44814000 */ mtc1 $at, $f8 -/* 0CA284 800C9684 3C01800F */ lui $at, %hi(D_800F3930) # $at, 0x800f -/* 0CA288 800C9688 E4A80018 */ swc1 $f8, 0x18($a1) -/* 0CA28C 800C968C C42A3930 */ lwc1 $f10, %lo(D_800F3930)($at) -/* 0CA290 800C9690 3C01800F */ lui $at, %hi(D_800F3934) # $at, 0x800f -/* 0CA294 800C9694 E4A00020 */ swc1 $f0, 0x20($a1) -/* 0CA298 800C9698 E4AA001C */ swc1 $f10, 0x1c($a1) -/* 0CA29C 800C969C C4303934 */ lwc1 $f16, %lo(D_800F3934)($at) -/* 0CA2A0 800C96A0 3C01800F */ lui $at, %hi(D_800F3938) # $at, 0x800f -/* 0CA2A4 800C96A4 E4A00028 */ swc1 $f0, 0x28($a1) -/* 0CA2A8 800C96A8 E4B00024 */ swc1 $f16, 0x24($a1) -/* 0CA2AC 800C96AC C4323938 */ lwc1 $f18, %lo(D_800F3938)($at) -/* 0CA2B0 800C96B0 3C01800F */ lui $at, %hi(D_800F393C) # $at, 0x800f -/* 0CA2B4 800C96B4 E4B2002C */ swc1 $f18, 0x2c($a1) -/* 0CA2B8 800C96B8 C424393C */ lwc1 $f4, %lo(D_800F393C)($at) -/* 0CA2BC 800C96BC 3C01800F */ lui $at, %hi(D_800F3940) # $at, 0x800f -/* 0CA2C0 800C96C0 E4A40030 */ swc1 $f4, 0x30($a1) -/* 0CA2C4 800C96C4 C4263940 */ lwc1 $f6, %lo(D_800F3940)($at) -/* 0CA2C8 800C96C8 10000017 */ b .L800C9728 -/* 0CA2CC 800C96CC E4A60034 */ swc1 $f6, 0x34($a1) -glabel L800C96D0 -/* 0CA2D0 800C96D0 3C01800F */ lui $at, %hi(D_800F3944) # $at, 0x800f -/* 0CA2D4 800C96D4 C4203944 */ lwc1 $f0, %lo(D_800F3944)($at) -/* 0CA2D8 800C96D8 3C01800F */ lui $at, %hi(D_800F3948) # $at, 0x800f -/* 0CA2DC 800C96DC C4283948 */ lwc1 $f8, %lo(D_800F3948)($at) -/* 0CA2E0 800C96E0 3C01800F */ lui $at, %hi(D_800F394C) # $at, 0x800f -/* 0CA2E4 800C96E4 E4A80018 */ swc1 $f8, 0x18($a1) -/* 0CA2E8 800C96E8 C42A394C */ lwc1 $f10, %lo(D_800F394C)($at) -/* 0CA2EC 800C96EC 3C01800F */ lui $at, %hi(D_800F3950) # $at, 0x800f -/* 0CA2F0 800C96F0 E4A00020 */ swc1 $f0, 0x20($a1) -/* 0CA2F4 800C96F4 E4AA001C */ swc1 $f10, 0x1c($a1) -/* 0CA2F8 800C96F8 C4303950 */ lwc1 $f16, %lo(D_800F3950)($at) -/* 0CA2FC 800C96FC 3C01800F */ lui $at, %hi(D_800F3954) # $at, 0x800f -/* 0CA300 800C9700 E4A00028 */ swc1 $f0, 0x28($a1) -/* 0CA304 800C9704 E4B00024 */ swc1 $f16, 0x24($a1) -/* 0CA308 800C9708 C4323954 */ lwc1 $f18, %lo(D_800F3954)($at) -/* 0CA30C 800C970C 3C01800F */ lui $at, %hi(D_800F3958) # $at, 0x800f -/* 0CA310 800C9710 E4B2002C */ swc1 $f18, 0x2c($a1) -/* 0CA314 800C9714 C4243958 */ lwc1 $f4, %lo(D_800F3958)($at) -/* 0CA318 800C9718 3C01800F */ lui $at, %hi(D_800F395C) # $at, 0x800f -/* 0CA31C 800C971C E4A40030 */ swc1 $f4, 0x30($a1) -/* 0CA320 800C9720 C426395C */ lwc1 $f6, %lo(D_800F395C)($at) -/* 0CA324 800C9724 E4A60034 */ swc1 $f6, 0x34($a1) -.L800C9728: -/* 0CA328 800C9728 3C02800F */ lui $v0, %hi(D_800E9F74) -/* 0CA32C 800C972C 00461021 */ addu $v0, $v0, $a2 -/* 0CA330 800C9730 90429F74 */ lbu $v0, %lo(D_800E9F74)($v0) -/* 0CA334 800C9734 3C010104 */ lui $at, (0x0104FF00 >> 16) # lui $at, 0x104 -/* 0CA338 800C9738 3421FF00 */ ori $at, (0x0104FF00 & 0xFFFF) # ori $at, $at, 0xff00 -/* 0CA33C 800C973C 10400008 */ beqz $v0, .L800C9760 -/* 0CA340 800C9740 00612021 */ addu $a0, $v1, $at -/* 0CA344 800C9744 24010001 */ li $at, 1 -/* 0CA348 800C9748 1041000B */ beq $v0, $at, .L800C9778 -/* 0CA34C 800C974C 24010002 */ li $at, 2 -/* 0CA350 800C9750 1041000B */ beq $v0, $at, .L800C9780 -/* 0CA354 800C9754 3C0C800F */ lui $t4, %hi(D_800EA1C0) # $t4, 0x800f -/* 0CA358 800C9758 10000010 */ b .L800C979C -/* 0CA35C 800C975C 24AD0010 */ addiu $t5, $a1, 0x10 -.L800C9760: -/* 0CA360 800C9760 3C0B800F */ lui $t3, %hi(D_800EA1C0) # $t3, 0x800f -/* 0CA364 800C9764 916BA1C0 */ lbu $t3, %lo(D_800EA1C0)($t3) -/* 0CA368 800C9768 5160000C */ beql $t3, $zero, .L800C979C -/* 0CA36C 800C976C 24AD0010 */ addiu $t5, $a1, 0x10 -/* 0CA370 800C9770 10000009 */ b .L800C9798 -/* 0CA374 800C9774 24840014 */ addiu $a0, $a0, 0x14 -.L800C9778: -/* 0CA378 800C9778 10000007 */ b .L800C9798 -/* 0CA37C 800C977C 2484002E */ addiu $a0, $a0, 0x2e -.L800C9780: -/* 0CA380 800C9780 918CA1C0 */ lbu $t4, %lo(D_800EA1C0)($t4) -/* 0CA384 800C9784 55800004 */ bnel $t4, $zero, .L800C9798 -/* 0CA388 800C9788 2484003E */ addiu $a0, $a0, 0x3e -/* 0CA38C 800C978C 10000002 */ b .L800C9798 -/* 0CA390 800C9790 24840036 */ addiu $a0, $a0, 0x36 -/* 0CA394 800C9794 2484003E */ addiu $a0, $a0, 0x3e -.L800C9798: -/* 0CA398 800C9798 24AD0010 */ addiu $t5, $a1, 0x10 -.L800C979C: -/* 0CA39C 800C979C 24AE0014 */ addiu $t6, $a1, 0x14 -/* 0CA3A0 800C97A0 AFAE0014 */ sw $t6, 0x14($sp) -/* 0CA3A4 800C97A4 AFAD0010 */ sw $t5, 0x10($sp) -/* 0CA3A8 800C97A8 0C031052 */ jal play_sound -/* 0CA3AC 800C97AC 24A7000C */ addiu $a3, $a1, 0xc -.L800C97B0: -/* 0CA3B0 800C97B0 8FDF0034 */ lw $ra, 0x34($fp) -/* 0CA3B4 800C97B4 03C0E825 */ move $sp, $fp -/* 0CA3B8 800C97B8 8FDE0030 */ lw $fp, 0x30($fp) -/* 0CA3BC 800C97BC 03E00008 */ jr $ra -/* 0CA3C0 800C97C0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/external/func_800CA118.s b/asm/non_matchings/audio/external/func_800CA118.s deleted file mode 100644 index f26481802..000000000 --- a/asm/non_matchings/audio/external/func_800CA118.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_800CA118 -/* 0CAD18 800CA118 3C05800F */ lui $a1, %hi(D_800EA0EC) # $a1, 0x800f -/* 0CAD1C 800CA11C 24A5A0EC */ addiu $a1, %lo(D_800EA0EC) # addiu $a1, $a1, -0x5f14 -/* 0CAD20 800CA120 308E00FF */ andi $t6, $a0, 0xff -/* 0CAD24 800CA124 24060001 */ li $a2, 1 -/* 0CAD28 800CA128 00AE7821 */ addu $t7, $a1, $t6 -/* 0CAD2C 800CA12C A1E60000 */ sb $a2, ($t7) -/* 0CAD30 800CA130 3C02800F */ lui $v0, %hi(D_800EA1C0) # $v0, 0x800f -/* 0CAD34 800CA134 9042A1C0 */ lbu $v0, %lo(D_800EA1C0)($v0) -/* 0CAD38 800CA138 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0CAD3C 800CA13C 000EC080 */ sll $t8, $t6, 2 -/* 0CAD40 800CA140 3C01800F */ lui $at, %hi(D_800E9EA4) -/* 0CAD44 800CA144 AFBE0028 */ sw $fp, 0x28($sp) -/* 0CAD48 800CA148 24030001 */ li $v1, 1 -/* 0CAD4C 800CA14C 00380821 */ addu $at, $at, $t8 -/* 0CAD50 800CA150 03A0F025 */ move $fp, $sp -/* 0CAD54 800CA154 AFBF002C */ sw $ra, 0x2c($sp) -/* 0CAD58 800CA158 AFA40030 */ sw $a0, 0x30($sp) -/* 0CAD5C 800CA15C 10400009 */ beqz $v0, .L800CA184 -/* 0CAD60 800CA160 AC239EA4 */ sw $v1, %lo(D_800E9EA4)($at) -/* 0CAD64 800CA164 1043000C */ beq $v0, $v1, .L800CA198 -/* 0CAD68 800CA168 24010002 */ li $at, 2 -/* 0CAD6C 800CA16C 10410015 */ beq $v0, $at, .L800CA1C4 -/* 0CAD70 800CA170 24010003 */ li $at, 3 -/* 0CAD74 800CA174 50410022 */ beql $v0, $at, .L800CA200 -/* 0CAD78 800CA178 90AC0000 */ lbu $t4, ($a1) -/* 0CAD7C 800CA17C 1000002F */ b .L800CA23C -/* 0CAD80 800CA180 8FDF002C */ lw $ra, 0x2c($fp) -.L800CA184: -/* 0CAD84 800CA184 3C01800F */ lui $at, %hi(D_800EA0F0) # $at, 0x800f -/* 0CAD88 800CA188 0C032839 */ jal func_800CA0E4 -/* 0CAD8C 800CA18C A026A0F0 */ sb $a2, %lo(D_800EA0F0)($at) -/* 0CAD90 800CA190 1000002A */ b .L800CA23C -/* 0CAD94 800CA194 8FDF002C */ lw $ra, 0x2c($fp) -.L800CA198: -/* 0CAD98 800CA198 90B90000 */ lbu $t9, ($a1) -/* 0CAD9C 800CA19C 54790027 */ bnel $v1, $t9, .L800CA23C -/* 0CADA0 800CA1A0 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CADA4 800CA1A4 90A80001 */ lbu $t0, 1($a1) -/* 0CADA8 800CA1A8 3C01800F */ lui $at, %hi(D_800EA0F0) # $at, 0x800f -/* 0CADAC 800CA1AC 54680023 */ bnel $v1, $t0, .L800CA23C -/* 0CADB0 800CA1B0 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CADB4 800CA1B4 0C032839 */ jal func_800CA0E4 -/* 0CADB8 800CA1B8 A026A0F0 */ sb $a2, %lo(D_800EA0F0)($at) -/* 0CADBC 800CA1BC 1000001F */ b .L800CA23C -/* 0CADC0 800CA1C0 8FDF002C */ lw $ra, 0x2c($fp) -.L800CA1C4: -/* 0CADC4 800CA1C4 90A90000 */ lbu $t1, ($a1) -/* 0CADC8 800CA1C8 5469001C */ bnel $v1, $t1, .L800CA23C -/* 0CADCC 800CA1CC 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CADD0 800CA1D0 90AA0001 */ lbu $t2, 1($a1) -/* 0CADD4 800CA1D4 546A0019 */ bnel $v1, $t2, .L800CA23C -/* 0CADD8 800CA1D8 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CADDC 800CA1DC 90AB0002 */ lbu $t3, 2($a1) -/* 0CADE0 800CA1E0 3C01800F */ lui $at, %hi(D_800EA0F0) # $at, 0x800f -/* 0CADE4 800CA1E4 546B0015 */ bnel $v1, $t3, .L800CA23C -/* 0CADE8 800CA1E8 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CADEC 800CA1EC 0C032839 */ jal func_800CA0E4 -/* 0CADF0 800CA1F0 A026A0F0 */ sb $a2, %lo(D_800EA0F0)($at) -/* 0CADF4 800CA1F4 10000011 */ b .L800CA23C -/* 0CADF8 800CA1F8 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CADFC 800CA1FC 90AC0000 */ lbu $t4, ($a1) -.L800CA200: -/* 0CAE00 800CA200 546C000E */ bnel $v1, $t4, .L800CA23C -/* 0CAE04 800CA204 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CAE08 800CA208 90AD0001 */ lbu $t5, 1($a1) -/* 0CAE0C 800CA20C 546D000B */ bnel $v1, $t5, .L800CA23C -/* 0CAE10 800CA210 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CAE14 800CA214 90AE0002 */ lbu $t6, 2($a1) -/* 0CAE18 800CA218 546E0008 */ bnel $v1, $t6, .L800CA23C -/* 0CAE1C 800CA21C 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CAE20 800CA220 90AF0003 */ lbu $t7, 3($a1) -/* 0CAE24 800CA224 3C01800F */ lui $at, %hi(D_800EA0F0) # $at, 0x800f -/* 0CAE28 800CA228 546F0004 */ bnel $v1, $t7, .L800CA23C -/* 0CAE2C 800CA22C 8FDF002C */ lw $ra, 0x2c($fp) -/* 0CAE30 800CA230 0C032839 */ jal func_800CA0E4 -/* 0CAE34 800CA234 A026A0F0 */ sb $a2, %lo(D_800EA0F0)($at) -/* 0CAE38 800CA238 8FDF002C */ lw $ra, 0x2c($fp) -.L800CA23C: -/* 0CAE3C 800CA23C 03C0E825 */ move $sp, $fp -/* 0CAE40 800CA240 8FDE0028 */ lw $fp, 0x28($fp) -/* 0CAE44 800CA244 03E00008 */ jr $ra -/* 0CAE48 800CA248 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/audio/external/func_800CA59C.s b/asm/non_matchings/audio/external/func_800CA59C.s deleted file mode 100644 index 6112e1140..000000000 --- a/asm/non_matchings/audio/external/func_800CA59C.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_800CA59C -/* 0CB19C 800CA59C 308600FF */ andi $a2, $a0, 0xff -/* 0CB1A0 800CA5A0 3C0E800F */ lui $t6, %hi(D_800EA0EC) -/* 0CB1A4 800CA5A4 01C67021 */ addu $t6, $t6, $a2 -/* 0CB1A8 800CA5A8 91CEA0EC */ lbu $t6, %lo(D_800EA0EC)($t6) -/* 0CB1AC 800CA5AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0CB1B0 800CA5B0 AFBE0030 */ sw $fp, 0x30($sp) -/* 0CB1B4 800CA5B4 03A0F025 */ move $fp, $sp -/* 0CB1B8 800CA5B8 AFBF0034 */ sw $ra, 0x34($sp) -/* 0CB1BC 800CA5BC 15C00057 */ bnez $t6, .L800CA71C -/* 0CB1C0 800CA5C0 AFA40038 */ sw $a0, 0x38($sp) -/* 0CB1C4 800CA5C4 3C0F800F */ lui $t7, %hi(D_800EA108) # $t7, 0x800f -/* 0CB1C8 800CA5C8 91EFA108 */ lbu $t7, %lo(D_800EA108)($t7) -/* 0CB1CC 800CA5CC 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0CB1D0 800CA5D0 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0CB1D4 800CA5D4 15E00051 */ bnez $t7, .L800CA71C -/* 0CB1D8 800CA5D8 0006C0C0 */ sll $t8, $a2, 3 -/* 0CB1DC 800CA5DC 0306C023 */ subu $t8, $t8, $a2 -/* 0CB1E0 800CA5E0 0018C100 */ sll $t8, $t8, 4 -/* 0CB1E4 800CA5E4 0306C023 */ subu $t8, $t8, $a2 -/* 0CB1E8 800CA5E8 0018C080 */ sll $t8, $t8, 2 -/* 0CB1EC 800CA5EC 0306C023 */ subu $t8, $t8, $a2 -/* 0CB1F0 800CA5F0 0018C0C0 */ sll $t8, $t8, 3 -/* 0CB1F4 800CA5F4 3C04800F */ lui $a0, %hi(gPlayers+0x254) -/* 0CB1F8 800CA5F8 00982021 */ addu $a0, $a0, $t8 -/* 0CB1FC 800CA5FC 00064100 */ sll $t0, $a2, 4 -/* 0CB200 800CA600 94846BE4 */ lhu $a0, %lo(gPlayers+0x254)($a0) -/* 0CB204 800CA604 01064023 */ subu $t0, $t0, $a2 -/* 0CB208 800CA608 3C09800F */ lui $t1, %hi(D_800E9F7C) # $t1, 0x800f -/* 0CB20C 800CA60C 25299F7C */ addiu $t1, %lo(D_800E9F7C) # addiu $t1, $t1, -0x6084 -/* 0CB210 800CA610 00084080 */ sll $t0, $t0, 2 -/* 0CB214 800CA614 01092821 */ addu $a1, $t0, $t1 -/* 0CB218 800CA618 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 -/* 0CB21C 800CA61C 34218001 */ ori $at, (0x29008001 & 0xFFFF) # ori $at, $at, 0x8001 -/* 0CB220 800CA620 24AA0014 */ addiu $t2, $a1, 0x14 -/* 0CB224 800CA624 0004C900 */ sll $t9, $a0, 4 -/* 0CB228 800CA628 03212021 */ addu $a0, $t9, $at -/* 0CB22C 800CA62C AFAA0014 */ sw $t2, 0x14($sp) -/* 0CB230 800CA630 AFA70010 */ sw $a3, 0x10($sp) -/* 0CB234 800CA634 0C031052 */ jal play_sound -/* 0CB238 800CA638 A3A6003B */ sb $a2, 0x3b($sp) -/* 0CB23C 800CA63C 3C0C800F */ lui $t4, %hi(D_800EA1C0) # $t4, 0x800f -/* 0CB240 800CA640 918CA1C0 */ lbu $t4, %lo(D_800EA1C0)($t4) -/* 0CB244 800CA644 240B0001 */ li $t3, 1 -/* 0CB248 800CA648 3C01800F */ lui $at, %hi(D_800EA164) # $at, 0x800f -/* 0CB24C 800CA64C A02BA164 */ sb $t3, %lo(D_800EA164)($at) -/* 0CB250 800CA650 29810002 */ slti $at, $t4, 2 -/* 0CB254 800CA654 14200007 */ bnez $at, .L800CA674 -/* 0CB258 800CA658 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001 -/* 0CB25C 800CA65C 3C050100 */ lui $a1, (0x0100FF2C >> 16) # lui $a1, 0x100 -/* 0CB260 800CA660 34A5FF2C */ ori $a1, (0x0100FF2C & 0xFFFF) # ori $a1, $a1, 0xff2c -/* 0CB264 800CA664 0C0323E0 */ jal func_800C8F80 -/* 0CB268 800CA668 93C4003B */ lbu $a0, 0x3b($fp) -/* 0CB26C 800CA66C 10000027 */ b .L800CA70C -/* 0CB270 800CA670 93D8003B */ lbu $t8, 0x3b($fp) -.L800CA674: -/* 0CB274 800CA674 0C030D12 */ jal func_800C3448 -/* 0CB278 800CA678 348400FF */ ori $a0, (0x100100FF & 0xFFFF) # ori $a0, $a0, 0xff -/* 0CB27C 800CA67C 3C0D800F */ lui $t5, %hi(D_800EA104) # $t5, 0x800f -/* 0CB280 800CA680 91ADA104 */ lbu $t5, %lo(D_800EA104)($t5) -/* 0CB284 800CA684 3C050100 */ lui $a1, (0x0100FF2C >> 16) # lui $a1, 0x100 -/* 0CB288 800CA688 34A5FF2C */ ori $a1, (0x0100FF2C & 0xFFFF) # ori $a1, $a1, 0xff2c -/* 0CB28C 800CA68C 11A00005 */ beqz $t5, .L800CA6A4 -/* 0CB290 800CA690 3C0E8019 */ lui $t6, %hi(D_8018FC08) # $t6, 0x8019 -/* 0CB294 800CA694 0C0323E0 */ jal func_800C8F80 -/* 0CB298 800CA698 93C4003B */ lbu $a0, 0x3b($fp) -/* 0CB29C 800CA69C 1000001B */ b .L800CA70C -/* 0CB2A0 800CA6A0 93D8003B */ lbu $t8, 0x3b($fp) -.L800CA6A4: -/* 0CB2A4 800CA6A4 91CEFC08 */ lbu $t6, %lo(D_8018FC08)($t6) -/* 0CB2A8 800CA6A8 11C00015 */ beqz $t6, .L800CA700 -/* 0CB2AC 800CA6AC 00000000 */ nop -/* 0CB2B0 800CA6B0 0C030D42 */ jal func_800C3508 -/* 0CB2B4 800CA6B4 24040001 */ li $a0, 1 -/* 0CB2B8 800CA6B8 2401000C */ li $at, 12 -/* 0CB2BC 800CA6BC 10410005 */ beq $v0, $at, .L800CA6D4 -/* 0CB2C0 800CA6C0 3C040101 */ lui $a0, (0x0101000C >> 16) # lui $a0, 0x101 -/* 0CB2C4 800CA6C4 0C030D5F */ jal func_800C357C -/* 0CB2C8 800CA6C8 3484000C */ ori $a0, (0x0101000C & 0xFFFF) # ori $a0, $a0, 0xc -/* 0CB2CC 800CA6CC 14400008 */ bnez $v0, .L800CA6F0 -/* 0CB2D0 800CA6D0 00000000 */ nop -.L800CA6D4: -/* 0CB2D4 800CA6D4 0C030D12 */ jal func_800C3448 -/* 0CB2D8 800CA6D8 3C04C1F0 */ lui $a0, 0xc1f0 -/* 0CB2DC 800CA6DC 3C04C151 */ lui $a0, (0xC1510011 >> 16) # lui $a0, 0xc151 -/* 0CB2E0 800CA6E0 0C030D12 */ jal func_800C3448 -/* 0CB2E4 800CA6E4 34840011 */ ori $a0, (0xC1510011 & 0xFFFF) # ori $a0, $a0, 0x11 -/* 0CB2E8 800CA6E8 10000008 */ b .L800CA70C -/* 0CB2EC 800CA6EC 93D8003B */ lbu $t8, 0x3b($fp) -.L800CA6F0: -/* 0CB2F0 800CA6F0 0C0323BE */ jal func_800C8EF8 -/* 0CB2F4 800CA6F4 24040011 */ li $a0, 17 -/* 0CB2F8 800CA6F8 10000004 */ b .L800CA70C -/* 0CB2FC 800CA6FC 93D8003B */ lbu $t8, 0x3b($fp) -.L800CA700: -/* 0CB300 800CA700 0C0323BE */ jal func_800C8EF8 -/* 0CB304 800CA704 24040011 */ li $a0, 17 -/* 0CB308 800CA708 93D8003B */ lbu $t8, 0x3b($fp) -.L800CA70C: -/* 0CB30C 800CA70C 3C01800F */ lui $at, %hi(D_800EA10C) -/* 0CB310 800CA710 240F0001 */ li $t7, 1 -/* 0CB314 800CA714 00380821 */ addu $at, $at, $t8 -/* 0CB318 800CA718 A02FA10C */ sb $t7, %lo(D_800EA10C)($at) -.L800CA71C: -/* 0CB31C 800CA71C 8FDF0034 */ lw $ra, 0x34($fp) -/* 0CB320 800CA720 03C0E825 */ move $sp, $fp -/* 0CB324 800CA724 8FDE0030 */ lw $fp, 0x30($fp) -/* 0CB328 800CA728 03E00008 */ jr $ra -/* 0CB32C 800CA72C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/external/func_800CAB4C.s b/asm/non_matchings/audio/external/func_800CAB4C.s deleted file mode 100644 index fc67c5d0d..000000000 --- a/asm/non_matchings/audio/external/func_800CAB4C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800CAB4C -/* 0CB74C 800CAB4C 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CB750 800CAB50 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CB754 800CAB54 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0CB758 800CAB58 AFBE0030 */ sw $fp, 0x30($sp) -/* 0CB75C 800CAB5C 03A0F025 */ move $fp, $sp -/* 0CB760 800CAB60 AFBF0034 */ sw $ra, 0x34($sp) -/* 0CB764 800CAB64 15C00023 */ bnez $t6, .L800CABF4 -/* 0CB768 800CAB68 AFA40038 */ sw $a0, 0x38($sp) -/* 0CB76C 800CAB6C 93AF003B */ lbu $t7, 0x3b($sp) -/* 0CB770 800CAB70 3C18800F */ lui $t8, %hi(D_800EA0EC) # $t8, 0x800f -/* 0CB774 800CAB74 2718A0EC */ addiu $t8, %lo(D_800EA0EC) # addiu $t8, $t8, -0x5f14 -/* 0CB778 800CAB78 01F81821 */ addu $v1, $t7, $t8 -/* 0CB77C 800CAB7C 90620000 */ lbu $v0, ($v1) -/* 0CB780 800CAB80 24010002 */ li $at, 2 -/* 0CB784 800CAB84 00002025 */ move $a0, $zero -/* 0CB788 800CAB88 10400004 */ beqz $v0, .L800CAB9C -/* 0CB78C 800CAB8C 24050001 */ li $a1, 1 -/* 0CB790 800CAB90 14410015 */ bne $v0, $at, .L800CABE8 -/* 0CB794 800CAB94 24190001 */ li $t9, 1 -/* 0CB798 800CAB98 A0790000 */ sb $t9, ($v1) -.L800CAB9C: -/* 0CB79C 800CAB9C 24060055 */ li $a2, 85 -/* 0CB7A0 800CABA0 0C030DB1 */ jal func_800C36C4 -/* 0CB7A4 800CABA4 24070005 */ li $a3, 5 -/* 0CB7A8 800CABA8 3C051900 */ lui $a1, (0x1900F013 >> 16) # lui $a1, 0x1900 -/* 0CB7AC 800CABAC 34A5F013 */ ori $a1, (0x1900F013 & 0xFFFF) # ori $a1, $a1, 0xf013 -/* 0CB7B0 800CABB0 0C032418 */ jal func_800C9060 -/* 0CB7B4 800CABB4 93C4003B */ lbu $a0, 0x3b($fp) -/* 0CB7B8 800CABB8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0CB7BC 800CABBC 3C08800F */ lui $t0, %hi(D_800EA1DC) # $t0, 0x800f -/* 0CB7C0 800CABC0 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0CB7C4 800CABC4 2508A1DC */ addiu $t0, %lo(D_800EA1DC) # addiu $t0, $t0, -0x5e24 -/* 0CB7C8 800CABC8 3C045101 */ lui $a0, (0x5101C00C >> 16) # lui $a0, 0x5101 -/* 0CB7CC 800CABCC 3C05800F */ lui $a1, %hi(D_800EA1C8) # $a1, 0x800f -/* 0CB7D0 800CABD0 24A5A1C8 */ addiu $a1, %lo(D_800EA1C8) # addiu $a1, $a1, -0x5e38 -/* 0CB7D4 800CABD4 3484C00C */ ori $a0, (0x5101C00C & 0xFFFF) # ori $a0, $a0, 0xc00c -/* 0CB7D8 800CABD8 AFA80014 */ sw $t0, 0x14($sp) -/* 0CB7DC 800CABDC AFA70010 */ sw $a3, 0x10($sp) -/* 0CB7E0 800CABE0 0C031052 */ jal play_sound -/* 0CB7E4 800CABE4 00003025 */ move $a2, $zero -.L800CABE8: -/* 0CB7E8 800CABE8 24090001 */ li $t1, 1 -/* 0CB7EC 800CABEC 3C01800F */ lui $at, %hi(D_800EA168) # $at, 0x800f -/* 0CB7F0 800CABF0 A029A168 */ sb $t1, %lo(D_800EA168)($at) -.L800CABF4: -/* 0CB7F4 800CABF4 8FDF0034 */ lw $ra, 0x34($fp) -/* 0CB7F8 800CABF8 03C0E825 */ move $sp, $fp -/* 0CB7FC 800CABFC 8FDE0030 */ lw $fp, 0x30($fp) -/* 0CB800 800CAC00 03E00008 */ jr $ra -/* 0CB804 800CAC04 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/audio/external/func_800CB14C.s b/asm/non_matchings/audio/external/func_800CB14C.s deleted file mode 100644 index cb8c609a3..000000000 --- a/asm/non_matchings/audio/external/func_800CB14C.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_800CB14C -/* 0CBD4C 800CB14C 3C04800F */ lui $a0, %hi(D_800EA174) # $a0, 0x800f -/* 0CBD50 800CB150 2484A174 */ addiu $a0, %lo(D_800EA174) # addiu $a0, $a0, -0x5e8c -/* 0CBD54 800CB154 94830000 */ lhu $v1, ($a0) -/* 0CBD58 800CB158 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0CBD5C 800CB15C AFBE0020 */ sw $fp, 0x20($sp) -/* 0CBD60 800CB160 03A0F025 */ move $fp, $sp -/* 0CBD64 800CB164 10600052 */ beqz $v1, .L800CB2B0 -/* 0CBD68 800CB168 AFBF0024 */ sw $ra, 0x24($sp) -/* 0CBD6C 800CB16C 246E0001 */ addiu $t6, $v1, 1 -/* 0CBD70 800CB170 31C2FFFF */ andi $v0, $t6, 0xffff -/* 0CBD74 800CB174 24010003 */ li $at, 3 -/* 0CBD78 800CB178 14410008 */ bne $v0, $at, .L800CB19C -/* 0CBD7C 800CB17C A48E0000 */ sh $t6, ($a0) -/* 0CBD80 800CB180 0C0323AB */ jal func_800C8EAC -/* 0CBD84 800CB184 2404001A */ li $a0, 26 -/* 0CBD88 800CB188 3C044000 */ lui $a0, (0x4000007F >> 16) # lui $a0, 0x4000 -/* 0CBD8C 800CB18C 0C030D12 */ jal func_800C3448 -/* 0CBD90 800CB190 3484007F */ ori $a0, (0x4000007F & 0xFFFF) # ori $a0, $a0, 0x7f -/* 0CBD94 800CB194 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBD98 800CB198 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -.L800CB19C: -/* 0CBD9C 800CB19C 2401012C */ li $at, 300 -/* 0CBDA0 800CB1A0 5441000D */ bnel $v0, $at, .L800CB1D8 -/* 0CBDA4 800CB1A4 24010230 */ li $at, 560 -/* 0CBDA8 800CB1A8 0C0323AB */ jal func_800C8EAC -/* 0CBDAC 800CB1AC 2404001B */ li $a0, 27 -/* 0CBDB0 800CB1B0 3C044000 */ lui $a0, (0x4000007F >> 16) # lui $a0, 0x4000 -/* 0CBDB4 800CB1B4 0C030D12 */ jal func_800C3448 -/* 0CBDB8 800CB1B8 3484007F */ ori $a0, (0x4000007F & 0xFFFF) # ori $a0, $a0, 0x7f -/* 0CBDBC 800CB1BC 0C0323BE */ jal func_800C8EF8 -/* 0CBDC0 800CB1C0 2404001D */ li $a0, 29 -/* 0CBDC4 800CB1C4 0C030D12 */ jal func_800C3448 -/* 0CBDC8 800CB1C8 3C044100 */ lui $a0, 0x4100 -/* 0CBDCC 800CB1CC 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBDD0 800CB1D0 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -/* 0CBDD4 800CB1D4 24010230 */ li $at, 560 -.L800CB1D8: -/* 0CBDD8 800CB1D8 5441000F */ bnel $v0, $at, .L800CB218 -/* 0CBDDC 800CB1DC 240102A8 */ li $at, 680 -/* 0CBDE0 800CB1E0 0C030D12 */ jal func_800C3448 -/* 0CBDE4 800CB1E4 3C044064 */ lui $a0, 0x4064 -/* 0CBDE8 800CB1E8 3C04B064 */ lui $a0, (0xB0640073 >> 16) # lui $a0, 0xb064 -/* 0CBDEC 800CB1EC 0C030D12 */ jal func_800C3448 -/* 0CBDF0 800CB1F0 34840073 */ ori $a0, (0xB0640073 & 0xFFFF) # ori $a0, $a0, 0x73 -/* 0CBDF4 800CB1F4 3C044150 */ lui $a0, (0x4150007F >> 16) # lui $a0, 0x4150 -/* 0CBDF8 800CB1F8 0C030D12 */ jal func_800C3448 -/* 0CBDFC 800CB1FC 3484007F */ ori $a0, (0x4150007F & 0xFFFF) # ori $a0, $a0, 0x7f -/* 0CBE00 800CB200 3C04B164 */ lui $a0, (0xB1640073 >> 16) # lui $a0, 0xb164 -/* 0CBE04 800CB204 0C030D12 */ jal func_800C3448 -/* 0CBE08 800CB208 34840073 */ ori $a0, (0xB1640073 & 0xFFFF) # ori $a0, $a0, 0x73 -/* 0CBE0C 800CB20C 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBE10 800CB210 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -/* 0CBE14 800CB214 240102A8 */ li $at, 680 -.L800CB218: -/* 0CBE18 800CB218 14410005 */ bne $v0, $at, .L800CB230 -/* 0CBE1C 800CB21C 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001 -/* 0CBE20 800CB220 0C030D12 */ jal func_800C3448 -/* 0CBE24 800CB224 348400FF */ ori $a0, (0x100100FF & 0xFFFF) # ori $a0, $a0, 0xff -/* 0CBE28 800CB228 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBE2C 800CB22C 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -.L800CB230: -/* 0CBE30 800CB230 2401041A */ li $at, 1050 -/* 0CBE34 800CB234 14410008 */ bne $v0, $at, .L800CB258 -/* 0CBE38 800CB238 3C04B150 */ lui $a0, (0xB1500001 >> 16) # lui $a0, 0xb150 -/* 0CBE3C 800CB23C 0C030D12 */ jal func_800C3448 -/* 0CBE40 800CB240 34840001 */ ori $a0, (0xB1500001 & 0xFFFF) # ori $a0, $a0, 1 -/* 0CBE44 800CB244 3C045150 */ lui $a0, (0x51500001 >> 16) # lui $a0, 0x5150 -/* 0CBE48 800CB248 0C030D12 */ jal func_800C3448 -/* 0CBE4C 800CB24C 34840001 */ ori $a0, (0x51500001 & 0xFFFF) # ori $a0, $a0, 1 -/* 0CBE50 800CB250 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBE54 800CB254 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -.L800CB258: -/* 0CBE58 800CB258 2401046A */ li $at, 1130 -/* 0CBE5C 800CB25C 54410006 */ bnel $v0, $at, .L800CB278 -/* 0CBE60 800CB260 240104B0 */ li $at, 1200 -/* 0CBE64 800CB264 0C030D12 */ jal func_800C3448 -/* 0CBE68 800CB268 3C044132 */ lui $a0, 0x4132 -/* 0CBE6C 800CB26C 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBE70 800CB270 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -/* 0CBE74 800CB274 240104B0 */ li $at, 1200 -.L800CB278: -/* 0CBE78 800CB278 14410005 */ bne $v0, $at, .L800CB290 -/* 0CBE7C 800CB27C 3C041101 */ lui $a0, (0x110100FF >> 16) # lui $a0, 0x1101 -/* 0CBE80 800CB280 0C030D12 */ jal func_800C3448 -/* 0CBE84 800CB284 348400FF */ ori $a0, (0x110100FF & 0xFFFF) # ori $a0, $a0, 0xff -/* 0CBE88 800CB288 3C02800F */ lui $v0, %hi(D_800EA174) # $v0, 0x800f -/* 0CBE8C 800CB28C 9442A174 */ lhu $v0, %lo(D_800EA174)($v0) -.L800CB290: -/* 0CBE90 800CB290 240104CE */ li $at, 1230 -/* 0CBE94 800CB294 54410007 */ bnel $v0, $at, .L800CB2B4 -/* 0CBE98 800CB298 8FDF0024 */ lw $ra, 0x24($fp) -/* 0CBE9C 800CB29C 0C0323AB */ jal func_800C8EAC -/* 0CBEA0 800CB2A0 24040014 */ li $a0, 20 -/* 0CBEA4 800CB2A4 3C044000 */ lui $a0, (0x4000007F >> 16) # lui $a0, 0x4000 -/* 0CBEA8 800CB2A8 0C030D12 */ jal func_800C3448 -/* 0CBEAC 800CB2AC 3484007F */ ori $a0, (0x4000007F & 0xFFFF) # ori $a0, $a0, 0x7f -.L800CB2B0: -/* 0CBEB0 800CB2B0 8FDF0024 */ lw $ra, 0x24($fp) -.L800CB2B4: -/* 0CBEB4 800CB2B4 03C0E825 */ move $sp, $fp -/* 0CBEB8 800CB2B8 8FDE0020 */ lw $fp, 0x20($fp) -/* 0CBEBC 800CB2BC 03E00008 */ jr $ra -/* 0CBEC0 800CB2C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/data/data_0DD0A0_2_1_1.s b/data/data_0DD0A0_2_1_1.s index 56feb8368..cdafca1c4 100644 --- a/data/data_0DD0A0_2_1_1.s +++ b/data/data_0DD0A0_2_1_1.s @@ -202,29 +202,41 @@ glabel D_800E9F78 .byte 0x00, 0x00, 0x00, 0x00 glabel D_800E9F7C -.float 0.0, 0.0, 0.0, 1.0 - -glabel D_800E9F8C +.float 0.0, 0.0, 0.0 .float 1.0 +.float 1.0 +.byte 0x00 +.balign 4 +.float 3800.0, 3.4, 0.4 +.float -1.0, 0.4, 1100.0 +.float 630.0, 3600.0, 1.0 -glabel D_800E9F90 -.byte 0x00, 0x00, 0x00, 0x00 +.float 0.0, 0.0, 0.0 +.float 1.0 +.float 1.0 +.byte 0x00 +.balign 4 +.float 3800.0, 3.4, 0.4 +.float -1.0, 0.4, 1100.0 +.float 630.0, 3600.0, 1.0 -glabel D_800E9F94 -.float 3800.0, 3.4 -.float 0.4, -1.0, 0.4, 1100.0 -.float 630.0, 3600.0, 1.0, 0.0 -.float 0.0, 0.0, 1.0, 1.0 -.float 0.0, 3800.0, 3.4, 0.4 -.float -1.0, 0.4, 1100.0, 630.0 -.float 3600.0, 1.0, 0.0, 0.0 -.float 0.0, 1.0, 1.0, 0.0 -.float 3800.0, 3.4, 0.4, -1.0 -.float 0.4, 1100.0, 630.0, 3600.0 -.float 1.0, 0.0, 0.0, 0.0 -.float 1.0, 1.0, 0.0, 3800.0 -.float 3.4, 0.4, -1.0, 0.4 -.float 1100.0, 630.0, 3600.0, 1.0 +.float 0.0, 0.0, 0.0 +.float 1.0 +.float 1.0 +.byte 0x00 +.balign 4 +.float 3800.0, 3.4, 0.4 +.float -1.0, 0.4, 1100.0 +.float 630.0, 3600.0, 1.0 + +.float 0.0, 0.0, 0.0 +.float 1.0 +.float 1.0 +.byte 0x00 +.balign 4 +.float 3800.0, 3.4, 0.4 +.float -1.0, 0.4, 1100.0 +.float 630.0, 3600.0, 1.0 .macro Entry800EA06C f0, f1, f2, b0 .float \f0, \f1, \f2 diff --git a/src/audio/external.c b/src/audio/external.c index 12bd81950..c85ccd690 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -97,11 +97,11 @@ s8 func_800C15D0(u8 bank, u8 soundId, u8 channel) { } #ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s8 D_800EA0F4 = 0; /* const */ -u8 D_800EA1C0 = 0; /* const */ +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-09-2023 +u8 D_800EA0F4 = 0; +u8 D_800EA1C0 = 0; -s8 func_800C16E8(f32 arg0, f32 arg1, u8 arg2) { +s8 func_800C16E8(f32 arg0, f32 arg1, s32 arg2) { f32 temp_f6; f32 var_f0; f32 var_f14; @@ -113,9 +113,9 @@ s8 func_800C16E8(f32 arg0, f32 arg1, u8 arg2) { unksp-18.unk10 = (f64) saved_reg_f20; unksp-18.unk1C = arg1; - unksp-18.unk20 = (s32) arg2; + unksp-18.unk20 = arg2; if (D_800EA1C0 == 0) { - if ((u8) D_800EA0F4 != 0) { + if (D_800EA0F4 != 0) { var_f16 = 10.0f; var_f14 = 20.0f; var_f18 = 2.5f; @@ -475,57 +475,48 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2274.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -struct _struct_D_800EA06C_0x10 { - /* 0x00 */ char pad0[0xC]; - /* 0x0C */ s8 unkC; /* inferred */ - /* 0x0D */ char padD[3]; /* maybe part of unkC[4]? */ -}; /* size = 0x10 */ - -? func_800CBBB8(?, ?); /* extern */ -extern s8 D_8018EF10; +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-09-2023 extern ? D_8018EF18; -extern ? D_8018FB98; -extern ? D_8018FBA8; -extern ? D_8018FBD8; -extern s8 D_8018FC08; extern ? D_8018FC10; -static s32 D_800E9DB4[4] = { 0, 0, 0, 0 }; /* const */ -static ?32 D_800E9DF4[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; /* const */ -static s32 D_800E9E74[4] = { 0, 0, 0, 0 }; /* const */ -static s32 D_800E9E84[4] = { 0, 0, 0, 0 }; /* const */ -static s32 D_800E9E94[4] = { 0, 0, 0, 0 }; /* const */ -static s32 D_800E9EA4[4] = { 0, 0, 0, 0 }; /* const */ -static ? D_800E9F24; /* unable to generate initializer; const */ -static ? D_800E9F2C; /* unable to generate initializer; const */ -static f32 D_800E9F34[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9F54[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static ? D_800E9F74; /* unable to generate initializer; const */ -static ? D_800E9F78; /* unable to generate initializer; const */ -static ? D_800E9F7C; /* unable to generate initializer; const */ -static struct _struct_D_800EA06C_0x10 D_800EA06C[0]; /* unable to generate initializer; const */ -static ? D_800EA0EC; /* unable to generate initializer; const */ -static s8 D_800EA0F0 = 0; /* const */ -static s8 D_800EA104 = 0; /* const */ -static ? D_800EA10C; /* unable to generate initializer; const */ -static f32 D_800EA130[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static s16 D_800EA15C = 0; /* const */ -static s16 D_800EA160 = 0; /* const */ -static s8 D_800EA164 = 0; /* const */ -static s8 D_800EA16C = 0; /* const */ -static s16 D_800EA180 = 0; /* const */ -static s16 D_800EA184 = 0; /* const */ -s8 D_800EA0F4 = 0; /* const */ -s8 D_800EA108 = 0; /* const */ +static s32 D_800E9DB4[4] = { 0, 0, 0, 0 }; +static ?32 D_800E9DF4[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +s32 D_800E9E74[4] = { 0, 0, 0, 0 }; +static s32 D_800E9E84[4] = { 0, 0, 0, 0 }; +static s32 D_800E9E94[4] = { 0, 0, 0, 0 }; +static s32 D_800E9EA4[4] = { 0, 0, 0, 0 }; +u8 D_800E9F24[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +u8 D_800E9F2C[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +f32 D_800E9F34[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; +f32 D_800E9F54[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; +static ? D_800E9F74; /* unable to generate initializer */ +static ? D_800E9F78; /* unable to generate initializer */ +struct Unk_800E9F7C D_800E9F7C[4]; /* unable to generate initializer */ +struct Unk_800EA06C D_800EA06C[8]; /* unable to generate initializer */ +u8 D_800EA0EC[1] = { 0 }; +u8 D_800EA0F0 = 0; +u8 D_800EA0F4 = 0; +u8 D_800EA104 = 0; +u8 D_800EA108 = 0; +u8 D_800EA10C[4] = { 0, 0, 0, 0 }; +static f32 D_800EA130[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; +u16 D_800EA15C = 0; +u16 D_800EA160 = 0; +u8 D_800EA164 = 0; +s8 D_800EA16C = 0; +f32 D_800EA178 = 1.0f; +f32 D_800EA17C = 0.85f; +u16 D_800EA180 = 0; +static s16 D_800EA184 = 0; void func_800C2474(void) { Player *temp_a2; Player *temp_t7; + f32 *temp_a0; + f32 *temp_a1; s32 temp_at; s32 temp_at_2; s32 temp_lo; s32 temp_lo_2; - s32 temp_lo_3; s32 temp_t6; s32 temp_t6_2; s32 temp_t6_3; @@ -538,17 +529,15 @@ void func_800C2474(void) { s8 temp_t8_2; s8 temp_t9; struct Unk_8018EFD8 *temp_a0_4; - void *temp_a0; void *temp_a0_2; void *temp_a0_3; - void *temp_a1; void *temp_v1; D_8018EF10 = 0; - D_8018FB98.unk0 = (Camera *) camera1; - D_8018FB98.unk4 = (Camera *) camera2; - D_8018FB98.unk8 = (Camera *) camera3; - D_8018FB98.unkC = (Camera *) camera4; + D_8018FB98->unk0 = camera1; + D_8018FB98->unk4 = (Camera *) camera2; + D_8018FB98->unk8 = (Camera *) camera3; + D_8018FB98->unkC = (Camera *) camera4; D_8018FB91 = 0; D_8018FB90 = 1; D_800EA0F4 = 0; @@ -557,7 +546,7 @@ void func_800C2474(void) { D_800EA108 = 0; D_800EA0F0 = 0; D_800EA16C = 0; - func_800CBBB8(0xF2000000, 0); + func_800CBBB8(0xF2000000U, 0); D_800EA16C = 0; D_800EA15C = 0; D_800EA160 = 0; @@ -568,13 +557,12 @@ void func_800C2474(void) { D_800EA184 = 0; var_v0 = 0; do { - temp_lo = var_v0 * 0xC; D_800E9DB4[var_v0] = 0; D_800E9DF4[var_v0] = 0; - *(&D_800EA0EC + var_v0) = 0; + D_800EA0EC[var_v0] = 0; D_800E9EA4[var_v0] = 0; - temp_a0 = &D_8018FBA8 + temp_lo; - temp_a1 = &D_8018FBD8 + temp_lo; + temp_a0 = D_8018FBA8[var_v0]; + temp_a1 = D_8018FBD8[var_v0]; temp_a0->unk0 = 0.0f; temp_a0->unk4 = 0.0f; temp_a0->unk8 = 0.0f; @@ -582,7 +570,7 @@ void func_800C2474(void) { temp_a1->unk4 = 0.0f; temp_a1->unk8 = 0.0f; temp_a0_2 = &D_8018FC10 + (var_v0 * 4); - (&D_800E9F7C + (var_v0 * 0x3C))->unk14 = 0; + D_800E9F7C[var_v0].unk_14 = 0; D_800E9E74[var_v0] = 0; D_800E9E84[var_v0] = 0; D_800E9E94[var_v0] = 0; @@ -596,7 +584,7 @@ void func_800C2474(void) { temp_a2->unk_0DE = 0; temp_a0_2->unk0 = 0x00FF; temp_a0_2->unk2 = 0; - *(&D_800EA10C + var_v0) = 0; + D_800EA10C[var_v0] = 0; *(&D_800E9F74 + var_v0) = 0; temp_t6 = (var_v0 + 1) & 0xFF; *(&D_800E9F78 + var_v0) = 0; @@ -604,25 +592,25 @@ void func_800C2474(void) { } while (temp_t6 < 4); var_v0_2 = 0; do { - *(&D_800E9F24 + var_v0_2) = 0; - *(&D_800E9F2C + var_v0_2) = 0; + D_800E9F24[var_v0_2] = 0; + D_800E9F2C[var_v0_2] = 0; D_800E9F34[var_v0_2] = 0.0f; D_800E9F54[var_v0_2] = 0.0f; D_800EA130[var_v0_2] = 0.0f; temp_t8 = (var_v0_2 + 1) & 0xFF; temp_at = temp_t8 < 8; - D_800EA06C[var_v0_2].unkC = 0; + D_800EA06C[var_v0_2].unk0C = 0; temp_t7 = &gPlayers[var_v0_2]; var_v0_2 = temp_t8; temp_t7->unk_0BC = 0; } while (temp_at != 0); var_v0_3 = 0; do { - temp_lo_2 = var_v0_3 * 0xC; + temp_lo = var_v0_3 * 0xC; temp_t6_2 = (var_v0_3 + 1) & 0xFF; temp_at_2 = temp_t6_2 < 0x10; var_v0_3 = temp_t6_2; - temp_v1 = &D_8018EF18 + temp_lo_2; + temp_v1 = &D_8018EF18 + temp_lo; temp_v1->unk0 = 1.0f; temp_v1->unk4 = 1.0f; temp_v1->unk8 = 0; @@ -633,13 +621,13 @@ void func_800C2474(void) { var_v0_4 = 1; var_v1 = 1; do { - temp_lo_3 = var_v0_4 * 0x3C; + temp_lo_2 = var_v0_4 * 0x3C; temp_t6_3 = (var_v0_4 + 1) & 0xFF; temp_t8_2 = var_v1 - 1; temp_t9 = var_v1 + 1; var_v1 = temp_t6_3; var_v0_4 = temp_t6_3; - temp_a0_3 = D_8018EFD8 + temp_lo_3; + temp_a0_3 = D_8018EFD8 + temp_lo_2; temp_a0_3->unk29 = temp_t8_2; temp_a0_3->unk2A = temp_t9; } while (temp_t6_3 < 0x31); @@ -713,21 +701,18 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C29B4.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C284C(u8, u8, u8, u32); /* extern */ +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-10-2023 ? func_800C29B4(u8, s32); /* extern */ -? func_800C5C40(); /* extern */ extern ? D_80192CA8; -extern ? D_80192CC6; extern ? D_801930D0; u8 D_800EA1C0 = 0; static s8 D_800EA1EC = 0; static ? D_800EA1F0; /* unable to generate initializer */ static s8 D_800EA1F4[0x4F]; -void func_800C2A2C(u16 arg0, u16 *arg2) { +void func_800C2A2C(u32 arg0) { u8 sp5B; - u32 sp4C; + s32 sp4C; /* compiler-managed */ s32 sp48; s32 sp44; s32 sp3C; @@ -749,6 +734,7 @@ void func_800C2A2C(u16 arg0, u16 *arg2) { s32 temp_a2_4; s32 temp_a2_5; s32 temp_a3; + s32 temp_a3_2; s32 temp_a3_3; s32 temp_at; s32 temp_at_2; @@ -764,6 +750,7 @@ void func_800C2A2C(u16 arg0, u16 *arg2) { s32 temp_v1; s32 temp_v1_2; s32 temp_v1_3; + s32 var_a0; s32 var_a3; s32 var_t0; s32 var_v0; @@ -774,14 +761,12 @@ void func_800C2A2C(u16 arg0, u16 *arg2) { s32 var_v1_4; s32 var_v1_5; s8 var_a2; - u32 temp_a3_2; u32 temp_t6; u32 temp_t6_3; u32 temp_t7; u32 temp_t8; u32 temp_t8_7; u32 temp_t9_2; - u32 var_a0; u32 var_a1_2; u8 *temp_t4; u8 *temp_t4_2; @@ -819,7 +804,7 @@ void func_800C2A2C(u16 arg0, u16 *arg2) { return; case 2: temp_t8_2 = temp_t6 & 0xFF; - temp_t4 = &D_80192CC6 + temp_t8_2; + temp_t4 = &D_80192CC6[temp_t8_2]; sp3C = temp_t8_2; temp_t1 = *temp_t4; var_v1 = 0; @@ -836,7 +821,7 @@ loop_6: } else { temp_t6_2 = (var_v1 + 1) & 0xFF; var_v1 = temp_t6_2; - if (temp_t6_2 >= (s32) *(&D_80192CC6 + temp_a1)) { + if (temp_t6_2 >= (s32) D_80192CC6[temp_a1]) { var_v1 = 0; goto block_11; } @@ -853,7 +838,7 @@ block_11: } temp_t8_3 = (var_v1 + 1) & 0xFF; var_v1 = temp_t8_3; - } while (temp_t8_3 < (s32) *(&D_80192CC6 + temp_a1)); + } while (temp_t8_3 < (s32) D_80192CC6[temp_a1]); } if ((var_t0 != var_t3) || (var_t0 == 0)) { temp_a2 = (sp3C * 0xA) + &D_80192CA8; @@ -888,7 +873,7 @@ block_11: break; case 3: temp_t8_4 = temp_t6 & 0xFF; - temp_t4_2 = &D_80192CC6 + temp_t8_4; + temp_t4_2 = &D_80192CC6[temp_t8_4]; sp3C = temp_t8_4; temp_t1_2 = *temp_t4_2; var_v1_3 = 0; @@ -901,7 +886,7 @@ block_11: } temp_t8_5 = (var_v1_3 + 1) & 0xFF; var_v1_3 = temp_t8_5; - } while (temp_t8_5 < (s32) *(&D_80192CC6 + temp_a1)); + } while (temp_t8_5 < (s32) D_80192CC6[temp_a1]); } if (var_t0_2 != temp_t1_2) { temp_a3 = temp_t1_2 - 1; @@ -1013,7 +998,7 @@ block_11: } break; case 9: - (&D_801930D0 + ((temp_t6 & 0xFF) * 0x24C))->unk24A = arg0; + (&D_801930D0 + ((temp_t6 & 0xFF) * 0x24C))->unk24A = (s16) arg0; return; case 10: var_a0 = 1; @@ -1037,7 +1022,7 @@ block_11: } while (temp_at_2 != 0); return; case 11: - (&D_801930D0 + ((temp_t6 & 0xFF) * 0x24C))->unk14 = (s32) arg0; + (&D_801930D0 + ((temp_t6 & 0xFF) * 0x24C))->unk14 = arg0; return; case 12: if ((((u32) (arg0 & 0xF00000) >> 0x14) & 0xFF) != 0xF) { @@ -1045,7 +1030,7 @@ block_11: temp_t0 = temp_v0_8->unk41; temp_v0_8->unk41 = (u8) (temp_t0 + 1); if ((s32) temp_t0 < 5) { - (temp_v0_8 + (temp_t0 * 4))->unk2C = (s32) arg0; + (temp_v0_8 + (temp_t0 * 4))->unk2C = arg0; temp_v0_8->unk40 = 2; return; } @@ -1082,13 +1067,11 @@ block_11: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2A2C.s") #endif -void func_800C3448(s32 arg0) { +void func_800C3448(u32 arg0) { D_80192CD0[D_800EA1E4] = arg0; D_800EA1E4 += 1; } -extern u8 D_800EA1E8; - void func_800C3478(void) { for(D_800EA1E8; D_800EA1E4 != D_800EA1E8;) { func_800C2A2C(D_80192CD0[D_800EA1E8++]); @@ -1113,8 +1096,6 @@ u16 func_800C3508(s32 player) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3508.s") #endif -extern u8 D_800EA1E8; - u8 func_800C357C(s32 arg0) { u8 var_v1; u8 i; @@ -1574,14 +1555,6 @@ void play_sound(u32 soundBits, f32 *position, u8 arg2, f32 *arg3, f32 *arg4, u8 } } -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -extern f32 D_800F3648;// = 100000.0f; -// jpt_800F364C -// data_0DD0A0_2_1_1.s -// Plain data -extern Vec3f D_800EA1C8;// = { 0.0f, 0.0f, 0.0f, }; - void func_800C41CC(u8 arg0, struct Unk_80191420 *arg1) { s32 found; u8 soundId; @@ -1630,9 +1603,6 @@ void func_800C41CC(u8 arg0, struct Unk_80191420 *arg1) { } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C41CC.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 @@ -2218,8 +2188,6 @@ void func_800C5278(u8 bank) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5278.s") #endif -extern void func_800C473C(u8, u8); /* extern */ - void func_800C5384(u8 arg0, f32 *arg1) { u8 curr; @@ -2276,9 +2244,7 @@ void func_800C550C(s32 arg0) { #ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C473C(s32, s32); /* extern */ - +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-10-2023 void func_800C5578(f32 *arg0, u32 arg1) { u32 sp84; f32 *sp60; @@ -2324,14 +2290,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5578.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_800C41CC(?, ? *); /* extern */ -? func_800C473C(s32, s32); /* extern */ -? func_800CBBE8(s32, ?); /* extern */ - -void func_800C56F0(s32 arg0) { - s32 sp8C; - ? sp68; +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-10-2023 +void func_800C56F0(u32 arg0) { + struct Unk_80191420 sp68; s32 temp_t8; s32 var_s2; struct Unk_80191420 *temp_s0; @@ -2359,8 +2320,8 @@ void func_800C56F0(s32 arg0) { } } while (var_s1 != 0xFF); } - sp8C = arg0; - func_800C41CC(5, &sp68); + sp68.soundBits = arg0; + func_800C41CC(5U, &sp68); } #else GLOBAL_ASM("asm/non_matchings/audio/external/func_800C56F0.s") @@ -2434,9 +2395,6 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5968.s") #endif -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; @@ -2553,11 +2511,9 @@ loop_8: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5A3C.s") #endif -extern u8 D_800EA154[]; - void func_800C5BD0(void) { if (D_800EA1C0 == 0) { - func_800CBBE8(((D_800EA154[gPlayers->characterId] & 0xFFFF) << 8) | 0xF3000000, 0); + func_800CBBE8(((D_800EA154[gPlayers[0].characterId] & 0xFFFF) << 8) | 0xF3000000, 0); } else { func_800CBBE8(0xF3004D00, 0); } @@ -2586,307 +2542,144 @@ void func_800C5CB8(void) { func_800C284C(2, 0, 0xFF, 1); } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C94A4(u8); /* extern */ -static s32 D_800E9E24[4] = { 0, 0, 0, 0 }; -static s32 D_800E9E34[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; -u8 D_800EA0EC[1] = { 0 }; -s8 D_800EA16C = 0; - void func_800C5D04(u8 playerId) { - s32 *temp_a0; - s32 *temp_v1_2; - s32 temp_a0_2; - s32 temp_t1; - s32 var_v1; - u8 *temp_v1; - u8 temp_a1; - u8 temp_v0; - - temp_a1 = playerId & 0xFF; - if ((*(&gPlayers->unk_044 + (temp_a1 * 0xDD8)) & 0x20) == 0x20) { - D_800E9E34[temp_a1] = 0; - temp_a0 = &D_800E9E24[temp_a1]; - var_v1 = *temp_a0; - if (var_v1 < 0x4E20) { - temp_t1 = var_v1 + 1; + if ((gPlayers[playerId].unk_044 & 0x20) == 0x20) { + D_800E9E34[playerId] = 0; + if (D_800E9E24[playerId] < 0x4E20) { if ((u8) D_800EA16C == 0) { - *temp_a0 = temp_t1; - var_v1 = temp_t1; + D_800E9E24[playerId]++; } } - temp_v1 = &D_800EA0EC[temp_a1]; - if (var_v1 == 1) { - temp_v0 = *temp_v1; - if (temp_v0 != 0) { - if (temp_v0 == 2) { - *temp_v1 = 1; - goto block_8; - } - } else { -block_8: - playerId = temp_a1; - func_800C97C4(temp_a1 & 0xFF); + if (D_800E9E24[playerId] == 1) { + switch (D_800EA0EC[playerId]) { + case 2: + D_800EA0EC[playerId] = 1; + case 0: + func_800C97C4(playerId); func_800C94A4(playerId); + break; + default: + break; } } } else { - D_800E9E24[temp_a1] = 0; - temp_v1_2 = &D_800E9E34[temp_a1]; - temp_a0_2 = *temp_v1_2; - if ((temp_a0_2 < 0x4E20) && ((u8) D_800EA16C == 0)) { - *temp_v1_2 = temp_a0_2 + 1; + D_800E9E24[playerId] = 0; + if ((D_800E9E34[playerId] < 0x4E20) && ((u8) D_800EA16C == 0)) { + D_800E9E34[playerId]++; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5D04.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -static ?32 D_800E9DC4[4] = { 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000 }; -static ?32 D_800E9DD4[4] = { 0, 0, 0, 0 }; -static s32 D_800E9E14[4] = { 0, 0, 0, 0 }; -static s32 D_800E9E24[4] = { 0, 0, 0, 0 }; -static s32 D_800E9E34[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; -static f32 D_800E9F04[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; -f32 D_800E9F54[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; -static ? D_800E9F74; /* unable to generate initializer */ -static ? D_800E9F7C; /* unable to generate initializer */ -static ? D_800E9F8C; /* unable to generate initializer */ -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA108 = 0; -static ? D_800EA130; /* unable to generate initializer */ -s8 D_800EA16C = 0; -u8 D_800EA1C0 = 0; void func_800C5E38(u8 playerId) { - s32 sp3C; - Player *temp_a3; - f32 *temp_a1; - f32 temp_f0; - f32 temp_f2; - s32 temp_v0; - u8 *temp_t0; - u8 temp_v1; - u8 var_a2; - void *temp_a1_2; - - var_a2 = playerId & 0xFF; if (D_800EA108 == 0) { - temp_a3 = &gPlayers[var_a2]; - temp_v0 = var_a2 * 4; - if (((temp_a3->unk_044 & 0x20) != 0x20) && (temp_t0 = &D_800EA0EC[var_a2], (temp_a3->unk_098 > 400.0f))) { - D_800E9E14[var_a2] = 1; - temp_v1 = *temp_t0; - if (temp_v1 == 0) { - *(&D_800E9F8C + (var_a2 * 0x3C)) = 0.6f - D_800E9F54[var_a2]; + if (((gPlayers[playerId].unk_044 & 0x20) != 0x20) && (gPlayers[playerId].unk_098 > 400.0f)) { + D_800E9E14[playerId] = 1; + if (D_800EA0EC[playerId] == 0) { + D_800E9F7C[playerId].unk_10 = 0.6f - D_800E9F54[playerId]; } - temp_a1 = (var_a2 * 0x3C) + &D_800E9F7C; - D_800E9DC4[var_a2] = temp_a1->unk30; - D_800E9DD4[var_a2] = temp_a1->unk24; - if ((D_800E9E34[var_a2] == 1) && ((u8) D_800EA16C == 0)) { - if (temp_v1 != 0) { - if (temp_v1 == 2) { - *temp_t0 = 1; - goto block_10; - } - } else { -block_10: - if ((*(&D_800E9F74 + var_a2) == 0) && (temp_a3->characterId != 3)) { + D_800E9DC4[playerId] = D_800E9F7C[playerId].unk_30; + D_800E9DD4[playerId] = D_800E9F7C[playerId].unk_24; + if ((D_800E9E34[playerId] == 1) && ((u8) D_800EA16C == 0)) { + switch (D_800EA0EC[playerId]) { + case 2: + D_800EA0EC[playerId] = 1; + case 0: + if ((D_800E9F74[playerId] == 0) && (gPlayers[playerId].characterId != 3)) { if ((s32) D_800EA1C0 < 2) { - play_sound(0x0100F926U, temp_a1, var_a2, temp_a1 + 0x38, &D_800E9F04[var_a2], temp_a1 + 0x14); - return; + play_sound(0x0100F926U, D_800E9F7C[playerId].pos, playerId, &D_800E9F7C[playerId].unk_38, &D_800E9F04[playerId], (u8 *) &D_800E9F7C[playerId].unk_14); + } else { + play_sound(0x01008026U, D_800E9F7C[playerId].pos, playerId, &D_800E9F7C[playerId].unk_38, &D_800E9F04[playerId], (u8 *) &D_800E9F7C[playerId].unk_14); } - play_sound(0x01008026U, temp_a1, var_a2, temp_a1 + 0x38, &D_800E9F04[var_a2], (u8 *) (temp_a1 + 0x14)); } + break; + default: + break; } } } else { - if (D_800E9E24[var_a2] == 0x0000000A) { + if (D_800E9E24[playerId] == 0x0000000A) { if ((s32) D_800EA1C0 < 2) { - sp3C = temp_v0; - playerId = var_a2; - func_800C9018(var_a2 & 0xFF, 0x0100F926); + func_800C9018(playerId, 0x0100F926); } else { - sp3C = temp_v0; - playerId = var_a2; - func_800C9018(var_a2 & 0xFF, 0x01008026); + func_800C9018(playerId, 0x01008026); } - var_a2 = playerId; } - *(D_800E9E14 + temp_v0) = 0; - temp_f0 = 1.0f - *(D_800E9F54 + temp_v0); - temp_f2 = *(&D_800EA130 + temp_v0); - temp_a1_2 = (var_a2 * 0x3C) + &D_800E9F7C; - temp_a1_2->unk10 = (f32) (temp_f0 - temp_f2); - if (temp_f0 < temp_f2) { - temp_a1_2->unk10 = 0.0f; + D_800E9E14[playerId] = 0; + D_800E9F7C[playerId].unk_10 = (1.0f - D_800E9F54[playerId]) - D_800EA130[playerId]; + if ((1.0f - D_800E9F54[playerId]) < D_800EA130[playerId]) { + D_800E9F7C[playerId].unk_10 = 0.0f; } - *(D_800E9DC4 + temp_v0) = temp_a1_2->unk2C; - *(D_800E9DD4 + temp_v0) = temp_a1_2->unk20; + D_800E9DC4[playerId] = D_800E9F7C[playerId].unk_2C; + D_800E9DD4[playerId] = D_800E9F7C[playerId].unk_20; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5E38.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static f32 D_800E9DC4[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ -static f32 D_800E9DD4[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9DE4[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9DF4[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9E54[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9E64[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9EB4[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9EC4[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9ED4[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9EE4[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static f32 D_800E9F34[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static ? D_800E9F74; /* unable to generate initializer; const */ -static ? D_800E9F78; /* unable to generate initializer; const */ -static ? D_800E9F7C; /* unable to generate initializer; const */ - -void func_800C6108(s32 playerId) { +void func_800C6108(u8 playerId) { Player *temp_v1; - f32 *temp_a2_2; - f32 *temp_a3; - f32 *temp_t0; - f32 *temp_v1_3; - f32 *temp_v1_4; - f32 *temp_v1_5; - f32 *var_a0; - f32 *var_t0; - f32 *var_t2; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f12; - f32 temp_f2; - s16 temp_t1; - s32 temp_a2; - u8 *temp_a3_2; - u8 temp_t0_2; - u8 temp_v1_2; - void *temp_a1; - void *temp_a1_2; - temp_a2 = playerId & 0xFF; - unksp-10.unk10 = playerId; - temp_v1 = &gPlayers[temp_a2]; - temp_f0 = temp_v1->unk_098; - temp_a3 = &D_800E9E64[temp_a2]; - *temp_a3 = D_800E9DD4[temp_a2] + (temp_f0 / D_800E9DC4[temp_a2]); - if ((temp_f0 < 1800.0f) && ((temp_v1->unk_044 & 0x20) != 0x20)) { - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; - *temp_a3 = temp_a1->unk28 + (temp_f0 / temp_a1->unk34); + temp_v1 = &gPlayers[playerId]; + D_800E9E64[playerId] = (temp_v1->unk_098 / D_800E9DC4[playerId]) + D_800E9DD4[playerId]; + if ((temp_v1->unk_098 < 1800.0f) && ((temp_v1->unk_044 & 0x20) != 0x20)) { + D_800E9E64[playerId] = (temp_v1->unk_098 / D_800E9F7C[playerId].unk_34) + D_800E9F7C[playerId].unk_28; + if (D_800E9EC4) {} // ? } - temp_a1_2 = (temp_a2 * 0x3C) + &D_800E9F7C; if (temp_v1->unk_094 > 4.75f) { - var_a0 = &D_800E9EB4[temp_a2]; - temp_t0 = &D_800E9DE4[temp_a2]; - if (*var_a0 < (temp_a1_2->unk18 + 0.4f)) { - *temp_t0 += 0.005f; + if (D_800E9EB4[playerId] < (D_800E9F7C[playerId].unk_18 + 0.4f)) { + D_800E9DE4[playerId] += 0.005f; } - var_t0 = &D_800E9DE4[temp_a2]; } else { - var_t0 = &D_800E9DE4[temp_a2]; - var_a0 = &D_800E9EB4[temp_a2]; - *var_t0 = 0.0f; + D_800E9DE4[playerId] = 0.0f; } - temp_t1 = temp_v1->unk_0C0; - if (temp_t1 > 0) { - var_t2 = &D_800E9E54[temp_a2]; - *var_t2 = (f32) temp_t1; + if (gPlayers[playerId].unk_0C0 > 0) { + D_800E9E54[playerId] = (f32) temp_v1->unk_0C0; } else { - var_t2 = &D_800E9E54[temp_a2]; - *var_t2 = (f32) -temp_t1; + D_800E9E54[playerId] = (f32) -temp_v1->unk_0C0; } if ((temp_v1->unk_0BC & 0x10) == 0x10) { - *var_a0 = *var_t0 + *temp_a3; + D_800E9EB4[playerId] = D_800E9E64[playerId] + D_800E9DE4[playerId]; } else { - temp_f0_2 = (*temp_a3 + *var_t0) - (*var_t2 / 12000.0f); - *var_a0 = temp_f0_2; - if (temp_f0_2 < 0.01f) { - *var_a0 = 0.01f; + D_800E9EB4[playerId] = D_800E9E64[playerId] + D_800E9DE4[playerId] - (D_800E9E54[playerId] / 12000.0f); + if (D_800E9EB4[playerId] < 0.01f) { + D_800E9EB4[playerId] = 0.01f; } } - temp_v1_2 = *(&D_800E9F74 + temp_a2); - temp_a3_2 = temp_a2 + &D_800E9F78; - if ((temp_v1_2 != 0) || (*(&D_800E9F78 + temp_a2) != 0)) { - temp_t0_2 = *temp_a3_2; - if (temp_v1_2 != 0) { - if ((s32) temp_t0_2 < 0xF) { - *temp_a3_2 = temp_t0_2 + 1; - temp_v1_3 = &D_800E9DF4[temp_a2]; - *temp_v1_3 += 0.03f; + if ((D_800E9F74[playerId]) || (D_800E9F78[playerId])) { + if (D_800E9F74[playerId]) { + if (D_800E9F78[playerId] < 0xF) { + D_800E9F78[playerId]++; + D_800E9DF4[playerId] += 0.03f; } - } else if (temp_t0_2 != 0) { - *temp_a3_2 = temp_t0_2 - 1; - temp_v1_4 = &D_800E9DF4[temp_a2]; - *temp_v1_4 -= 0.03f; + } else if (D_800E9F78[playerId]) { + D_800E9F78[playerId]--; + D_800E9DF4[playerId] -= 0.03f; } - *var_a0 -= D_800E9DF4[temp_a2]; + D_800E9EB4[playerId] -= D_800E9DF4[playerId]; } - temp_a2_2 = &D_800E9EC4[temp_a2]; - temp_f2 = *temp_a2_2; - temp_f0_3 = *var_a0; - temp_f12 = temp_f0_3 - temp_f2; - temp_v1_5 = &D_800E9EE4[temp_a2]; - *temp_v1_5 = temp_f12; - if ((temp_f12 > 0.5f) || (*temp_v1_5 < 0.5f)) { - temp_f0_4 = *temp_v1_5 * 0.25f; - D_800E9ED4[temp_a2] = temp_f0_4; - temp_a1_2->unkC = (f32) (D_800E9F34[temp_a2] + (temp_f2 + temp_f0_4)); + D_800E9EE4[playerId] = D_800E9EB4[playerId] - D_800E9EC4[playerId]; + if ((D_800E9EE4[playerId] > 0.5f) || (D_800E9EE4[playerId] < 0.5f)) { + D_800E9ED4[playerId] = D_800E9EE4[playerId] * 0.25f; + D_800E9F7C[playerId].unk_0C = D_800E9EC4[playerId] + D_800E9ED4[playerId] + D_800E9F34[playerId]; } else { - temp_a1_2->unkC = (f32) (D_800E9F34[temp_a2] + temp_f0_3); + D_800E9F7C[playerId].unk_0C = D_800E9EB4[playerId] + D_800E9F34[playerId]; } - if (temp_a1_2->unkC > 4.0f) { - temp_a1_2->unkC = 4.0f; + if (D_800E9F7C[playerId].unk_0C > 4.0f) { + D_800E9F7C[playerId].unk_0C = 4.0f; } - *temp_a2_2 = temp_a1_2->unkC; - temp_a1_2->unk38 = (f32) ((temp_a1_2->unkC / 1.5f) + 0.4f); + D_800E9EC4[playerId] = D_800E9F7C[playerId].unk_0C; + D_800E9F7C[playerId].unk_38 = (D_800E9F7C[playerId].unk_0C / 1.5f) + 0.4f; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C6108.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static s32 D_800E9E24[4] = { 0, 0, 0, 0 }; /* const */ -static s32 D_800E9E34[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; /* const */ -static f32 D_800E9E54[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static s32 D_800E9E74[4] = { 0, 0, 0, 0 }; /* const */ -static f32 D_800E9EF4[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ -static f32 D_800E9F04[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ -static ? D_800E9F24; /* unable to generate initializer; const */ - -void func_800C64A0(s32 playerId) { - f32 *var_v1; - f32 *var_v1_2; - f32 var_f16; - s32 temp_t6; - s32 temp_t7; - - temp_t6 = playerId & 0xFF; - unksp-10.unk10 = playerId; - temp_t7 = D_800E9E74[temp_t6]; - switch (temp_t7) { +void func_800C64A0(u8 playerId) { + switch (D_800E9E74[playerId]) { case 3: - var_v1 = &D_800E9EF4[temp_t6]; - *var_v1 = (gPlayers[temp_t6].unk_094 / 5.0f) + 0.2f; + D_800E9EF4[playerId] = (gPlayers[playerId].unk_094 / 5.0f) + 0.2f; break; case 1: case 13: case 14: case 17: - var_v1 = &D_800E9EF4[temp_t6]; - *var_v1 = ((D_800E9E54[temp_t6] - 3500.0f) / 3000.0f) + 0.4f; + D_800E9EF4[playerId] = ((D_800E9E54[playerId] - 3500.0f) / 3000.0f) + 0.4f; break; case 4: case 5: @@ -2903,38 +2696,30 @@ void func_800C64A0(s32 playerId) { case 29: case 30: case 31: - var_v1 = &D_800E9EF4[temp_t6]; - *var_v1 = (gPlayers[temp_t6].unk_094 / 5.0f) + 0.2f; + D_800E9EF4[playerId] = (gPlayers[playerId].unk_094 / 5.0f) + 0.2f; break; default: - var_v1 = &D_800E9EF4[temp_t6]; - *var_v1 = 1.0f; + D_800E9EF4[playerId] = 1.0f; break; } - if (*var_v1 > 1.0f) { - *var_v1 = 1.0f; + if (D_800E9EF4[playerId] > 1.0f) { + D_800E9EF4[playerId] = 1.0f; } - if (*var_v1 < 0.0f) { - *var_v1 = 0.0f; + if (D_800E9EF4[playerId] < 0.0f) { + D_800E9EF4[playerId] = 0.0f; } - if ((gPlayers[temp_t6].unk_044 & 0x20) == 0x20) { - var_v1_2 = &D_800E9F04[temp_t6]; - var_f16 = 0.56f - ((f32) D_800E9E24[temp_t6] * 0.06f); + if ((gPlayers[playerId].unk_044 & 0x20) == 0x20) { + D_800E9F04[playerId] = 0.56f - (D_800E9E24[playerId] * 0.06f); } else { - var_v1_2 = &D_800E9F04[temp_t6]; - var_f16 = ((f32) D_800E9E34[temp_t6] / 50.0f) + 0.25f; + D_800E9F04[playerId] = (D_800E9E34[playerId] / 50.0f) + 0.25f; } - *var_v1_2 = var_f16; - if (*(&D_800E9F24 + temp_t6) != 0) { - *var_v1_2 = 0.0f; + if (D_800E9F24[playerId] != 0) { + D_800E9F04[playerId] = 0.0f; } - if (*var_v1_2 > 0.9f) { - *var_v1_2 = 0.9f; + if (D_800E9F04[playerId] > 0.9f) { + D_800E9F04[playerId] = 0.9f; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C64A0.s") -#endif void func_800C6758(u8 playerId) { switch (D_800E9E74[playerId]) { /* irregular */ @@ -2952,406 +2737,344 @@ void func_800C6758(u8 playerId) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_800C5578(f32 *, s32, u8); /* extern */ -static s32 D_800E9E84[4] = { 0, 0, 0, 0 }; /* const */ -static s32 D_800E9E94[4] = { 0, 0, 0, 0 }; /* const */ -static f32 D_800E9EF4[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ -static ? D_800E9F7C; /* unable to generate initializer; const */ -static ? D_800EA0EC; /* unable to generate initializer; const */ -s32 D_800E9E74[4] = { 0, 0, 0, 0 }; /* const */ -f32 D_800E9F14[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ -u8 D_800EA108 = 0; /* const */ - void func_800C683C(u8 arg0) { - s32 sp4C; - s32 *sp40; - f32 *temp_s0; - s32 *temp_s1; - s32 *temp_s2; - s32 *temp_t0; - s32 temp_t6; - u8 temp_a2; - - temp_a2 = arg0 & 0xFF; - if ((D_800EA108 == 0) && (*(&D_800EA0EC + temp_a2) == 0)) { - temp_t0 = &D_800E9E84[temp_a2]; - sp40 = temp_t0; - temp_s2 = &D_800E9E74[temp_a2]; - if (*temp_s2 != *temp_t0) { - temp_s0 = (temp_a2 * 0x3C) + &D_800E9F7C; - temp_s1 = &D_800E9E94[temp_a2]; - sp4C = temp_a2 * 4; - arg0 = temp_a2; - func_800C5578(temp_s0, *temp_s1, temp_a2); - temp_t6 = *temp_s2; - switch (temp_t6) { + if ((D_800EA108 == 0) && (D_800EA0EC[arg0] == 0)) { + if (D_800E9E74[arg0] != D_800E9E84[arg0]) { + func_800C5578(D_800E9F7C[arg0].pos, D_800E9E94[arg0]); + switch (D_800E9E74[arg0]) { case 3: - play_sound(0x0100F908U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F908; + play_sound(0x0100F908U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F908; break; case 18: - play_sound(0x0100F81DU, temp_s0, arg0, &D_800EA1D4, &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F81D; + play_sound(0x0100F81DU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F81D; break; case 19: - play_sound(0x0100F822U, temp_s0, arg0, &D_800EA1D4, &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F822; + play_sound(0x0100F822U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F822; break; case 1: - play_sound(0x0100F009U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F009; + play_sound(0x0100F009U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F009; break; case 2: - play_sound(0x0100F40AU, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F40A; + play_sound(0x0100F40AU, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F40A; break; case 17: - play_sound(0x0100F01EU, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F01E; + play_sound(0x0100F01EU, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F01E; break; case 15: - play_sound(0x0100F01FU, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F01F; + play_sound(0x0100F01FU, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F01F; break; case 16: - play_sound(0x0100F021U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F021; + play_sound(0x0100F021U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F021; break; case 20: - play_sound(0x0100F027U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F027; + play_sound(0x0100F027U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F027; break; case 25: - play_sound(0x0100F020U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F020; + play_sound(0x0100F020U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F020; break; case 26: - play_sound(0x0100F023U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F023; + play_sound(0x0100F023U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F023; break; case 27: - play_sound(0x01008046U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x01008046; + play_sound(0x01008046U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x01008046; break; case 28: - play_sound(0x0100F025U, temp_s0, arg0, &D_800E9F14[temp_a2], &D_800EA1D4, (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F025; + play_sound(0x0100F025U, D_800E9F7C[arg0].pos, arg0, &D_800E9F14[arg0], D_800EA1D4, (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F025; break; case 4: - play_sound(0x0100F00BU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F00B; + play_sound(0x0100F00BU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F00B; break; case 5: - play_sound(0x0100F00CU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F00C; + play_sound(0x0100F00CU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F00C; break; case 6: - play_sound(0x0100F00DU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F00D; + play_sound(0x0100F00DU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F00D; break; case 7: - play_sound(0x0100F00EU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F00E; + play_sound(0x0100F00EU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F00E; break; case 8: - play_sound(0x0100F00FU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F00F; + play_sound(0x0100F00FU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F00F; break; case 9: - play_sound(0x0100F010U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F010; + play_sound(0x0100F010U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F010; break; case 10: case 14: - play_sound(0x0100F011U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F011; + play_sound(0x0100F011U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F011; break; case 11: - play_sound(0x0100F012U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F012; + play_sound(0x0100F012U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F012; break; case 12: - play_sound(0x0100F013U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F013; + play_sound(0x0100F013U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F013; break; case 29: - play_sound(0x0100F048U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F048; + play_sound(0x0100F048U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F048; break; case 30: - play_sound(0x0100F049U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F049; + play_sound(0x0100F049U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F049; break; case 31: - play_sound(0x0100F04AU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F04A; + play_sound(0x0100F04AU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F04A; break; case 13: case 22: - play_sound(0x0100F029U, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F029; + play_sound(0x0100F029U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F029; break; case 23: - play_sound(0x0100F02AU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F02A; + play_sound(0x0100F02AU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F02A; break; case 24: - play_sound(0x0100F02BU, temp_s0, arg0, &D_800EA1D4, &D_800E9EF4[temp_a2], (u8 *) (temp_s0 + 0x14)); - *temp_s1 = 0x0100F02B; + play_sound(0x0100F02BU, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800E9EF4[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + D_800E9E94[arg0] = 0x0100F02B; break; default: - func_800C5578(temp_s0, *temp_s1, arg0); + func_800C5578(D_800E9F7C[arg0].pos, D_800E9E94[arg0]); break; } } - *sp40 = *temp_s2; + D_800E9E84[arg0] = D_800E9E74[arg0]; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C683C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static f32 D_800E9E54[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ -static s32 D_800E9E74[4] = { 0, 0, 0, 0 }; /* const */ -static u8 D_800E9F74; /* unable to generate initializer; const */ -static u8 D_800EA0EC; /* unable to generate initializer; const */ -static u8 D_800EA1C0 = 0; /* const */ - -void func_800C70A8(s32 playerId) { - Player *temp_v1; - s32 *temp_v0; - s32 temp_a1; - s32 var_a0; - s32 var_t1; - u8 temp_t2; - u8 temp_t7; - u8 temp_t9; - - temp_a1 = playerId & 0xFF; - unksp-10.unk10 = playerId; - if (*(&D_800EA0EC + temp_a1) == 0) { - temp_v0 = &D_800E9E74[temp_a1]; - *temp_v0 = 0; - if ((D_800E9E54[temp_a1] > 3500.0f) || (var_a0 = gPlayers[temp_a1].unk_0BC, var_t1 = var_a0 & 0x10, (var_t1 == 0x10))) { - temp_v1 = &gPlayers[temp_a1]; - temp_t7 = temp_v1->boundingBoxCorners[2].surfaceType; - var_a0 = temp_v1->unk_0BC; - *temp_v0 = 1; - var_t1 = var_a0 & 0x10; - switch (temp_t7) { /* switch 1 */ +void func_800C70A8(u8 playerId) { + if (D_800EA0EC[playerId] == 0) { + D_800E9E74[playerId] = 0; + if ((D_800E9E54[playerId] > 3500.0f) || ((gPlayers[playerId].unk_0BC & 0x10) == 0x10)) { + D_800E9E74[playerId] = 1; + switch (gPlayers[playerId].boundingBoxCorners[2].surfaceType) { /* switch 1 */ case 2: /* switch 1 */ - *temp_v0 = 0x0000000D; + D_800E9E74[playerId] = 0x0000000D; break; case 3: /* switch 1 */ - *temp_v0 = 0x0000000E; + D_800E9E74[playerId] = 0x0000000E; break; case 6: /* switch 1 */ - *temp_v0 = 0x00000011; + D_800E9E74[playerId] = 0x00000011; break; case 4: /* switch 1 */ - *temp_v0 = 0x0000000F; + D_800E9E74[playerId] = 0x0000000F; break; case 5: /* switch 1 */ - *temp_v0 = 0x00000010; + D_800E9E74[playerId] = 0x00000010; break; case 9: /* switch 1 */ - *temp_v0 = 0x00000014; + D_800E9E74[playerId] = 0x00000014; break; case 16: /* switch 1 */ - *temp_v0 = 0x00000019; + D_800E9E74[playerId] = 0x00000019; break; case 17: /* switch 1 */ - *temp_v0 = 0x0000001A; + D_800E9E74[playerId] = 0x0000001A; break; case 14: /* switch 1 */ - *temp_v0 = 0x0000001B; + D_800E9E74[playerId] = 0x0000001B; break; } } - temp_t2 = gPlayers[temp_a1].boundingBoxCorners[2].surfaceType; - if (var_t1 == 0x10) { - *temp_v0 = 2; - switch (temp_t2) { /* switch 2 */ + if ((gPlayers[playerId].unk_0BC & 0x10) == 0x10) { + D_800E9E74[playerId] = 2; + switch (gPlayers[playerId].boundingBoxCorners[2].surfaceType) { /* switch 2 */ case 2: /* switch 2 */ - *temp_v0 = 0x0000000D; + D_800E9E74[playerId] = 0x0000000D; break; case 3: /* switch 2 */ - *temp_v0 = 0x0000000E; + D_800E9E74[playerId] = 0x0000000E; break; case 6: /* switch 2 */ - *temp_v0 = 0x00000011; + D_800E9E74[playerId] = 0x00000011; break; case 4: /* switch 2 */ - *temp_v0 = 0x0000000F; + D_800E9E74[playerId] = 0x0000000F; break; case 5: /* switch 2 */ - *temp_v0 = 0x00000010; + D_800E9E74[playerId] = 0x00000010; break; case 9: /* switch 2 */ - *temp_v0 = 0x00000014; + D_800E9E74[playerId] = 0x00000014; break; case 16: /* switch 2 */ - *temp_v0 = 0x00000019; + D_800E9E74[playerId] = 0x00000019; break; case 17: /* switch 2 */ - *temp_v0 = 0x0000001A; + D_800E9E74[playerId] = 0x0000001A; break; case 14: /* switch 2 */ - *temp_v0 = 0x0000001B; + D_800E9E74[playerId] = 0x0000001B; break; } } - switch (temp_t2) { /* switch 3 */ + switch (gPlayers[playerId].boundingBoxCorners[2].surfaceType) { /* switch 3 */ case 8: /* switch 3 */ - if (*temp_v0 == 6) { - *temp_v0 = 4; + if (D_800E9E74[playerId] == 6) { + D_800E9E74[playerId] = 4; } else if (D_800EA1C0 == 0) { - *temp_v0 = 5; + D_800E9E74[playerId] = 5; } else { - *temp_v0 = 4; + D_800E9E74[playerId] = 4; } break; case 7: /* switch 3 */ - if (*temp_v0 == 0x0000000C) { - *temp_v0 = 0x0000000A; + if (D_800E9E74[playerId] == 0x0000000C) { + D_800E9E74[playerId] = 0x0000000A; } else if (D_800EA1C0 == 0) { - *temp_v0 = 0x0000000B; + D_800E9E74[playerId] = 0x0000000B; } else { - *temp_v0 = 0x0000000A; + D_800E9E74[playerId] = 0x0000000A; } break; case 13: /* switch 3 */ - if (*temp_v0 == 0x00000018) { - *temp_v0 = 0x00000016; + if (D_800E9E74[playerId] == 0x00000018) { + D_800E9E74[playerId] = 0x00000016; } else if (D_800EA1C0 == 0) { - *temp_v0 = 0x00000017; + D_800E9E74[playerId] = 0x00000017; } else { - *temp_v0 = 0x00000016; + D_800E9E74[playerId] = 0x00000016; } break; case 11: /* switch 3 */ - if (*temp_v0 == 0x0000001F) { - *temp_v0 = 0x0000001D; + if (D_800E9E74[playerId] == 0x0000001F) { + D_800E9E74[playerId] = 0x0000001D; } else if (D_800EA1C0 == 0) { - *temp_v0 = 0x0000001E; + D_800E9E74[playerId] = 0x0000001E; } else { - *temp_v0 = 0x0000001D; + D_800E9E74[playerId] = 0x0000001D; } break; case 10: /* switch 3 */ - if (*(&D_800E9F74 + temp_a1) == 0) { - if (*temp_v0 == 9) { - *temp_v0 = 7; + if (D_800E9F74[playerId] == 0) { + if (D_800E9E74[playerId] == 9) { + D_800E9E74[playerId] = 7; } else if (D_800EA1C0 == 0) { - *temp_v0 = 8; + D_800E9E74[playerId] = 8; } else { - *temp_v0 = 7; + D_800E9E74[playerId] = 7; } } else { - *temp_v0 = 0x0000001C; + D_800E9E74[playerId] = 0x0000001C; } break; case 16: /* switch 3 */ - *temp_v0 = 0x00000019; + D_800E9E74[playerId] = 0x00000019; break; case 17: /* switch 3 */ - *temp_v0 = 0x0000001A; + D_800E9E74[playerId] = 0x0000001A; break; case 14: /* switch 3 */ - *temp_v0 = 0x0000001B; + D_800E9E74[playerId] = 0x0000001B; break; } - temp_t9 = gPlayers[temp_a1].boundingBoxCorners[3].surfaceType; - switch (temp_t9) { /* switch 4 */ + switch (gPlayers[playerId].boundingBoxCorners[3].surfaceType) { /* switch 4 */ case 8: /* switch 4 */ - if (*temp_v0 == 5) { - *temp_v0 = 4; + if (D_800E9E74[playerId] == 5) { + D_800E9E74[playerId] = 4; } else if (D_800EA1C0 == 0) { - *temp_v0 = 6; + D_800E9E74[playerId] = 6; } else { - *temp_v0 = 4; + D_800E9E74[playerId] = 4; } break; case 7: /* switch 4 */ - if (*temp_v0 == 0x0000000B) { - *temp_v0 = 0x0000000A; + if (D_800E9E74[playerId] == 0x0000000B) { + D_800E9E74[playerId] = 0x0000000A; } else if (D_800EA1C0 == 0) { - *temp_v0 = 0x0000000C; + D_800E9E74[playerId] = 0x0000000C; } else { - *temp_v0 = 0x0000000A; + D_800E9E74[playerId] = 0x0000000A; } break; case 13: /* switch 4 */ - if (*temp_v0 == 0x00000017) { - *temp_v0 = 0x00000016; + if (D_800E9E74[playerId] == 0x00000017) { + D_800E9E74[playerId] = 0x00000016; } else if (D_800EA1C0 == 0) { - *temp_v0 = 0x00000018; + D_800E9E74[playerId] = 0x00000018; } else { - *temp_v0 = 0x00000016; + D_800E9E74[playerId] = 0x00000016; } break; case 11: /* switch 4 */ - if (*temp_v0 == 0x0000001E) { - *temp_v0 = 0x0000001D; + if (D_800E9E74[playerId] == 0x0000001E) { + D_800E9E74[playerId] = 0x0000001D; } else if (D_800EA1C0 == 0) { - *temp_v0 = 0x0000001F; + D_800E9E74[playerId] = 0x0000001F; } else { - *temp_v0 = 0x0000001D; + D_800E9E74[playerId] = 0x0000001D; } break; case 10: /* switch 4 */ - if (*(&D_800E9F74 + temp_a1) == 0) { - if (*temp_v0 == 8) { - *temp_v0 = 7; + if (D_800E9F74[playerId] == 0) { + if (D_800E9E74[playerId] == 8) { + D_800E9E74[playerId] = 7; } else if (D_800EA1C0 == 0) { - *temp_v0 = 9; + D_800E9E74[playerId] = 9; } else { - *temp_v0 = 7; + D_800E9E74[playerId] = 7; } } else { - *temp_v0 = 0x0000001C; + D_800E9E74[playerId] = 0x0000001C; } break; case 16: /* switch 4 */ - *temp_v0 = 0x00000019; + D_800E9E74[playerId] = 0x00000019; break; case 17: /* switch 4 */ - *temp_v0 = 0x0000001A; + D_800E9E74[playerId] = 0x0000001A; break; case 14: /* switch 4 */ - *temp_v0 = 0x0000001B; + D_800E9E74[playerId] = 0x0000001B; break; } - if (((gPlayers[temp_a1].unk_094 < 0.5f) || ((var_a0 & 8) == 8)) && (*temp_v0 != 0x0000001C)) { - *temp_v0 = 0; + if (((gPlayers[playerId].unk_094 < 0.5f) || ((gPlayers[playerId].unk_0BC & 8) == 8)) && (D_800E9E74[playerId] != 0x0000001C)) { + D_800E9E74[playerId] = 0; } - if ((((var_a0 & 0x4000) == 0x4000) && ((gPlayers[temp_a1].unk_000 & 0x2000) != 0x2000)) || ((var_a0 & 0x800) == 0x800) || ((var_a0 & 0x80) == 0x80) || ((var_a0 & 0x40) == 0x40) || ((gPlayers[temp_a1].unk_044 & 0x4000) == 0x4000)) { - *temp_v0 = 0x00000012; + if ((((gPlayers[playerId].unk_0BC & 0x4000) == 0x4000) && ((gPlayers[playerId].unk_000 & 0x2000) != 0x2000)) || ((gPlayers[playerId].unk_0BC & 0x800) == 0x800) || ((gPlayers[playerId].unk_0BC & 0x80) == 0x80) || ((gPlayers[playerId].unk_0BC & 0x40) == 0x40) || ((gPlayers[playerId].unk_044 & 0x4000) == 0x4000)) { + D_800E9E74[playerId] = 0x00000012; } - if ((((var_a0 & 0x20) == 0x20) && ((gPlayers[temp_a1].unk_000 & 0x2000) != 0x2000)) || ((var_a0 & 0x800) == 0x800)) { - *temp_v0 = 0x00000013; + if ((((gPlayers[playerId].unk_0BC & 0x20) == 0x20) && ((gPlayers[playerId].unk_000 & 0x2000) != 0x2000)) || ((gPlayers[playerId].unk_0BC & 0x800) == 0x800)) { + D_800E9E74[playerId] = 0x00000013; } - if (gPlayers[temp_a1].unk_20C != 0.0f) { - *temp_v0 = 3; + if (gPlayers[playerId].unk_20C != 0.0f) { + D_800E9E74[playerId] = 3; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C70A8.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-09-2023 extern s8 D_801657E5; extern u8 D_8018ED90; s32 D_800E9E74[4] = { 0, 0, 0, 0 }; static ? D_800E9E94; /* unable to generate initializer */ static s32 D_800E9EA4[4] = { 0, 0, 0, 0 }; -static ? D_800E9F7C; /* unable to generate initializer */ +struct Unk_800E9F7C D_800E9F7C[4]; /* unable to generate initializer */ u8 D_800EA0EC[1] = { 0 }; static u8 D_800EA0ED = 0; static u8 D_800EA0EE = 0; @@ -3404,7 +3127,7 @@ void func_800C76C0(u8 playerId) { func_800C9018(temp_t6, 0x0100FA28); func_800C9018(playerId, 0x0100FF2C); func_800C9018(playerId, 0x0100FA4C); - func_800C5578((playerId * 0x3C) + &D_800E9F7C, *(&D_800E9E94 + sp38)); + func_800C5578(D_800E9F7C[playerId].pos, *(&D_800E9E94 + sp38)); *(D_800E9E74 + sp38) = 0; switch (gModeSelection) { /* irregular */ case 0: @@ -3418,12 +3141,12 @@ void func_800C76C0(u8 playerId) { func_800C5278(5U); temp_v0_2 = *(&gPlayers->currentRank + (playerId * 0xDD8)); if (temp_v0_2 == 0) { - func_800C97C4((s32) playerId); + func_800C97C4(playerId); D_800EA0F0 = 2; func_800C9A88(playerId); func_800CA414(0x000DU, 0x0010U); } else if (temp_v0_2 < 4) { - func_800C97C4((s32) playerId); + func_800C97C4(playerId); D_800EA0F0 = 2; func_800C9A88(playerId); func_800CA414(0x000EU, 0x0010U); @@ -3438,7 +3161,7 @@ void func_800C76C0(u8 playerId) { if (temp_v0_3 == 0) { func_800C3448(0x100100FF); func_800C3448(0x110100FF); - func_800C97C4((s32) playerId); + func_800C97C4(playerId); D_800EA0F0 = 2; func_800C9A88(playerId); func_800CA414(0x000DU, 0x0010U); @@ -3449,7 +3172,7 @@ void func_800C76C0(u8 playerId) { func_800C3448(0x100100FF); func_800C3448(0x110100FF); } - func_800C97C4((s32) playerId); + func_800C97C4(playerId); D_800EA0F0 = 2; func_800C9A88(playerId); func_800CA414(0x000EU, 0x0010U); @@ -3473,7 +3196,7 @@ block_23: case 1: func_800C3448(0x100100FF); func_800C3448(0x110100FF); - func_800C97C4((s32) playerId); + func_800C97C4(playerId); D_800EA0F0 = 2; func_800C9A88(0U); D_800EA0EC[playerId] = 2; @@ -3496,7 +3219,7 @@ block_23: case 1: /* switch 1 */ func_800C3448(0x100100FF); func_800C3448(0x110100FF); - func_800C97C4((s32) playerId); + func_800C97C4(playerId); D_800EA0F0 = 2; func_800C9A88(playerId); func_800CA414(0x000DU, 0x0017U); @@ -3620,7 +3343,7 @@ block_76: if (temp_v0_7 == 0) { if (temp_v1_3 >= 0x15F) { if (temp_v1_3 == 0x0000015F) { - func_800C9D0C((s32) playerId); + func_800C9D0C(playerId); return; } } else { @@ -3632,7 +3355,7 @@ block_134: } else if (temp_v0_7 < 4) { if (temp_v1_3 >= 0x15F) { if (temp_v1_3 == 0x0000015F) { - func_800C9D0C((s32) playerId); + func_800C9D0C(playerId); return; } } else { @@ -3641,7 +3364,7 @@ block_134: } } else if (temp_v1_3 >= 0x12D) { if (temp_v1_3 == 0x0000012D) { - func_800C97C4((s32) playerId); + func_800C97C4(playerId); return; } } else { @@ -3654,14 +3377,14 @@ block_134: if (D_800EA1C0 == (u8) 1) { if (temp_v1_4 >= 0x65) { if (temp_v1_4 == 0x00000065) { - func_800C9D0C((s32) playerId); + func_800C9D0C(playerId); } } else { *(&D_800EA130 + sp38) = (f32) temp_v1_4 / 120.0f; } } else if (temp_v1_4 >= 0x65) { if (temp_v1_4 == 0x00000065) { - func_800C97C4((s32) playerId); + func_800C97C4(playerId); } } else { *(&D_800EA130 + sp38) = (f32) temp_v1_4 / 120.0f; @@ -3671,7 +3394,7 @@ block_134: temp_v1_5 = *sp34; if (temp_v1_5 >= 0x12D) { if (temp_v1_5 == 0x0000012D) { - func_800C9D0C(0); + func_800C9D0C(0U); return; } } else { @@ -3683,7 +3406,7 @@ block_134: temp_v1_6 = *sp34; if (temp_v1_6 >= 0x65) { if (temp_v1_6 == 0x00000065) { - func_800C97C4((s32) playerId); + func_800C97C4(playerId); return; } } else { @@ -3699,65 +3422,42 @@ block_134: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C76C0.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -? func_800C94A4(s32); /* extern */ -s16 gCurrentCourseId; /* unable to generate initializer */ -static ? D_800E9F74; /* unable to generate initializer */ -static ? D_800E9F7C; /* unable to generate initializer */ -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA1C0 = 0; -f32 D_800EA1D4[3]; /* unable to generate initializer */ - -void func_800C847C(s32 playerId) { - Player *sp3C; - u8 *sp38; - Player *temp_t8; - f32 *temp_a1; - f32 *temp_a1_2; - s32 temp_s0; - u8 *temp_v0; - u8 *temp_v0_2; - - temp_s0 = playerId & 0xFF; - temp_t8 = &gPlayers[temp_s0]; - sp3C = temp_t8; - if ((temp_t8->unk_0DE & 1) == 1) { - temp_v0 = temp_s0 + &D_800E9F74; - if (*temp_v0 == 0) { +void func_800C847C(u8 playerId) { + if ((gPlayers[playerId].unk_0DE & 1) == 1) { + if (D_800E9F74[playerId] == 0) { if ((s32) D_800EA1C0 < 2) { - sp38 = temp_v0; - func_800C9018(temp_s0 & 0xFF, 0x0100F926); + func_800C9018(playerId, 0x0100F926); } else { - sp38 = temp_v0; - func_800C9018(temp_s0 & 0xFF, 0x01008026); + func_800C9018(playerId, 0x01008026); } - func_800C97C4(temp_s0 & 0xFF); - *sp38 = 1; - func_800C94A4(temp_s0 & 0xFF); - if (((gCurrentCourseId == 1) || (gCurrentCourseId == 2) || (gCurrentCourseId == 3) || (gCurrentCourseId == 4) || (gCurrentCourseId == 5) || (gCurrentCourseId == 6) || (gCurrentCourseId == 7) || (gCurrentCourseId == 0x000C) || (gCurrentCourseId == 0x0012) || (gCurrentCourseId == 0x0013)) && (D_800EA0EC[temp_s0] == 0)) { - temp_a1 = (temp_s0 * 0x3C) + &D_800E9F7C; - play_sound((sp3C->characterId * 0x10) + 0x29008005, temp_a1, temp_s0 & 0xFF, D_800EA1D4, D_800EA1D4, temp_a1 + 0x14); + func_800C97C4(playerId); + D_800E9F74[playerId] = 1; + func_800C94A4(playerId); + if (( (gCurrentCourseId == 1) + || (gCurrentCourseId == 2) + || (gCurrentCourseId == 3) + || (gCurrentCourseId == 4) + || (gCurrentCourseId == 5) + || (gCurrentCourseId == 6) + || (gCurrentCourseId == 7) + || (gCurrentCourseId == 0x000C) + || (gCurrentCourseId == 0x0012) + || (gCurrentCourseId == 0x0013)) && (D_800EA0EC[playerId] == 0)) { + play_sound((gPlayers[playerId].characterId * 0x10) + 0x29008005, D_800E9F7C[playerId].pos, playerId, D_800EA1D4, D_800EA1D4, (u8 *) &D_800E9F7C[playerId].unk_14); } } } else { - temp_v0_2 = temp_s0 + &D_800E9F74; - if (*temp_v0_2 == 1) { - sp38 = temp_v0_2; - func_800C97C4(temp_s0 & 0xFF); - *temp_v0_2 = 2; - func_800C94A4(temp_s0 & 0xFF); - *temp_v0_2 = 0; - if ((gCurrentCourseId == 6) && (D_800EA0EC[temp_s0] == 0)) { - temp_a1_2 = (temp_s0 * 0x3C) + &D_800E9F7C; - play_sound((sp3C->characterId * 0x10) + 0x29008008, temp_a1_2, temp_s0 & 0xFF, D_800EA1D4, D_800EA1D4, temp_a1_2 + 0x14); + if (D_800E9F74[playerId] == 1) { + func_800C97C4(playerId); + D_800E9F74[playerId] = 2; + func_800C94A4(playerId); + D_800E9F74[playerId] = 0; + if ((gCurrentCourseId == 6) && (D_800EA0EC[playerId] == 0)) { + play_sound((gPlayers[playerId].characterId * 0x10) + 0x29008008, D_800E9F7C[playerId].pos, playerId, D_800EA1D4, D_800EA1D4, (u8 *) &D_800E9F7C[playerId].unk_14); } } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C847C.s") -#endif void func_800C86D8(u8 playerId) { if (((gPlayers[playerId].unk_0BC & 0x40000000) != 0x40000000) && (D_800E9F24[playerId] == 1)) { @@ -3808,8 +3508,8 @@ void func_800C8920(void) { && ((gPlayers[5].unk_0BC & 0x40000000) != 0x40000000) && ((gPlayers[6].unk_0BC & 0x40000000) != 0x40000000) && ((gPlayers[7].unk_0BC & 0x40000000) != 0x40000000)) { - func_800CAC08(); - } + func_800CAC08(); + } } void func_800C89E4(void) { @@ -3835,42 +3535,39 @@ void func_800C89E4(void) { } } -extern struct Unk_800E9F7C D_800E9F7C[]; -extern u16 D_800EA184; -static f64 D_800F38B4 = 0.85; - void func_800C8AE4(void) { if (gCurrentCourseId == 8) { if (D_800EA184 != 0) { if ((u8) D_800EA16C == 0) { + // Has to be this way, can't be D_800EA184++ D_800EA184 += 1; } - if (D_800EA184 == 0x12C) { - D_800EA17C = 0.85; + if (D_800EA184 == 0x012C) { + D_800EA17C = 0.85f; D_800EA184 = 0; } } else { switch (D_800EA1C0) { /* irregular */ case 0: - if (D_800E9F7C[0].unk14[0] != 0) { + if (D_800E9F7C[0].unk_14 != 0) { D_800EA17C = 0.0f; D_800EA184 = 1; } break; case 1: - if ((D_800E9F7C[0].unk14[0] != 0) || (D_800E9F7C[1].unk14[0] != 0)) { + if ((D_800E9F7C[0].unk_14 != 0) || (D_800E9F7C[1].unk_14 != 0)) { D_800EA17C = 0.0f; D_800EA184 = 1; } break; case 2: - if ((D_800E9F7C[0].unk14[0] != 0) || (D_800E9F7C[1].unk14[0] != 0) || (D_800E9F7C[2].unk14[0] != 0)) { + if ((D_800E9F7C[0].unk_14 != 0) || (D_800E9F7C[1].unk_14 != 0) || (D_800E9F7C[2].unk_14 != 0)) { D_800EA17C = 0.0f; D_800EA184 = 1; } break; case 3: - if ((D_800E9F7C[0].unk14[0] != 0) || (D_800E9F7C[1].unk14[0] != 0) || (D_800E9F7C[2].unk14[0] != 0) || (D_800E9F7C[3].unk14[0] != 0)) { + if ((D_800E9F7C[0].unk_14 != 0) || (D_800E9F7C[1].unk_14 != 0) || (D_800E9F7C[2].unk_14 != 0) || (D_800E9F7C[3].unk_14 != 0)) { D_800EA17C = 0.0f; D_800EA184 = 1; } @@ -3880,47 +3577,34 @@ void func_800C8AE4(void) { } } -extern f32 D_800EA130; - void func_800C8C7C(u8 arg0) { - *(&D_800EA06C[arg0].unk00[2]) = (1.0f - D_800E9F54[arg0]) - (&D_800EA130)[arg0]; + D_800EA06C[arg0].unk00[2] = (1.0f - D_800E9F54[arg0]) - D_800EA130[arg0]; } -extern void func_800C5D04(u8); /* extern */ -extern void func_800C5E38(u8); /* extern */ -extern void func_800C6108(u8); /* extern */ -extern void func_800C64A0(u8); /* extern */ -extern void func_800C683C(u8); /* extern */ -extern void func_800C70A8(u8); /* extern */ -extern void func_800C76C0(u8); /* extern */ -extern void func_800C847C(u8); /* extern */ -extern void func_800C8920(); /* extern */ -extern void func_800C8AE4(); /* extern */ - void func_800C8CCC() { - u8 i; + u8 var_s0; - for (i = 0; i < D_800EA1C0 + 1; i++) { - func_800C5D04(i); - func_800C5E38(i); - func_800C6108(i); - func_800C64A0(i); - func_800C6758(i); - func_800C683C(i); - func_800C70A8(i); - func_800C76C0(i); - func_800C847C(i); - func_800C86D8(i); + for (var_s0 = 0; var_s0 < D_800EA1C0 + 1; var_s0++) { + func_800C5D04(var_s0); + func_800C5E38(var_s0); + func_800C6108(var_s0); + func_800C64A0(var_s0); + func_800C6758(var_s0); + func_800C683C(var_s0); + func_800C70A8(var_s0); + func_800C76C0(var_s0); + func_800C847C(var_s0); + func_800C86D8(var_s0); } if (gModeSelection == 0) { - for(i = 0; i < 8; i++) { - func_800C8770(i); - func_800C8C7C(i); + for (var_s0 = 0; var_s0 < 8; var_s0++) { + func_800C8770(var_s0); + func_800C8C7C(var_s0); } } else { - for(i = 0; i < D_800EA1C0 + 1; i++) { - func_800C8770(i); - func_800C8C7C(i); + for (var_s0 = 0; var_s0 < D_800EA1C0 + 1; var_s0++) { + func_800C8770(var_s0); + func_800C8C7C(var_s0); } } func_800C8920(); @@ -3954,18 +3638,13 @@ void func_800C8F44(u8 arg0) { func_800C36C4(0, 0, arg0, 1); } -void func_800C8F80(u8 arg0, s32 arg1) { - u8 temp_v0; - u8* temp_v1; - +void func_800C8F80(u8 arg0, u32 arg1) { if (D_800EA108 == 0) { - temp_v1 = &D_800EA0EC[arg0]; - temp_v0 = *temp_v1; - switch(temp_v0) { + switch(D_800EA0EC[arg0]) { case 2: - *temp_v1 = 1; + D_800EA0EC[arg0] = 1; case 0: - play_sound((u32) arg1, &D_800E9F7C[arg0], arg0, D_800EA1D4, D_800EA1D4, &D_800EA1DC); + play_sound(arg1, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, D_800EA1D4, &D_800EA1DC); break; } } @@ -3973,7 +3652,7 @@ void func_800C8F80(u8 arg0, s32 arg1) { void func_800C9018(u8 arg0, s32 arg1) { - func_800C5578((f32*) &D_800E9F7C[arg0], arg1); + func_800C5578(D_800E9F7C[arg0].pos, arg1); } void func_800C9060(u8 arg0, u32 arg1) { @@ -3982,58 +3661,32 @@ void func_800C9060(u8 arg0, u32 arg1) { case 2: D_800EA0EC[arg0] = 1; case 0: - play_sound(arg1, &D_800E9F7C[arg0], arg0, D_800EA1D4, D_800EA1D4, (u8*) &D_800E9F7C[arg0].unk14[0]); + play_sound(arg1, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, D_800EA1D4, &D_800E9F7C[arg0].unk_14); break; } } } -#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 u8 D_800E9F7C; /* unable to generate initializer */ -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA108 = 0; -static f32 D_800EA150 = 1.4f; -u16 D_800EA180 = 0; -f32 D_800EA1D4[3]; /* unable to generate initializer */ - -void func_800C90F4(u8 arg0, u32 arg1) { - f32 *temp_a1; - f32 *temp_a1_2; - s32 temp_t9; - u8 *temp_v1; - u8 temp_a2; - u8 temp_v0; - - temp_a2 = arg0 & 0xFF; +void func_800C90F4(u8 playerId, u32 arg1) { 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; - } - } else { -block_4: - temp_t9 = arg1 & ~0xF0; - if ((temp_t9 == 0x29008003) || (temp_t9 == 0x29008004) || (temp_t9 == 0x29008005)) { + switch (D_800EA0EC[playerId]) { + case 2: + D_800EA0EC[playerId] = 1; + case 0: + if (((arg1 & ~0xF0) == 0x29008003) || ((arg1 & ~0xF0) == 0x29008004) || ((arg1 & ~0xF0) == 0x29008005)) { D_800EA180 = 1; } - if (((*(&gPlayers->unk_0BC + (temp_a2 * 0xDD8)) & 0x40000000) == 0x40000000) && ((s32) D_800E9F2C[temp_a2] >= 0x1F)) { - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; - play_sound(arg1, temp_a1, temp_a2, &D_800EA150, D_800EA1D4, temp_a1 + 0x14); - return; + if (((gPlayers[playerId].unk_0BC & 0x40000000) == 0x40000000) && ((s32) D_800E9F2C[playerId] >= 0x1F)) { + play_sound(arg1, D_800E9F7C[playerId].pos, playerId, &D_800EA150, D_800EA1D4, (u8 *) &D_800E9F7C[playerId].unk_14); + } else { + play_sound(arg1, D_800E9F7C[playerId].pos, playerId, D_800EA1D4, D_800EA1D4, (u8 *) &D_800E9F7C[playerId].unk_14); } - temp_a1_2 = (temp_a2 * 0x3C) + &D_800E9F7C; - play_sound(arg1, temp_a1_2, temp_a2, D_800EA1D4, D_800EA1D4, temp_a1_2 + 0x14); + break; + default: + break; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C90F4.s") -#endif void func_800C9250(u8 arg0) { @@ -4041,149 +3694,92 @@ void func_800C9250(u8 arg0) } -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static ? D_800E9F2C; /* unable to generate initializer; const */ -static ? D_800EA06C; /* unable to generate initializer; const */ -static u8 D_800EA0F0 = 0; /* const */ -static u8 D_800EA1C0 = 0; /* const */ -s8 D_800EA108 = 0; /* const */ +void func_800C92CC(u8 playerId, u32 soundBits) { + u8 var_s0; + struct Unk_8018EFD8 *temp_v0; -void func_800C92CC(s32 playerId, u32 soundBits) { - f32 *sp68; - f32 *sp64; - Player *temp_s1; - f32 *temp_t0; - s32 temp_s4; - s32 temp_t3; - s32 var_s0; - struct Unk_8018EFD8 *temp_v0_2; - u8 temp_v0; - - temp_s4 = playerId & 0xFF; - if (((u8) D_800EA108 == 0) && (D_800EA0F0 == 0)) { - temp_v0 = D_800EA1C0; - if ((s32) temp_v0 < 2) { - var_s0 = 0; - if ((s32) temp_v0 >= 0) { - temp_s1 = &gPlayers[temp_s4]; - sp64 = temp_s1->unk_034; - sp68 = temp_s1->pos; - do { - temp_v0_2 = func_800C1C88(temp_s4 & 0xFF, sp68, sp64, &D_800EA1C8, (u8) var_s0, soundBits); - if (temp_v0_2 != NULL) { - temp_v0_2->unk34 = 170.0f; - temp_t0 = (temp_s4 * 0x10) + 0xC + &D_800EA06C; - if (((temp_s1->unk_0BC & 0x40000000) == 0x40000000) && ((s32) *(&D_800E9F2C + temp_s4) >= 0x1F)) { - play_sound((temp_s1->characterId * 0x10) + soundBits, temp_v0_2->unk18, var_s0 & 0xFF, &D_800EA150, &D_800EA1D4, temp_t0); - } else { - play_sound((temp_s1->characterId * 0x10) + soundBits, temp_v0_2->unk18, var_s0 & 0xFF, &temp_v0_2->unk2C, &D_800EA1D4, temp_t0); - } - } - temp_t3 = (var_s0 + 1) & 0xFF; - var_s0 = temp_t3; - } while (temp_t3 < (D_800EA1C0 + 1)); + if ((D_800EA108 == 0) && (D_800EA0F0 == 0) && ((s32) D_800EA1C0 < 2)) { + for (var_s0 = 0; var_s0 < D_800EA1C0 + 1; var_s0++) { + temp_v0 = func_800C1C88(playerId, gPlayers[playerId].pos, gPlayers[playerId].unk_034, D_800EA1C8, (u8) var_s0, soundBits); + if (temp_v0 != NULL) { + temp_v0->unk34 = 170.0f; + if (((gPlayers[playerId].unk_0BC & 0x40000000) == 0x40000000) && ((s32) D_800E9F2C[playerId] >= 0x1F)) { + play_sound((gPlayers[playerId].characterId * 0x10) + soundBits, temp_v0->unk18, var_s0, &D_800EA150, D_800EA1D4, &D_800EA06C[playerId].unk0C); + } else { + play_sound((gPlayers[playerId].characterId * 0x10) + soundBits, temp_v0->unk18, var_s0, &temp_v0->unk2C, D_800EA1D4, &D_800EA06C[playerId].unk0C); + } } } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C92CC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static ? D_800E9F74; /* unable to generate initializer; const */ -static ? D_800E9F7C; /* unable to generate initializer; const */ -static ? D_800EA0EC; /* unable to generate initializer; const */ -u8 D_800EA108 = 0; /* const */ -u8 D_800EA1C0 = 0; /* const */ void func_800C94A4(u8 playerId) { - f32 *temp_a1; - f32 var_f6; - u16 temp_v1_2; u32 var_a0; - u8 *temp_v1; - u8 temp_a2; - u8 temp_v0; - u8 temp_v0_2; - temp_a2 = playerId & 0xFF; if (D_800EA108 == 0) { - temp_v1 = temp_a2 + &D_800EA0EC; - temp_v0 = *temp_v1; - if (temp_v0 != 0) { - if (temp_v0 == 2) { - *temp_v1 = 1; - goto block_4; - } - } else { -block_4: - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; - temp_a1->unkC = 1.0f; - temp_a1->unk10 = 0.0f; - temp_v1_2 = *(&gPlayers->characterId + (temp_a2 * 0xDD8)); - switch (temp_v1_2) { + switch(D_800EA0EC[playerId]) { + case 2: + D_800EA0EC[playerId] = 1; + case 0: + D_800E9F7C[playerId].unk_0C = 1.0f; + D_800E9F7C[playerId].unk_10 = 0.0f; + switch (gPlayers[playerId].characterId) { case 0: case 1: - temp_a1->unk18 = 2.8f; - temp_a1->unk20 = 0.35f; - temp_a1->unk1C = 3844.0f; - temp_a1->unk28 = 0.35f; - temp_a1->unk24 = -0.8f; - temp_a1->unk2C = 1568.9796f; - temp_a1->unk30 = 1067.7778f; - var_f6 = 2766.065f; -block_11: - temp_a1->unk34 = var_f6; + D_800E9F7C[playerId].unk_18 = 2.8f; + D_800E9F7C[playerId].unk_1C = 3844.0f; + D_800E9F7C[playerId].unk_20 = 0.35f; + D_800E9F7C[playerId].unk_24 = -0.8f; + D_800E9F7C[playerId].unk_28 = 0.35f; + D_800E9F7C[playerId].unk_2C = 1568.9796f; + D_800E9F7C[playerId].unk_30 = 1067.7778f; + D_800E9F7C[playerId].unk_34 = 2766.065f; break; case 2: case 6: - temp_a1->unk18 = 3.2f; - temp_a1->unk20 = 0.6f; - temp_a1->unk1C = 3844.0f; - temp_a1->unk28 = 0.6f; - temp_a1->unk24 = -1.7f; - temp_a1->unk2C = 1478.4615f; - temp_a1->unk30 = 784.4898f; - var_f6 = 12813.335f; - goto block_11; + D_800E9F7C[playerId].unk_18 = 3.2f; + D_800E9F7C[playerId].unk_1C = 3844.0f; + D_800E9F7C[playerId].unk_20 = 0.6f; + D_800E9F7C[playerId].unk_24 = -1.7f; + D_800E9F7C[playerId].unk_28 = 0.6f; + D_800E9F7C[playerId].unk_2C = 1478.4615f; + D_800E9F7C[playerId].unk_30 = 784.4898f; + D_800E9F7C[playerId].unk_34 = 12813.335f; + break; case 3: - temp_a1->unk18 = 2.8f; - temp_a1->unk20 = 0.6f; - temp_a1->unk1C = 3844.0f; - temp_a1->unk28 = 0.6f; - temp_a1->unk24 = -0.6f; - temp_a1->unk2C = 1747.2728f; - temp_a1->unk30 = 1130.5883f; - var_f6 = 3844.001f; - goto block_11; + D_800E9F7C[playerId].unk_18 = 2.8f; + D_800E9F7C[playerId].unk_1C = 3844.0f; + D_800E9F7C[playerId].unk_20 = 0.6f; + D_800E9F7C[playerId].unk_24 = -0.6f; + D_800E9F7C[playerId].unk_28 = 0.6f; + D_800E9F7C[playerId].unk_2C = 1747.2728f; + D_800E9F7C[playerId].unk_30 = 1130.5883f; + D_800E9F7C[playerId].unk_34 = 3844.001f; + break; case 4: - temp_a1->unk18 = 2.0f; - temp_a1->unk20 = 0.2f; - temp_a1->unk1C = 3844.0f; - temp_a1->unk28 = 0.2f; - temp_a1->unk24 = -0.4f; - temp_a1->unk2C = 2135.5557f; - temp_a1->unk30 = 1601.6666f; - var_f6 = 3203.333f; - goto block_11; + D_800E9F7C[playerId].unk_18 = 2.0f; + D_800E9F7C[playerId].unk_1C = 3844.0f; + D_800E9F7C[playerId].unk_20 = 0.2f; + D_800E9F7C[playerId].unk_24 = -0.4f; + D_800E9F7C[playerId].unk_28 = 0.2f; + D_800E9F7C[playerId].unk_2C = 2135.5557f; + D_800E9F7C[playerId].unk_30 = 1601.6666f; + D_800E9F7C[playerId].unk_34 = 3203.333f; + break; case 5: case 7: - temp_a1->unk18 = 2.4f; - temp_a1->unk20 = 0.4f; - temp_a1->unk1C = 3844.0f; - temp_a1->unk28 = 0.4f; - temp_a1->unk24 = -0.8f; - temp_a1->unk2C = 1922.0f; - temp_a1->unk30 = 1201.25f; - var_f6 = 4805.0f; - goto block_11; + D_800E9F7C[playerId].unk_18 = 2.4f; + D_800E9F7C[playerId].unk_1C = 3844.0f; + D_800E9F7C[playerId].unk_20 = 0.4f; + D_800E9F7C[playerId].unk_24 = -0.8f; + D_800E9F7C[playerId].unk_28 = 0.4f; + D_800E9F7C[playerId].unk_2C = 1922.0f; + D_800E9F7C[playerId].unk_30 = 1201.25f; + D_800E9F7C[playerId].unk_34 = 4805.0f; + break; } - temp_v0_2 = *(&D_800E9F74 + temp_a2); - var_a0 = temp_v1_2 + 0x0104FF00; - switch (temp_v0_2) { /* switch 1; irregular */ + var_a0 = gPlayers[playerId].characterId + 0x0104FF00; + switch (D_800E9F74[playerId]) { /* switch 1; irregular */ case 0: /* switch 1 */ if (D_800EA1C0 != 0) { var_a0 += 0x14; @@ -4200,23 +3796,23 @@ block_11: } break; } - play_sound(var_a0, temp_a1, temp_a2, temp_a1 + 0xC, temp_a1 + 0x10, temp_a1 + 0x14); + play_sound(var_a0, D_800E9F7C[playerId].pos, playerId, &D_800E9F7C[playerId].unk_0C, &D_800E9F7C[playerId].unk_10, (u8 *) &D_800E9F7C[playerId].unk_14); + break; + default: + break; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C94A4.s") -#endif void func_800C97C4(u8 arg0) { - func_800C5578(&D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF00); - func_800C5578(&D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF14); - func_800C5578(&D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF2E); - func_800C5578(&D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF36); - func_800C5578(&D_800E9F7C[arg0], gPlayers[arg0].characterId + 0x0104FF3E); + func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + 0x0104FF00); + func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + 0x0104FF14); + func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + 0x0104FF2E); + func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + 0x0104FF36); + func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + 0x0104FF3E); } -void func_800C98B8(f32* position, f32* velocity, u32 soundBits) { +void func_800C98B8(Vec3f position, Vec3f velocity, u32 soundBits) { u8 var_s0; struct Unk_8018EFD8* temp_v0; @@ -4382,49 +3978,34 @@ void func_800CA0E4(void) { func_800C5278(5); } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -static s32 D_800E9EA4[4] = { 0, 0, 0, 0 }; -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA0F0 = 0; -u8 D_800EA1C0 = 0; - -void func_800CA118(s32 arg0) { - s32 temp_t6; - - temp_t6 = arg0 & 0xFF; - D_800EA0EC[temp_t6] = 1; - D_800E9EA4[temp_t6] = 1; +void func_800CA118(u8 arg0) { + D_800EA0EC[arg0] = 1; + D_800E9EA4[arg0] = 1; switch (D_800EA1C0) { /* irregular */ case 0: D_800EA0F0 = 1; - func_800CA0E4(D_800EA0EC, 1U); - return; + func_800CA0E4(); + break; case 1: - if ((D_800EA0EC->unk0 == (u8) 1) && (D_800EA0EC->unk1 == (u8) 1)) { + if ((D_800EA0EC[0] == (u8) 1) && (D_800EA0EC[1] == (u8) 1)) { D_800EA0F0 = 1; - func_800CA0E4(D_800EA0EC, 1U); - return; + func_800CA0E4(); } - return; + break; case 2: - if ((D_800EA0EC->unk0 == (u8) 1) && (D_800EA0EC->unk1 == (u8) 1) && (D_800EA0EC->unk2 == (u8) 1)) { + if ((D_800EA0EC[0] == (u8) 1) && (D_800EA0EC[1] == (u8) 1) && (D_800EA0EC[2] == (u8) 1)) { D_800EA0F0 = 1; - func_800CA0E4(D_800EA0EC, 1U); - return; + func_800CA0E4(); } break; case 3: - if ((D_800EA0EC->unk0 == (u8) 1) && (D_800EA0EC->unk1 == (u8) 1) && (D_800EA0EC->unk2 == (u8) 1) && (D_800EA0EC->unk3 == (u8) 1)) { + if ((D_800EA0EC[0] == (u8) 1) && (D_800EA0EC[1] == (u8) 1) && (D_800EA0EC[2] == (u8) 1) && (D_800EA0EC[3] == (u8) 1)) { D_800EA0F0 = 1; - func_800CA0E4(D_800EA0EC, 1U); + func_800CA0E4(); } break; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA118.s") -#endif void func_800CA24C(u8 arg0) { D_800EA0EC[arg0] = 2; @@ -4434,14 +4015,12 @@ void func_800CA270() { D_800EA0F4 = 1; } -// appears to write u8 in list of f32s? -// However, 0x3C is 0.0f which could likely get confused with `u8 = 0`; void func_800CA288(u8 arg0, s8 arg1) { - D_800E9F90[arg0 * 0x3C] = arg1; // * 0x3C + D_800E9F7C[arg0].unk_14 = arg1; } void func_800CA2B8(u8 arg0) { - D_800E9F90[arg0 * 0x3C] = 0; + D_800E9F7C[arg0].unk_14 = 0; } void func_800CA2E4(u8 arg0, s8 arg1) { @@ -4496,27 +4075,9 @@ void func_800CA49C(u8 arg0) { } } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -s32 func_800C357C(?); /* extern */ -static ? D_800E9F7C; /* unable to generate initializer */ -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA104 = 0; -u8 D_800EA108 = 0; -static ? D_800EA10C; /* unable to generate initializer */ -u8 D_800EA164 = 0; -u8 D_800EA1C0 = 0; -f32 D_800EA1D4[3]; /* unable to generate initializer */ - void func_800CA59C(u8 playerId) { - f32 *temp_a1; - u8 temp_a2; - - temp_a2 = playerId & 0xFF; - if ((D_800EA0EC[temp_a2] == 0) && (D_800EA108 == 0)) { - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; - playerId = temp_a2; - play_sound((*(&gPlayers->characterId + (temp_a2 * 0xDD8)) * 0x10) + 0x29008001, temp_a1, temp_a2, D_800EA1D4, D_800EA1D4, temp_a1 + 0x14); + if ((D_800EA0EC[playerId] == 0) && (D_800EA108 == 0)) { + play_sound((gPlayers[playerId].characterId * 0x10) + 0x29008001, D_800E9F7C[playerId].pos, playerId, D_800EA1D4, D_800EA1D4, (u8 *) &D_800E9F7C[playerId].unk_14); D_800EA164 = 1; if ((s32) D_800EA1C0 >= 2) { func_800C8F80(playerId, 0x0100FF2C); @@ -4526,32 +4087,30 @@ void func_800CA59C(u8 playerId) { func_800C8F80(playerId, 0x0100FF2C); } else if (D_8018FC08 != 0) { if ((func_800C3508(1) == 0x000C) || (func_800C357C(0x0101000C) == 0)) { - func_800C3448(-0x3E100000); - func_800C3448(-0x3EAEFFEF); + func_800C3448(0xC1F00000); + func_800C3448(0xC1510011); } else { func_800C8EF8(0x0011U); } } else { + if(1){} // ? func_800C8EF8(0x0011U); } } - *(&D_800EA10C + playerId) = 1; + D_800EA10C[playerId] = 1; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA59C.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-09-2023 s32 func_800C357C(?); /* extern */ ? func_800C3608(?, ?, u8); /* extern */ extern u32 D_803B1658; -static ? D_800E9F7C; /* unable to generate initializer */ +struct Unk_800E9F7C D_800E9F7C[4]; /* unable to generate initializer */ u8 D_800EA0EC[1] = { 0 }; u8 D_800EA104 = 0; u8 D_800EA108 = 0; -static ? D_800EA10C; /* unable to generate initializer */ +u8 D_800EA10C[4] = { 0, 0, 0, 0 }; u16 D_800EA15C = 0; u8 D_800EA164 = 0; u8 D_800EA1C0 = 0; @@ -4559,18 +4118,18 @@ f32 D_800EA1D4[3]; /* unable to generate initia void func_800CA730(u8 playerId) { u8 *sp3C; - f32 *temp_a1; + struct Unk_800E9F7C *temp_a1; u8 *temp_v1; u8 temp_a2; temp_a2 = playerId & 0xFF; if (D_800EA0EC[temp_a2] == 0) { - temp_v1 = &D_800EA10C + temp_a2; + temp_v1 = &D_800EA10C[temp_a2]; if ((D_800EA108 == 0) && (*temp_v1 != 0)) { - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; + temp_a1 = &D_800E9F7C[temp_a2]; sp3C = temp_v1; playerId = temp_a2; - play_sound((*(&gPlayers->characterId + (temp_a2 * 0xDD8)) * 0x10) + 0x29008008, temp_a1, temp_a2, D_800EA1D4, D_800EA1D4, temp_a1 + 0x14); + play_sound((*(&gPlayers->characterId + (temp_a2 * 0xDD8)) * 0x10) + 0x29008008, temp_a1->pos, temp_a2, D_800EA1D4, D_800EA1D4, (u8 *) &temp_a1->unk_14); if (*sp3C != 0) { if ((s32) D_800EA1C0 >= 2) { func_800C9018(playerId & 0xFF, 0x0100FF2C); @@ -4578,7 +4137,7 @@ void func_800CA730(u8 playerId) { *sp3C = 0; if (D_800EA104 != 0) { func_800C9018(playerId & 0xFF, 0x0100FF2C); - } else if ((D_800EA10C.unk0 == 0) && (D_800EA10C.unk1 == 0)) { + } else if ((D_800EA10C->unk0 == 0) && (D_800EA10C->unk1 == 0)) { if (D_8018FC08 != 0) { if (((u32) D_803B1658 >> 0x1F) == 0) { func_800C3608(1, 5, playerId); @@ -4630,42 +4189,25 @@ void func_800CAACC(u8 playerId) { } } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA108 = 0; -static s8 D_800EA168 = 0; -f32 D_800EA1C8[3] = { 0.0f, 0.0f, 0.0f }; -f32 D_800EA1D4[3]; /* unable to generate initializer */ -u8 D_800EA1DC = 0; - void func_800CAB4C(u8 arg0) { u8 *temp_v1; u8 temp_v0; if (D_800EA108 == 0) { - temp_v1 = &D_800EA0EC[arg0]; - temp_v0 = *temp_v1; - if (temp_v0 != 0) { - if (temp_v0 == 2) { - *temp_v1 = 1; - goto block_4; - } - } else { -block_4: + switch(D_800EA0EC[arg0]) { + case 2: + D_800EA0EC[arg0] = 1; + case 0: func_800C36C4(0, 1U, 0x55U, 5); func_800C9060(arg0, 0x1900F013U); play_sound(0x5101C00CU, D_800EA1C8, 0U, D_800EA1D4, D_800EA1D4, &D_800EA1DC); + break; + default: + break; } D_800EA168 = 1; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAB4C.s") -#endif - -extern u8 D_800EA108; -extern s8 D_800EA168; void func_800CAC08() { if (D_800EA108 == 0) { @@ -4697,44 +4239,30 @@ void func_800CAD40(UNUSED s32 arg0) { } -#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; -static f32 D_800EA110[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; -f32 D_800EA1D4[3]; /* unable to generate initializer */ +#ifdef NON_MATCHING +// There's some bad ordering of the commands. This ought to be +// functionally equivalent void func_800CADD0(u8 arg0, f32 arg1) { - f32 *temp_a1; - f32 *temp_v0_2; f32 var_f12; - 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; - } - } else { -block_4: + switch(D_800EA0EC[arg0]) { + case 2: + D_800EA0EC[arg0] = 1; + case 0: var_f12 = (arg1 * 0.55f) + 0.45f; - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; - temp_v0_2 = &D_800EA110[temp_a2]; if (var_f12 > 1.0f) { var_f12 = 1.0f; } if (var_f12 < 0.0f) { var_f12 = 0.0f; } - *temp_v0_2 = var_f12; - play_sound(0x1900A209U, temp_a1, temp_a2, D_800EA1D4, temp_v0_2, temp_a1 + 0x14); + D_800EA110[arg0] = var_f12; + play_sound(0x1900A209U, D_800E9F7C[arg0].pos, arg0, D_800EA1D4, &D_800EA110[arg0], (u8 *) &D_800E9F7C[arg0].unk_14); + break; + default: + break; } } } @@ -4743,18 +4271,18 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CADD0.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 +//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-09-2023 s16 gCurrentCourseId; /* unable to generate initializer */ -static ? D_800E9F7C; /* unable to generate initializer */ +struct Unk_800E9F7C D_800E9F7C[4]; /* unable to generate initializer */ u8 D_800EA0EC[1] = { 0 }; u8 D_800EA108 = 0; static f32 D_800EA120[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; f32 D_800EA1D4[3]; /* unable to generate initializer */ void func_800CAEC4(u8 arg0, f32 arg1) { - f32 *temp_a1; f32 *temp_v0_2; f32 var_f12; + struct Unk_800E9F7C *temp_a1; u8 *temp_v1; u8 temp_a2; u8 temp_v0; @@ -4772,7 +4300,7 @@ void func_800CAEC4(u8 arg0, f32 arg1) { block_4: var_f12 = (arg1 * 0.7f) + 0.1f; temp_v0_2 = &D_800EA120[temp_a2]; - temp_a1 = (temp_a2 * 0x3C) + &D_800E9F7C; + temp_a1 = &D_800E9F7C[temp_a2]; if (var_f12 > 1.0f) { var_f12 = 1.0f; } @@ -4780,7 +4308,7 @@ block_4: var_f12 = 0.0f; } *temp_v0_2 = var_f12; - play_sound(gCurrentCourseId + 0x19007020, temp_a1, temp_a2, D_800EA1D4, temp_v0_2, temp_a1 + 0x14); + play_sound(gCurrentCourseId + 0x19007020, temp_a1->pos, temp_a2, D_800EA1D4, temp_v0_2, (u8 *) &temp_a1->unk_14); } } } @@ -4827,63 +4355,44 @@ void func_800CB134() { D_800EA174 = 1; } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -s16 D_800EA174 = 0; - -void func_800CB14C(void) { - s16 temp_t6; - u16 var_v0; - - if ((u16) D_800EA174 != 0) { - temp_t6 = (u16) D_800EA174 + 1; - var_v0 = temp_t6 & 0xFFFF; - D_800EA174 = temp_t6; - if (var_v0 == 3) { +void func_800CB14C() { + if (D_800EA174 != 0) { + D_800EA174++; + if (D_800EA174 == 3) { func_800C8EAC(0x001AU); func_800C3448(0x4000007F); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x012C) { + if (D_800EA174 == 0x012C) { func_800C8EAC(0x001BU); func_800C3448(0x4000007F); func_800C8EF8(0x001DU); func_800C3448(0x41000000); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x0230) { + if (D_800EA174 == 0x0230) { func_800C3448(0x40640000); func_800C3448(0xB0640073); func_800C3448(0x4150007F); func_800C3448(0xB1640073); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x02A8) { + if (D_800EA174 == 0x02A8) { func_800C3448(0x100100FF); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x041A) { + if (D_800EA174 == 0x041A) { func_800C3448(0xB1500001); func_800C3448(0x51500001); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x046A) { + if (D_800EA174 == 0x046A) { func_800C3448(0x41320000); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x04B0) { + if (D_800EA174 == 0x04B0) { func_800C3448(0x110100FF); - var_v0 = (u16) D_800EA174; } - if (var_v0 == 0x04CE) { + if (D_800EA174 == 0x04CE) { func_800C8EAC(0x0014U); func_800C3448(0x4000007F); } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB14C.s") -#endif // run audio? void func_800CB2C4() { diff --git a/src/audio/external.h b/src/audio/external.h index 41ce545b3..b7e3271ba 100644 --- a/src/audio/external.h +++ b/src/audio/external.h @@ -36,6 +36,23 @@ struct Unk_8018FC20 { /* 0x14 */ u8 *unk14; }; // size = 0x18 +struct Unk_800E9F7C { + /* 0x00 */ Vec3f pos; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ s8 unk_14; + /* 0x15 */ // s8 comilerPadding[3]; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ f32 unk_38; +} ; // size = 0x3C + // I'm speculating that this struct has something to do with // the doppler effect that happens to some sounds struct Unk_8018EFD8 { @@ -88,15 +105,6 @@ struct Unk_800EA06C { /* 0x0D */ // u8 compilerPadding0[3]; }; -// Similar to Unk_8018EFD8 -// Should look like 5 f32's, then 4 u8's, then 9 f32's. -struct Unk_800E9F7C { - Vec3f pos; - f32 unk4[2]; - s8 unk14[4]; - f32 unk18[9]; -}; // Size is still 0x3C. - void func_800C94A4(u8); void func_800CADD0(u8, f32); void func_800C13F0(void); @@ -115,9 +123,10 @@ void func_800C2474(void); void func_800C284C(u8, u8, u8, s32); void func_800C3724(void); -void func_800C3448(s32); +void func_800C3448(u32); void func_800C3478(void); u16 func_800C3508(s32); +u8 func_800C357C(s32); void func_800C35E8(u8); void func_800C36C4(s32, u32, u8, s8); void func_800C3F70(void); @@ -127,35 +136,58 @@ void func_800C4084(u16); void play_sound(u32, f32*, u8, f32*, f32*, u8*); void func_800C41CC(u8, struct Unk_80191420*); void func_800C4398(void); +void func_800C473C(u8, u8); +void func_800C4888(u8); +void func_800C4FE4(u8); void func_800C5278(u8); +void func_800C5384(u8, f32*); +void func_800C54B8(u8, s32); +void func_800C550C(s32); void func_800C5578(Vec3f, u32); u8 func_800C56F0(u32); void func_800C5848(void); void func_800C58B8(u8, u8, u16); +void func_800C5968(u8); void func_800C59C4(void); void func_800C5A3C(void); void func_800C5BD0(void); void func_800C5C40(void); void func_800C5CB8(void); +void func_800C5D04(u8); +void func_800C5E38(u8); +void func_800C6108(u8); +void func_800C64A0(u8); void func_800C6758(u8); +void func_800C683C(u8); +void func_800C70A8(u8); +void func_800C76C0(u8); + +void func_800C847C(u8); void func_800C86D8(u8); void func_800C8770(u8); void func_800C8920(void); void func_800C89E4(void); +void func_800C8AE4(void); +void func_800C8C7C(u8); void func_800C8CCC(void); void play_sound2(s32); void func_800C8EAC(u16); void func_800C8EF8(u16); void func_800C8F44(u8); -void func_800C8F80(u8, s32); +void func_800C8F80(u8, u32); void func_800C9018(u8, s32); void func_800C9060(u8, u32); -void func_800C90F4(u8, uintptr_t); +void func_800C90F4(u8, u32); +void func_800C9250(u8); +void func_800C92CC(u8, u32); +void func_800C94A4(u8); void func_800C97C4(u8); +void func_800C98B8(Vec3f, Vec3f, u32); +void func_800C99E0(Vec3f, s32); void func_800C9A88(u8); void func_800C9D0C(u8); void func_800C9D80(Vec3f, Vec3f, u32); @@ -167,7 +199,7 @@ void func_800CA0A0(void); void func_800CA0B8(void); void func_800CA0CC(void); void func_800CA0E4(void); -void func_800CA118(s32); +void func_800CA118(u8); void func_800CA24C(u8); void func_800CA270(void); void func_800CA288(u8, s8); @@ -178,8 +210,11 @@ void func_800CA330(u8); void func_800CA388(u8); void func_800CA414(u16, u16); void func_800CA49C(u8); +void func_800CA59C(u8); +void func_800CA984(u8); void func_800CAACC(u8); -void func_800CAC08(); +void func_800CAB4C(u8); +void func_800CAC08(void); void func_800CAC60(s32); void func_800CAD40(s32); void func_800CAEC4(u8, f32); @@ -217,13 +252,33 @@ extern u32 D_80192CD0[]; // Data entries extern u8 D_800E9DA0; +extern f32 D_800E9DC4[4];// = { 1.0f, 1.0f, 1.0f, 1.0f }; +extern f32 D_800E9DD4[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800E9DE4[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800E9DF4[8];// = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; +extern s32 D_800E9E14[4];// = { 0, 0, 0, 0 }; +extern s32 D_800E9E24[4];// = { 0, 0, 0, 0 }; +extern s32 D_800E9E34[8]; extern f32 D_800E9E54[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ +extern f32 D_800E9E64[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; extern s32 D_800E9E74[4];// = { 0, 0, 0, 0 }; /* const */ +extern s32 D_800E9E84[4]; +extern u32 D_800E9E94[4]; +extern s32 D_800E9EA4[4];// = { 0, 0, 0, 0 }; +extern f32 D_800E9EB4[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800E9EC4[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800E9ED4[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800E9EE4[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800E9EF4[4]; +extern f32 D_800E9F04[4];// = { 1.0f, 1.0f, 1.0f, 1.0f }; extern f32 D_800E9F14[4];// = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ extern u8 D_800E9F24[8];// = { 0, 0, 0, 0, 0, 0, 0, 0 }; +extern u8 D_800E9F2C[8];// = { 0, 0, 0, 0, 0, 0, 0, 0 }; extern f32 D_800E9F34[8];// = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* const */ extern f32 D_800E9F54[4];// = { 1.0f, 1.0f, 1.0f, 1.0f }; /* const */ -extern u8 D_800E9F2C[8];// = { 0, 0, 0, 0, 0, 0, 0, 0 }; +extern u8 D_800E9F74[4]; +extern u8 D_800E9F78[4]; +extern struct Unk_800E9F7C D_800E9F7C[4]; extern u8 D_800E9F90[]; extern struct Unk_800EA06C D_800EA06C[8]; extern u8 D_800EA0EC[]; @@ -232,15 +287,21 @@ extern u8 D_800EA0F4; extern u8 D_800EA104; extern u8 D_800EA108;// = 0; extern u8 D_800EA10C[]; +extern f32 D_800EA110[4];// = { 0.0f, 0.0f, 0.0f, 0.0f }; +extern f32 D_800EA120[4]; +extern f32 D_800EA130[4]; +extern f32 D_800EA150;// = 1.4f; +extern u8 D_800EA154[]; extern u16 D_800EA15C; extern u16 D_800EA160; extern u8 D_800EA164; extern s8 D_800EA168; extern u8 D_800EA170[]; -extern s16 D_800EA174;// = 0; +extern u16 D_800EA174;// = 0; extern f32 D_800EA178; extern f32 D_800EA17C; extern u16 D_800EA180;// = 0; /* const */ +extern u16 D_800EA184; extern u8 D_800EA1C0;// = 0; // Most similar to gGlobalSoundSource from SM64, but I don't know if its really // a sound source, its usage makes it look like a 0'd Vec3f for general usage @@ -248,6 +309,7 @@ extern Vec3f D_800EA1C8;// = {0.0f, 0.0f, 0.0f} extern Vec3f D_800EA1D4; extern u8 D_800EA1DC;// = 0; extern u8 D_800EA1E4; +extern u8 D_800EA1E8; extern u8 D_800EA244; extern s8 D_800EA16C;