diff --git a/asm/non_matchings/code/code_800E11F0/func_800E12DC.s b/asm/non_matchings/code/audio_load/func_800E12DC.s similarity index 98% rename from asm/non_matchings/code/code_800E11F0/func_800E12DC.s rename to asm/non_matchings/code/audio_load/func_800E12DC.s index 860a4e5ed5..f50c04d9b8 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E12DC.s +++ b/asm/non_matchings/code/audio_load/func_800E12DC.s @@ -1,3 +1,9 @@ +.rdata +glabel D_80149420 + .asciz "SUPERDMA" + .balign 4 + +.text glabel func_800E12DC /* B5847C 800E12DC 27BDFFB0 */ addiu $sp, $sp, -0x50 /* B58480 800E12E0 AFB10030 */ sw $s1, 0x30($sp) @@ -208,7 +214,7 @@ glabel func_800E12DC /* B58774 800E15D4 00003025 */ move $a2, $zero /* B58778 800E15D8 AFA20014 */ sw $v0, 0x14($sp) /* B5877C 800E15DC AFB90010 */ sw $t9, 0x10($sp) -/* B58780 800E15E0 0C038AF8 */ jal func_800E2BE0 +/* B58780 800E15E0 0C038AF8 */ jal Audio_DMA /* B58784 800E15E4 AFAE001C */ sw $t6, 0x1c($sp) /* B58788 800E15E8 8FAA0038 */ lw $t2, 0x38($sp) /* B5878C 800E15EC 8FB8005C */ lw $t8, 0x5c($sp) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1618.s b/asm/non_matchings/code/audio_load/func_800E1618.s similarity index 100% rename from asm/non_matchings/code/code_800E11F0/func_800E1618.s rename to asm/non_matchings/code/audio_load/func_800E1618.s diff --git a/asm/non_matchings/code/code_800E11F0/func_800E283C.s b/asm/non_matchings/code/audio_load/func_800E283C.s similarity index 96% rename from asm/non_matchings/code/code_800E11F0/func_800E283C.s rename to asm/non_matchings/code/audio_load/func_800E283C.s index 12d24d197f..ee31bfd111 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E283C.s +++ b/asm/non_matchings/code/audio_load/func_800E283C.s @@ -45,7 +45,7 @@ glabel func_800E283C /* B59A84 800E28E4 02602825 */ move $a1, $s3 /* B59A88 800E28E8 02803025 */ move $a2, $s4 /* B59A8C 800E28EC AFA3003C */ sw $v1, 0x3c($sp) -/* B59A90 800E28F0 0C039016 */ jal func_800E4058 +/* B59A90 800E28F0 0C039016 */ jal Audio_SampleReloc /* B59A94 800E28F4 AFA70054 */ sw $a3, 0x54($sp) /* B59A98 800E28F8 8E30000C */ lw $s0, 0xc($s1) /* B59A9C 800E28FC 8FA3003C */ lw $v1, 0x3c($sp) @@ -79,7 +79,7 @@ glabel func_800E283C /* B59AFC 800E295C 02602825 */ move $a1, $s3 /* B59B00 800E2960 51C00004 */ beql $t6, $zero, .L800E2974 /* B59B04 800E2964 26310008 */ addiu $s1, $s1, 8 -/* B59B08 800E2968 0C039016 */ jal func_800E4058 +/* B59B08 800E2968 0C039016 */ jal Audio_SampleReloc /* B59B0C 800E296C 02803025 */ move $a2, $s4 /* B59B10 800E2970 26310008 */ addiu $s1, $s1, 8 .L800E2974: @@ -115,19 +115,19 @@ glabel func_800E283C /* B59B78 800E29D8 02602825 */ move $a1, $s3 /* B59B7C 800E29DC 51400004 */ beql $t2, $zero, .L800E29F0 /* B59B80 800E29E0 26240010 */ addiu $a0, $s1, 0x10 -/* B59B84 800E29E4 0C039016 */ jal func_800E4058 +/* B59B84 800E29E4 0C039016 */ jal Audio_SampleReloc /* B59B88 800E29E8 02803025 */ move $a2, $s4 /* B59B8C 800E29EC 26240010 */ addiu $a0, $s1, 0x10 .L800E29F0: /* B59B90 800E29F0 02602825 */ move $a1, $s3 -/* B59B94 800E29F4 0C039016 */ jal func_800E4058 +/* B59B94 800E29F4 0C039016 */ jal Audio_SampleReloc /* B59B98 800E29F8 02803025 */ move $a2, $s4 /* B59B9C 800E29FC 922B0002 */ lbu $t3, 2($s1) /* B59BA0 800E2A00 2401007F */ li $at, 127 /* B59BA4 800E2A04 26240018 */ addiu $a0, $s1, 0x18 /* B59BA8 800E2A08 11610003 */ beq $t3, $at, .L800E2A18 /* B59BAC 800E2A0C 02602825 */ move $a1, $s3 -/* B59BB0 800E2A10 0C039016 */ jal func_800E4058 +/* B59BB0 800E2A10 0C039016 */ jal Audio_SampleReloc /* B59BB4 800E2A14 02803025 */ move $a2, $s4 .L800E2A18: /* B59BB8 800E2A18 8E300004 */ lw $s0, 4($s1) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4198.s b/asm/non_matchings/code/audio_load/func_800E4198.s similarity index 99% rename from asm/non_matchings/code/code_800E11F0/func_800E4198.s rename to asm/non_matchings/code/audio_load/func_800E4198.s index 96582cfc9c..94e1d234df 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E4198.s +++ b/asm/non_matchings/code/audio_load/func_800E4198.s @@ -189,7 +189,7 @@ glabel func_800E4198 /* B5B5E8 800E4448 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* B5B5EC 800E444C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* B5B5F0 800E4450 00613024 */ and $a2, $v1, $at -/* B5B5F4 800E4454 0C038AAA */ jal func_800E2AA8 +/* B5B5F4 800E4454 0C038AAA */ jal Audio_DMAFastCopy /* B5B5F8 800E4458 8E040004 */ lw $a0, 4($s0) /* B5B5FC 800E445C 920F0000 */ lbu $t7, ($s0) /* B5B600 800E4460 AE110004 */ sw $s1, 4($s0) @@ -259,7 +259,7 @@ glabel func_800E4198 /* B5B6F0 800E4550 00033900 */ sll $a3, $v1, 4 /* B5B6F4 800E4554 24420D54 */ addiu $v0, $v0, 0xd54 /* B5B6F8 800E4558 00073F82 */ srl $a3, $a3, 0x1e -/* B5B6FC 800E455C 0C038EB2 */ jal func_800E3AC8 +/* B5B6FC 800E455C 0C038EB2 */ jal Audio_InitAsyncReq /* B5B700 800E4560 AFB90018 */ sw $t9, 0x18($sp) .L800E4564: /* B5B704 800E4564 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4590.s b/asm/non_matchings/code/audio_load/func_800E4590.s similarity index 99% rename from asm/non_matchings/code/code_800E11F0/func_800E4590.s rename to asm/non_matchings/code/audio_load/func_800E4590.s index 8f6b11b770..34541f1f06 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E4590.s +++ b/asm/non_matchings/code/audio_load/func_800E4590.s @@ -106,7 +106,7 @@ glabel func_800E4590 /* B5B8B8 800E4718 8C78000C */ lw $t8, 0xc($v1) /* B5B8BC 800E471C 02002025 */ move $a0, $s0 /* B5B8C0 800E4720 01003825 */ move $a3, $t0 -/* B5B8C4 800E4724 0C038EB2 */ jal func_800E3AC8 +/* B5B8C4 800E4724 0C038EB2 */ jal Audio_InitAsyncReq /* B5B8C8 800E4728 AFB80018 */ sw $t8, 0x18($sp) .L800E472C: /* B5B8CC 800E472C 24020001 */ li $v0, 1 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4918.s b/asm/non_matchings/code/audio_load/func_800E4918.s similarity index 99% rename from asm/non_matchings/code/code_800E11F0/func_800E4918.s rename to asm/non_matchings/code/audio_load/func_800E4918.s index c4affc16fb..86fc6a7855 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E4918.s +++ b/asm/non_matchings/code/audio_load/func_800E4918.s @@ -233,7 +233,7 @@ glabel func_800E4918 /* B5BDF8 800E4C58 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* B5BDFC 800E4C5C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* B5BE00 800E4C60 00613024 */ and $a2, $v1, $at -/* B5BE04 800E4C64 0C038AAA */ jal func_800E2AA8 +/* B5BE04 800E4C64 0C038AAA */ jal Audio_DMAFastCopy /* B5BE08 800E4C68 8E040004 */ lw $a0, 4($s0) /* B5BE0C 800E4C6C 920D0000 */ lbu $t5, ($s0) /* B5BE10 800E4C70 AE110004 */ sw $s1, 4($s0) @@ -303,7 +303,7 @@ glabel func_800E4918 /* B5BEFC 800E4D5C 00033900 */ sll $a3, $v1, 4 /* B5BF00 800E4D60 24420D54 */ addiu $v0, $v0, 0xd54 /* B5BF04 800E4D64 00073F82 */ srl $a3, $a3, 0x1e -/* B5BF08 800E4D68 0C038EB2 */ jal func_800E3AC8 +/* B5BF08 800E4D68 0C038EB2 */ jal Audio_InitAsyncReq /* B5BF0C 800E4D6C AFAD0018 */ sw $t5, 0x18($sp) .L800E4D70: /* B5BF10 800E4D70 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s index 8f9e14ee80..c5cf4b6083 100644 --- a/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s +++ b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s @@ -1050,7 +1050,7 @@ glabel L800EBBDC /* B62D94 800EBBF4 A05E00C4 */ sb $fp, 0xc4($v0) /* B62D98 800EBBF8 82C50019 */ lb $a1, 0x19($s6) /* B62D9C 800EBBFC 92840007 */ lbu $a0, 7($s4) -/* B62DA0 800EBC00 0C038D05 */ jal func_800E3414 +/* B62DA0 800EBC00 0C038D05 */ jal Audio_SyncLoadSample /* B62DA4 800EBC04 244600C4 */ addiu $a2, $v0, 0xc4 /* B62DA8 800EBC08 145EFD3A */ bne $v0, $fp, .L800EB0F4 /* B62DAC 800EBC0C 00000000 */ nop @@ -1064,7 +1064,7 @@ glabel L800EBBDC /* B62DC8 800EBC28 96850022 */ lhu $a1, 0x22($s4) /* B62DCC 800EBC2C 92840007 */ lbu $a0, 7($s4) /* B62DD0 800EBC30 244600C4 */ addiu $a2, $v0, 0xc4 -/* B62DD4 800EBC34 0C038D05 */ jal func_800E3414 +/* B62DD4 800EBC34 0C038D05 */ jal Audio_SyncLoadSample /* B62DD8 800EBC38 24A50100 */ addiu $a1, $a1, 0x100 /* B62DDC 800EBC3C 145EFD2D */ bne $v0, $fp, .L800EB0F4 /* B62DE0 800EBC40 00000000 */ nop diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s index e30c6b5d17..9152ca2cd7 100644 --- a/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s +++ b/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s @@ -697,7 +697,7 @@ glabel L800EC4A8 /* B63668 800EC4C8 024E3021 */ addu $a2, $s2, $t6 /* B6366C 800EC4CC 24C60158 */ addiu $a2, $a2, 0x158 /* B63670 800EC4D0 02002025 */ move $a0, $s0 -/* B63674 800EC4D4 0C038E43 */ jal func_800E390C +/* B63674 800EC4D4 0C038E43 */ jal Audio_SyncLoadSeq /* B63678 800EC4D8 018B2821 */ addu $a1, $t4, $t3 /* B6367C 800EC4DC 1000FE62 */ b .L800EBE68 /* B63680 800EC4E0 00000000 */ nop diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC384.s b/asm/non_matchings/code/audio_synthesis/func_800DC384.s similarity index 100% rename from asm/non_matchings/code/code_800DACC0/func_800DC384.s rename to asm/non_matchings/code/audio_synthesis/func_800DC384.s diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC910.s b/asm/non_matchings/code/audio_synthesis/func_800DC910.s similarity index 98% rename from asm/non_matchings/code/code_800DACC0/func_800DC910.s rename to asm/non_matchings/code/audio_synthesis/func_800DC910.s index 3ad2f7f00e..9a46dd4962 100644 --- a/asm/non_matchings/code/code_800DACC0/func_800DC910.s +++ b/asm/non_matchings/code/audio_synthesis/func_800DC910.s @@ -519,13 +519,13 @@ glabel L800DCDA0 /* B54200 800DD060 00196C03 */ sra $t5, $t9, 0x10 /* B54204 800DD064 00107840 */ sll $t7, $s0, 1 /* B54208 800DD068 AFAF0010 */ sw $t7, 0x10($sp) -/* B5420C 800DD06C 0C036F08 */ jal func_800DBC20 +/* B5420C 800DD06C 0C036F08 */ jal AudioSynth_SetBuffer /* B54210 800DD070 01A83021 */ addu $a2, $t5, $t0 /* B54214 800DD074 8FAB0168 */ lw $t3, 0x168($sp) /* B54218 800DD078 02402025 */ move $a0, $s2 /* B5421C 800DD07C 26520008 */ addiu $s2, $s2, 8 /* B54220 800DD080 8FA50138 */ lw $a1, 0x138($sp) -/* B54224 800DD084 0C036F65 */ jal func_800DBD94 +/* B54224 800DD084 0C036F65 */ jal AudioSynth_UnkCmd17 /* B54228 800DD088 8D66000C */ lw $a2, 0xc($t3) /* B5422C 800DD08C 8FA90104 */ lw $t1, 0x104($sp) /* B54230 800DD090 8FAA00D4 */ lw $t2, 0xd4($sp) @@ -661,7 +661,7 @@ glabel L800DCDA0 .L800DD25C: /* B543FC 800DD25C 2401FFF8 */ li $at, -8 /* B54400 800DD260 24E70007 */ addiu $a3, $a3, 7 -/* B54404 800DD264 0C036F2C */ jal func_800DBCB0 +/* B54404 800DD264 0C036F2C */ jal AudioSynth_InterL /* B54408 800DD268 00E13824 */ and $a3, $a3, $at /* B5440C 800DD26C 8FAC0088 */ lw $t4, 0x88($sp) /* B54410 800DD270 8FAA00D4 */ lw $t2, 0xd4($sp) @@ -693,7 +693,7 @@ glabel L800DCDA0 .L800DD2D0: /* B54470 800DD2D0 2401FFF8 */ li $at, -8 /* B54474 800DD2D4 24E70007 */ addiu $a3, $a3, 7 -/* B54478 800DD2D8 0C036F2C */ jal func_800DBCB0 +/* B54478 800DD2D8 0C036F2C */ jal AudioSynth_InterL /* B5447C 800DD2DC 00E13824 */ and $a3, $a3, $at /* B54480 800DD2E0 8FAA00D4 */ lw $t2, 0xd4($sp) /* B54484 800DD2E4 8FAB0168 */ lw $t3, 0x168($sp) @@ -752,7 +752,7 @@ glabel L800DCDA0 /* B54544 800DD3A4 240603C0 */ li $a2, 960 /* B54548 800DD3A8 02803825 */ move $a3, $s4 /* B5454C 800DD3AC AFA00010 */ sw $zero, 0x10($sp) -/* B54550 800DD3B0 0C036F79 */ jal func_800DBDE4 +/* B54550 800DD3B0 0C036F79 */ jal AudioSynth_UnkCmd19 /* B54554 800DD3B4 24520008 */ addiu $s2, $v0, 8 .L800DD3B8: /* B54558 800DD3B8 8FAC008C */ lw $t4, 0x8c($sp) @@ -762,7 +762,7 @@ glabel L800DCDA0 /* B54568 800DD3C8 240503C0 */ li $a1, 960 /* B5456C 800DD3CC 240603C0 */ li $a2, 960 /* B54570 800DD3D0 02803825 */ move $a3, $s4 -/* B54574 800DD3D4 0C036F8E */ jal func_800DBE38 +/* B54574 800DD3D4 0C036F8E */ jal AudioSynth_UnkCmd3 /* B54578 800DD3D8 26520008 */ addiu $s2, $s2, 8 .L800DD3DC: /* B5457C 800DD3DC 8FB60164 */ lw $s6, 0x164($sp) @@ -777,7 +777,7 @@ glabel L800DCDA0 /* B545A0 800DD400 26520008 */ addiu $s2, $s2, 8 /* B545A4 800DD404 24050010 */ li $a1, 16 .L800DD408: -/* B545A8 800DD408 0C036F6C */ jal func_800DBDB0 +/* B545A8 800DD408 0C036F6C */ jal AudioSynth_HiLoGain /* B545AC 800DD40C AFAF0010 */ sw $t7, 0x10($sp) /* B545B0 800DD410 8FB60164 */ lw $s6, 0x164($sp) .L800DD414: @@ -786,7 +786,7 @@ glabel L800DCDA0 /* B545BC 800DD41C 02802825 */ move $a1, $s4 /* B545C0 800DD420 50C0000D */ beql $a2, $zero, .L800DD458 /* B545C4 800DD424 8FB10168 */ lw $s1, 0x168($sp) -/* B545C8 800DD428 0C036FA6 */ jal func_800DBE98 +/* B545C8 800DD428 0C036FA6 */ jal AudioSynth_SetFilterCount /* B545CC 800DD42C 26520008 */ addiu $s2, $s2, 8 /* B545D0 800DD430 8FAE0168 */ lw $t6, 0x168($sp) /* B545D4 800DD434 02402025 */ move $a0, $s2 @@ -794,7 +794,7 @@ glabel L800DCDA0 /* B545DC 800DD43C 8DC7000C */ lw $a3, 0xc($t6) /* B545E0 800DD440 8FA50138 */ lw $a1, 0x138($sp) /* B545E4 800DD444 240603C0 */ li $a2, 960 -/* B545E8 800DD448 0C036F9D */ jal func_800DBE74 +/* B545E8 800DD448 0C036F9D */ jal AudioSynth_SetFilter /* B545EC 800DD44C 24E70040 */ addiu $a3, $a3, 0x40 /* B545F0 800DD450 8FB60164 */ lw $s6, 0x164($sp) /* B545F4 800DD454 8FB10168 */ lw $s1, 0x168($sp) @@ -811,7 +811,7 @@ glabel L800DCDA0 /* B5461C 800DD47C 240503C0 */ li $a1, 960 /* B54620 800DD480 24060760 */ li $a2, 1888 /* B54624 800DD484 02803825 */ move $a3, $s4 -/* B54628 800DD488 0C036F19 */ jal func_800DBC64 +/* B54628 800DD488 0C036F19 */ jal AudioSynth_DMemMove /* B5462C 800DD48C 26520008 */ addiu $s2, $s2, 8 /* B54630 800DD490 8FB80168 */ lw $t8, 0x168($sp) /* B54634 800DD494 240F0760 */ li $t7, 1888 @@ -854,7 +854,7 @@ glabel L800DCDA0 /* B546C0 800DD520 26520008 */ addiu $s2, $s2, 8 /* B546C4 800DD524 02202825 */ move $a1, $s1 /* B546C8 800DD528 240603C0 */ li $a2, 960 -/* B546CC 800DD52C 0C036F19 */ jal func_800DBC64 +/* B546CC 800DD52C 0C036F19 */ jal AudioSynth_DMemMove /* B546D0 800DD530 02803825 */ move $a3, $s4 /* B546D4 800DD534 8FB10168 */ lw $s1, 0x168($sp) /* B546D8 800DD538 10000002 */ b .L800DD544 diff --git a/asm/non_matchings/code/code_800DACC0/func_800DDB64.s b/asm/non_matchings/code/audio_synthesis/func_800DDB64.s similarity index 100% rename from asm/non_matchings/code/code_800DACC0/func_800DDB64.s rename to asm/non_matchings/code/audio_synthesis/func_800DDB64.s diff --git a/asm/non_matchings/code/code_800DACC0/pad_800DACB0.s b/asm/non_matchings/code/audio_synthesis/pad_800DACB0.s similarity index 100% rename from asm/non_matchings/code/code_800DACC0/pad_800DACB0.s rename to asm/non_matchings/code/audio_synthesis/pad_800DACB0.s diff --git a/asm/non_matchings/code/code_800DACC0/func_800DACC0.s b/asm/non_matchings/code/code_800DACC0/func_800DACC0.s deleted file mode 100644 index 22b7551750..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DACC0.s +++ /dev/null @@ -1,244 +0,0 @@ -glabel func_800DACC0 -/* B51E60 800DACC0 00067080 */ sll $t6, $a2, 2 -/* B51E64 800DACC4 01C67023 */ subu $t6, $t6, $a2 -/* B51E68 800DACC8 000E7080 */ sll $t6, $t6, 2 -/* B51E6C 800DACCC 01C67023 */ subu $t6, $t6, $a2 -/* B51E70 800DACD0 000E70C0 */ sll $t6, $t6, 3 -/* B51E74 800DACD4 01C67021 */ addu $t6, $t6, $a2 -/* B51E78 800DACD8 3C0F8017 */ lui $t7, %hi(gAudioContext) # $t7, 0x8017 -/* B51E7C 800DACDC 25EFF180 */ addiu $t7, %lo(gAudioContext) # addiu $t7, $t7, -0xe80 -/* B51E80 800DACE0 000E70C0 */ sll $t6, $t6, 3 -/* B51E84 800DACE4 01CF4021 */ addu $t0, $t6, $t7 -/* B51E88 800DACE8 9118001C */ lbu $t8, 0x1c($t0) -/* B51E8C 800DACEC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B51E90 800DACF0 AFBF0014 */ sw $ra, 0x14($sp) -/* B51E94 800DACF4 2B010002 */ slti $at, $t8, 2 -/* B51E98 800DACF8 AFA40050 */ sw $a0, 0x50($sp) -/* B51E9C 800DACFC 14200065 */ bnez $at, .L800DAE94 -/* B51EA0 800DAD00 AFA50054 */ sw $a1, 0x54($sp) -/* B51EA4 800DAD04 25070018 */ addiu $a3, $t0, 0x18 -/* B51EA8 800DAD08 90F90002 */ lbu $t9, 2($a3) -/* B51EAC 800DAD0C 000578C0 */ sll $t7, $a1, 3 -/* B51EB0 800DAD10 01E57823 */ subu $t7, $t7, $a1 -/* B51EB4 800DAD14 57200060 */ bnezl $t9, .L800DAE98 -/* B51EB8 800DAD18 25070018 */ addiu $a3, $t0, 0x18 -/* B51EBC 800DAD1C 90EB0003 */ lbu $t3, 3($a3) -/* B51EC0 800DAD20 000F7880 */ sll $t7, $t7, 2 -/* B51EC4 800DAD24 24050340 */ li $a1, 832 -/* B51EC8 800DAD28 000B60C0 */ sll $t4, $t3, 3 -/* B51ECC 800DAD2C 018B6021 */ addu $t4, $t4, $t3 -/* B51ED0 800DAD30 000C6080 */ sll $t4, $t4, 2 -/* B51ED4 800DAD34 018B6023 */ subu $t4, $t4, $t3 -/* B51ED8 800DAD38 000C6080 */ sll $t4, $t4, 2 -/* B51EDC 800DAD3C 00EC6821 */ addu $t5, $a3, $t4 -/* B51EE0 800DAD40 01AF3021 */ addu $a2, $t5, $t7 -/* B51EE4 800DAD44 8CC40044 */ lw $a0, 0x44($a2) -/* B51EE8 800DAD48 24C60040 */ addiu $a2, $a2, 0x40 -/* B51EEC 800DAD4C AFA6004C */ sw $a2, 0x4c($sp) -/* B51EF0 800DAD50 AFA80020 */ sw $t0, 0x20($sp) -/* B51EF4 800DAD54 0C039A10 */ jal func_800E6840 -/* B51EF8 800DAD58 AFA7001C */ sw $a3, 0x1c($sp) -/* B51EFC 800DAD5C 8FA6004C */ lw $a2, 0x4c($sp) -/* B51F00 800DAD60 8FA7001C */ lw $a3, 0x1c($sp) -/* B51F04 800DAD64 8FA80020 */ lw $t0, 0x20($sp) -/* B51F08 800DAD68 84D80010 */ lh $t8, 0x10($a2) -/* B51F0C 800DAD6C 00002825 */ move $a1, $zero -/* B51F10 800DAD70 00002025 */ move $a0, $zero -/* B51F14 800DAD74 07010003 */ bgez $t8, .L800DAD84 -/* B51F18 800DAD78 0018C843 */ sra $t9, $t8, 1 -/* B51F1C 800DAD7C 27010001 */ addiu $at, $t8, 1 -/* B51F20 800DAD80 0001C843 */ sra $t9, $at, 1 -.L800DAD84: -/* B51F24 800DAD84 5B200023 */ blezl $t9, .L800DAE14 -/* B51F28 800DAD88 84CE0012 */ lh $t6, 0x12($a2) -/* B51F2C 800DAD8C 00001025 */ move $v0, $zero -/* B51F30 800DAD90 8CCB0004 */ lw $t3, 4($a2) -.L800DAD94: -/* B51F34 800DAD94 8CCF000C */ lw $t7, 0xc($a2) -/* B51F38 800DAD98 8CED0028 */ lw $t5, 0x28($a3) -/* B51F3C 800DAD9C 00051840 */ sll $v1, $a1, 1 -/* B51F40 800DADA0 01636021 */ addu $t4, $t3, $v1 -/* B51F44 800DADA4 858E0000 */ lh $t6, ($t4) -/* B51F48 800DADA8 000FC040 */ sll $t8, $t7, 1 -/* B51F4C 800DADAC 01B8C821 */ addu $t9, $t5, $t8 -/* B51F50 800DADB0 03225821 */ addu $t3, $t9, $v0 -/* B51F54 800DADB4 A56E0000 */ sh $t6, ($t3) -/* B51F58 800DADB8 8CCC0008 */ lw $t4, 8($a2) -/* B51F5C 800DADBC 8CD9000C */ lw $t9, 0xc($a2) -/* B51F60 800DADC0 8CF8002C */ lw $t8, 0x2c($a3) -/* B51F64 800DADC4 01837821 */ addu $t7, $t4, $v1 -/* B51F68 800DADC8 85ED0000 */ lh $t5, ($t7) -/* B51F6C 800DADCC 00197040 */ sll $t6, $t9, 1 -/* B51F70 800DADD0 030E5821 */ addu $t3, $t8, $t6 -/* B51F74 800DADD4 01626021 */ addu $t4, $t3, $v0 -/* B51F78 800DADD8 A58D0000 */ sh $t5, ($t4) -/* B51F7C 800DADDC 84D90010 */ lh $t9, 0x10($a2) -/* B51F80 800DADE0 90EF0004 */ lbu $t7, 4($a3) -/* B51F84 800DADE4 24840001 */ addiu $a0, $a0, 1 -/* B51F88 800DADE8 24420002 */ addiu $v0, $v0, 2 -/* B51F8C 800DADEC 00AF2821 */ addu $a1, $a1, $t7 -/* B51F90 800DADF0 07210003 */ bgez $t9, .L800DAE00 -/* B51F94 800DADF4 0019C043 */ sra $t8, $t9, 1 -/* B51F98 800DADF8 27210001 */ addiu $at, $t9, 1 -/* B51F9C 800DADFC 0001C043 */ sra $t8, $at, 1 -.L800DAE00: -/* B51FA0 800DAE00 0098082A */ slt $at, $a0, $t8 -/* B51FA4 800DAE04 5420FFE3 */ bnezl $at, .L800DAD94 -/* B51FA8 800DAE08 8CCB0004 */ lw $t3, 4($a2) -/* B51FAC 800DAE0C 00002025 */ move $a0, $zero -/* B51FB0 800DAE10 84CE0012 */ lh $t6, 0x12($a2) -.L800DAE14: -/* B51FB4 800DAE14 05C10003 */ bgez $t6, .L800DAE24 -/* B51FB8 800DAE18 000E5843 */ sra $t3, $t6, 1 -/* B51FBC 800DAE1C 25C10001 */ addiu $at, $t6, 1 -/* B51FC0 800DAE20 00015843 */ sra $t3, $at, 1 -.L800DAE24: -/* B51FC4 800DAE24 5960001C */ blezl $t3, .L800DAE98 -/* B51FC8 800DAE28 25070018 */ addiu $a3, $t0, 0x18 -/* B51FCC 800DAE2C 00001025 */ move $v0, $zero -/* B51FD0 800DAE30 8CCD0004 */ lw $t5, 4($a2) -.L800DAE34: -/* B51FD4 800DAE34 00051840 */ sll $v1, $a1, 1 -/* B51FD8 800DAE38 8CF90028 */ lw $t9, 0x28($a3) -/* B51FDC 800DAE3C 01A36021 */ addu $t4, $t5, $v1 -/* B51FE0 800DAE40 858F0000 */ lh $t7, ($t4) -/* B51FE4 800DAE44 0322C021 */ addu $t8, $t9, $v0 -/* B51FE8 800DAE48 24840001 */ addiu $a0, $a0, 1 -/* B51FEC 800DAE4C A70F0000 */ sh $t7, ($t8) -/* B51FF0 800DAE50 8CCE0008 */ lw $t6, 8($a2) -/* B51FF4 800DAE54 8CEC002C */ lw $t4, 0x2c($a3) -/* B51FF8 800DAE58 01C35821 */ addu $t3, $t6, $v1 -/* B51FFC 800DAE5C 856D0000 */ lh $t5, ($t3) -/* B52000 800DAE60 0182C821 */ addu $t9, $t4, $v0 -/* B52004 800DAE64 24420002 */ addiu $v0, $v0, 2 -/* B52008 800DAE68 A72D0000 */ sh $t5, ($t9) -/* B5200C 800DAE6C 84D80012 */ lh $t8, 0x12($a2) -/* B52010 800DAE70 90EF0004 */ lbu $t7, 4($a3) -/* B52014 800DAE74 00AF2821 */ addu $a1, $a1, $t7 -/* B52018 800DAE78 07010003 */ bgez $t8, .L800DAE88 -/* B5201C 800DAE7C 00187043 */ sra $t6, $t8, 1 -/* B52020 800DAE80 27010001 */ addiu $at, $t8, 1 -/* B52024 800DAE84 00017043 */ sra $t6, $at, 1 -.L800DAE88: -/* B52028 800DAE88 008E082A */ slt $at, $a0, $t6 -/* B5202C 800DAE8C 5420FFE9 */ bnezl $at, .L800DAE34 -/* B52030 800DAE90 8CCD0004 */ lw $t5, 4($a2) -.L800DAE94: -/* B52034 800DAE94 25070018 */ addiu $a3, $t0, 0x18 -.L800DAE98: -/* B52038 800DAE98 90EF0004 */ lbu $t7, 4($a3) -/* B5203C 800DAE9C 8FB90050 */ lw $t9, 0x50($sp) -/* B52040 800DAEA0 8FA90054 */ lw $t1, 0x54($sp) -/* B52044 800DAEA4 90EB0003 */ lbu $t3, 3($a3) -/* B52048 800DAEA8 032F001A */ div $zero, $t9, $t7 -/* B5204C 800DAEAC 01200821 */ addu $at, $t1, $zero -/* B52050 800DAEB0 000948C0 */ sll $t1, $t1, 3 -/* B52054 800DAEB4 01214823 */ subu $t1, $t1, $at -/* B52058 800DAEB8 000B60C0 */ sll $t4, $t3, 3 -/* B5205C 800DAEBC 018B6021 */ addu $t4, $t4, $t3 -/* B52060 800DAEC0 8CE4001C */ lw $a0, 0x1c($a3) -/* B52064 800DAEC4 000C6080 */ sll $t4, $t4, 2 -/* B52068 800DAEC8 8CEE0024 */ lw $t6, 0x24($a3) -/* B5206C 800DAECC 018B6023 */ subu $t4, $t4, $t3 -/* B52070 800DAED0 000C6080 */ sll $t4, $t4, 2 -/* B52074 800DAED4 00001812 */ mflo $v1 -/* B52078 800DAED8 00EC6821 */ addu $t5, $a3, $t4 -/* B5207C 800DAEDC 00094880 */ sll $t1, $t1, 2 -/* B52080 800DAEE0 0083C021 */ addu $t8, $a0, $v1 -/* B52084 800DAEE4 01A93021 */ addu $a2, $t5, $t1 -/* B52088 800DAEE8 030E1023 */ subu $v0, $t8, $t6 -/* B5208C 800DAEEC 24C60040 */ addiu $a2, $a2, 0x40 -/* B52090 800DAEF0 15E00002 */ bnez $t7, .L800DAEFC -/* B52094 800DAEF4 00000000 */ nop -/* B52098 800DAEF8 0007000D */ break 7 -.L800DAEFC: -/* B5209C 800DAEFC 2401FFFF */ li $at, -1 -/* B520A0 800DAF00 15E10004 */ bne $t7, $at, .L800DAF14 -/* B520A4 800DAF04 3C018000 */ lui $at, 0x8000 -/* B520A8 800DAF08 17210002 */ bne $t9, $at, .L800DAF14 -/* B520AC 800DAF0C 00000000 */ nop -/* B520B0 800DAF10 0006000D */ break 6 -.L800DAF14: -/* B520B4 800DAF14 00627823 */ subu $t7, $v1, $v0 -/* B520B8 800DAF18 0441000A */ bgez $v0, .L800DAF44 -/* B520BC 800DAF1C 00805025 */ move $t2, $a0 -/* B520C0 800DAF20 00035840 */ sll $t3, $v1, 1 -/* B520C4 800DAF24 A4CB0010 */ sh $t3, 0x10($a2) -/* B520C8 800DAF28 A4C00012 */ sh $zero, 0x12($a2) -/* B520CC 800DAF2C 8CEC001C */ lw $t4, 0x1c($a3) -/* B520D0 800DAF30 ACCC000C */ sw $t4, 0xc($a2) -/* B520D4 800DAF34 8CED001C */ lw $t5, 0x1c($a3) -/* B520D8 800DAF38 01A3C821 */ addu $t9, $t5, $v1 -/* B520DC 800DAF3C 10000008 */ b .L800DAF60 -/* B520E0 800DAF40 ACF9001C */ sw $t9, 0x1c($a3) -.L800DAF44: -/* B520E4 800DAF44 000FC040 */ sll $t8, $t7, 1 -/* B520E8 800DAF48 00027040 */ sll $t6, $v0, 1 -/* B520EC 800DAF4C A4D80010 */ sh $t8, 0x10($a2) -/* B520F0 800DAF50 A4CE0012 */ sh $t6, 0x12($a2) -/* B520F4 800DAF54 8CEB001C */ lw $t3, 0x1c($a3) -/* B520F8 800DAF58 ACCB000C */ sw $t3, 0xc($a2) -/* B520FC 800DAF5C ACE2001C */ sw $v0, 0x1c($a3) -.L800DAF60: -/* B52100 800DAF60 A4C30000 */ sh $v1, ($a2) -/* B52104 800DAF64 8FAC0050 */ lw $t4, 0x50($sp) -/* B52108 800DAF68 A4CC0002 */ sh $t4, 2($a2) -/* B5210C 800DAF6C 94E20014 */ lhu $v0, 0x14($a3) -/* B52110 800DAF70 8FB80050 */ lw $t8, 0x50($sp) -/* B52114 800DAF74 5040002E */ beql $v0, $zero, .L800DB030 -/* B52118 800DAF78 8FBF0014 */ lw $ra, 0x14($sp) -/* B5211C 800DAF7C 8CE50024 */ lw $a1, 0x24($a3) -/* B52120 800DAF80 004A2021 */ addu $a0, $v0, $t2 -/* B52124 800DAF84 0085082A */ slt $at, $a0, $a1 -/* B52128 800DAF88 54200003 */ bnezl $at, .L800DAF98 -/* B5212C 800DAF8C 90EE0004 */ lbu $t6, 4($a3) -/* B52130 800DAF90 00852023 */ subu $a0, $a0, $a1 -/* B52134 800DAF94 90EE0004 */ lbu $t6, 4($a3) -.L800DAF98: -/* B52138 800DAF98 90ED0003 */ lbu $t5, 3($a3) -/* B5213C 800DAF9C 030E001A */ div $zero, $t8, $t6 -/* B52140 800DAFA0 000DC8C0 */ sll $t9, $t5, 3 -/* B52144 800DAFA4 032DC821 */ addu $t9, $t9, $t5 -/* B52148 800DAFA8 0019C880 */ sll $t9, $t9, 2 -/* B5214C 800DAFAC 00001812 */ mflo $v1 -/* B52150 800DAFB0 032DC823 */ subu $t9, $t9, $t5 -/* B52154 800DAFB4 0019C880 */ sll $t9, $t9, 2 -/* B52158 800DAFB8 00835821 */ addu $t3, $a0, $v1 -/* B5215C 800DAFBC 00F97821 */ addu $t7, $a3, $t9 -/* B52160 800DAFC0 01651023 */ subu $v0, $t3, $a1 -/* B52164 800DAFC4 01E93021 */ addu $a2, $t7, $t1 -/* B52168 800DAFC8 24C60158 */ addiu $a2, $a2, 0x158 -/* B5216C 800DAFCC 15C00002 */ bnez $t6, .L800DAFD8 -/* B52170 800DAFD0 00000000 */ nop -/* B52174 800DAFD4 0007000D */ break 7 -.L800DAFD8: -/* B52178 800DAFD8 2401FFFF */ li $at, -1 -/* B5217C 800DAFDC 15C10004 */ bne $t6, $at, .L800DAFF0 -/* B52180 800DAFE0 3C018000 */ lui $at, 0x8000 -/* B52184 800DAFE4 17010002 */ bne $t8, $at, .L800DAFF0 -/* B52188 800DAFE8 00000000 */ nop -/* B5218C 800DAFEC 0006000D */ break 6 -.L800DAFF0: -/* B52190 800DAFF0 00626823 */ subu $t5, $v1, $v0 -/* B52194 800DAFF4 04410006 */ bgez $v0, .L800DB010 -/* B52198 800DAFF8 00027840 */ sll $t7, $v0, 1 -/* B5219C 800DAFFC 00036040 */ sll $t4, $v1, 1 -/* B521A0 800DB000 A4CC0010 */ sh $t4, 0x10($a2) -/* B521A4 800DB004 A4C00012 */ sh $zero, 0x12($a2) -/* B521A8 800DB008 10000005 */ b .L800DB020 -/* B521AC 800DB00C ACC4000C */ sw $a0, 0xc($a2) -.L800DB010: -/* B521B0 800DB010 000DC840 */ sll $t9, $t5, 1 -/* B521B4 800DB014 A4D90010 */ sh $t9, 0x10($a2) -/* B521B8 800DB018 A4CF0012 */ sh $t7, 0x12($a2) -/* B521BC 800DB01C ACC4000C */ sw $a0, 0xc($a2) -.L800DB020: -/* B521C0 800DB020 A4C30000 */ sh $v1, ($a2) -/* B521C4 800DB024 8FB80050 */ lw $t8, 0x50($sp) -/* B521C8 800DB028 A4D80002 */ sh $t8, 2($a2) -/* B521CC 800DB02C 8FBF0014 */ lw $ra, 0x14($sp) -.L800DB030: -/* B521D0 800DB030 27BD0050 */ addiu $sp, $sp, 0x50 -/* B521D4 800DB034 03E00008 */ jr $ra -/* B521D8 800DB038 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB03C.s b/asm/non_matchings/code/code_800DACC0/func_800DB03C.s deleted file mode 100644 index fcb594d188..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB03C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800DB03C -/* B521DC 800DB03C 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B521E0 800DB040 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B521E4 800DB044 8CE32894 */ lw $v1, 0x2894($a3) -/* B521E8 800DB048 00002825 */ move $a1, $zero -/* B521EC 800DB04C 00640019 */ multu $v1, $a0 -/* B521F0 800DB050 00001012 */ mflo $v0 -/* B521F4 800DB054 00023140 */ sll $a2, $v0, 5 -/* B521F8 800DB058 18600018 */ blez $v1, .L800DB0BC -/* B521FC 800DB05C 00001825 */ move $v1, $zero -.L800DB060: -/* B52200 800DB060 8CEE352C */ lw $t6, 0x352c($a3) -/* B52204 800DB064 8CEF0014 */ lw $t7, 0x14($a3) -/* B52208 800DB068 006E1021 */ addu $v0, $v1, $t6 -/* B5220C 800DB06C 8C5800C0 */ lw $t8, 0xc0($v0) -/* B52210 800DB070 244200C0 */ addiu $v0, $v0, 0xc0 -/* B52214 800DB074 00CF2021 */ addu $a0, $a2, $t7 -/* B52218 800DB078 0018CFC2 */ srl $t9, $t8, 0x1f -/* B5221C 800DB07C 53200006 */ beql $t9, $zero, .L800DB098 -/* B52220 800DB080 908A0000 */ lbu $t2, ($a0) -/* B52224 800DB084 90480000 */ lbu $t0, ($v0) -/* B52228 800DB088 3109FFBF */ andi $t1, $t0, 0xffbf -/* B5222C 800DB08C 10000004 */ b .L800DB0A0 -/* B52230 800DB090 A0490000 */ sb $t1, ($v0) -/* B52234 800DB094 908A0000 */ lbu $t2, ($a0) -.L800DB098: -/* B52238 800DB098 314BFF7F */ andi $t3, $t2, 0xff7f -/* B5223C 800DB09C A08B0000 */ sb $t3, ($a0) -.L800DB0A0: -/* B52240 800DB0A0 A0400006 */ sb $zero, 6($v0) -/* B52244 800DB0A4 8CEC2894 */ lw $t4, 0x2894($a3) -/* B52248 800DB0A8 24A50001 */ addiu $a1, $a1, 1 -/* B5224C 800DB0AC 246300E0 */ addiu $v1, $v1, 0xe0 -/* B52250 800DB0B0 00AC082A */ slt $at, $a1, $t4 -/* B52254 800DB0B4 1420FFEA */ bnez $at, .L800DB060 -/* B52258 800DB0B8 24C60020 */ addiu $a2, $a2, 0x20 -.L800DB0BC: -/* B5225C 800DB0BC 03E00008 */ jr $ra -/* B52260 800DB0C0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s b/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s deleted file mode 100644 index fae0c22fbb..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_800DB0C4 -/* B52264 800DB0C4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B52268 800DB0C8 AFB5002C */ sw $s5, 0x2c($sp) -/* B5226C 800DB0CC 3C158017 */ lui $s5, %hi(gAudioContext) # $s5, 0x8017 -/* B52270 800DB0D0 26B5F180 */ addiu $s5, %lo(gAudioContext) # addiu $s5, $s5, -0xe80 -/* B52274 800DB0D4 AFB40028 */ sw $s4, 0x28($sp) -/* B52278 800DB0D8 86B42854 */ lh $s4, 0x2854($s5) -/* B5227C 800DB0DC AFBE0038 */ sw $fp, 0x38($sp) -/* B52280 800DB0E0 AFB60030 */ sw $s6, 0x30($sp) -/* B52284 800DB0E4 AFB1001C */ sw $s1, 0x1c($sp) -/* B52288 800DB0E8 00C08825 */ move $s1, $a2 -/* B5228C 800DB0EC 00E0B025 */ move $s6, $a3 -/* B52290 800DB0F0 AFBF003C */ sw $ra, 0x3c($sp) -/* B52294 800DB0F4 AFB70034 */ sw $s7, 0x34($sp) -/* B52298 800DB0F8 AFB30024 */ sw $s3, 0x24($sp) -/* B5229C 800DB0FC AFB20020 */ sw $s2, 0x20($sp) -/* B522A0 800DB100 AFB00018 */ sw $s0, 0x18($sp) -/* B522A4 800DB104 AFA40040 */ sw $a0, 0x40($sp) -/* B522A8 800DB108 AFA50044 */ sw $a1, 0x44($sp) -/* B522AC 800DB10C 1A80000A */ blez $s4, .L800DB138 -/* B522B0 800DB110 0080F025 */ move $fp, $a0 -.L800DB114: -/* B522B4 800DB114 2690FFFF */ addiu $s0, $s4, -1 -/* B522B8 800DB118 0C03B159 */ jal Audio_ProcessSequences -/* B522BC 800DB11C 02002025 */ move $a0, $s0 -/* B522C0 800DB120 86AE2854 */ lh $t6, 0x2854($s5) -/* B522C4 800DB124 0C036C0F */ jal func_800DB03C -/* B522C8 800DB128 01D42023 */ subu $a0, $t6, $s4 -/* B522CC 800DB12C 1E00FFF9 */ bgtz $s0, .L800DB114 -/* B522D0 800DB130 0200A025 */ move $s4, $s0 -/* B522D4 800DB134 86B42854 */ lh $s4, 0x2854($s5) -.L800DB138: -/* B522D8 800DB138 0220B825 */ move $s7, $s1 -/* B522DC 800DB13C 1A80003C */ blez $s4, .L800DB230 -/* B522E0 800DB140 AEA00010 */ sw $zero, 0x10($s5) -.L800DB144: -/* B522E4 800DB144 24010001 */ li $at, 1 -/* B522E8 800DB148 86B22854 */ lh $s2, 0x2854($s5) -/* B522EC 800DB14C 16810003 */ bne $s4, $at, .L800DB15C -/* B522F0 800DB150 00008825 */ move $s1, $zero -/* B522F4 800DB154 10000019 */ b .L800DB1BC -/* B522F8 800DB158 02C09825 */ move $s3, $s6 -.L800DB15C: -/* B522FC 800DB15C 02D4001A */ div $zero, $s6, $s4 -/* B52300 800DB160 16800002 */ bnez $s4, .L800DB16C -/* B52304 800DB164 00000000 */ nop -/* B52308 800DB168 0007000D */ break 7 -.L800DB16C: -/* B5230C 800DB16C 2401FFFF */ li $at, -1 -/* B52310 800DB170 16810004 */ bne $s4, $at, .L800DB184 -/* B52314 800DB174 3C018000 */ lui $at, 0x8000 -/* B52318 800DB178 16C10002 */ bne $s6, $at, .L800DB184 -/* B5231C 800DB17C 00000000 */ nop -/* B52320 800DB180 0006000D */ break 6 -.L800DB184: -/* B52324 800DB184 86A32858 */ lh $v1, 0x2858($s5) -/* B52328 800DB188 00001012 */ mflo $v0 -/* B5232C 800DB18C 0043082A */ slt $at, $v0, $v1 -/* B52330 800DB190 54200004 */ bnezl $at, .L800DB1A4 -/* B52334 800DB194 86A3285A */ lh $v1, 0x285a($s5) -/* B52338 800DB198 10000008 */ b .L800DB1BC -/* B5233C 800DB19C 00609825 */ move $s3, $v1 -/* B52340 800DB1A0 86A3285A */ lh $v1, 0x285a($s5) -.L800DB1A4: -/* B52344 800DB1A4 0062082A */ slt $at, $v1, $v0 -/* B52348 800DB1A8 54200004 */ bnezl $at, .L800DB1BC -/* B5234C 800DB1AC 86B32856 */ lh $s3, 0x2856($s5) -/* B52350 800DB1B0 10000002 */ b .L800DB1BC -/* B52354 800DB1B4 00609825 */ move $s3, $v1 -/* B52358 800DB1B8 86B32856 */ lh $s3, 0x2856($s5) -.L800DB1BC: -/* B5235C 800DB1BC 82A20001 */ lb $v0, 1($s5) -/* B52360 800DB1C0 58400011 */ blezl $v0, .L800DB208 -/* B52364 800DB1C4 02E02025 */ move $a0, $s7 -/* B52368 800DB1C8 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5236C 800DB1CC 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -.L800DB1D0: -/* B52370 800DB1D0 920F0019 */ lbu $t7, 0x19($s0) -/* B52374 800DB1D4 02602025 */ move $a0, $s3 -/* B52378 800DB1D8 02542823 */ subu $a1, $s2, $s4 -/* B5237C 800DB1DC 51E00006 */ beql $t7, $zero, .L800DB1F8 -/* B52380 800DB1E0 26310001 */ addiu $s1, $s1, 1 -/* B52384 800DB1E4 0C036B30 */ jal func_800DACC0 -/* B52388 800DB1E8 02203025 */ move $a2, $s1 -/* B5238C 800DB1EC 86B22854 */ lh $s2, 0x2854($s5) -/* B52390 800DB1F0 82A20001 */ lb $v0, 1($s5) -/* B52394 800DB1F4 26310001 */ addiu $s1, $s1, 1 -.L800DB1F8: -/* B52398 800DB1F8 0222082A */ slt $at, $s1, $v0 -/* B5239C 800DB1FC 1420FFF4 */ bnez $at, .L800DB1D0 -/* B523A0 800DB200 261002C8 */ addiu $s0, $s0, 0x2c8 -/* B523A4 800DB204 02E02025 */ move $a0, $s7 -.L800DB208: -/* B523A8 800DB208 02602825 */ move $a1, $s3 -/* B523AC 800DB20C 03C03025 */ move $a2, $fp -/* B523B0 800DB210 0C0370E1 */ jal func_800DC384 -/* B523B4 800DB214 02543823 */ subu $a3, $s2, $s4 -/* B523B8 800DB218 2694FFFF */ addiu $s4, $s4, -1 -/* B523BC 800DB21C 0013C080 */ sll $t8, $s3, 2 -/* B523C0 800DB220 0040F025 */ move $fp, $v0 -/* B523C4 800DB224 02D3B023 */ subu $s6, $s6, $s3 -/* B523C8 800DB228 1E80FFC6 */ bgtz $s4, .L800DB144 -/* B523CC 800DB22C 02F8B821 */ addu $s7, $s7, $t8 -.L800DB230: -/* B523D0 800DB230 82B90001 */ lb $t9, 1($s5) -/* B523D4 800DB234 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B523D8 800DB238 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -/* B523DC 800DB23C 1B20000E */ blez $t9, .L800DB278 -/* B523E0 800DB240 00008825 */ move $s1, $zero -/* B523E4 800DB244 9202001A */ lbu $v0, 0x1a($s0) -.L800DB248: -/* B523E8 800DB248 10400002 */ beqz $v0, .L800DB254 -/* B523EC 800DB24C 2448FFFF */ addiu $t0, $v0, -1 -/* B523F0 800DB250 A208001A */ sb $t0, 0x1a($s0) -.L800DB254: -/* B523F4 800DB254 9209001B */ lbu $t1, 0x1b($s0) -/* B523F8 800DB258 26310001 */ addiu $s1, $s1, 1 -/* B523FC 800DB25C 261002C8 */ addiu $s0, $s0, 0x2c8 -/* B52400 800DB260 392A0001 */ xori $t2, $t1, 1 -/* B52404 800DB264 A20AFD53 */ sb $t2, -0x2ad($s0) -/* B52408 800DB268 82AB0001 */ lb $t3, 1($s5) -/* B5240C 800DB26C 022B082A */ slt $at, $s1, $t3 -/* B52410 800DB270 5420FFF5 */ bnezl $at, .L800DB248 -/* B52414 800DB274 9202001A */ lbu $v0, 0x1a($s0) -.L800DB278: -/* B52418 800DB278 8FAC0040 */ lw $t4, 0x40($sp) -/* B5241C 800DB27C 8FAF0044 */ lw $t7, 0x44($sp) -/* B52420 800DB280 03C01025 */ move $v0, $fp -/* B52424 800DB284 03CC6823 */ subu $t5, $fp, $t4 -/* B52428 800DB288 000D70C3 */ sra $t6, $t5, 3 -/* B5242C 800DB28C ADEE0000 */ sw $t6, ($t7) -/* B52430 800DB290 8FBF003C */ lw $ra, 0x3c($sp) -/* B52434 800DB294 8FBE0038 */ lw $fp, 0x38($sp) -/* B52438 800DB298 8FB70034 */ lw $s7, 0x34($sp) -/* B5243C 800DB29C 8FB60030 */ lw $s6, 0x30($sp) -/* B52440 800DB2A0 8FB5002C */ lw $s5, 0x2c($sp) -/* B52444 800DB2A4 8FB40028 */ lw $s4, 0x28($sp) -/* B52448 800DB2A8 8FB30024 */ lw $s3, 0x24($sp) -/* B5244C 800DB2AC 8FB20020 */ lw $s2, 0x20($sp) -/* B52450 800DB2B0 8FB1001C */ lw $s1, 0x1c($sp) -/* B52454 800DB2B4 8FB00018 */ lw $s0, 0x18($sp) -/* B52458 800DB2B8 03E00008 */ jr $ra -/* B5245C 800DB2BC 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB2C0.s b/asm/non_matchings/code/code_800DACC0/func_800DB2C0.s deleted file mode 100644 index e3f5a0faec..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB2C0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800DB2C0 -/* B52460 800DB2C0 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 -/* B52464 800DB2C4 24C6F180 */ addiu $a2, %lo(gAudioContext) # addiu $a2, $a2, -0xe80 -/* B52468 800DB2C8 84CE2854 */ lh $t6, 0x2854($a2) -/* B5246C 800DB2CC 24820001 */ addiu $v0, $a0, 1 -/* B52470 800DB2D0 004E082A */ slt $at, $v0, $t6 -/* B52474 800DB2D4 10200014 */ beqz $at, .L800DB328 -/* B52478 800DB2D8 00000000 */ nop -/* B5247C 800DB2DC 8CCF2894 */ lw $t7, 0x2894($a2) -.L800DB2E0: -/* B52480 800DB2E0 8CC90014 */ lw $t1, 0x14($a2) -/* B52484 800DB2E4 01E20019 */ multu $t7, $v0 -/* B52488 800DB2E8 0000C012 */ mflo $t8 -/* B5248C 800DB2EC 0305C821 */ addu $t9, $t8, $a1 -/* B52490 800DB2F0 00194140 */ sll $t0, $t9, 5 -/* B52494 800DB2F4 01091821 */ addu $v1, $t0, $t1 -/* B52498 800DB2F8 8C6A0000 */ lw $t2, ($v1) -/* B5249C 800DB2FC 000A6040 */ sll $t4, $t2, 1 -/* B524A0 800DB300 05800009 */ bltz $t4, .L800DB328 -/* B524A4 800DB304 00000000 */ nop -/* B524A8 800DB308 906D0000 */ lbu $t5, ($v1) -/* B524AC 800DB30C 24420001 */ addiu $v0, $v0, 1 -/* B524B0 800DB310 31AEFF7F */ andi $t6, $t5, 0xff7f -/* B524B4 800DB314 A06E0000 */ sb $t6, ($v1) -/* B524B8 800DB318 84CF2854 */ lh $t7, 0x2854($a2) -/* B524BC 800DB31C 004F082A */ slt $at, $v0, $t7 -/* B524C0 800DB320 5420FFEF */ bnezl $at, .L800DB2E0 -/* B524C4 800DB324 8CCF2894 */ lw $t7, 0x2894($a2) -.L800DB328: -/* B524C8 800DB328 03E00008 */ jr $ra -/* B524CC 800DB32C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB330.s b/asm/non_matchings/code/code_800DACC0/func_800DB330.s deleted file mode 100644 index b53d6a5b0b..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB330.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_800DB330 -/* B524D0 800DB330 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B524D4 800DB334 AFBF001C */ sw $ra, 0x1c($sp) -/* B524D8 800DB338 AFA5002C */ sw $a1, 0x2c($sp) -/* B524DC 800DB33C AFA60030 */ sw $a2, 0x30($sp) -/* B524E0 800DB340 90AF0003 */ lbu $t7, 3($a1) -/* B524E4 800DB344 87A80032 */ lh $t0, 0x32($sp) -/* B524E8 800DB348 00A07025 */ move $t6, $a1 -/* B524EC 800DB34C 000FC0C0 */ sll $t8, $t7, 3 -/* B524F0 800DB350 030FC021 */ addu $t8, $t8, $t7 -/* B524F4 800DB354 0018C080 */ sll $t8, $t8, 2 -/* B524F8 800DB358 030FC023 */ subu $t8, $t8, $t7 -/* B524FC 800DB35C 000848C0 */ sll $t1, $t0, 3 -/* B52500 800DB360 0018C080 */ sll $t8, $t8, 2 -/* B52504 800DB364 01284823 */ subu $t1, $t1, $t0 -/* B52508 800DB368 00094880 */ sll $t1, $t1, 2 -/* B5250C 800DB36C 00B8C821 */ addu $t9, $a1, $t8 -/* B52510 800DB370 03291821 */ addu $v1, $t9, $t1 -/* B52514 800DB374 24630040 */ addiu $v1, $v1, 0x40 -/* B52518 800DB378 84670010 */ lh $a3, 0x10($v1) -/* B5251C 800DB37C 9466000E */ lhu $a2, 0xe($v1) -/* B52520 800DB380 AFA30024 */ sw $v1, 0x24($sp) -/* B52524 800DB384 AFAE0010 */ sw $t6, 0x10($sp) -/* B52528 800DB388 0C037002 */ jal func_800DC008 -/* B5252C 800DB38C 240503E0 */ li $a1, 992 -/* B52530 800DB390 8FA30024 */ lw $v1, 0x24($sp) -/* B52534 800DB394 00402025 */ move $a0, $v0 -/* B52538 800DB398 8FAA002C */ lw $t2, 0x2c($sp) -/* B5253C 800DB39C 84670012 */ lh $a3, 0x12($v1) -/* B52540 800DB3A0 50E00009 */ beql $a3, $zero, .L800DB3C8 -/* B52544 800DB3A4 8FBF001C */ lw $ra, 0x1c($sp) -/* B52548 800DB3A8 84650010 */ lh $a1, 0x10($v1) -/* B5254C 800DB3AC AFAA0010 */ sw $t2, 0x10($sp) -/* B52550 800DB3B0 00003025 */ move $a2, $zero -/* B52554 800DB3B4 24A503E0 */ addiu $a1, $a1, 0x3e0 -/* B52558 800DB3B8 0C037002 */ jal func_800DC008 -/* B5255C 800DB3BC 30A5FFFF */ andi $a1, $a1, 0xffff -/* B52560 800DB3C0 00402025 */ move $a0, $v0 -/* B52564 800DB3C4 8FBF001C */ lw $ra, 0x1c($sp) -.L800DB3C8: -/* B52568 800DB3C8 27BD0028 */ addiu $sp, $sp, 0x28 -/* B5256C 800DB3CC 00801025 */ move $v0, $a0 -/* B52570 800DB3D0 03E00008 */ jr $ra -/* B52574 800DB3D4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB3D8.s b/asm/non_matchings/code/code_800DACC0/func_800DB3D8.s deleted file mode 100644 index a51b51e46a..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB3D8.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_800DB3D8 -/* B52578 800DB3D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5257C 800DB3DC AFBF001C */ sw $ra, 0x1c($sp) -/* B52580 800DB3E0 AFA5002C */ sw $a1, 0x2c($sp) -/* B52584 800DB3E4 AFA60030 */ sw $a2, 0x30($sp) -/* B52588 800DB3E8 90AF0003 */ lbu $t7, 3($a1) -/* B5258C 800DB3EC 87A80032 */ lh $t0, 0x32($sp) -/* B52590 800DB3F0 00A07025 */ move $t6, $a1 -/* B52594 800DB3F4 000FC0C0 */ sll $t8, $t7, 3 -/* B52598 800DB3F8 030FC021 */ addu $t8, $t8, $t7 -/* B5259C 800DB3FC 0018C080 */ sll $t8, $t8, 2 -/* B525A0 800DB400 030FC023 */ subu $t8, $t8, $t7 -/* B525A4 800DB404 000848C0 */ sll $t1, $t0, 3 -/* B525A8 800DB408 0018C080 */ sll $t8, $t8, 2 -/* B525AC 800DB40C 01284823 */ subu $t1, $t1, $t0 -/* B525B0 800DB410 00094880 */ sll $t1, $t1, 2 -/* B525B4 800DB414 00B8C821 */ addu $t9, $a1, $t8 -/* B525B8 800DB418 03291821 */ addu $v1, $t9, $t1 -/* B525BC 800DB41C 24630040 */ addiu $v1, $v1, 0x40 -/* B525C0 800DB420 84670010 */ lh $a3, 0x10($v1) -/* B525C4 800DB424 9466000E */ lhu $a2, 0xe($v1) -/* B525C8 800DB428 AFA30024 */ sw $v1, 0x24($sp) -/* B525CC 800DB42C AFAE0010 */ sw $t6, 0x10($sp) -/* B525D0 800DB430 0C03701D */ jal func_800DC074 -/* B525D4 800DB434 240503E0 */ li $a1, 992 -/* B525D8 800DB438 8FA30024 */ lw $v1, 0x24($sp) -/* B525DC 800DB43C 00402025 */ move $a0, $v0 -/* B525E0 800DB440 8FAA002C */ lw $t2, 0x2c($sp) -/* B525E4 800DB444 84670012 */ lh $a3, 0x12($v1) -/* B525E8 800DB448 50E00009 */ beql $a3, $zero, .L800DB470 -/* B525EC 800DB44C 8FBF001C */ lw $ra, 0x1c($sp) -/* B525F0 800DB450 84650010 */ lh $a1, 0x10($v1) -/* B525F4 800DB454 AFAA0010 */ sw $t2, 0x10($sp) -/* B525F8 800DB458 00003025 */ move $a2, $zero -/* B525FC 800DB45C 24A503E0 */ addiu $a1, $a1, 0x3e0 -/* B52600 800DB460 0C03701D */ jal func_800DC074 -/* B52604 800DB464 30A5FFFF */ andi $a1, $a1, 0xffff -/* B52608 800DB468 00402025 */ move $a0, $v0 -/* B5260C 800DB46C 8FBF001C */ lw $ra, 0x1c($sp) -.L800DB470: -/* B52610 800DB470 27BD0028 */ addiu $sp, $sp, 0x28 -/* B52614 800DB474 00801025 */ move $v0, $a0 -/* B52618 800DB478 03E00008 */ jr $ra -/* B5261C 800DB47C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB480.s b/asm/non_matchings/code/code_800DACC0/func_800DB480.s deleted file mode 100644 index 99f27d94fa..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB480.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800DB480 -/* B52620 800DB480 3C0E0A00 */ lui $t6, (0x0A000C80 >> 16) # lui $t6, 0xa00 -/* B52624 800DB484 3C0F0720 */ lui $t7, (0x072001A0 >> 16) # lui $t7, 0x720 -/* B52628 800DB488 35EF01A0 */ ori $t7, (0x072001A0 & 0xFFFF) # ori $t7, $t7, 0x1a0 -/* B5262C 800DB48C 35CE0C80 */ ori $t6, (0x0A000C80 & 0xFFFF) # ori $t6, $t6, 0xc80 -/* B52630 800DB490 AC8E0000 */ sw $t6, ($a0) -/* B52634 800DB494 AC8F0004 */ sw $t7, 4($a0) -/* B52638 800DB498 84B80010 */ lh $t8, 0x10($a1) -/* B5263C 800DB49C 3C080C1A */ lui $t0, 0xc1a -/* B52640 800DB4A0 24860008 */ addiu $a2, $a0, 8 -/* B52644 800DB4A4 3C0A0E20 */ lui $t2, (0x0E200C80 >> 16) # lui $t2, 0xe20 -/* B52648 800DB4A8 3319FFFF */ andi $t9, $t8, 0xffff -/* B5264C 800DB4AC 03284825 */ or $t1, $t9, $t0 -/* B52650 800DB4B0 354A0C80 */ ori $t2, (0x0E200C80 & 0xFFFF) # ori $t2, $t2, 0xc80 -/* B52654 800DB4B4 ACCA0004 */ sw $t2, 4($a2) -/* B52658 800DB4B8 ACC90000 */ sw $t1, ($a2) -/* B5265C 800DB4BC 84AB0012 */ lh $t3, 0x12($a1) -/* B52660 800DB4C0 24C70008 */ addiu $a3, $a2, 8 -/* B52664 800DB4C4 3C0E0720 */ lui $t6, (0x07200E20 >> 16) # lui $t6, 0x720 -/* B52668 800DB4C8 316CFFFF */ andi $t4, $t3, 0xffff -/* B5266C 800DB4CC 01886825 */ or $t5, $t4, $t0 -/* B52670 800DB4D0 35CE0E20 */ ori $t6, (0x07200E20 & 0xFFFF) # ori $t6, $t6, 0xe20 -/* B52674 800DB4D4 ACEE0004 */ sw $t6, 4($a3) -/* B52678 800DB4D8 ACED0000 */ sw $t5, ($a3) -/* B5267C 800DB4DC 03E00008 */ jr $ra -/* B52680 800DB4E0 24E20008 */ addiu $v0, $a3, 8 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB4E4.s b/asm/non_matchings/code/code_800DACC0/func_800DB4E4.s deleted file mode 100644 index 90f80b1c1e..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB4E4.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_800DB4E4 -/* B52684 800DB4E4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B52688 800DB4E8 AFBF0024 */ sw $ra, 0x24($sp) -/* B5268C 800DB4EC AFB00020 */ sw $s0, 0x20($sp) -/* B52690 800DB4F0 AFA50034 */ sw $a1, 0x34($sp) -/* B52694 800DB4F4 AFA7003C */ sw $a3, 0x3c($sp) -/* B52698 800DB4F8 90CE0003 */ lbu $t6, 3($a2) -/* B5269C 800DB4FC 87B9003E */ lh $t9, 0x3e($sp) -/* B526A0 800DB500 2401FFF0 */ li $at, -16 -/* B526A4 800DB504 000E78C0 */ sll $t7, $t6, 3 -/* B526A8 800DB508 01EE7821 */ addu $t7, $t7, $t6 -/* B526AC 800DB50C 000F7880 */ sll $t7, $t7, 2 -/* B526B0 800DB510 01EE7823 */ subu $t7, $t7, $t6 -/* B526B4 800DB514 001960C0 */ sll $t4, $t9, 3 -/* B526B8 800DB518 000F7880 */ sll $t7, $t7, 2 -/* B526BC 800DB51C 01996023 */ subu $t4, $t4, $t9 -/* B526C0 800DB520 000C6080 */ sll $t4, $t4, 2 -/* B526C4 800DB524 00CFC021 */ addu $t8, $a2, $t7 -/* B526C8 800DB528 030C1821 */ addu $v1, $t8, $t4 -/* B526CC 800DB52C 8C62004C */ lw $v0, 0x4c($v1) -/* B526D0 800DB530 846D0050 */ lh $t5, 0x50($v1) -/* B526D4 800DB534 00C08025 */ move $s0, $a2 -/* B526D8 800DB538 30480007 */ andi $t0, $v0, 7 -/* B526DC 800DB53C 00084040 */ sll $t0, $t0, 1 -/* B526E0 800DB540 00084400 */ sll $t0, $t0, 0x10 -/* B526E4 800DB544 00084403 */ sra $t0, $t0, 0x10 -/* B526E8 800DB548 010D4821 */ addu $t1, $t0, $t5 -/* B526EC 800DB54C 2529000F */ addiu $t1, $t1, 0xf -/* B526F0 800DB550 3129FFF0 */ andi $t1, $t1, 0xfff0 -/* B526F4 800DB554 00094C00 */ sll $t1, $t1, 0x10 -/* B526F8 800DB558 24630040 */ addiu $v1, $v1, 0x40 -/* B526FC 800DB55C 00094C03 */ sra $t1, $t1, 0x10 -/* B52700 800DB560 A7A90028 */ sh $t1, 0x28($sp) -/* B52704 800DB564 AFA3002C */ sw $v1, 0x2c($sp) -/* B52708 800DB568 A7A8002A */ sh $t0, 0x2a($sp) -/* B5270C 800DB56C AFB00010 */ sw $s0, 0x10($sp) -/* B52710 800DB570 240701A0 */ li $a3, 416 -/* B52714 800DB574 240503E0 */ li $a1, 992 -/* B52718 800DB578 05010003 */ bgez $t0, .L800DB588 -/* B5271C 800DB57C 00087043 */ sra $t6, $t0, 1 -/* B52720 800DB580 25010001 */ addiu $at, $t0, 1 -/* B52724 800DB584 00017043 */ sra $t6, $at, 1 -.L800DB588: -/* B52728 800DB588 004E3023 */ subu $a2, $v0, $t6 -/* B5272C 800DB58C 0C037002 */ jal func_800DC008 -/* B52730 800DB590 30C6FFFF */ andi $a2, $a2, 0xffff -/* B52734 800DB594 8FA3002C */ lw $v1, 0x2c($sp) -/* B52738 800DB598 87A90028 */ lh $t1, 0x28($sp) -/* B5273C 800DB59C 87A8002A */ lh $t0, 0x2a($sp) -/* B52740 800DB5A0 846F0012 */ lh $t7, 0x12($v1) -/* B52744 800DB5A4 252503E0 */ addiu $a1, $t1, 0x3e0 -/* B52748 800DB5A8 00402025 */ move $a0, $v0 -/* B5274C 800DB5AC 11E00008 */ beqz $t7, .L800DB5D0 -/* B52750 800DB5B0 30A5FFFF */ andi $a1, $a1, 0xffff -/* B52754 800DB5B4 241901A0 */ li $t9, 416 -/* B52758 800DB5B8 03293823 */ subu $a3, $t9, $t1 -/* B5275C 800DB5BC 00003025 */ move $a2, $zero -/* B52760 800DB5C0 AFB00010 */ sw $s0, 0x10($sp) -/* B52764 800DB5C4 0C037002 */ jal func_800DC008 -/* B52768 800DB5C8 A7A8002A */ sh $t0, 0x2a($sp) -/* B5276C 800DB5CC 87A8002A */ lh $t0, 0x2a($sp) -.L800DB5D0: -/* B52770 800DB5D0 251803E0 */ addiu $t8, $t0, 0x3e0 -/* B52774 800DB5D4 3C0A0800 */ lui $t2, 0x800 -/* B52778 800DB5D8 330CFFFF */ andi $t4, $t8, 0xffff -/* B5277C 800DB5DC 018A6825 */ or $t5, $t4, $t2 -/* B52780 800DB5E0 AC4D0000 */ sw $t5, ($v0) -/* B52784 800DB5E4 8FA50034 */ lw $a1, 0x34($sp) -/* B52788 800DB5E8 3C010C80 */ lui $at, 0xc80 -/* B5278C 800DB5EC 3C0B0500 */ lui $t3, 0x500 -/* B52790 800DB5F0 00052840 */ sll $a1, $a1, 1 -/* B52794 800DB5F4 30A5FFFF */ andi $a1, $a1, 0xffff -/* B52798 800DB5F8 00A17025 */ or $t6, $a1, $at -/* B5279C 800DB5FC AC4E0004 */ sw $t6, 4($v0) -/* B527A0 800DB600 92190000 */ lbu $t9, ($s0) -/* B527A4 800DB604 960E000E */ lhu $t6, 0xe($s0) -/* B527A8 800DB608 24460008 */ addiu $a2, $v0, 8 -/* B527AC 800DB60C 0019C400 */ sll $t8, $t9, 0x10 -/* B527B0 800DB610 030B6025 */ or $t4, $t8, $t3 -/* B527B4 800DB614 018E7825 */ or $t7, $t4, $t6 -/* B527B8 800DB618 ACCF0000 */ sw $t7, ($a2) -/* B527BC 800DB61C 8E190030 */ lw $t9, 0x30($s0) -/* B527C0 800DB620 25180580 */ addiu $t8, $t0, 0x580 -/* B527C4 800DB624 24C70008 */ addiu $a3, $a2, 8 -/* B527C8 800DB628 330DFFFF */ andi $t5, $t8, 0xffff -/* B527CC 800DB62C 3C010E20 */ lui $at, 0xe20 -/* B527D0 800DB630 ACD90004 */ sw $t9, 4($a2) -/* B527D4 800DB634 00A17025 */ or $t6, $a1, $at -/* B527D8 800DB638 01AA6025 */ or $t4, $t5, $t2 -/* B527DC 800DB63C ACEC0000 */ sw $t4, ($a3) -/* B527E0 800DB640 ACEE0004 */ sw $t6, 4($a3) -/* B527E4 800DB644 92190000 */ lbu $t9, ($s0) -/* B527E8 800DB648 960E000E */ lhu $t6, 0xe($s0) -/* B527EC 800DB64C 24E90008 */ addiu $t1, $a3, 8 -/* B527F0 800DB650 0019C400 */ sll $t8, $t9, 0x10 -/* B527F4 800DB654 030B6825 */ or $t5, $t8, $t3 -/* B527F8 800DB658 01AE7825 */ or $t7, $t5, $t6 -/* B527FC 800DB65C AD2F0000 */ sw $t7, ($t1) -/* B52800 800DB660 8E190034 */ lw $t9, 0x34($s0) -/* B52804 800DB664 25220008 */ addiu $v0, $t1, 8 -/* B52808 800DB668 AD390004 */ sw $t9, 4($t1) -/* B5280C 800DB66C 8FBF0024 */ lw $ra, 0x24($sp) -/* B52810 800DB670 8FB00020 */ lw $s0, 0x20($sp) -/* B52814 800DB674 27BD0030 */ addiu $sp, $sp, 0x30 -/* B52818 800DB678 03E00008 */ jr $ra -/* B5281C 800DB67C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB680.s b/asm/non_matchings/code/code_800DACC0/func_800DB680.s deleted file mode 100644 index 70f99f3f5d..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB680.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel func_800DB680 -/* B52820 800DB680 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B52824 800DB684 AFBF002C */ sw $ra, 0x2c($sp) -/* B52828 800DB688 AFB20028 */ sw $s2, 0x28($sp) -/* B5282C 800DB68C AFB10024 */ sw $s1, 0x24($sp) -/* B52830 800DB690 AFB00020 */ sw $s0, 0x20($sp) -/* B52834 800DB694 AFA60038 */ sw $a2, 0x38($sp) -/* B52838 800DB698 90AE0003 */ lbu $t6, 3($a1) -/* B5283C 800DB69C 87B9003A */ lh $t9, 0x3a($sp) -/* B52840 800DB6A0 3C090800 */ lui $t1, (0x08000C80 >> 16) # lui $t1, 0x800 -/* B52844 800DB6A4 000E78C0 */ sll $t7, $t6, 3 -/* B52848 800DB6A8 01EE7821 */ addu $t7, $t7, $t6 -/* B5284C 800DB6AC 000F7880 */ sll $t7, $t7, 2 -/* B52850 800DB6B0 01EE7823 */ subu $t7, $t7, $t6 -/* B52854 800DB6B4 001940C0 */ sll $t0, $t9, 3 -/* B52858 800DB6B8 000F7880 */ sll $t7, $t7, 2 -/* B5285C 800DB6BC 01194023 */ subu $t0, $t0, $t9 -/* B52860 800DB6C0 00084080 */ sll $t0, $t0, 2 -/* B52864 800DB6C4 00AFC021 */ addu $t8, $a1, $t7 -/* B52868 800DB6C8 35290C80 */ ori $t1, (0x08000C80 & 0xFFFF) # ori $t1, $t1, 0xc80 -/* B5286C 800DB6CC 03088821 */ addu $s1, $t8, $t0 -/* B52870 800DB6D0 AC890000 */ sw $t1, ($a0) -/* B52874 800DB6D4 962A0058 */ lhu $t2, 0x58($s1) -/* B52878 800DB6D8 3C010720 */ lui $at, 0x720 -/* B5287C 800DB6DC 24830008 */ addiu $v1, $a0, 8 -/* B52880 800DB6E0 000A5840 */ sll $t3, $t2, 1 -/* B52884 800DB6E4 316CFFFF */ andi $t4, $t3, 0xffff -/* B52888 800DB6E8 01816825 */ or $t5, $t4, $at -/* B5288C 800DB6EC AC8D0004 */ sw $t5, 4($a0) -/* B52890 800DB6F0 90AF0000 */ lbu $t7, ($a1) -/* B52894 800DB6F4 96290056 */ lhu $t1, 0x56($s1) -/* B52898 800DB6F8 3C010500 */ lui $at, 0x500 -/* B5289C 800DB6FC 000FCC00 */ sll $t9, $t7, 0x10 -/* B528A0 800DB700 0321C025 */ or $t8, $t9, $at -/* B528A4 800DB704 03095025 */ or $t2, $t8, $t1 -/* B528A8 800DB708 AC6A0000 */ sw $t2, ($v1) -/* B528AC 800DB70C 8CAB0038 */ lw $t3, 0x38($a1) -/* B528B0 800DB710 00A09025 */ move $s2, $a1 -/* B528B4 800DB714 26310040 */ addiu $s1, $s1, 0x40 -/* B528B8 800DB718 AC6B0004 */ sw $t3, 4($v1) -/* B528BC 800DB71C 8E4C0028 */ lw $t4, 0x28($s2) -/* B528C0 800DB720 86270010 */ lh $a3, 0x10($s1) -/* B528C4 800DB724 9626000E */ lhu $a2, 0xe($s1) -/* B528C8 800DB728 24640008 */ addiu $a0, $v1, 8 -/* B528CC 800DB72C 24050720 */ li $a1, 1824 -/* B528D0 800DB730 0C037038 */ jal func_800DC0E0 -/* B528D4 800DB734 AFAC0010 */ sw $t4, 0x10($sp) -/* B528D8 800DB738 86270012 */ lh $a3, 0x12($s1) -/* B528DC 800DB73C 00408025 */ move $s0, $v0 -/* B528E0 800DB740 00402025 */ move $a0, $v0 -/* B528E4 800DB744 50E0000A */ beql $a3, $zero, .L800DB770 -/* B528E8 800DB748 3C0E0800 */ lui $t6, 0x800 -/* B528EC 800DB74C 86250010 */ lh $a1, 0x10($s1) -/* B528F0 800DB750 8E4D0028 */ lw $t5, 0x28($s2) -/* B528F4 800DB754 00003025 */ move $a2, $zero -/* B528F8 800DB758 24A50720 */ addiu $a1, $a1, 0x720 -/* B528FC 800DB75C 30A5FFFF */ andi $a1, $a1, 0xffff -/* B52900 800DB760 0C037038 */ jal func_800DC0E0 -/* B52904 800DB764 AFAD0010 */ sw $t5, 0x10($sp) -/* B52908 800DB768 00408025 */ move $s0, $v0 -/* B5290C 800DB76C 3C0E0800 */ lui $t6, (0x08000E20 >> 16) # lui $t6, 0x800 -.L800DB770: -/* B52910 800DB770 35CE0E20 */ ori $t6, (0x08000E20 & 0xFFFF) # ori $t6, $t6, 0xe20 -/* B52914 800DB774 02001025 */ move $v0, $s0 -/* B52918 800DB778 AC4E0000 */ sw $t6, ($v0) -/* B5291C 800DB77C 962F0018 */ lhu $t7, 0x18($s1) -/* B52920 800DB780 3C010720 */ lui $at, 0x720 -/* B52924 800DB784 26030008 */ addiu $v1, $s0, 8 -/* B52928 800DB788 000FC840 */ sll $t9, $t7, 1 -/* B5292C 800DB78C 3328FFFF */ andi $t0, $t9, 0xffff -/* B52930 800DB790 0101C025 */ or $t8, $t0, $at -/* B52934 800DB794 AC580004 */ sw $t8, 4($v0) -/* B52938 800DB798 924A0000 */ lbu $t2, ($s2) -/* B5293C 800DB79C 962E0016 */ lhu $t6, 0x16($s1) -/* B52940 800DB7A0 3C010500 */ lui $at, 0x500 -/* B52944 800DB7A4 000A5C00 */ sll $t3, $t2, 0x10 -/* B52948 800DB7A8 01616025 */ or $t4, $t3, $at -/* B5294C 800DB7AC 018E7825 */ or $t7, $t4, $t6 -/* B52950 800DB7B0 AC6F0000 */ sw $t7, ($v1) -/* B52954 800DB7B4 8E59003C */ lw $t9, 0x3c($s2) -/* B52958 800DB7B8 24640008 */ addiu $a0, $v1, 8 -/* B5295C 800DB7BC 24050720 */ li $a1, 1824 -/* B52960 800DB7C0 AC790004 */ sw $t9, 4($v1) -/* B52964 800DB7C4 8E48002C */ lw $t0, 0x2c($s2) -/* B52968 800DB7C8 86270010 */ lh $a3, 0x10($s1) -/* B5296C 800DB7CC 9626000E */ lhu $a2, 0xe($s1) -/* B52970 800DB7D0 0C037038 */ jal func_800DC0E0 -/* B52974 800DB7D4 AFA80010 */ sw $t0, 0x10($sp) -/* B52978 800DB7D8 86270012 */ lh $a3, 0x12($s1) -/* B5297C 800DB7DC 00408025 */ move $s0, $v0 -/* B52980 800DB7E0 00402025 */ move $a0, $v0 -/* B52984 800DB7E4 50E0000A */ beql $a3, $zero, .L800DB810 -/* B52988 800DB7E8 8FBF002C */ lw $ra, 0x2c($sp) -/* B5298C 800DB7EC 86250010 */ lh $a1, 0x10($s1) -/* B52990 800DB7F0 8E58002C */ lw $t8, 0x2c($s2) -/* B52994 800DB7F4 00003025 */ move $a2, $zero -/* B52998 800DB7F8 24A50720 */ addiu $a1, $a1, 0x720 -/* B5299C 800DB7FC 30A5FFFF */ andi $a1, $a1, 0xffff -/* B529A0 800DB800 0C037038 */ jal func_800DC0E0 -/* B529A4 800DB804 AFB80010 */ sw $t8, 0x10($sp) -/* B529A8 800DB808 00408025 */ move $s0, $v0 -/* B529AC 800DB80C 8FBF002C */ lw $ra, 0x2c($sp) -.L800DB810: -/* B529B0 800DB810 02001025 */ move $v0, $s0 -/* B529B4 800DB814 8FB00020 */ lw $s0, 0x20($sp) -/* B529B8 800DB818 8FB10024 */ lw $s1, 0x24($sp) -/* B529BC 800DB81C 8FB20028 */ lw $s2, 0x28($sp) -/* B529C0 800DB820 03E00008 */ jr $ra -/* B529C4 800DB824 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB828.s b/asm/non_matchings/code/code_800DACC0/func_800DB828.s deleted file mode 100644 index b06c414afb..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DB828.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_800DB828 -/* B529C8 800DB828 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B529CC 800DB82C AFBF0024 */ sw $ra, 0x24($sp) -/* B529D0 800DB830 AFB00020 */ sw $s0, 0x20($sp) -/* B529D4 800DB834 AFA50034 */ sw $a1, 0x34($sp) -/* B529D8 800DB838 AFA7003C */ sw $a3, 0x3c($sp) -/* B529DC 800DB83C 90CE0003 */ lbu $t6, 3($a2) -/* B529E0 800DB840 87B9003E */ lh $t9, 0x3e($sp) -/* B529E4 800DB844 00C08025 */ move $s0, $a2 -/* B529E8 800DB848 000E78C0 */ sll $t7, $t6, 3 -/* B529EC 800DB84C 01EE7821 */ addu $t7, $t7, $t6 -/* B529F0 800DB850 000F7880 */ sll $t7, $t7, 2 -/* B529F4 800DB854 01EE7823 */ subu $t7, $t7, $t6 -/* B529F8 800DB858 001968C0 */ sll $t5, $t9, 3 -/* B529FC 800DB85C 000F7880 */ sll $t7, $t7, 2 -/* B52A00 800DB860 01B96823 */ subu $t5, $t5, $t9 -/* B52A04 800DB864 000D6880 */ sll $t5, $t5, 2 -/* B52A08 800DB868 00CFC021 */ addu $t8, $a2, $t7 -/* B52A0C 800DB86C 030D1821 */ addu $v1, $t8, $t5 -/* B52A10 800DB870 94620058 */ lhu $v0, 0x58($v1) -/* B52A14 800DB874 00A07825 */ move $t7, $a1 -/* B52A18 800DB878 8C68004C */ lw $t0, 0x4c($v1) -/* B52A1C 800DB87C 000273C0 */ sll $t6, $v0, 0xf -/* B52A20 800DB880 01C5001A */ div $zero, $t6, $a1 -/* B52A24 800DB884 0000C812 */ mflo $t9 -/* B52A28 800DB888 A4790054 */ sh $t9, 0x54($v1) -/* B52A2C 800DB88C 8FB80034 */ lw $t8, 0x34($sp) -/* B52A30 800DB890 31090007 */ andi $t1, $t0, 7 -/* B52A34 800DB894 00094840 */ sll $t1, $t1, 1 -/* B52A38 800DB898 00186BC0 */ sll $t5, $t8, 0xf -/* B52A3C 800DB89C 01A2001A */ div $zero, $t5, $v0 -/* B52A40 800DB8A0 00094C00 */ sll $t1, $t1, 0x10 -/* B52A44 800DB8A4 00094C03 */ sra $t1, $t1, 0x10 -/* B52A48 800DB8A8 24630040 */ addiu $v1, $v1, 0x40 -/* B52A4C 800DB8AC 15E00002 */ bnez $t7, .L800DB8B8 -/* B52A50 800DB8B0 00000000 */ nop -/* B52A54 800DB8B4 0007000D */ break 7 -.L800DB8B8: -/* B52A58 800DB8B8 2401FFFF */ li $at, -1 -/* B52A5C 800DB8BC 15E10004 */ bne $t7, $at, .L800DB8D0 -/* B52A60 800DB8C0 3C018000 */ lui $at, 0x8000 -/* B52A64 800DB8C4 15C10002 */ bne $t6, $at, .L800DB8D0 -/* B52A68 800DB8C8 00000000 */ nop -/* B52A6C 800DB8CC 0006000D */ break 6 -.L800DB8D0: -/* B52A70 800DB8D0 846F0010 */ lh $t7, 0x10($v1) -/* B52A74 800DB8D4 14400002 */ bnez $v0, .L800DB8E0 -/* B52A78 800DB8D8 00000000 */ nop -/* B52A7C 800DB8DC 0007000D */ break 7 -.L800DB8E0: -/* B52A80 800DB8E0 2401FFFF */ li $at, -1 -/* B52A84 800DB8E4 14410004 */ bne $v0, $at, .L800DB8F8 -/* B52A88 800DB8E8 3C018000 */ lui $at, 0x8000 -/* B52A8C 800DB8EC 15A10002 */ bne $t5, $at, .L800DB8F8 -/* B52A90 800DB8F0 00000000 */ nop -/* B52A94 800DB8F4 0006000D */ break 6 -.L800DB8F8: -/* B52A98 800DB8F8 012F5021 */ addu $t2, $t1, $t7 -/* B52A9C 800DB8FC 00007012 */ mflo $t6 -/* B52AA0 800DB900 254A000F */ addiu $t2, $t2, 0xf -/* B52AA4 800DB904 A46E0016 */ sh $t6, 0x16($v1) -/* B52AA8 800DB908 314AFFF0 */ andi $t2, $t2, 0xfff0 -/* B52AAC 800DB90C 2401FFF0 */ li $at, -16 -/* B52AB0 800DB910 000A5400 */ sll $t2, $t2, 0x10 -/* B52AB4 800DB914 000A5403 */ sra $t2, $t2, 0x10 -/* B52AB8 800DB918 A7AA0028 */ sh $t2, 0x28($sp) -/* B52ABC 800DB91C A7A9002A */ sh $t1, 0x2a($sp) -/* B52AC0 800DB920 AFA3002C */ sw $v1, 0x2c($sp) -/* B52AC4 800DB924 AFB00010 */ sw $s0, 0x10($sp) -/* B52AC8 800DB928 240503E0 */ li $a1, 992 -/* B52ACC 800DB92C 05210003 */ bgez $t1, .L800DB93C -/* B52AD0 800DB930 0009C843 */ sra $t9, $t1, 1 -/* B52AD4 800DB934 25210001 */ addiu $at, $t1, 1 -/* B52AD8 800DB938 0001C843 */ sra $t9, $at, 1 -.L800DB93C: -/* B52ADC 800DB93C 01193023 */ subu $a2, $t0, $t9 -/* B52AE0 800DB940 30C6FFFF */ andi $a2, $a2, 0xffff -/* B52AE4 800DB944 0C037002 */ jal func_800DC008 -/* B52AE8 800DB948 240701A0 */ li $a3, 416 -/* B52AEC 800DB94C 8FA3002C */ lw $v1, 0x2c($sp) -/* B52AF0 800DB950 87AA0028 */ lh $t2, 0x28($sp) -/* B52AF4 800DB954 87A9002A */ lh $t1, 0x2a($sp) -/* B52AF8 800DB958 84780012 */ lh $t8, 0x12($v1) -/* B52AFC 800DB95C 254503E0 */ addiu $a1, $t2, 0x3e0 -/* B52B00 800DB960 00402025 */ move $a0, $v0 -/* B52B04 800DB964 1300000A */ beqz $t8, .L800DB990 -/* B52B08 800DB968 30A5FFFF */ andi $a1, $a1, 0xffff -/* B52B0C 800DB96C 240D01A0 */ li $t5, 416 -/* B52B10 800DB970 01AA3823 */ subu $a3, $t5, $t2 -/* B52B14 800DB974 00003025 */ move $a2, $zero -/* B52B18 800DB978 AFB00010 */ sw $s0, 0x10($sp) -/* B52B1C 800DB97C AFA3002C */ sw $v1, 0x2c($sp) -/* B52B20 800DB980 0C037002 */ jal func_800DC008 -/* B52B24 800DB984 A7A9002A */ sh $t1, 0x2a($sp) -/* B52B28 800DB988 8FA3002C */ lw $v1, 0x2c($sp) -/* B52B2C 800DB98C 87A9002A */ lh $t1, 0x2a($sp) -.L800DB990: -/* B52B30 800DB990 252E03E0 */ addiu $t6, $t1, 0x3e0 -/* B52B34 800DB994 3C0B0800 */ lui $t3, 0x800 -/* B52B38 800DB998 31CFFFFF */ andi $t7, $t6, 0xffff -/* B52B3C 800DB99C 01EBC825 */ or $t9, $t7, $t3 -/* B52B40 800DB9A0 AC590000 */ sw $t9, ($v0) -/* B52B44 800DB9A4 8FA60034 */ lw $a2, 0x34($sp) -/* B52B48 800DB9A8 3C010C80 */ lui $at, 0xc80 -/* B52B4C 800DB9AC 3C0C0500 */ lui $t4, 0x500 -/* B52B50 800DB9B0 00063040 */ sll $a2, $a2, 1 -/* B52B54 800DB9B4 30C6FFFF */ andi $a2, $a2, 0xffff -/* B52B58 800DB9B8 00C1C025 */ or $t8, $a2, $at -/* B52B5C 800DB9BC AC580004 */ sw $t8, 4($v0) -/* B52B60 800DB9C0 920E0000 */ lbu $t6, ($s0) -/* B52B64 800DB9C4 946D0014 */ lhu $t5, 0x14($v1) -/* B52B68 800DB9C8 24470008 */ addiu $a3, $v0, 8 -/* B52B6C 800DB9CC 000E7C00 */ sll $t7, $t6, 0x10 -/* B52B70 800DB9D0 01ECC825 */ or $t9, $t7, $t4 -/* B52B74 800DB9D4 032D7025 */ or $t6, $t9, $t5 -/* B52B78 800DB9D8 ACEE0000 */ sw $t6, ($a3) -/* B52B7C 800DB9DC 8E0F0030 */ lw $t7, 0x30($s0) -/* B52B80 800DB9E0 25380580 */ addiu $t8, $t1, 0x580 -/* B52B84 800DB9E4 24E80008 */ addiu $t0, $a3, 8 -/* B52B88 800DB9E8 3319FFFF */ andi $t9, $t8, 0xffff -/* B52B8C 800DB9EC 3C010E20 */ lui $at, 0xe20 -/* B52B90 800DB9F0 ACEF0004 */ sw $t7, 4($a3) -/* B52B94 800DB9F4 00C17025 */ or $t6, $a2, $at -/* B52B98 800DB9F8 032B6825 */ or $t5, $t9, $t3 -/* B52B9C 800DB9FC AD0D0000 */ sw $t5, ($t0) -/* B52BA0 800DBA00 AD0E0004 */ sw $t6, 4($t0) -/* B52BA4 800DBA04 92180000 */ lbu $t8, ($s0) -/* B52BA8 800DBA08 946F0014 */ lhu $t7, 0x14($v1) -/* B52BAC 800DBA0C 250A0008 */ addiu $t2, $t0, 8 -/* B52BB0 800DBA10 0018CC00 */ sll $t9, $t8, 0x10 -/* B52BB4 800DBA14 032C6825 */ or $t5, $t9, $t4 -/* B52BB8 800DBA18 01AFC025 */ or $t8, $t5, $t7 -/* B52BBC 800DBA1C AD580000 */ sw $t8, ($t2) -/* B52BC0 800DBA20 8E190034 */ lw $t9, 0x34($s0) -/* B52BC4 800DBA24 25420008 */ addiu $v0, $t2, 8 -/* B52BC8 800DBA28 AD590004 */ sw $t9, 4($t2) -/* B52BCC 800DBA2C 8FBF0024 */ lw $ra, 0x24($sp) -/* B52BD0 800DBA30 8FB00020 */ lw $s0, 0x20($sp) -/* B52BD4 800DBA34 27BD0030 */ addiu $sp, $sp, 0x30 -/* B52BD8 800DBA38 03E00008 */ jr $ra -/* B52BDC 800DBA3C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBA40.s b/asm/non_matchings/code/code_800DACC0/func_800DBA40.s deleted file mode 100644 index c4f9e1b87b..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBA40.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_800DBA40 -/* B52BE0 800DBA40 8CCE0270 */ lw $t6, 0x270($a2) -/* B52BE4 800DBA44 00801025 */ move $v0, $a0 -/* B52BE8 800DBA48 30AFFFFF */ andi $t7, $a1, 0xffff -/* B52BEC 800DBA4C 11C00010 */ beqz $t6, .L800DBA90 -/* B52BF0 800DBA50 3C010702 */ lui $at, 0x702 -/* B52BF4 800DBA54 01E1C025 */ or $t8, $t7, $at -/* B52BF8 800DBA58 AC580000 */ sw $t8, ($v0) -/* B52BFC 800DBA5C 8CD90270 */ lw $t9, 0x270($a2) -/* B52C00 800DBA60 3C010700 */ lui $at, 0x700 -/* B52C04 800DBA64 24840008 */ addiu $a0, $a0, 8 -/* B52C08 800DBA68 AC590004 */ sw $t9, 4($v0) -/* B52C0C 800DBA6C 90C90000 */ lbu $t1, ($a2) -/* B52C10 800DBA70 00801825 */ move $v1, $a0 -/* B52C14 800DBA74 24840008 */ addiu $a0, $a0, 8 -/* B52C18 800DBA78 00095400 */ sll $t2, $t1, 0x10 -/* B52C1C 800DBA7C 01415825 */ or $t3, $t2, $at -/* B52C20 800DBA80 356C0C80 */ ori $t4, $t3, 0xc80 -/* B52C24 800DBA84 AC6C0000 */ sw $t4, ($v1) -/* B52C28 800DBA88 8CCD0278 */ lw $t5, 0x278($a2) -/* B52C2C 800DBA8C AC6D0004 */ sw $t5, 4($v1) -.L800DBA90: -/* B52C30 800DBA90 8CCE0274 */ lw $t6, 0x274($a2) -/* B52C34 800DBA94 00801025 */ move $v0, $a0 -/* B52C38 800DBA98 30AFFFFF */ andi $t7, $a1, 0xffff -/* B52C3C 800DBA9C 11C00010 */ beqz $t6, .L800DBAE0 -/* B52C40 800DBAA0 3C010702 */ lui $at, 0x702 -/* B52C44 800DBAA4 01E1C025 */ or $t8, $t7, $at -/* B52C48 800DBAA8 AC580000 */ sw $t8, ($v0) -/* B52C4C 800DBAAC 8CD90274 */ lw $t9, 0x274($a2) -/* B52C50 800DBAB0 3C010700 */ lui $at, 0x700 -/* B52C54 800DBAB4 24840008 */ addiu $a0, $a0, 8 -/* B52C58 800DBAB8 AC590004 */ sw $t9, 4($v0) -/* B52C5C 800DBABC 90C90000 */ lbu $t1, ($a2) -/* B52C60 800DBAC0 00801825 */ move $v1, $a0 -/* B52C64 800DBAC4 24840008 */ addiu $a0, $a0, 8 -/* B52C68 800DBAC8 00095400 */ sll $t2, $t1, 0x10 -/* B52C6C 800DBACC 01415825 */ or $t3, $t2, $at -/* B52C70 800DBAD0 356C0E20 */ ori $t4, $t3, 0xe20 -/* B52C74 800DBAD4 AC6C0000 */ sw $t4, ($v1) -/* B52C78 800DBAD8 8CCD027C */ lw $t5, 0x27c($a2) -/* B52C7C 800DBADC AC6D0004 */ sw $t5, 4($v1) -.L800DBAE0: -/* B52C80 800DBAE0 03E00008 */ jr $ra -/* B52C84 800DBAE4 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBAE8.s b/asm/non_matchings/code/code_800DACC0/func_800DBAE8.s deleted file mode 100644 index 037ceef4cb..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBAE8.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_800DBAE8 -/* B52C88 800DBAE8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B52C8C 800DBAEC AFBF0014 */ sw $ra, 0x14($sp) -/* B52C90 800DBAF0 AFA5002C */ sw $a1, 0x2c($sp) -/* B52C94 800DBAF4 AFA60030 */ sw $a2, 0x30($sp) -/* B52C98 800DBAF8 80AF0005 */ lb $t7, 5($a1) -/* B52C9C 800DBAFC 3C088017 */ lui $t0, %hi(gAudioContext) # $t0, 0x8017 -/* B52CA0 800DBB00 2508F180 */ addiu $t0, %lo(gAudioContext) # addiu $t0, $t0, -0xe80 -/* B52CA4 800DBB04 000FC080 */ sll $t8, $t7, 2 -/* B52CA8 800DBB08 030FC023 */ subu $t8, $t8, $t7 -/* B52CAC 800DBB0C 0018C080 */ sll $t8, $t8, 2 -/* B52CB0 800DBB10 030FC023 */ subu $t8, $t8, $t7 -/* B52CB4 800DBB14 0018C0C0 */ sll $t8, $t8, 3 -/* B52CB8 800DBB18 030FC021 */ addu $t8, $t8, $t7 -/* B52CBC 800DBB1C 0018C0C0 */ sll $t8, $t8, 3 -/* B52CC0 800DBB20 27190018 */ addiu $t9, $t8, 0x18 -/* B52CC4 800DBB24 03283821 */ addu $a3, $t9, $t0 -/* B52CC8 800DBB28 90E90004 */ lbu $t1, 4($a3) -/* B52CCC 800DBB2C 24010001 */ li $at, 1 -/* B52CD0 800DBB30 00E02825 */ move $a1, $a3 -/* B52CD4 800DBB34 15210012 */ bne $t1, $at, .L800DBB80 -/* B52CD8 800DBB38 87A60032 */ lh $a2, 0x32($sp) -/* B52CDC 800DBB3C AFA6001C */ sw $a2, 0x1c($sp) -/* B52CE0 800DBB40 0C036CCC */ jal func_800DB330 -/* B52CE4 800DBB44 AFA70024 */ sw $a3, 0x24($sp) -/* B52CE8 800DBB48 8FAA002C */ lw $t2, 0x2c($sp) -/* B52CEC 800DBB4C 3C010C34 */ lui $at, 0xc34 -/* B52CF0 800DBB50 3C0E0C80 */ lui $t6, (0x0C8003E0 >> 16) # lui $t6, 0xc80 -/* B52CF4 800DBB54 854B0008 */ lh $t3, 8($t2) -/* B52CF8 800DBB58 8FA6001C */ lw $a2, 0x1c($sp) -/* B52CFC 800DBB5C 8FA50024 */ lw $a1, 0x24($sp) -/* B52D00 800DBB60 316CFFFF */ andi $t4, $t3, 0xffff -/* B52D04 800DBB64 01816825 */ or $t5, $t4, $at -/* B52D08 800DBB68 35CE03E0 */ ori $t6, (0x0C8003E0 & 0xFFFF) # ori $t6, $t6, 0x3e0 -/* B52D0C 800DBB6C AC4E0004 */ sw $t6, 4($v0) -/* B52D10 800DBB70 AC4D0000 */ sw $t5, ($v0) -/* B52D14 800DBB74 0C036CF6 */ jal func_800DB3D8 -/* B52D18 800DBB78 24440008 */ addiu $a0, $v0, 8 -/* B52D1C 800DBB7C 00402025 */ move $a0, $v0 -.L800DBB80: -/* B52D20 800DBB80 8FBF0014 */ lw $ra, 0x14($sp) -/* B52D24 800DBB84 27BD0028 */ addiu $sp, $sp, 0x28 -/* B52D28 800DBB88 00801025 */ move $v0, $a0 -/* B52D2C 800DBB8C 03E00008 */ jr $ra -/* B52D30 800DBB90 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBB94.s b/asm/non_matchings/code/code_800DACC0/func_800DBB94.s deleted file mode 100644 index 63f6356bff..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBB94.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBB94 -/* B52D34 800DBB94 03E00008 */ jr $ra -/* B52D38 800DBB98 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBB9C.s b/asm/non_matchings/code/code_800DACC0/func_800DBB9C.s deleted file mode 100644 index 017783028c..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBB9C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800DBB9C -/* B52D3C 800DBB9C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B52D40 800DBBA0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B52D44 800DBBA4 00A17024 */ and $t6, $a1, $at -/* B52D48 800DBBA8 3C010200 */ lui $at, 0x200 -/* B52D4C 800DBBAC 01C17825 */ or $t7, $t6, $at -/* B52D50 800DBBB0 AC8F0000 */ sw $t7, ($a0) -/* B52D54 800DBBB4 03E00008 */ jr $ra -/* B52D58 800DBBB8 AC860004 */ sw $a2, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBBBC.s b/asm/non_matchings/code/code_800DACC0/func_800DBBBC.s deleted file mode 100644 index 50374ce0f9..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBBBC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBBBC -/* B52D5C 800DBBBC 03E00008 */ jr $ra -/* B52D60 800DBBC0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBBC4.s b/asm/non_matchings/code/code_800DACC0/func_800DBBC4.s deleted file mode 100644 index 2b1c5b8a62..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBBC4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBBC4 -/* B52D64 800DBBC4 03E00008 */ jr $ra -/* B52D68 800DBBC8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBBCC.s b/asm/non_matchings/code/code_800DACC0/func_800DBBCC.s deleted file mode 100644 index 78b99c022a..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBBCC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBBCC -/* B52D6C 800DBBCC 03E00008 */ jr $ra -/* B52D70 800DBBD0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBBD4.s b/asm/non_matchings/code/code_800DACC0/func_800DBBD4.s deleted file mode 100644 index 71076a77aa..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBBD4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800DBBD4 -/* B52D74 800DBBD4 30AE00FF */ andi $t6, $a1, 0xff -/* B52D78 800DBBD8 000E7C00 */ sll $t7, $t6, 0x10 -/* B52D7C 800DBBDC 3C010C00 */ lui $at, 0xc00 -/* B52D80 800DBBE0 01E1C025 */ or $t8, $t7, $at -/* B52D84 800DBBE4 30D9FFFF */ andi $t9, $a2, 0xffff -/* B52D88 800DBBE8 03194025 */ or $t0, $t8, $t9 -/* B52D8C 800DBBEC AC880000 */ sw $t0, ($a0) -/* B52D90 800DBBF0 8FAB0010 */ lw $t3, 0x10($sp) -/* B52D94 800DBBF4 00075400 */ sll $t2, $a3, 0x10 -/* B52D98 800DBBF8 316CFFFF */ andi $t4, $t3, 0xffff -/* B52D9C 800DBBFC 014C6825 */ or $t5, $t2, $t4 -/* B52DA0 800DBC00 03E00008 */ jr $ra -/* B52DA4 800DBC04 AC8D0004 */ sw $t5, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC08.s b/asm/non_matchings/code/code_800DACC0/func_800DBC08.s deleted file mode 100644 index 8159973b16..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC08.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC08 -/* B52DA8 800DBC08 03E00008 */ jr $ra -/* B52DAC 800DBC0C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC10.s b/asm/non_matchings/code/code_800DACC0/func_800DBC10.s deleted file mode 100644 index 6f0884bf0d..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC10.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC10 -/* B52DB0 800DBC10 03E00008 */ jr $ra -/* B52DB4 800DBC14 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC18.s b/asm/non_matchings/code/code_800DACC0/func_800DBC18.s deleted file mode 100644 index 4a484b75b7..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC18.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC18 -/* B52DB8 800DBC18 03E00008 */ jr $ra -/* B52DBC 800DBC1C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC20.s b/asm/non_matchings/code/code_800DACC0/func_800DBC20.s deleted file mode 100644 index 2794aac91b..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC20.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800DBC20 -/* B52DC0 800DBC20 30AE00FF */ andi $t6, $a1, 0xff -/* B52DC4 800DBC24 000E7C00 */ sll $t7, $t6, 0x10 -/* B52DC8 800DBC28 3C010800 */ lui $at, 0x800 -/* B52DCC 800DBC2C 01E1C025 */ or $t8, $t7, $at -/* B52DD0 800DBC30 30D9FFFF */ andi $t9, $a2, 0xffff -/* B52DD4 800DBC34 03194025 */ or $t0, $t8, $t9 -/* B52DD8 800DBC38 AC880000 */ sw $t0, ($a0) -/* B52DDC 800DBC3C 8FAB0010 */ lw $t3, 0x10($sp) -/* B52DE0 800DBC40 00075400 */ sll $t2, $a3, 0x10 -/* B52DE4 800DBC44 316CFFFF */ andi $t4, $t3, 0xffff -/* B52DE8 800DBC48 014C6825 */ or $t5, $t2, $t4 -/* B52DEC 800DBC4C 03E00008 */ jr $ra -/* B52DF0 800DBC50 AC8D0004 */ sw $t5, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC54.s b/asm/non_matchings/code/code_800DACC0/func_800DBC54.s deleted file mode 100644 index de6f692f7b..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC54.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC54 -/* B52DF4 800DBC54 03E00008 */ jr $ra -/* B52DF8 800DBC58 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC5C.s b/asm/non_matchings/code/code_800DACC0/func_800DBC5C.s deleted file mode 100644 index 1ff1c87593..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC5C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC5C -/* B52DFC 800DBC5C 03E00008 */ jr $ra -/* B52E00 800DBC60 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC64.s b/asm/non_matchings/code/code_800DACC0/func_800DBC64.s deleted file mode 100644 index 58b376a8ec..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC64.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800DBC64 -/* B52E04 800DBC64 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B52E08 800DBC68 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B52E0C 800DBC6C 00A17024 */ and $t6, $a1, $at -/* B52E10 800DBC70 3C010A00 */ lui $at, 0xa00 -/* B52E14 800DBC74 0006CC00 */ sll $t9, $a2, 0x10 -/* B52E18 800DBC78 30E8FFFF */ andi $t0, $a3, 0xffff -/* B52E1C 800DBC7C 01C17825 */ or $t7, $t6, $at -/* B52E20 800DBC80 03284825 */ or $t1, $t9, $t0 -/* B52E24 800DBC84 AC8F0000 */ sw $t7, ($a0) -/* B52E28 800DBC88 03E00008 */ jr $ra -/* B52E2C 800DBC8C AC890004 */ sw $t1, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC90.s b/asm/non_matchings/code/code_800DACC0/func_800DBC90.s deleted file mode 100644 index f6e542b194..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC90.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC90 -/* B52E30 800DBC90 03E00008 */ jr $ra -/* B52E34 800DBC94 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBC98.s b/asm/non_matchings/code/code_800DACC0/func_800DBC98.s deleted file mode 100644 index 246d1466d8..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBC98.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBC98 -/* B52E38 800DBC98 03E00008 */ jr $ra -/* B52E3C 800DBC9C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBCA0.s b/asm/non_matchings/code/code_800DACC0/func_800DBCA0.s deleted file mode 100644 index 952e65a92f..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBCA0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBCA0 -/* B52E40 800DBCA0 03E00008 */ jr $ra -/* B52E44 800DBCA4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBCA8.s b/asm/non_matchings/code/code_800DACC0/func_800DBCA8.s deleted file mode 100644 index a6ffbce793..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBCA8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBCA8 -/* B52E48 800DBCA8 03E00008 */ jr $ra -/* B52E4C 800DBCAC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBCB0.s b/asm/non_matchings/code/code_800DACC0/func_800DBCB0.s deleted file mode 100644 index c4841a8ed2..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBCB0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800DBCB0 -/* B52E50 800DBCB0 30EEFFFF */ andi $t6, $a3, 0xffff -/* B52E54 800DBCB4 3C011100 */ lui $at, 0x1100 -/* B52E58 800DBCB8 0005CC00 */ sll $t9, $a1, 0x10 -/* B52E5C 800DBCBC 30C8FFFF */ andi $t0, $a2, 0xffff -/* B52E60 800DBCC0 01C17825 */ or $t7, $t6, $at -/* B52E64 800DBCC4 03284825 */ or $t1, $t9, $t0 -/* B52E68 800DBCC8 AC8F0000 */ sw $t7, ($a0) -/* B52E6C 800DBCCC 03E00008 */ jr $ra -/* B52E70 800DBCD0 AC890004 */ sw $t1, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBCD4.s b/asm/non_matchings/code/code_800DACC0/func_800DBCD4.s deleted file mode 100644 index 917a232e64..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBCD4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800DBCD4 -/* B52E74 800DBCD4 30AE00FF */ andi $t6, $a1, 0xff -/* B52E78 800DBCD8 000E7C00 */ sll $t7, $t6, 0x10 -/* B52E7C 800DBCDC 3C011200 */ lui $at, 0x1200 -/* B52E80 800DBCE0 01E1C025 */ or $t8, $t7, $at -/* B52E84 800DBCE4 30D9FFFF */ andi $t9, $a2, 0xffff -/* B52E88 800DBCE8 03194025 */ or $t0, $t8, $t9 -/* B52E8C 800DBCEC AC880000 */ sw $t0, ($a0) -/* B52E90 800DBCF0 8FAB0010 */ lw $t3, 0x10($sp) -/* B52E94 800DBCF4 00075400 */ sll $t2, $a3, 0x10 -/* B52E98 800DBCF8 316CFFFF */ andi $t4, $t3, 0xffff -/* B52E9C 800DBCFC 014C6825 */ or $t5, $t2, $t4 -/* B52EA0 800DBD00 03E00008 */ jr $ra -/* B52EA4 800DBD04 AC8D0004 */ sw $t5, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD08.s b/asm/non_matchings/code/code_800DACC0/func_800DBD08.s deleted file mode 100644 index 0f72b6292a..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD08.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBD08 -/* B52EA8 800DBD08 03E00008 */ jr $ra -/* B52EAC 800DBD0C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD10.s b/asm/non_matchings/code/code_800DACC0/func_800DBD10.s deleted file mode 100644 index 38055a42de..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD10.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800DBD10 -/* B52EB0 800DBD10 00067103 */ sra $t6, $a2, 4 -/* B52EB4 800DBD14 31CF00FF */ andi $t7, $t6, 0xff -/* B52EB8 800DBD18 000FC400 */ sll $t8, $t7, 0x10 -/* B52EBC 800DBD1C 3C011400 */ lui $at, 0x1400 -/* B52EC0 800DBD20 0301C825 */ or $t9, $t8, $at -/* B52EC4 800DBD24 30A8FFFF */ andi $t0, $a1, 0xffff -/* B52EC8 800DBD28 03284825 */ or $t1, $t9, $t0 -/* B52ECC 800DBD2C AC890000 */ sw $t1, ($a0) -/* B52ED0 800DBD30 03E00008 */ jr $ra -/* B52ED4 800DBD34 AC870004 */ sw $a3, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD38.s b/asm/non_matchings/code/code_800DACC0/func_800DBD38.s deleted file mode 100644 index d6d428394a..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD38.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800DBD38 -/* B52ED8 800DBD38 00067103 */ sra $t6, $a2, 4 -/* B52EDC 800DBD3C 31CF00FF */ andi $t7, $t6, 0xff -/* B52EE0 800DBD40 000FC400 */ sll $t8, $t7, 0x10 -/* B52EE4 800DBD44 3C011500 */ lui $at, 0x1500 -/* B52EE8 800DBD48 0301C825 */ or $t9, $t8, $at -/* B52EEC 800DBD4C 30A8FFFF */ andi $t0, $a1, 0xffff -/* B52EF0 800DBD50 03284825 */ or $t1, $t9, $t0 -/* B52EF4 800DBD54 AC890000 */ sw $t1, ($a0) -/* B52EF8 800DBD58 03E00008 */ jr $ra -/* B52EFC 800DBD5C AC870004 */ sw $a3, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD60.s b/asm/non_matchings/code/code_800DACC0/func_800DBD60.s deleted file mode 100644 index e90d5e113d..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD60.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800DBD60 -/* B52F00 800DBD60 0005C400 */ sll $t8, $a1, 0x10 -/* B52F04 800DBD64 30D9FFFF */ andi $t9, $a2, 0xffff -/* B52F08 800DBD68 3C0E1600 */ lui $t6, 0x1600 -/* B52F0C 800DBD6C 03194025 */ or $t0, $t8, $t9 -/* B52F10 800DBD70 AC8E0000 */ sw $t6, ($a0) -/* B52F14 800DBD74 03E00008 */ jr $ra -/* B52F18 800DBD78 AC880004 */ sw $t0, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD7C.s b/asm/non_matchings/code/code_800DACC0/func_800DBD7C.s deleted file mode 100644 index 4b9f1b81d2..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD7C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBD7C -/* B52F1C 800DBD7C 03E00008 */ jr $ra -/* B52F20 800DBD80 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD84.s b/asm/non_matchings/code/code_800DACC0/func_800DBD84.s deleted file mode 100644 index c13cbc67d2..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD84.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBD84 -/* B52F24 800DBD84 03E00008 */ jr $ra -/* B52F28 800DBD88 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD8C.s b/asm/non_matchings/code/code_800DACC0/func_800DBD8C.s deleted file mode 100644 index b7ac2618d3..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD8C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBD8C -/* B52F2C 800DBD8C 03E00008 */ jr $ra -/* B52F30 800DBD90 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBD94.s b/asm/non_matchings/code/code_800DACC0/func_800DBD94.s deleted file mode 100644 index f7dc2ec0b9..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBD94.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800DBD94 -/* B52F34 800DBD94 30AE00FF */ andi $t6, $a1, 0xff -/* B52F38 800DBD98 000E7C00 */ sll $t7, $t6, 0x10 -/* B52F3C 800DBD9C 3C011700 */ lui $at, 0x1700 -/* B52F40 800DBDA0 01E1C025 */ or $t8, $t7, $at -/* B52F44 800DBDA4 AC980000 */ sw $t8, ($a0) -/* B52F48 800DBDA8 03E00008 */ jr $ra -/* B52F4C 800DBDAC AC860004 */ sw $a2, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBDB0.s b/asm/non_matchings/code/code_800DACC0/func_800DBDB0.s deleted file mode 100644 index 29ea16f481..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBDB0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800DBDB0 -/* B52F50 800DBDB0 8FB90010 */ lw $t9, 0x10($sp) -/* B52F54 800DBDB4 30AE00FF */ andi $t6, $a1, 0xff -/* B52F58 800DBDB8 000E7C00 */ sll $t7, $t6, 0x10 -/* B52F5C 800DBDBC 3C010E00 */ lui $at, 0xe00 -/* B52F60 800DBDC0 01E1C025 */ or $t8, $t7, $at -/* B52F64 800DBDC4 00065C00 */ sll $t3, $a2, 0x10 -/* B52F68 800DBDC8 30ECFFFF */ andi $t4, $a3, 0xffff -/* B52F6C 800DBDCC 3328FFFF */ andi $t0, $t9, 0xffff -/* B52F70 800DBDD0 03084825 */ or $t1, $t8, $t0 -/* B52F74 800DBDD4 016C6825 */ or $t5, $t3, $t4 -/* B52F78 800DBDD8 AC890000 */ sw $t1, ($a0) -/* B52F7C 800DBDDC 03E00008 */ jr $ra -/* B52F80 800DBDE0 AC8D0004 */ sw $t5, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBDE4.s b/asm/non_matchings/code/code_800DACC0/func_800DBDE4.s deleted file mode 100644 index 2d59a4ce44..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBDE4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800DBDE4 -/* B52F84 800DBDE4 8FAE0010 */ lw $t6, 0x10($sp) -/* B52F88 800DBDE8 3C011900 */ lui $at, 0x1900 -/* B52F8C 800DBDEC 30E8FFFF */ andi $t0, $a3, 0xffff -/* B52F90 800DBDF0 31CF00FF */ andi $t7, $t6, 0xff -/* B52F94 800DBDF4 000FC400 */ sll $t8, $t7, 0x10 -/* B52F98 800DBDF8 0301C825 */ or $t9, $t8, $at -/* B52F9C 800DBDFC 00055C00 */ sll $t3, $a1, 0x10 -/* B52FA0 800DBE00 30CCFFFF */ andi $t4, $a2, 0xffff -/* B52FA4 800DBE04 03284825 */ or $t1, $t9, $t0 -/* B52FA8 800DBE08 016C6825 */ or $t5, $t3, $t4 -/* B52FAC 800DBE0C AC890000 */ sw $t1, ($a0) -/* B52FB0 800DBE10 03E00008 */ jr $ra -/* B52FB4 800DBE14 AC8D0004 */ sw $t5, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE18.s b/asm/non_matchings/code/code_800DACC0/func_800DBE18.s deleted file mode 100644 index 836444b673..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE18.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE18 -/* B52FB8 800DBE18 03E00008 */ jr $ra -/* B52FBC 800DBE1C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE20.s b/asm/non_matchings/code/code_800DACC0/func_800DBE20.s deleted file mode 100644 index b4f40f1de8..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE20.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE20 -/* B52FC0 800DBE20 03E00008 */ jr $ra -/* B52FC4 800DBE24 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE28.s b/asm/non_matchings/code/code_800DACC0/func_800DBE28.s deleted file mode 100644 index 7018b67171..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE28.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE28 -/* B52FC8 800DBE28 03E00008 */ jr $ra -/* B52FCC 800DBE2C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE30.s b/asm/non_matchings/code/code_800DACC0/func_800DBE30.s deleted file mode 100644 index b35733fb04..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE30.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE30 -/* B52FD0 800DBE30 03E00008 */ jr $ra -/* B52FD4 800DBE34 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE38.s b/asm/non_matchings/code/code_800DACC0/func_800DBE38.s deleted file mode 100644 index 3a8a6fee55..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE38.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800DBE38 -/* B52FD8 800DBE38 30EEFFFF */ andi $t6, $a3, 0xffff -/* B52FDC 800DBE3C 3C010300 */ lui $at, 0x300 -/* B52FE0 800DBE40 0005CC00 */ sll $t9, $a1, 0x10 -/* B52FE4 800DBE44 30C8FFFF */ andi $t0, $a2, 0xffff -/* B52FE8 800DBE48 01C17825 */ or $t7, $t6, $at -/* B52FEC 800DBE4C 03284825 */ or $t1, $t9, $t0 -/* B52FF0 800DBE50 AC8F0000 */ sw $t7, ($a0) -/* B52FF4 800DBE54 03E00008 */ jr $ra -/* B52FF8 800DBE58 AC890004 */ sw $t1, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE5C.s b/asm/non_matchings/code/code_800DACC0/func_800DBE5C.s deleted file mode 100644 index c75629e0d5..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE5C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE5C -/* B52FFC 800DBE5C 03E00008 */ jr $ra -/* B53000 800DBE60 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE64.s b/asm/non_matchings/code/code_800DACC0/func_800DBE64.s deleted file mode 100644 index 1f96cbcd18..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE64.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE64 -/* B53004 800DBE64 03E00008 */ jr $ra -/* B53008 800DBE68 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE6C.s b/asm/non_matchings/code/code_800DACC0/func_800DBE6C.s deleted file mode 100644 index 59c762ecbd..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE6C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800DBE6C -/* B5300C 800DBE6C 03E00008 */ jr $ra -/* B53010 800DBE70 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE74.s b/asm/non_matchings/code/code_800DACC0/func_800DBE74.s deleted file mode 100644 index 188a90d9a3..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE74.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800DBE74 -/* B53014 800DBE74 30AE00FF */ andi $t6, $a1, 0xff -/* B53018 800DBE78 000E7C00 */ sll $t7, $t6, 0x10 -/* B5301C 800DBE7C 3C010700 */ lui $at, 0x700 -/* B53020 800DBE80 01E1C025 */ or $t8, $t7, $at -/* B53024 800DBE84 30D9FFFF */ andi $t9, $a2, 0xffff -/* B53028 800DBE88 03194025 */ or $t0, $t8, $t9 -/* B5302C 800DBE8C AC880000 */ sw $t0, ($a0) -/* B53030 800DBE90 03E00008 */ jr $ra -/* B53034 800DBE94 AC870004 */ sw $a3, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBE98.s b/asm/non_matchings/code/code_800DACC0/func_800DBE98.s deleted file mode 100644 index de9f4ba746..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBE98.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800DBE98 -/* B53038 800DBE98 30AEFFFF */ andi $t6, $a1, 0xffff -/* B5303C 800DBE9C 3C010702 */ lui $at, 0x702 -/* B53040 800DBEA0 01C17825 */ or $t7, $t6, $at -/* B53044 800DBEA4 AC8F0000 */ sw $t7, ($a0) -/* B53048 800DBEA8 03E00008 */ jr $ra -/* B5304C 800DBEAC AC860004 */ sw $a2, 4($a0) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBEB0.s b/asm/non_matchings/code/code_800DACC0/func_800DBEB0.s deleted file mode 100644 index d3acb280c9..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBEB0.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_800DBEB0 -/* B53050 800DBEB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B53054 800DBEB4 AFBF001C */ sw $ra, 0x1c($sp) -/* B53058 800DBEB8 AFA5002C */ sw $a1, 0x2c($sp) -/* B5305C 800DBEBC AFA60030 */ sw $a2, 0x30($sp) -/* B53060 800DBEC0 AFA70034 */ sw $a3, 0x34($sp) -/* B53064 800DBEC4 90CF0003 */ lbu $t7, 3($a2) -/* B53068 800DBEC8 87A80036 */ lh $t0, 0x36($sp) -/* B5306C 800DBECC 00C07025 */ move $t6, $a2 -/* B53070 800DBED0 000FC0C0 */ sll $t8, $t7, 3 -/* B53074 800DBED4 030FC021 */ addu $t8, $t8, $t7 -/* B53078 800DBED8 0018C080 */ sll $t8, $t8, 2 -/* B5307C 800DBEDC 030FC023 */ subu $t8, $t8, $t7 -/* B53080 800DBEE0 000848C0 */ sll $t1, $t0, 3 -/* B53084 800DBEE4 0018C080 */ sll $t8, $t8, 2 -/* B53088 800DBEE8 01284823 */ subu $t1, $t1, $t0 -/* B5308C 800DBEEC 00094880 */ sll $t1, $t1, 2 -/* B53090 800DBEF0 00D8C821 */ addu $t9, $a2, $t8 -/* B53094 800DBEF4 03291821 */ addu $v1, $t9, $t1 -/* B53098 800DBEF8 24630040 */ addiu $v1, $v1, 0x40 -/* B5309C 800DBEFC 84670010 */ lh $a3, 0x10($v1) -/* B530A0 800DBF00 9466000E */ lhu $a2, 0xe($v1) -/* B530A4 800DBF04 AFA30024 */ sw $v1, 0x24($sp) -/* B530A8 800DBF08 AFAE0010 */ sw $t6, 0x10($sp) -/* B530AC 800DBF0C 0C037002 */ jal func_800DC008 -/* B530B0 800DBF10 24050C80 */ li $a1, 3200 -/* B530B4 800DBF14 8FA30024 */ lw $v1, 0x24($sp) -/* B530B8 800DBF18 00402025 */ move $a0, $v0 -/* B530BC 800DBF1C 8FAA0030 */ lw $t2, 0x30($sp) -/* B530C0 800DBF20 84670012 */ lh $a3, 0x12($v1) -/* B530C4 800DBF24 50E00009 */ beql $a3, $zero, .L800DBF4C -/* B530C8 800DBF28 8FBF001C */ lw $ra, 0x1c($sp) -/* B530CC 800DBF2C 84650010 */ lh $a1, 0x10($v1) -/* B530D0 800DBF30 AFAA0010 */ sw $t2, 0x10($sp) -/* B530D4 800DBF34 00003025 */ move $a2, $zero -/* B530D8 800DBF38 24A50C80 */ addiu $a1, $a1, 0xc80 -/* B530DC 800DBF3C 0C037002 */ jal func_800DC008 -/* B530E0 800DBF40 30A5FFFF */ andi $a1, $a1, 0xffff -/* B530E4 800DBF44 00402025 */ move $a0, $v0 -/* B530E8 800DBF48 8FBF001C */ lw $ra, 0x1c($sp) -.L800DBF4C: -/* B530EC 800DBF4C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B530F0 800DBF50 00801025 */ move $v0, $a0 -/* B530F4 800DBF54 03E00008 */ jr $ra -/* B530F8 800DBF58 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DBF5C.s b/asm/non_matchings/code/code_800DACC0/func_800DBF5C.s deleted file mode 100644 index 481a2ccb64..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DBF5C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_800DBF5C -/* B530FC 800DBF5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B53100 800DBF60 AFBF001C */ sw $ra, 0x1c($sp) -/* B53104 800DBF64 AFA5002C */ sw $a1, 0x2c($sp) -/* B53108 800DBF68 AFA60030 */ sw $a2, 0x30($sp) -/* B5310C 800DBF6C AFA70034 */ sw $a3, 0x34($sp) -/* B53110 800DBF70 90CF0003 */ lbu $t7, 3($a2) -/* B53114 800DBF74 87A80036 */ lh $t0, 0x36($sp) -/* B53118 800DBF78 00C07025 */ move $t6, $a2 -/* B5311C 800DBF7C 000FC0C0 */ sll $t8, $t7, 3 -/* B53120 800DBF80 030FC021 */ addu $t8, $t8, $t7 -/* B53124 800DBF84 0018C080 */ sll $t8, $t8, 2 -/* B53128 800DBF88 030FC023 */ subu $t8, $t8, $t7 -/* B5312C 800DBF8C 000848C0 */ sll $t1, $t0, 3 -/* B53130 800DBF90 0018C080 */ sll $t8, $t8, 2 -/* B53134 800DBF94 01284823 */ subu $t1, $t1, $t0 -/* B53138 800DBF98 00094880 */ sll $t1, $t1, 2 -/* B5313C 800DBF9C 00D8C821 */ addu $t9, $a2, $t8 -/* B53140 800DBFA0 03291821 */ addu $v1, $t9, $t1 -/* B53144 800DBFA4 24630158 */ addiu $v1, $v1, 0x158 -/* B53148 800DBFA8 84670010 */ lh $a3, 0x10($v1) -/* B5314C 800DBFAC 9466000E */ lhu $a2, 0xe($v1) -/* B53150 800DBFB0 AFA30024 */ sw $v1, 0x24($sp) -/* B53154 800DBFB4 AFAE0010 */ sw $t6, 0x10($sp) -/* B53158 800DBFB8 0C037002 */ jal func_800DC008 -/* B5315C 800DBFBC 24050C80 */ li $a1, 3200 -/* B53160 800DBFC0 8FA30024 */ lw $v1, 0x24($sp) -/* B53164 800DBFC4 00402025 */ move $a0, $v0 -/* B53168 800DBFC8 8FAA0030 */ lw $t2, 0x30($sp) -/* B5316C 800DBFCC 84670012 */ lh $a3, 0x12($v1) -/* B53170 800DBFD0 50E00009 */ beql $a3, $zero, .L800DBFF8 -/* B53174 800DBFD4 8FBF001C */ lw $ra, 0x1c($sp) -/* B53178 800DBFD8 84650010 */ lh $a1, 0x10($v1) -/* B5317C 800DBFDC AFAA0010 */ sw $t2, 0x10($sp) -/* B53180 800DBFE0 00003025 */ move $a2, $zero -/* B53184 800DBFE4 24A50C80 */ addiu $a1, $a1, 0xc80 -/* B53188 800DBFE8 0C037002 */ jal func_800DC008 -/* B5318C 800DBFEC 30A5FFFF */ andi $a1, $a1, 0xffff -/* B53190 800DBFF0 00402025 */ move $a0, $v0 -/* B53194 800DBFF4 8FBF001C */ lw $ra, 0x1c($sp) -.L800DBFF8: -/* B53198 800DBFF8 27BD0028 */ addiu $sp, $sp, 0x28 -/* B5319C 800DBFFC 00801025 */ move $v0, $a0 -/* B531A0 800DC000 03E00008 */ jr $ra -/* B531A4 800DC004 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC008.s b/asm/non_matchings/code/code_800DACC0/func_800DC008.s deleted file mode 100644 index 8bbb635259..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC008.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800DC008 -/* B531A8 800DC008 00074103 */ sra $t0, $a3, 4 -/* B531AC 800DC00C 310800FF */ andi $t0, $t0, 0xff -/* B531B0 800DC010 00084400 */ sll $t0, $t0, 0x10 -/* B531B4 800DC014 3C011400 */ lui $at, 0x1400 -/* B531B8 800DC018 01014025 */ or $t0, $t0, $at -/* B531BC 800DC01C 30AEFFFF */ andi $t6, $a1, 0xffff -/* B531C0 800DC020 AFA50004 */ sw $a1, 4($sp) -/* B531C4 800DC024 AFA60008 */ sw $a2, 8($sp) -/* B531C8 800DC028 010E7825 */ or $t7, $t0, $t6 -/* B531CC 800DC02C AC8F0000 */ sw $t7, ($a0) -/* B531D0 800DC030 8FB80010 */ lw $t8, 0x10($sp) -/* B531D4 800DC034 30C6FFFF */ andi $a2, $a2, 0xffff -/* B531D8 800DC038 00064840 */ sll $t1, $a2, 1 -/* B531DC 800DC03C 8F190028 */ lw $t9, 0x28($t8) -/* B531E0 800DC040 24AC01A0 */ addiu $t4, $a1, 0x1a0 -/* B531E4 800DC044 318DFFFF */ andi $t5, $t4, 0xffff -/* B531E8 800DC048 03295821 */ addu $t3, $t9, $t1 -/* B531EC 800DC04C AC8B0004 */ sw $t3, 4($a0) -/* B531F0 800DC050 248A0008 */ addiu $t2, $a0, 8 -/* B531F4 800DC054 010D7025 */ or $t6, $t0, $t5 -/* B531F8 800DC058 AD4E0000 */ sw $t6, ($t2) -/* B531FC 800DC05C 8FAF0010 */ lw $t7, 0x10($sp) -/* B53200 800DC060 25420008 */ addiu $v0, $t2, 8 -/* B53204 800DC064 8DF8002C */ lw $t8, 0x2c($t7) -/* B53208 800DC068 0309C821 */ addu $t9, $t8, $t1 -/* B5320C 800DC06C 03E00008 */ jr $ra -/* B53210 800DC070 AD590004 */ sw $t9, 4($t2) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC074.s b/asm/non_matchings/code/code_800DACC0/func_800DC074.s deleted file mode 100644 index 25352b8ccb..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC074.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800DC074 -/* B53214 800DC074 00074103 */ sra $t0, $a3, 4 -/* B53218 800DC078 310800FF */ andi $t0, $t0, 0xff -/* B5321C 800DC07C 00084400 */ sll $t0, $t0, 0x10 -/* B53220 800DC080 3C011500 */ lui $at, 0x1500 -/* B53224 800DC084 01014025 */ or $t0, $t0, $at -/* B53228 800DC088 30AEFFFF */ andi $t6, $a1, 0xffff -/* B5322C 800DC08C AFA50004 */ sw $a1, 4($sp) -/* B53230 800DC090 AFA60008 */ sw $a2, 8($sp) -/* B53234 800DC094 010E7825 */ or $t7, $t0, $t6 -/* B53238 800DC098 AC8F0000 */ sw $t7, ($a0) -/* B5323C 800DC09C 8FB80010 */ lw $t8, 0x10($sp) -/* B53240 800DC0A0 30C6FFFF */ andi $a2, $a2, 0xffff -/* B53244 800DC0A4 00064840 */ sll $t1, $a2, 1 -/* B53248 800DC0A8 8F190028 */ lw $t9, 0x28($t8) -/* B5324C 800DC0AC 24AC01A0 */ addiu $t4, $a1, 0x1a0 -/* B53250 800DC0B0 318DFFFF */ andi $t5, $t4, 0xffff -/* B53254 800DC0B4 03295821 */ addu $t3, $t9, $t1 -/* B53258 800DC0B8 AC8B0004 */ sw $t3, 4($a0) -/* B5325C 800DC0BC 248A0008 */ addiu $t2, $a0, 8 -/* B53260 800DC0C0 010D7025 */ or $t6, $t0, $t5 -/* B53264 800DC0C4 AD4E0000 */ sw $t6, ($t2) -/* B53268 800DC0C8 8FAF0010 */ lw $t7, 0x10($sp) -/* B5326C 800DC0CC 25420008 */ addiu $v0, $t2, 8 -/* B53270 800DC0D0 8DF8002C */ lw $t8, 0x2c($t7) -/* B53274 800DC0D4 0309C821 */ addu $t9, $t8, $t1 -/* B53278 800DC0D8 03E00008 */ jr $ra -/* B5327C 800DC0DC AD590004 */ sw $t9, 4($t2) - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC0E0.s b/asm/non_matchings/code/code_800DACC0/func_800DC0E0.s deleted file mode 100644 index 7b6c3aec45..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC0E0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800DC0E0 -/* B53280 800DC0E0 00077103 */ sra $t6, $a3, 4 -/* B53284 800DC0E4 31CF00FF */ andi $t7, $t6, 0xff -/* B53288 800DC0E8 000FC400 */ sll $t8, $t7, 0x10 -/* B5328C 800DC0EC 3C011500 */ lui $at, 0x1500 -/* B53290 800DC0F0 0301C825 */ or $t9, $t8, $at -/* B53294 800DC0F4 30A8FFFF */ andi $t0, $a1, 0xffff -/* B53298 800DC0F8 AFA50004 */ sw $a1, 4($sp) -/* B5329C 800DC0FC AFA60008 */ sw $a2, 8($sp) -/* B532A0 800DC100 03284825 */ or $t1, $t9, $t0 -/* B532A4 800DC104 AC890000 */ sw $t1, ($a0) -/* B532A8 800DC108 8FAB0010 */ lw $t3, 0x10($sp) -/* B532AC 800DC10C 30C6FFFF */ andi $a2, $a2, 0xffff -/* B532B0 800DC110 00065040 */ sll $t2, $a2, 1 -/* B532B4 800DC114 014B6021 */ addu $t4, $t2, $t3 -/* B532B8 800DC118 AC8C0004 */ sw $t4, 4($a0) -/* B532BC 800DC11C 03E00008 */ jr $ra -/* B532C0 800DC120 24820008 */ addiu $v0, $a0, 8 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC124.s b/asm/non_matchings/code/code_800DACC0/func_800DC124.s deleted file mode 100644 index 0ae484d298..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC124.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800DC124 -/* B532C4 800DC124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B532C8 800DC128 AFBF0014 */ sw $ra, 0x14($sp) -/* B532CC 800DC12C AFA70024 */ sw $a3, 0x24($sp) -/* B532D0 800DC130 90CE0004 */ lbu $t6, 4($a2) -/* B532D4 800DC134 00073C00 */ sll $a3, $a3, 0x10 -/* B532D8 800DC138 24010001 */ li $at, 1 -/* B532DC 800DC13C 15C10004 */ bne $t6, $at, .L800DC150 -/* B532E0 800DC140 00073C03 */ sra $a3, $a3, 0x10 -/* B532E4 800DC144 0C036FD7 */ jal func_800DBF5C -/* B532E8 800DC148 00000000 */ nop -/* B532EC 800DC14C 00402025 */ move $a0, $v0 -.L800DC150: -/* B532F0 800DC150 8FBF0014 */ lw $ra, 0x14($sp) -/* B532F4 800DC154 27BD0018 */ addiu $sp, $sp, 0x18 -/* B532F8 800DC158 00801025 */ move $v0, $a0 -/* B532FC 800DC15C 03E00008 */ jr $ra -/* B53300 800DC160 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC164.s b/asm/non_matchings/code/code_800DACC0/func_800DC164.s deleted file mode 100644 index d4db5d036e..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC164.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_800DC164 -/* B53304 800DC164 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B53308 800DC168 AFBF001C */ sw $ra, 0x1c($sp) -/* B5330C 800DC16C AFB00018 */ sw $s0, 0x18($sp) -/* B53310 800DC170 AFA7002C */ sw $a3, 0x2c($sp) -/* B53314 800DC174 90CE0004 */ lbu $t6, 4($a2) -/* B53318 800DC178 00073C00 */ sll $a3, $a3, 0x10 -/* B5331C 800DC17C 24010001 */ li $at, 1 -/* B53320 800DC180 00073C03 */ sra $a3, $a3, 0x10 -/* B53324 800DC184 15C1000C */ bne $t6, $at, .L800DC1B8 -/* B53328 800DC188 00808025 */ move $s0, $a0 -/* B5332C 800DC18C 90CF0018 */ lbu $t7, 0x18($a2) -/* B53330 800DC190 11E00005 */ beqz $t7, .L800DC1A8 -/* B53334 800DC194 00000000 */ nop -/* B53338 800DC198 0C036E0A */ jal func_800DB828 -/* B5333C 800DC19C 00000000 */ nop -/* B53340 800DC1A0 10000008 */ b .L800DC1C4 -/* B53344 800DC1A4 00408025 */ move $s0, $v0 -.L800DC1A8: -/* B53348 800DC1A8 0C036FAC */ jal func_800DBEB0 -/* B5334C 800DC1AC 02002025 */ move $a0, $s0 -/* B53350 800DC1B0 10000004 */ b .L800DC1C4 -/* B53354 800DC1B4 00408025 */ move $s0, $v0 -.L800DC1B8: -/* B53358 800DC1B8 0C036D39 */ jal func_800DB4E4 -/* B5335C 800DC1BC 02002025 */ move $a0, $s0 -/* B53360 800DC1C0 00408025 */ move $s0, $v0 -.L800DC1C4: -/* B53364 800DC1C4 8FBF001C */ lw $ra, 0x1c($sp) -/* B53368 800DC1C8 02001025 */ move $v0, $s0 -/* B5336C 800DC1CC 8FB00018 */ lw $s0, 0x18($sp) -/* B53370 800DC1D0 03E00008 */ jr $ra -/* B53374 800DC1D4 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC1D8.s b/asm/non_matchings/code/code_800DACC0/func_800DC1D8.s deleted file mode 100644 index 8988a9e608..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC1D8.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_800DC1D8 -/* B53378 800DC1D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5337C 800DC1DC AFBF0024 */ sw $ra, 0x24($sp) -/* B53380 800DC1E0 AFB10020 */ sw $s1, 0x20($sp) -/* B53384 800DC1E4 AFB0001C */ sw $s0, 0x1c($sp) -/* B53388 800DC1E8 AFA60038 */ sw $a2, 0x38($sp) -/* B5338C 800DC1EC 90AE0003 */ lbu $t6, 3($a1) -/* B53390 800DC1F0 00063400 */ sll $a2, $a2, 0x10 -/* B53394 800DC1F4 00063403 */ sra $a2, $a2, 0x10 -/* B53398 800DC1F8 000E78C0 */ sll $t7, $t6, 3 -/* B5339C 800DC1FC 01EE7821 */ addu $t7, $t7, $t6 -/* B533A0 800DC200 000F7880 */ sll $t7, $t7, 2 -/* B533A4 800DC204 0006C8C0 */ sll $t9, $a2, 3 -/* B533A8 800DC208 01EE7823 */ subu $t7, $t7, $t6 -/* B533AC 800DC20C 90A80004 */ lbu $t0, 4($a1) -/* B533B0 800DC210 000F7880 */ sll $t7, $t7, 2 -/* B533B4 800DC214 0326C823 */ subu $t9, $t9, $a2 -/* B533B8 800DC218 0019C880 */ sll $t9, $t9, 2 -/* B533BC 800DC21C 00AFC021 */ addu $t8, $a1, $t7 -/* B533C0 800DC220 03191021 */ addu $v0, $t8, $t9 -/* B533C4 800DC224 24010001 */ li $at, 1 -/* B533C8 800DC228 00808025 */ move $s0, $a0 -/* B533CC 800DC22C 00A08825 */ move $s1, $a1 -/* B533D0 800DC230 1501001D */ bne $t0, $at, .L800DC2A8 -/* B533D4 800DC234 24430040 */ addiu $v1, $v0, 0x40 -/* B533D8 800DC238 90A90018 */ lbu $t1, 0x18($a1) -/* B533DC 800DC23C 51200006 */ beql $t1, $zero, .L800DC258 -/* B533E0 800DC240 9466000E */ lhu $a2, 0xe($v1) -/* B533E4 800DC244 0C036DA0 */ jal func_800DB680 -/* B533E8 800DC248 00000000 */ nop -/* B533EC 800DC24C 1000001C */ b .L800DC2C0 -/* B533F0 800DC250 00408025 */ move $s0, $v0 -/* B533F4 800DC254 9466000E */ lhu $a2, 0xe($v1) -.L800DC258: -/* B533F8 800DC258 84670010 */ lh $a3, 0x10($v1) -/* B533FC 800DC25C AFA3002C */ sw $v1, 0x2c($sp) -/* B53400 800DC260 AFB10010 */ sw $s1, 0x10($sp) -/* B53404 800DC264 02002025 */ move $a0, $s0 -/* B53408 800DC268 0C03701D */ jal func_800DC074 -/* B5340C 800DC26C 24050C80 */ li $a1, 3200 -/* B53410 800DC270 8FA3002C */ lw $v1, 0x2c($sp) -/* B53414 800DC274 00408025 */ move $s0, $v0 -/* B53418 800DC278 00402025 */ move $a0, $v0 -/* B5341C 800DC27C 84670012 */ lh $a3, 0x12($v1) -/* B53420 800DC280 50E00010 */ beql $a3, $zero, .L800DC2C4 -/* B53424 800DC284 A2200000 */ sb $zero, ($s1) -/* B53428 800DC288 84650010 */ lh $a1, 0x10($v1) -/* B5342C 800DC28C AFB10010 */ sw $s1, 0x10($sp) -/* B53430 800DC290 00003025 */ move $a2, $zero -/* B53434 800DC294 24A50C80 */ addiu $a1, $a1, 0xc80 -/* B53438 800DC298 0C03701D */ jal func_800DC074 -/* B5343C 800DC29C 30A5FFFF */ andi $a1, $a1, 0xffff -/* B53440 800DC2A0 10000007 */ b .L800DC2C0 -/* B53444 800DC2A4 00408025 */ move $s0, $v0 -.L800DC2A8: -/* B53448 800DC2A8 02002025 */ move $a0, $s0 -/* B5344C 800DC2AC 26100008 */ addiu $s0, $s0, 8 -/* B53450 800DC2B0 24050C80 */ li $a1, 3200 -/* B53454 800DC2B4 24060340 */ li $a2, 832 -/* B53458 800DC2B8 0C036F4E */ jal func_800DBD38 -/* B5345C 800DC2BC 8C470044 */ lw $a3, 0x44($v0) -.L800DC2C0: -/* B53460 800DC2C0 A2200000 */ sb $zero, ($s1) -.L800DC2C4: -/* B53464 800DC2C4 8FBF0024 */ lw $ra, 0x24($sp) -/* B53468 800DC2C8 02001025 */ move $v0, $s0 -/* B5346C 800DC2CC 8FB0001C */ lw $s0, 0x1c($sp) -/* B53470 800DC2D0 8FB10020 */ lw $s1, 0x20($sp) -/* B53474 800DC2D4 03E00008 */ jr $ra -/* B53478 800DC2D8 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC2DC.s b/asm/non_matchings/code/code_800DACC0/func_800DC2DC.s deleted file mode 100644 index 61a5a8a75b..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DC2DC.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_800DC2DC -/* B5347C 800DC2DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B53480 800DC2E0 AFBF001C */ sw $ra, 0x1c($sp) -/* B53484 800DC2E4 AFA5002C */ sw $a1, 0x2c($sp) -/* B53488 800DC2E8 AFA60030 */ sw $a2, 0x30($sp) -/* B5348C 800DC2EC 90AF0003 */ lbu $t7, 3($a1) -/* B53490 800DC2F0 87A80032 */ lh $t0, 0x32($sp) -/* B53494 800DC2F4 00A07025 */ move $t6, $a1 -/* B53498 800DC2F8 000FC0C0 */ sll $t8, $t7, 3 -/* B5349C 800DC2FC 030FC021 */ addu $t8, $t8, $t7 -/* B534A0 800DC300 0018C080 */ sll $t8, $t8, 2 -/* B534A4 800DC304 030FC023 */ subu $t8, $t8, $t7 -/* B534A8 800DC308 000848C0 */ sll $t1, $t0, 3 -/* B534AC 800DC30C 0018C080 */ sll $t8, $t8, 2 -/* B534B0 800DC310 01284823 */ subu $t1, $t1, $t0 -/* B534B4 800DC314 00094880 */ sll $t1, $t1, 2 -/* B534B8 800DC318 00B8C821 */ addu $t9, $a1, $t8 -/* B534BC 800DC31C 03291821 */ addu $v1, $t9, $t1 -/* B534C0 800DC320 24630158 */ addiu $v1, $v1, 0x158 -/* B534C4 800DC324 84670010 */ lh $a3, 0x10($v1) -/* B534C8 800DC328 9466000E */ lhu $a2, 0xe($v1) -/* B534CC 800DC32C AFA30024 */ sw $v1, 0x24($sp) -/* B534D0 800DC330 AFAE0010 */ sw $t6, 0x10($sp) -/* B534D4 800DC334 0C03701D */ jal func_800DC074 -/* B534D8 800DC338 24050C80 */ li $a1, 3200 -/* B534DC 800DC33C 8FA30024 */ lw $v1, 0x24($sp) -/* B534E0 800DC340 00402025 */ move $a0, $v0 -/* B534E4 800DC344 8FAA002C */ lw $t2, 0x2c($sp) -/* B534E8 800DC348 84670012 */ lh $a3, 0x12($v1) -/* B534EC 800DC34C 50E00009 */ beql $a3, $zero, .L800DC374 -/* B534F0 800DC350 8FBF001C */ lw $ra, 0x1c($sp) -/* B534F4 800DC354 84650010 */ lh $a1, 0x10($v1) -/* B534F8 800DC358 AFAA0010 */ sw $t2, 0x10($sp) -/* B534FC 800DC35C 00003025 */ move $a2, $zero -/* B53500 800DC360 24A50C80 */ addiu $a1, $a1, 0xc80 -/* B53504 800DC364 0C03701D */ jal func_800DC074 -/* B53508 800DC368 30A5FFFF */ andi $a1, $a1, 0xffff -/* B5350C 800DC36C 00402025 */ move $a0, $v0 -/* B53510 800DC370 8FBF001C */ lw $ra, 0x1c($sp) -.L800DC374: -/* B53514 800DC374 27BD0028 */ addiu $sp, $sp, 0x28 -/* B53518 800DC378 00801025 */ move $v0, $a0 -/* B5351C 800DC37C 03E00008 */ jr $ra -/* B53520 800DC380 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DD62C.s b/asm/non_matchings/code/code_800DACC0/func_800DD62C.s deleted file mode 100644 index 29302f5f15..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DD62C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800DD62C -/* B547CC 800DD62C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B547D0 800DD630 AFA7002C */ sw $a3, 0x2c($sp) -/* B547D4 800DD634 30E7FFFF */ andi $a3, $a3, 0xffff -/* B547D8 800DD638 AFB00018 */ sw $s0, 0x18($sp) -/* B547DC 800DD63C 00808025 */ move $s0, $a0 -/* B547E0 800DD640 14E00006 */ bnez $a3, .L800DD65C -/* B547E4 800DD644 AFBF001C */ sw $ra, 0x1c($sp) -/* B547E8 800DD648 240503C0 */ li $a1, 960 -/* B547EC 800DD64C 0C036EE7 */ jal func_800DBB9C -/* B547F0 800DD650 26100008 */ addiu $s0, $s0, 8 -/* B547F4 800DD654 10000019 */ b .L800DD6BC -/* B547F8 800DD658 8FBF001C */ lw $ra, 0x1c($sp) -.L800DD65C: -/* B547FC 800DD65C 97AF0032 */ lhu $t7, 0x32($sp) -/* B54800 800DD660 3C010800 */ lui $at, 0x800 -/* B54804 800DD664 02001025 */ move $v0, $s0 -/* B54808 800DD668 01E1C025 */ or $t8, $t7, $at -/* B5480C 800DD66C 3C0103C0 */ lui $at, 0x3c0 -/* B54810 800DD670 30D9FFFF */ andi $t9, $a2, 0xffff -/* B54814 800DD674 03214025 */ or $t0, $t9, $at -/* B54818 800DD678 AC480004 */ sw $t0, 4($v0) -/* B5481C 800DD67C AC580000 */ sw $t8, ($v0) -/* B54820 800DD680 8FA90034 */ lw $t1, 0x34($sp) -/* B54824 800DD684 3C010500 */ lui $at, 0x500 -/* B54828 800DD688 26100008 */ addiu $s0, $s0, 8 -/* B5482C 800DD68C 312A00FF */ andi $t2, $t1, 0xff -/* B54830 800DD690 000A5C00 */ sll $t3, $t2, 0x10 -/* B54834 800DD694 01616025 */ or $t4, $t3, $at -/* B54838 800DD698 30EDFFFF */ andi $t5, $a3, 0xffff -/* B5483C 800DD69C 018D7025 */ or $t6, $t4, $t5 -/* B54840 800DD6A0 02001825 */ move $v1, $s0 -/* B54844 800DD6A4 AC6E0000 */ sw $t6, ($v1) -/* B54848 800DD6A8 8CAF000C */ lw $t7, 0xc($a1) -/* B5484C 800DD6AC 26100008 */ addiu $s0, $s0, 8 -/* B54850 800DD6B0 25F80020 */ addiu $t8, $t7, 0x20 -/* B54854 800DD6B4 AC780004 */ sw $t8, 4($v1) -/* B54858 800DD6B8 8FBF001C */ lw $ra, 0x1c($sp) -.L800DD6BC: -/* B5485C 800DD6BC 02001025 */ move $v0, $s0 -/* B54860 800DD6C0 8FB00018 */ lw $s0, 0x18($sp) -/* B54864 800DD6C4 03E00008 */ jr $ra -/* B54868 800DD6C8 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DD6CC.s b/asm/non_matchings/code/code_800DACC0/func_800DD6CC.s deleted file mode 100644 index 7ea05e5240..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DD6CC.s +++ /dev/null @@ -1,220 +0,0 @@ -glabel func_800DD6CC -/* B5486C 800DD6CC 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B54870 800DD6D0 AFBF0024 */ sw $ra, 0x24($sp) -/* B54874 800DD6D4 AFB10020 */ sw $s1, 0x20($sp) -/* B54878 800DD6D8 AFB0001C */ sw $s0, 0x1c($sp) -/* B5487C 800DD6DC AFA70074 */ sw $a3, 0x74($sp) -/* B54880 800DD6E0 94A20008 */ lhu $v0, 8($a1) -/* B54884 800DD6E4 94A3000A */ lhu $v1, 0xa($a1) -/* B54888 800DD6E8 94CD0010 */ lhu $t5, 0x10($a2) -/* B5488C 800DD6EC 00021100 */ sll $v0, $v0, 4 -/* B54890 800DD6F0 3048FFFF */ andi $t0, $v0, 0xffff -/* B54894 800DD6F4 00031900 */ sll $v1, $v1, 4 -/* B54898 800DD6F8 00808025 */ move $s0, $a0 -/* B5489C 800DD6FC 00A08825 */ move $s1, $a1 -/* B548A0 800DD700 90AA0005 */ lbu $t2, 5($a1) -/* B548A4 800DD704 94DF0012 */ lhu $ra, 0x12($a2) -/* B548A8 800DD708 3063FFFF */ andi $v1, $v1, 0xffff -/* B548AC 800DD70C 11A80012 */ beq $t5, $t0, .L800DD758 -/* B548B0 800DD710 01A04825 */ move $t1, $t5 -/* B548B4 800DD714 000710C3 */ sra $v0, $a3, 3 -/* B548B8 800DD718 01097023 */ subu $t6, $t0, $t1 -/* B548BC 800DD71C 01C2001A */ div $zero, $t6, $v0 -/* B548C0 800DD720 00003812 */ mflo $a3 -/* B548C4 800DD724 00073C00 */ sll $a3, $a3, 0x10 -/* B548C8 800DD728 14400002 */ bnez $v0, .L800DD734 -/* B548CC 800DD72C 00000000 */ nop -/* B548D0 800DD730 0007000D */ break 7 -.L800DD734: -/* B548D4 800DD734 2401FFFF */ li $at, -1 -/* B548D8 800DD738 14410004 */ bne $v0, $at, .L800DD74C -/* B548DC 800DD73C 3C018000 */ lui $at, 0x8000 -/* B548E0 800DD740 15C10002 */ bne $t6, $at, .L800DD74C -/* B548E4 800DD744 00000000 */ nop -/* B548E8 800DD748 0006000D */ break 6 -.L800DD74C: -/* B548EC 800DD74C 00073C03 */ sra $a3, $a3, 0x10 -/* B548F0 800DD750 10000005 */ b .L800DD768 -/* B548F4 800DD754 03E05825 */ move $t3, $ra -.L800DD758: -/* B548F8 800DD758 8FA20074 */ lw $v0, 0x74($sp) -/* B548FC 800DD75C 00003825 */ move $a3, $zero -/* B54900 800DD760 000210C3 */ sra $v0, $v0, 3 -/* B54904 800DD764 03E05825 */ move $t3, $ra -.L800DD768: -/* B54908 800DD768 13E30011 */ beq $ra, $v1, .L800DD7B0 -/* B5490C 800DD76C 00602025 */ move $a0, $v1 -/* B54910 800DD770 008B7823 */ subu $t7, $a0, $t3 -/* B54914 800DD774 01E2001A */ div $zero, $t7, $v0 -/* B54918 800DD778 00004012 */ mflo $t0 -/* B5491C 800DD77C 00084400 */ sll $t0, $t0, 0x10 -/* B54920 800DD780 14400002 */ bnez $v0, .L800DD78C -/* B54924 800DD784 00000000 */ nop -/* B54928 800DD788 0007000D */ break 7 -.L800DD78C: -/* B5492C 800DD78C 2401FFFF */ li $at, -1 -/* B54930 800DD790 14410004 */ bne $v0, $at, .L800DD7A4 -/* B54934 800DD794 3C018000 */ lui $at, 0x8000 -/* B54938 800DD798 15E10002 */ bne $t7, $at, .L800DD7A4 -/* B5493C 800DD79C 00000000 */ nop -/* B54940 800DD7A0 0006000D */ break 6 -.L800DD7A4: -/* B54944 800DD7A4 00084403 */ sra $t0, $t0, 0x10 -/* B54948 800DD7A8 10000003 */ b .L800DD7B8 -/* B5494C 800DD7AC 90CC0004 */ lbu $t4, 4($a2) -.L800DD7B0: -/* B54950 800DD7B0 00004025 */ move $t0, $zero -/* B54954 800DD7B4 90CC0004 */ lbu $t4, 4($a2) -.L800DD7B8: -/* B54958 800DD7B8 AFA90030 */ sw $t1, 0x30($sp) -/* B5495C 800DD7BC 3158007F */ andi $t8, $t2, 0x7f -/* B54960 800DD7C0 118A0013 */ beq $t4, $t2, .L800DD810 -/* B54964 800DD7C4 3189007F */ andi $t1, $t4, 0x7f -/* B54968 800DD7C8 3189007F */ andi $t1, $t4, 0x7f -/* B5496C 800DD7CC 0309C823 */ subu $t9, $t8, $t1 -/* B54970 800DD7D0 00197240 */ sll $t6, $t9, 9 -/* B54974 800DD7D4 01C2001A */ div $zero, $t6, $v0 -/* B54978 800DD7D8 00007812 */ mflo $t7 -/* B5497C 800DD7DC A7AF0052 */ sh $t7, 0x52($sp) -/* B54980 800DD7E0 14400002 */ bnez $v0, .L800DD7EC -/* B54984 800DD7E4 00000000 */ nop -/* B54988 800DD7E8 0007000D */ break 7 -.L800DD7EC: -/* B5498C 800DD7EC 2401FFFF */ li $at, -1 -/* B54990 800DD7F0 14410004 */ bne $v0, $at, .L800DD804 -/* B54994 800DD7F4 3C018000 */ lui $at, 0x8000 -/* B54998 800DD7F8 15C10002 */ bne $t6, $at, .L800DD804 -/* B5499C 800DD7FC 00000000 */ nop -/* B549A0 800DD800 0006000D */ break 6 -.L800DD804: -/* B549A4 800DD804 A0CA0004 */ sb $t2, 4($a2) -/* B549A8 800DD808 10000002 */ b .L800DD814 -/* B549AC 800DD80C 00000000 */ nop -.L800DD810: -/* B549B0 800DD810 A7A00052 */ sh $zero, 0x52($sp) -.L800DD814: -/* B549B4 800DD814 00E20019 */ multu $a3, $v0 -/* B549B8 800DD818 8FB80030 */ lw $t8, 0x30($sp) -/* B549BC 800DD81C 02002025 */ move $a0, $s0 -/* B549C0 800DD820 3C011200 */ lui $at, 0x1200 -/* B549C4 800DD824 3C058013 */ lui $a1, %hi(D_801304AC) # $a1, 0x8013 -/* B549C8 800DD828 0000C812 */ mflo $t9 -/* B549CC 800DD82C 03197021 */ addu $t6, $t8, $t9 -/* B549D0 800DD830 A4CE0010 */ sh $t6, 0x10($a2) -/* B549D4 800DD834 01020019 */ multu $t0, $v0 -/* B549D8 800DD838 02001025 */ move $v0, $s0 -/* B549DC 800DD83C 00007812 */ mflo $t7 -/* B549E0 800DD840 016FC021 */ addu $t8, $t3, $t7 -/* B549E4 800DD844 A4D80012 */ sh $t8, 0x12($a2) -/* B549E8 800DD848 96390000 */ lhu $t9, ($s1) -/* B549EC 800DD84C 00097840 */ sll $t7, $t1, 1 -/* B549F0 800DD850 31F800FF */ andi $t8, $t7, 0xff -/* B549F4 800DD854 332E0001 */ andi $t6, $t9, 1 -/* B549F8 800DD858 11C00027 */ beqz $t6, .L800DD8F8 -/* B549FC 800DD85C 0018CC00 */ sll $t9, $t8, 0x10 -/* B54A00 800DD860 240505C0 */ li $a1, 1472 -/* B54A04 800DD864 240601A0 */ li $a2, 416 -/* B54A08 800DD868 26100008 */ addiu $s0, $s0, 8 -/* B54A0C 800DD86C A7A70056 */ sh $a3, 0x56($sp) -/* B54A10 800DD870 A7A80054 */ sh $t0, 0x54($sp) -/* B54A14 800DD874 AFA90034 */ sw $t1, 0x34($sp) -/* B54A18 800DD878 AFAB0028 */ sw $t3, 0x28($sp) -/* B54A1C 800DD87C 0C036EE7 */ jal func_800DBB9C -/* B54A20 800DD880 A7AC0050 */ sh $t4, 0x50($sp) -/* B54A24 800DD884 87A80054 */ lh $t0, 0x54($sp) -/* B54A28 800DD888 8FA90034 */ lw $t1, 0x34($sp) -/* B54A2C 800DD88C 02002025 */ move $a0, $s0 -/* B54A30 800DD890 87A70056 */ lh $a3, 0x56($sp) -/* B54A34 800DD894 26100008 */ addiu $s0, $s0, 8 -/* B54A38 800DD898 87A60052 */ lh $a2, 0x52($sp) -/* B54A3C 800DD89C AFA80010 */ sw $t0, 0x10($sp) -/* B54A40 800DD8A0 0C036F35 */ jal func_800DBCD4 -/* B54A44 800DD8A4 00092840 */ sll $a1, $t1, 1 -/* B54A48 800DD8A8 02002025 */ move $a0, $s0 -/* B54A4C 800DD8AC 26100008 */ addiu $s0, $s0, 8 -/* B54A50 800DD8B0 8FA50030 */ lw $a1, 0x30($sp) -/* B54A54 800DD8B4 0C036F58 */ jal func_800DBD60 -/* B54A58 800DD8B8 8FA60028 */ lw $a2, 0x28($sp) -/* B54A5C 800DD8BC 8FA2007C */ lw $v0, 0x7c($sp) -/* B54A60 800DD8C0 24010001 */ li $at, 1 -/* B54A64 800DD8C4 87AC0050 */ lh $t4, 0x50($sp) -/* B54A68 800DD8C8 10410007 */ beq $v0, $at, .L800DD8E8 -/* B54A6C 800DD8CC 3C058013 */ lui $a1, %hi(D_801304A4) # $a1, 0x8013 -/* B54A70 800DD8D0 24010002 */ li $at, 2 -/* B54A74 800DD8D4 10410006 */ beq $v0, $at, .L800DD8F0 -/* B54A78 800DD8D8 3C058013 */ lui $a1, %hi(D_801304A8) # $a1, 0x8013 -/* B54A7C 800DD8DC 3C058013 */ lui $a1, %hi(D_801304AC) # $a1, 0x8013 -/* B54A80 800DD8E0 10000018 */ b .L800DD944 -/* B54A84 800DD8E4 8CA504AC */ lw $a1, %lo(D_801304AC)($a1) -.L800DD8E8: -/* B54A88 800DD8E8 10000016 */ b .L800DD944 -/* B54A8C 800DD8EC 8CA504A4 */ lw $a1, %lo(D_801304A4)($a1) -.L800DD8F0: -/* B54A90 800DD8F0 10000014 */ b .L800DD944 -/* B54A94 800DD8F4 8CA504A8 */ lw $a1, %lo(D_801304A8)($a1) -.L800DD8F8: -/* B54A98 800DD8F8 87AF0052 */ lh $t7, 0x52($sp) -/* B54A9C 800DD8FC 03217025 */ or $t6, $t9, $at -/* B54AA0 800DD900 26100008 */ addiu $s0, $s0, 8 -/* B54AA4 800DD904 31F8FFFF */ andi $t8, $t7, 0xffff -/* B54AA8 800DD908 01D8C825 */ or $t9, $t6, $t8 -/* B54AAC 800DD90C AC590000 */ sw $t9, ($v0) -/* B54AB0 800DD910 3118FFFF */ andi $t8, $t0, 0xffff -/* B54AB4 800DD914 00077400 */ sll $t6, $a3, 0x10 -/* B54AB8 800DD918 01D8C825 */ or $t9, $t6, $t8 -/* B54ABC 800DD91C AC590004 */ sw $t9, 4($v0) -/* B54AC0 800DD920 3C0F1600 */ lui $t7, 0x1600 -/* B54AC4 800DD924 02001825 */ move $v1, $s0 -/* B54AC8 800DD928 AC6F0000 */ sw $t7, ($v1) -/* B54ACC 800DD92C 33F9FFFF */ andi $t9, $ra, 0xffff -/* B54AD0 800DD930 000DC400 */ sll $t8, $t5, 0x10 -/* B54AD4 800DD934 03197825 */ or $t7, $t8, $t9 -/* B54AD8 800DD938 AC6F0004 */ sw $t7, 4($v1) -/* B54ADC 800DD93C 26100008 */ addiu $s0, $s0, 8 -/* B54AE0 800DD940 8CA504AC */ lw $a1, %lo(D_801304AC)($a1) -.L800DD944: -/* B54AE4 800DD944 97AE007A */ lhu $t6, 0x7a($sp) -/* B54AE8 800DD948 8E230000 */ lw $v1, ($s1) -/* B54AEC 800DD94C 02002025 */ move $a0, $s0 -/* B54AF0 800DD950 000EC103 */ sra $t8, $t6, 4 -/* B54AF4 800DD954 331900FF */ andi $t9, $t8, 0xff -/* B54AF8 800DD958 3C0E8013 */ lui $t6, %hi(D_801304A0) # $t6, 0x8013 -/* B54AFC 800DD95C 8DCE04A0 */ lw $t6, %lo(D_801304A0)($t6) -/* B54B00 800DD960 00197C00 */ sll $t7, $t9, 0x10 -/* B54B04 800DD964 8FB90074 */ lw $t9, 0x74($sp) -/* B54B08 800DD968 01EEC025 */ or $t8, $t7, $t6 -/* B54B0C 800DD96C 26020008 */ addiu $v0, $s0, 8 -/* B54B10 800DD970 332F00FF */ andi $t7, $t9, 0xff -/* B54B14 800DD974 000F7200 */ sll $t6, $t7, 8 -/* B54B18 800DD978 030EC825 */ or $t9, $t8, $t6 -/* B54B1C 800DD97C 318F0080 */ andi $t7, $t4, 0x80 -/* B54B20 800DD980 000FC1C3 */ sra $t8, $t7, 7 -/* B54B24 800DD984 330E0001 */ andi $t6, $t8, 1 -/* B54B28 800DD988 000E7900 */ sll $t7, $t6, 4 -/* B54B2C 800DD98C 032FC025 */ or $t8, $t9, $t7 -/* B54B30 800DD990 00037180 */ sll $t6, $v1, 6 -/* B54B34 800DD994 000ECFC2 */ srl $t9, $t6, 0x1f -/* B54B38 800DD998 332F0001 */ andi $t7, $t9, 1 -/* B54B3C 800DD99C 000F70C0 */ sll $t6, $t7, 3 -/* B54B40 800DD9A0 030EC825 */ or $t9, $t8, $t6 -/* B54B44 800DD9A4 92380000 */ lbu $t8, ($s1) -/* B54B48 800DD9A8 AC850004 */ sw $a1, 4($a0) -/* B54B4C 800DD9AC 330E0001 */ andi $t6, $t8, 1 -/* B54B50 800DD9B0 000E7880 */ sll $t7, $t6, 2 -/* B54B54 800DD9B4 032FC025 */ or $t8, $t9, $t7 -/* B54B58 800DD9B8 00037100 */ sll $t6, $v1, 4 -/* B54B5C 800DD9BC 000ECFC2 */ srl $t9, $t6, 0x1f -/* B54B60 800DD9C0 332F0001 */ andi $t7, $t9, 1 -/* B54B64 800DD9C4 000F7040 */ sll $t6, $t7, 1 -/* B54B68 800DD9C8 030EC825 */ or $t9, $t8, $t6 -/* B54B6C 800DD9CC 00037940 */ sll $t7, $v1, 5 -/* B54B70 800DD9D0 000FC7C2 */ srl $t8, $t7, 0x1f -/* B54B74 800DD9D4 330E0001 */ andi $t6, $t8, 1 -/* B54B78 800DD9D8 032E7825 */ or $t7, $t9, $t6 -/* B54B7C 800DD9DC AC8F0000 */ sw $t7, ($a0) -/* B54B80 800DD9E0 8FBF0024 */ lw $ra, 0x24($sp) -/* B54B84 800DD9E4 8FB10020 */ lw $s1, 0x20($sp) -/* B54B88 800DD9E8 8FB0001C */ lw $s0, 0x1c($sp) -/* B54B8C 800DD9EC 03E00008 */ jr $ra -/* B54B90 800DD9F0 27BD0068 */ addiu $sp, $sp, 0x68 - diff --git a/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s b/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s deleted file mode 100644 index 0d38ced10d..0000000000 --- a/asm/non_matchings/code/code_800DACC0/func_800DD9F4.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_800DD9F4 -/* B54B94 800DD9F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B54B98 800DD9F8 AFBF001C */ sw $ra, 0x1c($sp) -/* B54B9C 800DD9FC AFB00018 */ sw $s0, 0x18($sp) -/* B54BA0 800DDA00 AFA7002C */ sw $a3, 0x2c($sp) -/* B54BA4 800DDA04 8CAE0000 */ lw $t6, ($a1) -/* B54BA8 800DDA08 00808025 */ move $s0, $a0 -/* B54BAC 800DDA0C 90A80006 */ lbu $t0, 6($a1) -/* B54BB0 800DDA10 000E7AC0 */ sll $t7, $t6, 0xb -/* B54BB4 800DDA14 000FC782 */ srl $t8, $t7, 0x1e -/* B54BB8 800DDA18 13000014 */ beqz $t8, .L800DDA6C -/* B54BBC 800DDA1C 8CC30008 */ lw $v1, 8($a2) -/* B54BC0 800DDA20 00073040 */ sll $a2, $a3, 1 -/* B54BC4 800DDA24 24C6000F */ addiu $a2, $a2, 0xf -/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(gWaveSamples+0x20) # $a3, 0x8013 -/* B54BCC 800DDA2C 02002025 */ move $a0, $s0 -/* B54BD0 800DDA30 2401FFF0 */ li $at, -16 -/* B54BD4 800DDA34 00C13024 */ and $a2, $a2, $at -/* B54BD8 800DDA38 26100008 */ addiu $s0, $s0, 8 -/* B54BDC 800DDA3C 8CE7F0B0 */ lw $a3, %lo(gWaveSamples+0x20)($a3) -/* B54BE0 800DDA40 0C036F44 */ jal func_800DBD10 -/* B54BE4 800DDA44 24050580 */ li $a1, 1408 -/* B54BE8 800DDA48 3C038013 */ lui $v1, %hi(gWaveSamples) # $v1, 0x8013 -/* B54BEC 800DDA4C 8FA9002C */ lw $t1, 0x2c($sp) -/* B54BF0 800DDA50 2463F090 */ addiu $v1, %lo(gWaveSamples) # addiu $v1, $v1, -0xf70 -/* B54BF4 800DDA54 8C790020 */ lw $t9, 0x20($v1) -/* B54BF8 800DDA58 00095080 */ sll $t2, $t1, 2 -/* B54BFC 800DDA5C 02001025 */ move $v0, $s0 -/* B54C00 800DDA60 032A5821 */ addu $t3, $t9, $t2 -/* B54C04 800DDA64 1000003A */ b .L800DDB50 -/* B54C08 800DDA68 AC6B0020 */ sw $t3, 0x20($v1) -.L800DDA6C: -/* B54C0C 800DDA6C 3C0C1408 */ lui $t4, (0x14080580 >> 16) # lui $t4, 0x1408 -/* B54C10 800DDA70 358C0580 */ ori $t4, (0x14080580 & 0xFFFF) # ori $t4, $t4, 0x580 -/* B54C14 800DDA74 02001025 */ move $v0, $s0 -/* B54C18 800DDA78 AC4C0000 */ sw $t4, ($v0) -/* B54C1C 800DDA7C 8CAD0010 */ lw $t5, 0x10($a1) -/* B54C20 800DDA80 26100008 */ addiu $s0, $s0, 8 -/* B54C24 800DDA84 11000018 */ beqz $t0, .L800DDAE8 -/* B54C28 800DDA88 AC4D0004 */ sw $t5, 4($v0) -/* B54C2C 800DDA8C 3C028013 */ lui $v0, %hi(D_801304C0) # $v0, 0x8013 -/* B54C30 800DDA90 244204C0 */ addiu $v0, %lo(D_801304C0) # addiu $v0, $v0, 0x4c0 -/* B54C34 800DDA94 00087083 */ sra $t6, $t0, 2 -/* B54C38 800DDA98 004E7821 */ addu $t7, $v0, $t6 -/* B54C3C 800DDA9C 91F80000 */ lbu $t8, ($t7) -/* B54C40 800DDAA0 31190003 */ andi $t9, $t0, 3 -/* B54C44 800DDAA4 00595021 */ addu $t2, $v0, $t9 -/* B54C48 800DDAA8 00780019 */ multu $v1, $t8 -/* B54C4C 800DDAAC 914B0000 */ lbu $t3, ($t2) -/* B54C50 800DDAB0 00004812 */ mflo $t1 -/* B54C54 800DDAB4 00000000 */ nop -/* B54C58 800DDAB8 00000000 */ nop -/* B54C5C 800DDABC 012B001A */ div $zero, $t1, $t3 -/* B54C60 800DDAC0 00001812 */ mflo $v1 -/* B54C64 800DDAC4 15600002 */ bnez $t3, .L800DDAD0 -/* B54C68 800DDAC8 00000000 */ nop -/* B54C6C 800DDACC 0007000D */ break 7 -.L800DDAD0: -/* B54C70 800DDAD0 2401FFFF */ li $at, -1 -/* B54C74 800DDAD4 15610004 */ bne $t3, $at, .L800DDAE8 -/* B54C78 800DDAD8 3C018000 */ lui $at, 0x8000 -/* B54C7C 800DDADC 15210002 */ bne $t1, $at, .L800DDAE8 -/* B54C80 800DDAE0 00000000 */ nop -/* B54C84 800DDAE4 0006000D */ break 6 -.L800DDAE8: -/* B54C88 800DDAE8 8FAD002C */ lw $t5, 0x2c($sp) -/* B54C8C 800DDAEC 3063003F */ andi $v1, $v1, 0x3f -/* B54C90 800DDAF0 240C0040 */ li $t4, 64 -/* B54C94 800DDAF4 01831023 */ subu $v0, $t4, $v1 -/* B54C98 800DDAF8 004D082A */ slt $at, $v0, $t5 -/* B54C9C 800DDAFC 10200012 */ beqz $at, .L800DDB48 -/* B54CA0 800DDB00 01A22023 */ subu $a0, $t5, $v0 -/* B54CA4 800DDB04 2484003F */ addiu $a0, $a0, 0x3f -/* B54CA8 800DDB08 04810002 */ bgez $a0, .L800DDB14 -/* B54CAC 800DDB0C 00800821 */ addu $at, $a0, $zero -/* B54CB0 800DDB10 2481003F */ addiu $at, $a0, 0x3f -.L800DDB14: -/* B54CB4 800DDB14 00012183 */ sra $a0, $at, 6 -/* B54CB8 800DDB18 1080000B */ beqz $a0, .L800DDB48 -/* B54CBC 800DDB1C 02001025 */ move $v0, $s0 -/* B54CC0 800DDB20 308E00FF */ andi $t6, $a0, 0xff -/* B54CC4 800DDB24 000E7C00 */ sll $t7, $t6, 0x10 -/* B54CC8 800DDB28 3C010900 */ lui $at, 0x900 -/* B54CCC 800DDB2C 01E1C025 */ or $t8, $t7, $at -/* B54CD0 800DDB30 3C0A0600 */ lui $t2, (0x06000080 >> 16) # lui $t2, 0x600 -/* B54CD4 800DDB34 354A0080 */ ori $t2, (0x06000080 & 0xFFFF) # ori $t2, $t2, 0x80 -/* B54CD8 800DDB38 37190580 */ ori $t9, $t8, 0x580 -/* B54CDC 800DDB3C AC590000 */ sw $t9, ($v0) -/* B54CE0 800DDB40 AC4A0004 */ sw $t2, 4($v0) -/* B54CE4 800DDB44 26100008 */ addiu $s0, $s0, 8 -.L800DDB48: -/* B54CE8 800DDB48 ACC30008 */ sw $v1, 8($a2) -/* B54CEC 800DDB4C 02001025 */ move $v0, $s0 -.L800DDB50: -/* B54CF0 800DDB50 8FBF001C */ lw $ra, 0x1c($sp) -/* B54CF4 800DDB54 8FB00018 */ lw $s0, 0x18($sp) -/* B54CF8 800DDB58 27BD0020 */ addiu $sp, $sp, 0x20 -/* B54CFC 800DDB5C 03E00008 */ jr $ra -/* B54D00 800DDB60 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s b/asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s deleted file mode 100644 index 286d4532b2..0000000000 --- a/asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel Audio_IsBankLoadComplete -/* B58A50 800E18B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B58A54 800E18B4 240100FF */ li $at, 255 -/* B58A58 800E18B8 AFBF0014 */ sw $ra, 0x14($sp) -/* B58A5C 800E18BC 14810003 */ bne $a0, $at, .L800E18CC -/* B58A60 800E18C0 00802825 */ move $a1, $a0 -/* B58A64 800E18C4 10000014 */ b .L800E1918 -/* B58A68 800E18C8 24020001 */ li $v0, 1 -.L800E18CC: -/* B58A6C 800E18CC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3468) -/* B58A70 800E18D0 01C57021 */ addu $t6, $t6, $a1 -/* B58A74 800E18D4 91CE25E8 */ lbu $t6, %lo(gAudioContext+0x3468)($t6) -/* B58A78 800E18D8 29C10002 */ slti $at, $t6, 2 -/* B58A7C 800E18DC 14200003 */ bnez $at, .L800E18EC -/* B58A80 800E18E0 00000000 */ nop -/* B58A84 800E18E4 1000000C */ b .L800E1918 -/* B58A88 800E18E8 24020001 */ li $v0, 1 -.L800E18EC: -/* B58A8C 800E18EC 0C0389DA */ jal func_800E2768 -/* B58A90 800E18F0 24040001 */ li $a0, 1 -/* B58A94 800E18F4 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3468) -/* B58A98 800E18F8 01E27821 */ addu $t7, $t7, $v0 -/* B58A9C 800E18FC 91EF25E8 */ lbu $t7, %lo(gAudioContext+0x3468)($t7) -/* B58AA0 800E1900 00001025 */ move $v0, $zero -/* B58AA4 800E1904 29E10002 */ slti $at, $t7, 2 -/* B58AA8 800E1908 14200003 */ bnez $at, .L800E1918 -/* B58AAC 800E190C 00000000 */ nop -/* B58AB0 800E1910 10000001 */ b .L800E1918 -/* B58AB4 800E1914 24020001 */ li $v0, 1 -.L800E1918: -/* B58AB8 800E1918 8FBF0014 */ lw $ra, 0x14($sp) -/* B58ABC 800E191C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B58AC0 800E1920 03E00008 */ jr $ra -/* B58AC4 800E1924 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s b/asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s deleted file mode 100644 index 7fe2fd19ee..0000000000 --- a/asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel Audio_IsSeqLoadComplete -/* B58AC8 800E1928 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B58ACC 800E192C 240100FF */ li $at, 255 -/* B58AD0 800E1930 AFBF0014 */ sw $ra, 0x14($sp) -/* B58AD4 800E1934 14810003 */ bne $a0, $at, .L800E1944 -/* B58AD8 800E1938 00802825 */ move $a1, $a0 -/* B58ADC 800E193C 10000014 */ b .L800E1990 -/* B58AE0 800E1940 24020001 */ li $v0, 1 -.L800E1944: -/* B58AE4 800E1944 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) -/* B58AE8 800E1948 01C57021 */ addu $t6, $t6, $a1 -/* B58AEC 800E194C 91CE2618 */ lbu $t6, %lo(gAudioContext+0x3498)($t6) -/* B58AF0 800E1950 29C10002 */ slti $at, $t6, 2 -/* B58AF4 800E1954 14200003 */ bnez $at, .L800E1964 -/* B58AF8 800E1958 00000000 */ nop -/* B58AFC 800E195C 1000000C */ b .L800E1990 -/* B58B00 800E1960 24020001 */ li $v0, 1 -.L800E1964: -/* B58B04 800E1964 0C0389DA */ jal func_800E2768 -/* B58B08 800E1968 00002025 */ move $a0, $zero -/* B58B0C 800E196C 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3498) -/* B58B10 800E1970 01E27821 */ addu $t7, $t7, $v0 -/* B58B14 800E1974 91EF2618 */ lbu $t7, %lo(gAudioContext+0x3498)($t7) -/* B58B18 800E1978 00001025 */ move $v0, $zero -/* B58B1C 800E197C 29E10002 */ slti $at, $t7, 2 -/* B58B20 800E1980 14200003 */ bnez $at, .L800E1990 -/* B58B24 800E1984 00000000 */ nop -/* B58B28 800E1988 10000001 */ b .L800E1990 -/* B58B2C 800E198C 24020001 */ li $v0, 1 -.L800E1990: -/* B58B30 800E1990 8FBF0014 */ lw $ra, 0x14($sp) -/* B58B34 800E1994 27BD0018 */ addiu $sp, $sp, 0x18 -/* B58B38 800E1998 03E00008 */ jr $ra -/* B58B3C 800E199C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s b/asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s deleted file mode 100644 index 6f89f1b81c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel Audio_NextRandom -/* B5D960 800E67C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D964 800E67C4 AFBF0014 */ sw $ra, 0x14($sp) -/* B5D968 800E67C8 0C001BA8 */ jal osGetCount -/* B5D96C 800E67CC 00000000 */ nop -/* B5D970 800E67D0 3C048017 */ lui $a0, %hi(gAudioContext) # $a0, 0x8017 -/* B5D974 800E67D4 2484F180 */ addiu $a0, %lo(gAudioContext) # addiu $a0, $a0, -0xe80 -/* B5D978 800E67D8 3C038013 */ lui $v1, %hi(D_801304F0) # $v1, 0x8013 -/* B5D97C 800E67DC 8C6304F0 */ lw $v1, %lo(D_801304F0)($v1) -/* B5D980 800E67E0 8C8F289C */ lw $t7, 0x289c($a0) -/* B5D984 800E67E4 3C010123 */ lui $at, (0x01234567 >> 16) # lui $at, 0x123 -/* B5D988 800E67E8 34214567 */ ori $at, (0x01234567 & 0xFFFF) # ori $at, $at, 0x4567 -/* B5D98C 800E67EC 00417021 */ addu $t6, $v0, $at -/* B5D990 800E67F0 006FC021 */ addu $t8, $v1, $t7 -/* B5D994 800E67F4 01D80019 */ multu $t6, $t8 -/* B5D998 800E67F8 8C99297C */ lw $t9, 0x297c($a0) -/* B5D99C 800E67FC 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D9A0 800E6800 3C018013 */ lui $at, %hi(D_801304F0) -/* B5D9A4 800E6804 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D9A8 800E6808 00001812 */ mflo $v1 -/* B5D9AC 800E680C 00791021 */ addu $v0, $v1, $t9 -/* B5D9B0 800E6810 03E00008 */ jr $ra -/* B5D9B4 800E6814 AC2204F0 */ sw $v0, %lo(D_801304F0)($at) - diff --git a/asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s b/asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s deleted file mode 100644 index 25cd9f239d..0000000000 --- a/asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel Audio_SetBankLoadStatus -/* B58BB8 800E1A18 240100FF */ li $at, 255 -/* B58BBC 800E1A1C 10810008 */ beq $a0, $at, .L800E1A40 -/* B58BC0 800E1A20 3C0E8017 */ lui $t6, %hi(gAudioContext) # $t6, 0x8017 -/* B58BC4 800E1A24 25CEF180 */ addiu $t6, %lo(gAudioContext) # addiu $t6, $t6, -0xe80 -/* B58BC8 800E1A28 008E1021 */ addu $v0, $a0, $t6 -/* B58BCC 800E1A2C 904F3468 */ lbu $t7, 0x3468($v0) -/* B58BD0 800E1A30 24010005 */ li $at, 5 -/* B58BD4 800E1A34 11E10002 */ beq $t7, $at, .L800E1A40 -/* B58BD8 800E1A38 00000000 */ nop -/* B58BDC 800E1A3C A0453468 */ sb $a1, 0x3468($v0) -.L800E1A40: -/* B58BE0 800E1A40 03E00008 */ jr $ra -/* B58BE4 800E1A44 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s b/asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s deleted file mode 100644 index 237202276a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel Audio_SetSeqLoadStatus -/* B58BE8 800E1A48 240100FF */ li $at, 255 -/* B58BEC 800E1A4C 10810008 */ beq $a0, $at, .L800E1A70 -/* B58BF0 800E1A50 3C0E8017 */ lui $t6, %hi(gAudioContext) # $t6, 0x8017 -/* B58BF4 800E1A54 25CEF180 */ addiu $t6, %lo(gAudioContext) # addiu $t6, $t6, -0xe80 -/* B58BF8 800E1A58 008E1021 */ addu $v0, $a0, $t6 -/* B58BFC 800E1A5C 904F3498 */ lbu $t7, 0x3498($v0) -/* B58C00 800E1A60 24010005 */ li $at, 5 -/* B58C04 800E1A64 11E10002 */ beq $t7, $at, .L800E1A70 -/* B58C08 800E1A68 00000000 */ nop -/* B58C0C 800E1A6C A0453498 */ sb $a1, 0x3498($v0) -.L800E1A70: -/* B58C10 800E1A70 03E00008 */ jr $ra -/* B58C14 800E1A74 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E11F0.s b/asm/non_matchings/code/code_800E11F0/func_800E11F0.s deleted file mode 100644 index f9b3062eab..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E11F0.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_800E11F0 -/* B58390 800E11F0 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 -/* B58394 800E11F4 24C6F180 */ addiu $a2, %lo(gAudioContext) # addiu $a2, $a2, -0xe80 -/* B58398 800E11F8 8CC32624 */ lw $v1, 0x2624($a2) -/* B5839C 800E11FC 00001025 */ move $v0, $zero -/* B583A0 800E1200 00002025 */ move $a0, $zero -/* B583A4 800E1204 50600018 */ beql $v1, $zero, .L800E1268 -/* B583A8 800E1208 8CCC2620 */ lw $t4, 0x2620($a2) -/* B583AC 800E120C 8CCE261C */ lw $t6, 0x261c($a2) -.L800E1210: -/* B583B0 800E1210 008E1821 */ addu $v1, $a0, $t6 -/* B583B4 800E1214 9065000E */ lbu $a1, 0xe($v1) -/* B583B8 800E1218 10A0000C */ beqz $a1, .L800E124C -/* B583BC 800E121C 24AFFFFF */ addiu $t7, $a1, -1 -/* B583C0 800E1220 31F800FF */ andi $t8, $t7, 0xff -/* B583C4 800E1224 17000009 */ bnez $t8, .L800E124C -/* B583C8 800E1228 A06F000E */ sb $t7, 0xe($v1) -/* B583CC 800E122C 90D9282E */ lbu $t9, 0x282e($a2) -/* B583D0 800E1230 A079000D */ sb $t9, 0xd($v1) -/* B583D4 800E1234 90C8282E */ lbu $t0, 0x282e($a2) -/* B583D8 800E1238 00C84821 */ addu $t1, $a2, $t0 -/* B583DC 800E123C A122262C */ sb $v0, 0x262c($t1) -/* B583E0 800E1240 90CA282E */ lbu $t2, 0x282e($a2) -/* B583E4 800E1244 254B0001 */ addiu $t3, $t2, 1 -/* B583E8 800E1248 A0CB282E */ sb $t3, 0x282e($a2) -.L800E124C: -/* B583EC 800E124C 8CC32624 */ lw $v1, 0x2624($a2) -/* B583F0 800E1250 24420001 */ addiu $v0, $v0, 1 -/* B583F4 800E1254 24840010 */ addiu $a0, $a0, 0x10 -/* B583F8 800E1258 0043082B */ sltu $at, $v0, $v1 -/* B583FC 800E125C 5420FFEC */ bnezl $at, .L800E1210 -/* B58400 800E1260 8CCE261C */ lw $t6, 0x261c($a2) -/* B58404 800E1264 8CCC2620 */ lw $t4, 0x2620($a2) -.L800E1268: -/* B58408 800E1268 00601025 */ move $v0, $v1 -/* B5840C 800E126C 00032100 */ sll $a0, $v1, 4 -/* B58410 800E1270 006C082B */ sltu $at, $v1, $t4 -/* B58414 800E1274 10200017 */ beqz $at, .L800E12D4 -/* B58418 800E1278 00000000 */ nop -/* B5841C 800E127C 8CCD261C */ lw $t5, 0x261c($a2) -.L800E1280: -/* B58420 800E1280 008D1821 */ addu $v1, $a0, $t5 -/* B58424 800E1284 9065000E */ lbu $a1, 0xe($v1) -/* B58428 800E1288 10A0000C */ beqz $a1, .L800E12BC -/* B5842C 800E128C 24AEFFFF */ addiu $t6, $a1, -1 -/* B58430 800E1290 31CF00FF */ andi $t7, $t6, 0xff -/* B58434 800E1294 15E00009 */ bnez $t7, .L800E12BC -/* B58438 800E1298 A06E000E */ sb $t6, 0xe($v1) -/* B5843C 800E129C 90D8282F */ lbu $t8, 0x282f($a2) -/* B58440 800E12A0 A078000D */ sb $t8, 0xd($v1) -/* B58444 800E12A4 90D9282F */ lbu $t9, 0x282f($a2) -/* B58448 800E12A8 00D94021 */ addu $t0, $a2, $t9 -/* B5844C 800E12AC A102272C */ sb $v0, 0x272c($t0) -/* B58450 800E12B0 90C9282F */ lbu $t1, 0x282f($a2) -/* B58454 800E12B4 252A0001 */ addiu $t2, $t1, 1 -/* B58458 800E12B8 A0CA282F */ sb $t2, 0x282f($a2) -.L800E12BC: -/* B5845C 800E12BC 8CCB2620 */ lw $t3, 0x2620($a2) -/* B58460 800E12C0 24420001 */ addiu $v0, $v0, 1 -/* B58464 800E12C4 24840010 */ addiu $a0, $a0, 0x10 -/* B58468 800E12C8 004B082B */ sltu $at, $v0, $t3 -/* B5846C 800E12CC 5420FFEC */ bnezl $at, .L800E1280 -/* B58470 800E12D0 8CCD261C */ lw $t5, 0x261c($a2) -.L800E12D4: -/* B58474 800E12D4 03E00008 */ jr $ra -/* B58478 800E12D8 ACC02628 */ sw $zero, 0x2628($a2) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E19A0.s b/asm/non_matchings/code/code_800E11F0/func_800E19A0.s deleted file mode 100644 index f752d00eca..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E19A0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_800E19A0 -/* B58B40 800E19A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B58B44 800E19A4 240100FF */ li $at, 255 -/* B58B48 800E19A8 AFBF0014 */ sw $ra, 0x14($sp) -/* B58B4C 800E19AC 14810003 */ bne $a0, $at, .L800E19BC -/* B58B50 800E19B0 00802825 */ move $a1, $a0 -/* B58B54 800E19B4 10000014 */ b .L800E1A08 -/* B58B58 800E19B8 24020001 */ li $v0, 1 -.L800E19BC: -/* B58B5C 800E19BC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3438) -/* B58B60 800E19C0 01C57021 */ addu $t6, $t6, $a1 -/* B58B64 800E19C4 91CE25B8 */ lbu $t6, %lo(gAudioContext+0x3438)($t6) -/* B58B68 800E19C8 29C10002 */ slti $at, $t6, 2 -/* B58B6C 800E19CC 14200003 */ bnez $at, .L800E19DC -/* B58B70 800E19D0 00000000 */ nop -/* B58B74 800E19D4 1000000C */ b .L800E1A08 -/* B58B78 800E19D8 24020001 */ li $v0, 1 -.L800E19DC: -/* B58B7C 800E19DC 0C0389DA */ jal func_800E2768 -/* B58B80 800E19E0 24040002 */ li $a0, 2 -/* B58B84 800E19E4 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3438) -/* B58B88 800E19E8 01E27821 */ addu $t7, $t7, $v0 -/* B58B8C 800E19EC 91EF25B8 */ lbu $t7, %lo(gAudioContext+0x3438)($t7) -/* B58B90 800E19F0 00001025 */ move $v0, $zero -/* B58B94 800E19F4 29E10002 */ slti $at, $t7, 2 -/* B58B98 800E19F8 14200003 */ bnez $at, .L800E1A08 -/* B58B9C 800E19FC 00000000 */ nop -/* B58BA0 800E1A00 10000001 */ b .L800E1A08 -/* B58BA4 800E1A04 24020001 */ li $v0, 1 -.L800E1A08: -/* B58BA8 800E1A08 8FBF0014 */ lw $ra, 0x14($sp) -/* B58BAC 800E1A0C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B58BB0 800E1A10 03E00008 */ jr $ra -/* B58BB4 800E1A14 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1A78.s b/asm/non_matchings/code/code_800E11F0/func_800E1A78.s deleted file mode 100644 index b113626969..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1A78.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800E1A78 -/* B58C18 800E1A78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B58C1C 800E1A7C 240100FF */ li $at, 255 -/* B58C20 800E1A80 10810011 */ beq $a0, $at, .L800E1AC8 -/* B58C24 800E1A84 AFBF0014 */ sw $ra, 0x14($sp) -/* B58C28 800E1A88 3C0E8017 */ lui $t6, %hi(gAudioContext) # $t6, 0x8017 -/* B58C2C 800E1A8C 25CEF180 */ addiu $t6, %lo(gAudioContext) # addiu $t6, $t6, -0xe80 -/* B58C30 800E1A90 008E1821 */ addu $v1, $a0, $t6 -/* B58C34 800E1A94 90623438 */ lbu $v0, 0x3438($v1) -/* B58C38 800E1A98 24060005 */ li $a2, 5 -/* B58C3C 800E1A9C 24010002 */ li $at, 2 -/* B58C40 800E1AA0 10C20003 */ beq $a2, $v0, .L800E1AB0 -/* B58C44 800E1AA4 00000000 */ nop -/* B58C48 800E1AA8 A0653438 */ sb $a1, 0x3438($v1) -/* B58C4C 800E1AAC 30A200FF */ andi $v0, $a1, 0xff -.L800E1AB0: -/* B58C50 800E1AB0 10C20003 */ beq $a2, $v0, .L800E1AC0 -/* B58C54 800E1AB4 00000000 */ nop -/* B58C58 800E1AB8 54410004 */ bnel $v0, $at, .L800E1ACC -/* B58C5C 800E1ABC 8FBF0014 */ lw $ra, 0x14($sp) -.L800E1AC0: -/* B58C60 800E1AC0 0C0383A4 */ jal func_800E0E90 -/* B58C64 800E1AC4 00000000 */ nop -.L800E1AC8: -/* B58C68 800E1AC8 8FBF0014 */ lw $ra, 0x14($sp) -.L800E1ACC: -/* B58C6C 800E1ACC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B58C70 800E1AD0 03E00008 */ jr $ra -/* B58C74 800E1AD4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1AD8.s b/asm/non_matchings/code/code_800E11F0/func_800E1AD8.s deleted file mode 100644 index 5019ad3992..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1AD8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800E1AD8 -/* B58C78 800E1AD8 240100FF */ li $at, 255 -/* B58C7C 800E1ADC 10810008 */ beq $a0, $at, .L800E1B00 -/* B58C80 800E1AE0 3C0E8017 */ lui $t6, %hi(gAudioContext) # $t6, 0x8017 -/* B58C84 800E1AE4 25CEF180 */ addiu $t6, %lo(gAudioContext) # addiu $t6, $t6, -0xe80 -/* B58C88 800E1AE8 008E1021 */ addu $v0, $a0, $t6 -/* B58C8C 800E1AEC 904F3438 */ lbu $t7, 0x3438($v0) -/* B58C90 800E1AF0 24010005 */ li $at, 5 -/* B58C94 800E1AF4 11E10002 */ beq $t7, $at, .L800E1B00 -/* B58C98 800E1AF8 00000000 */ nop -/* B58C9C 800E1AFC A0453438 */ sb $a1, 0x3438($v0) -.L800E1B00: -/* B58CA0 800E1B00 03E00008 */ jr $ra -/* B58CA4 800E1B04 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1B08.s b/asm/non_matchings/code/code_800E11F0/func_800E1B08.s deleted file mode 100644 index bf19b9a1f1..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1B08.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800E1B08 -/* B58CA8 800E1B08 AFA60008 */ sw $a2, 8($sp) -/* B58CAC 800E1B0C 84830000 */ lh $v1, ($a0) -/* B58CB0 800E1B10 A4860002 */ sh $a2, 2($a0) -/* B58CB4 800E1B14 AC850004 */ sw $a1, 4($a0) -/* B58CB8 800E1B18 18600011 */ blez $v1, .L800E1B60 -/* B58CBC 800E1B1C 00001025 */ move $v0, $zero -/* B58CC0 800E1B20 00803025 */ move $a2, $a0 -/* B58CC4 800E1B24 24070002 */ li $a3, 2 -.L800E1B28: -/* B58CC8 800E1B28 8CCE0014 */ lw $t6, 0x14($a2) -/* B58CCC 800E1B2C 24420001 */ addiu $v0, $v0, 1 -/* B58CD0 800E1B30 51C00009 */ beql $t6, $zero, .L800E1B58 -/* B58CD4 800E1B34 0043082A */ slt $at, $v0, $v1 -/* B58CD8 800E1B38 80CF0018 */ lb $t7, 0x18($a2) -/* B58CDC 800E1B3C 54EF0006 */ bnel $a3, $t7, .L800E1B58 -/* B58CE0 800E1B40 0043082A */ slt $at, $v0, $v1 -/* B58CE4 800E1B44 8CD80010 */ lw $t8, 0x10($a2) -/* B58CE8 800E1B48 0305C821 */ addu $t9, $t8, $a1 -/* B58CEC 800E1B4C ACD90010 */ sw $t9, 0x10($a2) -/* B58CF0 800E1B50 84830000 */ lh $v1, ($a0) -/* B58CF4 800E1B54 0043082A */ slt $at, $v0, $v1 -.L800E1B58: -/* B58CF8 800E1B58 1420FFF3 */ bnez $at, .L800E1B28 -/* B58CFC 800E1B5C 24C60010 */ addiu $a2, $a2, 0x10 -.L800E1B60: -/* B58D00 800E1B60 03E00008 */ jr $ra -/* B58D04 800E1B64 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1B68.s b/asm/non_matchings/code/code_800E11F0/func_800E1B68.s deleted file mode 100644 index 9304a96204..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1B68.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_800E1B68 -/* B58D08 800E1B68 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B58D0C 800E1B6C AFB30020 */ sw $s3, 0x20($sp) -/* B58D10 800E1B70 3C138017 */ lui $s3, %hi(gAudioContext) # $s3, 0x8017 -/* B58D14 800E1B74 2673F180 */ addiu $s3, %lo(gAudioContext) # addiu $s3, $s3, -0xe80 -/* B58D18 800E1B78 966E2840 */ lhu $t6, 0x2840($s3) -/* B58D1C 800E1B7C AFBF0024 */ sw $ra, 0x24($sp) -/* B58D20 800E1B80 AFB2001C */ sw $s2, 0x1c($sp) -/* B58D24 800E1B84 008E082A */ slt $at, $a0, $t6 -/* B58D28 800E1B88 AFB10018 */ sw $s1, 0x18($sp) -/* B58D2C 800E1B8C AFB00014 */ sw $s0, 0x14($sp) -/* B58D30 800E1B90 14200003 */ bnez $at, .L800E1BA0 -/* B58D34 800E1B94 AFA5003C */ sw $a1, 0x3c($sp) -/* B58D38 800E1B98 10000018 */ b .L800E1BFC -/* B58D3C 800E1B9C 00001025 */ move $v0, $zero -.L800E1BA0: -/* B58D40 800E1BA0 8E62283C */ lw $v0, 0x283c($s3) -/* B58D44 800E1BA4 00047840 */ sll $t7, $a0, 1 -/* B58D48 800E1BA8 241200FF */ li $s2, 255 -/* B58D4C 800E1BAC 004FC021 */ addu $t8, $v0, $t7 -/* B58D50 800E1BB0 97100000 */ lhu $s0, ($t8) -/* B58D54 800E1BB4 0202C821 */ addu $t9, $s0, $v0 -/* B58D58 800E1BB8 93310000 */ lbu $s1, ($t9) -/* B58D5C 800E1BBC 26100001 */ addiu $s0, $s0, 1 -/* B58D60 800E1BC0 5A20000C */ blezl $s1, .L800E1BF4 -/* B58D64 800E1BC4 8FAA003C */ lw $t2, 0x3c($sp) -/* B58D68 800E1BC8 8E68283C */ lw $t0, 0x283c($s3) -.L800E1BCC: -/* B58D6C 800E1BCC 02084821 */ addu $t1, $s0, $t0 -/* B58D70 800E1BD0 91320000 */ lbu $s2, ($t1) -/* B58D74 800E1BD4 26100001 */ addiu $s0, $s0, 1 -/* B58D78 800E1BD8 0C038915 */ jal func_800E2454 -/* B58D7C 800E1BDC 02402025 */ move $a0, $s2 -/* B58D80 800E1BE0 2631FFFF */ addiu $s1, $s1, -1 -/* B58D84 800E1BE4 5E20FFF9 */ bgtzl $s1, .L800E1BCC -/* B58D88 800E1BE8 8E68283C */ lw $t0, 0x283c($s3) -/* B58D8C 800E1BEC AFA20028 */ sw $v0, 0x28($sp) -/* B58D90 800E1BF0 8FAA003C */ lw $t2, 0x3c($sp) -.L800E1BF4: -/* B58D94 800E1BF4 8FA20028 */ lw $v0, 0x28($sp) -/* B58D98 800E1BF8 AD520000 */ sw $s2, ($t2) -.L800E1BFC: -/* B58D9C 800E1BFC 8FBF0024 */ lw $ra, 0x24($sp) -/* B58DA0 800E1C00 8FB00014 */ lw $s0, 0x14($sp) -/* B58DA4 800E1C04 8FB10018 */ lw $s1, 0x18($sp) -/* B58DA8 800E1C08 8FB2001C */ lw $s2, 0x1c($sp) -/* B58DAC 800E1C0C 8FB30020 */ lw $s3, 0x20($sp) -/* B58DB0 800E1C10 03E00008 */ jr $ra -/* B58DB4 800E1C14 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1C18.s b/asm/non_matchings/code/code_800E11F0/func_800E1C18.s deleted file mode 100644 index 498c5f278c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1C18.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800E1C18 -/* B58DB8 800E1C18 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2840) # $t6, 0x8017 -/* B58DBC 800E1C1C 95CE19C0 */ lhu $t6, %lo(gAudioContext+0x2840)($t6) -/* B58DC0 800E1C20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B58DC4 800E1C24 AFBF0014 */ sw $ra, 0x14($sp) -/* B58DC8 800E1C28 008E082A */ slt $at, $a0, $t6 -/* B58DCC 800E1C2C 1020000E */ beqz $at, .L800E1C68 -/* B58DD0 800E1C30 00A03025 */ move $a2, $a1 -/* B58DD4 800E1C34 30AF0002 */ andi $t7, $a1, 2 -/* B58DD8 800E1C38 11E00006 */ beqz $t7, .L800E1C54 -/* B58DDC 800E1C3C 27A50018 */ addiu $a1, $sp, 0x18 -/* B58DE0 800E1C40 AFA40020 */ sw $a0, 0x20($sp) -/* B58DE4 800E1C44 0C0386DA */ jal func_800E1B68 -/* B58DE8 800E1C48 AFA60024 */ sw $a2, 0x24($sp) -/* B58DEC 800E1C4C 8FA40020 */ lw $a0, 0x20($sp) -/* B58DF0 800E1C50 8FA60024 */ lw $a2, 0x24($sp) -.L800E1C54: -/* B58DF4 800E1C54 30D80001 */ andi $t8, $a2, 1 -/* B58DF8 800E1C58 53000004 */ beql $t8, $zero, .L800E1C6C -/* B58DFC 800E1C5C 8FBF0014 */ lw $ra, 0x14($sp) -/* B58E00 800E1C60 0C0388B1 */ jal func_800E22C4 -/* B58E04 800E1C64 00000000 */ nop -.L800E1C68: -/* B58E08 800E1C68 8FBF0014 */ lw $ra, 0x14($sp) -.L800E1C6C: -/* B58E0C 800E1C6C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B58E10 800E1C70 03E00008 */ jr $ra -/* B58E14 800E1C74 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1C78.s b/asm/non_matchings/code/code_800E11F0/func_800E1C78.s deleted file mode 100644 index 0e3114fd4e..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1C78.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_800E1C78 -/* B58E18 800E1C78 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B58E1C 800E1C7C AFBF0024 */ sw $ra, 0x24($sp) -/* B58E20 800E1C80 AFB00020 */ sw $s0, 0x20($sp) -/* B58E24 800E1C84 908E0000 */ lbu $t6, ($a0) -/* B58E28 800E1C88 24010001 */ li $at, 1 -/* B58E2C 800E1C8C 00808025 */ move $s0, $a0 -/* B58E30 800E1C90 31CF0001 */ andi $t7, $t6, 1 -/* B58E34 800E1C94 55E1002F */ bnel $t7, $at, .L800E1D54 -/* B58E38 800E1C98 8FBF0024 */ lw $ra, 0x24($sp) -/* B58E3C 800E1C9C 8C820000 */ lw $v0, ($a0) -/* B58E40 800E1CA0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B58E44 800E1CA4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B58E48 800E1CA8 00021900 */ sll $v1, $v0, 4 -/* B58E4C 800E1CAC 00031F82 */ srl $v1, $v1, 0x1e -/* B58E50 800E1CB0 10600027 */ beqz $v1, .L800E1D50 -/* B58E54 800E1CB4 00412024 */ and $a0, $v0, $at -/* B58E58 800E1CB8 8E060004 */ lw $a2, 4($s0) -/* B58E5C 800E1CBC 00033E00 */ sll $a3, $v1, 0x18 -/* B58E60 800E1CC0 24180001 */ li $t8, 1 -/* B58E64 800E1CC4 AFB80010 */ sw $t8, 0x10($sp) -/* B58E68 800E1CC8 0C038171 */ jal func_800E05C4 -/* B58E6C 800E1CCC 00073E03 */ sra $a3, $a3, 0x18 -/* B58E70 800E1CD0 14400003 */ bnez $v0, .L800E1CE0 -/* B58E74 800E1CD4 00402825 */ move $a1, $v0 -/* B58E78 800E1CD8 1000001D */ b .L800E1D50 -/* B58E7C 800E1CDC 2402FFFF */ li $v0, -1 -.L800E1CE0: -/* B58E80 800E1CE0 8E020000 */ lw $v0, ($s0) -/* B58E84 800E1CE4 24010001 */ li $at, 1 -/* B58E88 800E1CE8 3C198017 */ lui $t9, %hi(gAudioContext+0x2838) # $t9, 0x8017 -/* B58E8C 800E1CEC 00021900 */ sll $v1, $v0, 4 -/* B58E90 800E1CF0 00031F82 */ srl $v1, $v1, 0x1e -/* B58E94 800E1CF4 1461000B */ bne $v1, $at, .L800E1D24 -/* B58E98 800E1CF8 00603825 */ move $a3, $v1 -/* B58E9C 800E1CFC 8F3919B8 */ lw $t9, %lo(gAudioContext+0x2838)($t9) -/* B58EA0 800E1D00 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B58EA4 800E1D04 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B58EA8 800E1D08 8E040004 */ lw $a0, 4($s0) -/* B58EAC 800E1D0C 87270002 */ lh $a3, 2($t9) -/* B58EB0 800E1D10 AFA5002C */ sw $a1, 0x2c($sp) -/* B58EB4 800E1D14 0C038AF3 */ jal func_800E2BCC -/* B58EB8 800E1D18 00413024 */ and $a2, $v0, $at -/* B58EBC 800E1D1C 10000008 */ b .L800E1D40 -/* B58EC0 800E1D20 92080000 */ lbu $t0, ($s0) -.L800E1D24: -/* B58EC4 800E1D24 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B58EC8 800E1D28 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B58ECC 800E1D2C 8E040004 */ lw $a0, 4($s0) -/* B58ED0 800E1D30 AFA5002C */ sw $a1, 0x2c($sp) -/* B58ED4 800E1D34 0C038AAA */ jal func_800E2AA8 -/* B58ED8 800E1D38 00413024 */ and $a2, $v0, $at -/* B58EDC 800E1D3C 92080000 */ lbu $t0, ($s0) -.L800E1D40: -/* B58EE0 800E1D40 3109FFF3 */ andi $t1, $t0, 0xfff3 -/* B58EE4 800E1D44 A2090000 */ sb $t1, ($s0) -/* B58EE8 800E1D48 8FAA002C */ lw $t2, 0x2c($sp) -/* B58EEC 800E1D4C AE0A0004 */ sw $t2, 4($s0) -.L800E1D50: -/* B58EF0 800E1D50 8FBF0024 */ lw $ra, 0x24($sp) -.L800E1D54: -/* B58EF4 800E1D54 8FB00020 */ lw $s0, 0x20($sp) -/* B58EF8 800E1D58 27BD0030 */ addiu $sp, $sp, 0x30 -/* B58EFC 800E1D5C 03E00008 */ jr $ra -/* B58F00 800E1D60 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1D64.s b/asm/non_matchings/code/code_800E11F0/func_800E1D64.s deleted file mode 100644 index ed7668021e..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1D64.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_800E1D64 -/* B58F04 800E1D64 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B58F08 800E1D68 AFB00018 */ sw $s0, 0x18($sp) -/* B58F0C 800E1D6C 28A1007F */ slti $at, $a1, 0x7f -/* B58F10 800E1D70 00808025 */ move $s0, $a0 -/* B58F14 800E1D74 1020001D */ beqz $at, .L800E1DEC -/* B58F18 800E1D78 AFBF001C */ sw $ra, 0x1c($sp) -/* B58F1C 800E1D7C 0C039D26 */ jal Audio_GetInstrumentInner -/* B58F20 800E1D80 00000000 */ nop -/* B58F24 800E1D84 14400003 */ bnez $v0, .L800E1D94 -/* B58F28 800E1D88 00401825 */ move $v1, $v0 -/* B58F2C 800E1D8C 10000024 */ b .L800E1E20 -/* B58F30 800E1D90 2402FFFF */ li $v0, -1 -.L800E1D94: -/* B58F34 800E1D94 904E0001 */ lbu $t6, 1($v0) -/* B58F38 800E1D98 02002825 */ move $a1, $s0 -/* B58F3C 800E1D9C 51C00006 */ beql $t6, $zero, .L800E1DB8 -/* B58F40 800E1DA0 8C640010 */ lw $a0, 0x10($v1) -/* B58F44 800E1DA4 8C640008 */ lw $a0, 8($v1) -/* B58F48 800E1DA8 0C03871E */ jal func_800E1C78 -/* B58F4C 800E1DAC AFA30024 */ sw $v1, 0x24($sp) -/* B58F50 800E1DB0 8FA30024 */ lw $v1, 0x24($sp) -/* B58F54 800E1DB4 8C640010 */ lw $a0, 0x10($v1) -.L800E1DB8: -/* B58F58 800E1DB8 AFA30024 */ sw $v1, 0x24($sp) -/* B58F5C 800E1DBC 0C03871E */ jal func_800E1C78 -/* B58F60 800E1DC0 02002825 */ move $a1, $s0 -/* B58F64 800E1DC4 8FA30024 */ lw $v1, 0x24($sp) -/* B58F68 800E1DC8 2401007F */ li $at, 127 -/* B58F6C 800E1DCC 02002825 */ move $a1, $s0 -/* B58F70 800E1DD0 906F0002 */ lbu $t7, 2($v1) -/* B58F74 800E1DD4 51E10013 */ beql $t7, $at, .L800E1E24 -/* B58F78 800E1DD8 8FBF001C */ lw $ra, 0x1c($sp) -/* B58F7C 800E1DDC 0C03871E */ jal func_800E1C78 -/* B58F80 800E1DE0 8C640018 */ lw $a0, 0x18($v1) -/* B58F84 800E1DE4 1000000F */ b .L800E1E24 -/* B58F88 800E1DE8 8FBF001C */ lw $ra, 0x1c($sp) -.L800E1DEC: -/* B58F8C 800E1DEC 2401007F */ li $at, 127 -/* B58F90 800E1DF0 14A1000B */ bne $a1, $at, .L800E1E20 -/* B58F94 800E1DF4 02002025 */ move $a0, $s0 -/* B58F98 800E1DF8 0C039D5B */ jal Audio_GetDrum -/* B58F9C 800E1DFC 00C02825 */ move $a1, $a2 -/* B58FA0 800E1E00 14400003 */ bnez $v0, .L800E1E10 -/* B58FA4 800E1E04 00401825 */ move $v1, $v0 -/* B58FA8 800E1E08 10000005 */ b .L800E1E20 -/* B58FAC 800E1E0C 2402FFFF */ li $v0, -1 -.L800E1E10: -/* B58FB0 800E1E10 8C640004 */ lw $a0, 4($v1) -/* B58FB4 800E1E14 0C03871E */ jal func_800E1C78 -/* B58FB8 800E1E18 02002825 */ move $a1, $s0 -/* B58FBC 800E1E1C 00001025 */ move $v0, $zero -.L800E1E20: -/* B58FC0 800E1E20 8FBF001C */ lw $ra, 0x1c($sp) -.L800E1E24: -/* B58FC4 800E1E24 8FB00018 */ lw $s0, 0x18($sp) -/* B58FC8 800E1E28 27BD0028 */ addiu $sp, $sp, 0x28 -/* B58FCC 800E1E2C 03E00008 */ jr $ra -/* B58FD0 800E1E30 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1E34.s b/asm/non_matchings/code/code_800E11F0/func_800E1E34.s deleted file mode 100644 index eb1862a999..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1E34.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800E1E34 -/* B58FD4 800E1E34 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B58FD8 800E1E38 8FAE0030 */ lw $t6, 0x30($sp) -/* B58FDC 800E1E3C AFBF001C */ sw $ra, 0x1c($sp) -/* B58FE0 800E1E40 0C038B38 */ jal func_800E2CE0 -/* B58FE4 800E1E44 AFAE0010 */ sw $t6, 0x10($sp) -/* B58FE8 800E1E48 14400004 */ bnez $v0, .L800E1E5C -/* B58FEC 800E1E4C 8FA40030 */ lw $a0, 0x30($sp) -/* B58FF0 800E1E50 2405FFFF */ li $a1, -1 -/* B58FF4 800E1E54 0C000C18 */ jal osSendMesg -/* B58FF8 800E1E58 00003025 */ move $a2, $zero -.L800E1E5C: -/* B58FFC 800E1E5C 8FBF001C */ lw $ra, 0x1c($sp) -/* B59000 800E1E60 27BD0020 */ addiu $sp, $sp, 0x20 -/* B59004 800E1E64 03E00008 */ jr $ra -/* B59008 800E1E68 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1E6C.s b/asm/non_matchings/code/code_800E11F0/func_800E1E6C.s deleted file mode 100644 index 4b48385421..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1E6C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800E1E6C -/* B5900C 800E1E6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59010 800E1E70 AFA7002C */ sw $a3, 0x2c($sp) -/* B59014 800E1E74 8FAE002C */ lw $t6, 0x2c($sp) -/* B59018 800E1E78 AFA50024 */ sw $a1, 0x24($sp) -/* B5901C 800E1E7C 00802825 */ move $a1, $a0 -/* B59020 800E1E80 00C03825 */ move $a3, $a2 -/* B59024 800E1E84 AFBF001C */ sw $ra, 0x1c($sp) -/* B59028 800E1E88 AFA40020 */ sw $a0, 0x20($sp) -/* B5902C 800E1E8C AFA60028 */ sw $a2, 0x28($sp) -/* B59030 800E1E90 00003025 */ move $a2, $zero -/* B59034 800E1E94 00002025 */ move $a0, $zero -/* B59038 800E1E98 0C03878D */ jal func_800E1E34 -/* B5903C 800E1E9C AFAE0010 */ sw $t6, 0x10($sp) -/* B59040 800E1EA0 8FBF001C */ lw $ra, 0x1c($sp) -/* B59044 800E1EA4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B59048 800E1EA8 03E00008 */ jr $ra -/* B5904C 800E1EAC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1EB0.s b/asm/non_matchings/code/code_800E11F0/func_800E1EB0.s deleted file mode 100644 index 7efde4ba73..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1EB0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800E1EB0 -/* B59050 800E1EB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59054 800E1EB4 AFA7002C */ sw $a3, 0x2c($sp) -/* B59058 800E1EB8 8FAE002C */ lw $t6, 0x2c($sp) -/* B5905C 800E1EBC AFA50024 */ sw $a1, 0x24($sp) -/* B59060 800E1EC0 00802825 */ move $a1, $a0 -/* B59064 800E1EC4 00C03825 */ move $a3, $a2 -/* B59068 800E1EC8 AFBF001C */ sw $ra, 0x1c($sp) -/* B5906C 800E1ECC AFA40020 */ sw $a0, 0x20($sp) -/* B59070 800E1ED0 AFA60028 */ sw $a2, 0x28($sp) -/* B59074 800E1ED4 00003025 */ move $a2, $zero -/* B59078 800E1ED8 24040002 */ li $a0, 2 -/* B5907C 800E1EDC 0C03878D */ jal func_800E1E34 -/* B59080 800E1EE0 AFAE0010 */ sw $t6, 0x10($sp) -/* B59084 800E1EE4 8FBF001C */ lw $ra, 0x1c($sp) -/* B59088 800E1EE8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B5908C 800E1EEC 03E00008 */ jr $ra -/* B59090 800E1EF0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1EF4.s b/asm/non_matchings/code/code_800E11F0/func_800E1EF4.s deleted file mode 100644 index 4edef24e08..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1EF4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800E1EF4 -/* B59094 800E1EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59098 800E1EF8 AFA7002C */ sw $a3, 0x2c($sp) -/* B5909C 800E1EFC 8FAE002C */ lw $t6, 0x2c($sp) -/* B590A0 800E1F00 AFA50024 */ sw $a1, 0x24($sp) -/* B590A4 800E1F04 00802825 */ move $a1, $a0 -/* B590A8 800E1F08 00C03825 */ move $a3, $a2 -/* B590AC 800E1F0C AFBF001C */ sw $ra, 0x1c($sp) -/* B590B0 800E1F10 AFA40020 */ sw $a0, 0x20($sp) -/* B590B4 800E1F14 AFA60028 */ sw $a2, 0x28($sp) -/* B590B8 800E1F18 00003025 */ move $a2, $zero -/* B590BC 800E1F1C 24040001 */ li $a0, 1 -/* B590C0 800E1F20 0C03878D */ jal func_800E1E34 -/* B590C4 800E1F24 AFAE0010 */ sw $t6, 0x10($sp) -/* B590C8 800E1F28 8FBF001C */ lw $ra, 0x1c($sp) -/* B590CC 800E1F2C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B590D0 800E1F30 03E00008 */ jr $ra -/* B590D4 800E1F34 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1F38.s b/asm/non_matchings/code/code_800E11F0/func_800E1F38.s deleted file mode 100644 index e512914fbd..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1F38.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800E1F38 -/* B590D8 800E1F38 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 -/* B590DC 800E1F3C 24C6F180 */ addiu $a2, %lo(gAudioContext) # addiu $a2, $a2, -0xe80 -/* B590E0 800E1F40 8CC2283C */ lw $v0, 0x283c($a2) -/* B590E4 800E1F44 00047040 */ sll $t6, $a0, 1 -/* B590E8 800E1F48 004E7821 */ addu $t7, $v0, $t6 -/* B590EC 800E1F4C 95E30000 */ lhu $v1, ($t7) -/* B590F0 800E1F50 0062C021 */ addu $t8, $v1, $v0 -/* B590F4 800E1F54 93190000 */ lbu $t9, ($t8) -/* B590F8 800E1F58 24630001 */ addiu $v1, $v1, 1 -/* B590FC 800E1F5C 17200003 */ bnez $t9, .L800E1F6C -/* B59100 800E1F60 ACB90000 */ sw $t9, ($a1) -/* B59104 800E1F64 03E00008 */ jr $ra -/* B59108 800E1F68 00001025 */ move $v0, $zero - -.L800E1F6C: -/* B5910C 800E1F6C 8CC9283C */ lw $t1, 0x283c($a2) -/* B59110 800E1F70 01231021 */ addu $v0, $t1, $v1 -/* B59114 800E1F74 03E00008 */ jr $ra -/* B59118 800E1F78 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s b/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s deleted file mode 100644 index 97271bf264..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800E1F7C -/* B5911C 800E1F7C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B59120 800E1F80 AFB30020 */ sw $s3, 0x20($sp) -/* B59124 800E1F84 3C138017 */ lui $s3, %hi(gAudioContext) # $s3, 0x8017 -/* B59128 800E1F88 2673F180 */ addiu $s3, %lo(gAudioContext) # addiu $s3, $s3, -0xe80 -/* B5912C 800E1F8C 8E62283C */ lw $v0, 0x283c($s3) -/* B59130 800E1F90 00047040 */ sll $t6, $a0, 1 -/* B59134 800E1F94 AFBF0024 */ sw $ra, 0x24($sp) -/* B59138 800E1F98 AFB2001C */ sw $s2, 0x1c($sp) -/* B5913C 800E1F9C AFB10018 */ sw $s1, 0x18($sp) -/* B59140 800E1FA0 AFB00014 */ sw $s0, 0x14($sp) -/* B59144 800E1FA4 004E7821 */ addu $t7, $v0, $t6 -/* B59148 800E1FA8 95F10000 */ lhu $s1, ($t7) -/* B5914C 800E1FAC 0222C021 */ addu $t8, $s1, $v0 -/* B59150 800E1FB0 93120000 */ lbu $s2, ($t8) -/* B59154 800E1FB4 26310001 */ addiu $s1, $s1, 1 -/* B59158 800E1FB8 5A400016 */ blezl $s2, .L800E2014 -/* B5915C 800E1FBC 8FBF0024 */ lw $ra, 0x24($sp) -/* B59160 800E1FC0 8E79283C */ lw $t9, 0x283c($s3) -.L800E1FC4: -/* B59164 800E1FC4 2652FFFF */ addiu $s2, $s2, -1 -/* B59168 800E1FC8 24040001 */ li $a0, 1 -/* B5916C 800E1FCC 02394021 */ addu $t0, $s1, $t9 -/* B59170 800E1FD0 91050000 */ lbu $a1, ($t0) -/* B59174 800E1FD4 0C0389DA */ jal func_800E2768 -/* B59178 800E1FD8 26310001 */ addiu $s1, $s1, 1 -/* B5917C 800E1FDC 00408025 */ move $s0, $v0 -/* B59180 800E1FE0 24040001 */ li $a0, 1 -/* B59184 800E1FE4 0C03813A */ jal func_800E04E8 -/* B59188 800E1FE8 00402825 */ move $a1, $v0 -/* B5918C 800E1FEC 14400006 */ bnez $v0, .L800E2008 -/* B59190 800E1FF0 00000000 */ nop -/* B59194 800E1FF4 0C03880B */ jal func_800E202C -/* B59198 800E1FF8 02002025 */ move $a0, $s0 -/* B5919C 800E1FFC 02002025 */ move $a0, $s0 -/* B591A0 800E2000 0C038686 */ jal Audio_SetBankLoadStatus -/* B591A4 800E2004 00002825 */ move $a1, $zero -.L800E2008: -/* B591A8 800E2008 5E40FFEE */ bgtzl $s2, .L800E1FC4 -/* B591AC 800E200C 8E79283C */ lw $t9, 0x283c($s3) -/* B591B0 800E2010 8FBF0024 */ lw $ra, 0x24($sp) -.L800E2014: -/* B591B4 800E2014 8FB00014 */ lw $s0, 0x14($sp) -/* B591B8 800E2018 8FB10018 */ lw $s1, 0x18($sp) -/* B591BC 800E201C 8FB2001C */ lw $s2, 0x1c($sp) -/* B591C0 800E2020 8FB30020 */ lw $s3, 0x20($sp) -/* B591C4 800E2024 03E00008 */ jr $ra -/* B591C8 800E2028 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E202C.s b/asm/non_matchings/code/code_800E11F0/func_800E202C.s deleted file mode 100644 index 6794f0b33d..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E202C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800E202C -/* B591CC 800E202C 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2c22) # $t6, 0x8017 -/* B591D0 800E2030 85CE1DA2 */ lh $t6, %lo(gAudioContext+0x2c22)($t6) -/* B591D4 800E2034 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B591D8 800E2038 AFBF0014 */ sw $ra, 0x14($sp) -/* B591DC 800E203C 148E0005 */ bne $a0, $t6, .L800E2054 -/* B591E0 800E2040 00803025 */ move $a2, $a0 -/* B591E4 800E2044 240FFFFF */ li $t7, -1 -/* B591E8 800E2048 3C018017 */ lui $at, %hi(gAudioContext+0x2c22) # $at, 0x8017 -/* B591EC 800E204C 10000008 */ b .L800E2070 -/* B591F0 800E2050 A42F1DA2 */ sh $t7, %lo(gAudioContext+0x2c22)($at) -.L800E2054: -/* B591F4 800E2054 3C188017 */ lui $t8, %hi(gAudioContext+0x2c2e) # $t8, 0x8017 -/* B591F8 800E2058 87181DAE */ lh $t8, %lo(gAudioContext+0x2c2e)($t8) -/* B591FC 800E205C 2419FFFF */ li $t9, -1 -/* B59200 800E2060 3C018017 */ lui $at, %hi(gAudioContext+0x2c2e) # $at, 0x8017 -/* B59204 800E2064 14D80002 */ bne $a2, $t8, .L800E2070 -/* B59208 800E2068 00000000 */ nop -/* B5920C 800E206C A4391DAE */ sh $t9, %lo(gAudioContext+0x2c2e)($at) -.L800E2070: -/* B59210 800E2070 3C098017 */ lui $t1, %hi(gAudioContext+0x2b30) # $t1, 0x8017 -/* B59214 800E2074 8D291CB0 */ lw $t1, %lo(gAudioContext+0x2b30)($t1) -/* B59218 800E2078 3C088017 */ lui $t0, %hi(gAudioContext+0x2b30) # $t0, 0x8017 -/* B5921C 800E207C 25081CB0 */ addiu $t0, %lo(gAudioContext+0x2b30) # addiu $t0, $t0, 0x1cb0 -/* B59220 800E2080 01002025 */ move $a0, $t0 -/* B59224 800E2084 1120000D */ beqz $t1, .L800E20BC -/* B59228 800E2088 00001825 */ move $v1, $zero -/* B5922C 800E208C 01001025 */ move $v0, $t0 -/* B59230 800E2090 2405FFFF */ li $a1, -1 -/* B59234 800E2094 844A001E */ lh $t2, 0x1e($v0) -.L800E2098: -/* B59238 800E2098 54CA0003 */ bnel $a2, $t2, .L800E20A8 -/* B5923C 800E209C 8C8B0000 */ lw $t3, ($a0) -/* B59240 800E20A0 A445001E */ sh $a1, 0x1e($v0) -/* B59244 800E20A4 8C8B0000 */ lw $t3, ($a0) -.L800E20A8: -/* B59248 800E20A8 24630001 */ addiu $v1, $v1, 1 -/* B5924C 800E20AC 2442000C */ addiu $v0, $v0, 0xc -/* B59250 800E20B0 006B082B */ sltu $at, $v1, $t3 -/* B59254 800E20B4 5420FFF8 */ bnezl $at, .L800E2098 -/* B59258 800E20B8 844A001E */ lh $t2, 0x1e($v0) -.L800E20BC: -/* B5925C 800E20BC 0C037812 */ jal Audio_DiscardBank -/* B59260 800E20C0 00C02025 */ move $a0, $a2 -/* B59264 800E20C4 8FBF0014 */ lw $ra, 0x14($sp) -/* B59268 800E20C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5926C 800E20CC 03E00008 */ jr $ra -/* B59270 800E20D0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E20D4.s b/asm/non_matchings/code/code_800E11F0/func_800E20D4.s deleted file mode 100644 index 942dce1ab7..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E20D4.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800E20D4 -/* B59274 800E20D4 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B59278 800E20D8 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5927C 800E20DC 8C4E2984 */ lw $t6, 0x2984($v0) -/* B59280 800E20E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B59284 800E20E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B59288 800E20E8 11C00003 */ beqz $t6, .L800E20F8 -/* B5928C 800E20EC 00047880 */ sll $t7, $a0, 2 -/* B59290 800E20F0 10000008 */ b .L800E2114 -/* B59294 800E20F4 00001025 */ move $v0, $zero -.L800E20F8: -/* B59298 800E20F8 01E47823 */ subu $t7, $t7, $a0 -/* B5929C 800E20FC 000F7880 */ sll $t7, $t7, 2 -/* B592A0 800E2100 01E47823 */ subu $t7, $t7, $a0 -/* B592A4 800E2104 000F7940 */ sll $t7, $t7, 5 -/* B592A8 800E2108 004FC021 */ addu $t8, $v0, $t7 -/* B592AC 800E210C 0C03885F */ jal func_800E217C -/* B592B0 800E2110 AF00360C */ sw $zero, 0x360c($t8) -.L800E2114: -/* B592B4 800E2114 8FBF0014 */ lw $ra, 0x14($sp) -/* B592B8 800E2118 27BD0018 */ addiu $sp, $sp, 0x18 -/* B592BC 800E211C 03E00008 */ jr $ra -/* B592C0 800E2120 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2124.s b/asm/non_matchings/code/code_800E11F0/func_800E2124.s deleted file mode 100644 index 2d0ca10305..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2124.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800E2124 -/* B592C4 800E2124 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B592C8 800E2128 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B592CC 800E212C 8C4E2984 */ lw $t6, 0x2984($v0) -/* B592D0 800E2130 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B592D4 800E2134 AFBF0014 */ sw $ra, 0x14($sp) -/* B592D8 800E2138 11C00003 */ beqz $t6, .L800E2148 -/* B592DC 800E213C 00C03825 */ move $a3, $a2 -/* B592E0 800E2140 1000000A */ b .L800E216C -/* B592E4 800E2144 00001025 */ move $v0, $zero -.L800E2148: -/* B592E8 800E2148 00047880 */ sll $t7, $a0, 2 -/* B592EC 800E214C 01E47823 */ subu $t7, $t7, $a0 -/* B592F0 800E2150 000F7880 */ sll $t7, $t7, 2 -/* B592F4 800E2154 01E47823 */ subu $t7, $t7, $a0 -/* B592F8 800E2158 000F7940 */ sll $t7, $t7, 5 -/* B592FC 800E215C 004FC021 */ addu $t8, $v0, $t7 -/* B59300 800E2160 AF07360C */ sw $a3, 0x360c($t8) -/* B59304 800E2164 0C03885F */ jal func_800E217C -/* B59308 800E2168 00003025 */ move $a2, $zero -.L800E216C: -/* B5930C 800E216C 8FBF0014 */ lw $ra, 0x14($sp) -/* B59310 800E2170 27BD0018 */ addiu $sp, $sp, 0x18 -/* B59314 800E2174 03E00008 */ jr $ra -/* B59318 800E2178 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E217C.s b/asm/non_matchings/code/code_800E11F0/func_800E217C.s deleted file mode 100644 index ed07db5896..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E217C.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_800E217C -/* B5931C 800E217C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B59320 800E2180 AFB30024 */ sw $s3, 0x24($sp) -/* B59324 800E2184 3C138017 */ lui $s3, %hi(gAudioContext) # $s3, 0x8017 -/* B59328 800E2188 2673F180 */ addiu $s3, %lo(gAudioContext) # addiu $s3, $s3, -0xe80 -/* B5932C 800E218C 966F2840 */ lhu $t7, 0x2840($s3) -/* B59330 800E2190 AFBF002C */ sw $ra, 0x2c($sp) -/* B59334 800E2194 AFB40028 */ sw $s4, 0x28($sp) -/* B59338 800E2198 00AF082A */ slt $at, $a1, $t7 -/* B5933C 800E219C AFB20020 */ sw $s2, 0x20($sp) -/* B59340 800E21A0 AFB1001C */ sw $s1, 0x1c($sp) -/* B59344 800E21A4 AFB00018 */ sw $s0, 0x18($sp) -/* B59348 800E21A8 AFA40030 */ sw $a0, 0x30($sp) -/* B5934C 800E21AC AFA50034 */ sw $a1, 0x34($sp) -/* B59350 800E21B0 14200003 */ bnez $at, .L800E21C0 -/* B59354 800E21B4 AFA60038 */ sw $a2, 0x38($sp) -/* B59358 800E21B8 1000003A */ b .L800E22A4 -/* B5935C 800E21BC 00001025 */ move $v0, $zero -.L800E21C0: -/* B59360 800E21C0 8FB80030 */ lw $t8, 0x30($sp) -/* B59364 800E21C4 0018C880 */ sll $t9, $t8, 2 -/* B59368 800E21C8 0338C823 */ subu $t9, $t9, $t8 -/* B5936C 800E21CC 0019C880 */ sll $t9, $t9, 2 -/* B59370 800E21D0 0338C823 */ subu $t9, $t9, $t8 -/* B59374 800E21D4 0019C940 */ sll $t9, $t9, 5 -/* B59378 800E21D8 0279A021 */ addu $s4, $s3, $t9 -/* B5937C 800E21DC 26943530 */ addiu $s4, $s4, 0x3530 -/* B59380 800E21E0 0C03A6DB */ jal Audio_SequencePlayerDisable -/* B59384 800E21E4 02802025 */ move $a0, $s4 -/* B59388 800E21E8 8FA80034 */ lw $t0, 0x34($sp) -/* B5938C 800E21EC 8E62283C */ lw $v0, 0x283c($s3) -/* B59390 800E21F0 241200FF */ li $s2, 255 -/* B59394 800E21F4 00084840 */ sll $t1, $t0, 1 -/* B59398 800E21F8 00495021 */ addu $t2, $v0, $t1 -/* B5939C 800E21FC 95500000 */ lhu $s0, ($t2) -/* B593A0 800E2200 02025821 */ addu $t3, $s0, $v0 -/* B593A4 800E2204 91710000 */ lbu $s1, ($t3) -/* B593A8 800E2208 26100001 */ addiu $s0, $s0, 1 -/* B593AC 800E220C 1A20000A */ blez $s1, .L800E2238 -/* B593B0 800E2210 00000000 */ nop -/* B593B4 800E2214 8E6C283C */ lw $t4, 0x283c($s3) -.L800E2218: -/* B593B8 800E2218 020C6821 */ addu $t5, $s0, $t4 -/* B593BC 800E221C 91B20000 */ lbu $s2, ($t5) -/* B593C0 800E2220 26100001 */ addiu $s0, $s0, 1 -/* B593C4 800E2224 0C038915 */ jal func_800E2454 -/* B593C8 800E2228 02402025 */ move $a0, $s2 -/* B593CC 800E222C 2631FFFF */ addiu $s1, $s1, -1 -/* B593D0 800E2230 5E20FFF9 */ bgtzl $s1, .L800E2218 -/* B593D4 800E2234 8E6C283C */ lw $t4, 0x283c($s3) -.L800E2238: -/* B593D8 800E2238 0C0388B1 */ jal func_800E22C4 -/* B593DC 800E223C 8FA40034 */ lw $a0, 0x34($sp) -/* B593E0 800E2240 14400003 */ bnez $v0, .L800E2250 -/* B593E4 800E2244 00408025 */ move $s0, $v0 -/* B593E8 800E2248 10000016 */ b .L800E22A4 -/* B593EC 800E224C 00001025 */ move $v0, $zero -.L800E2250: -/* B593F0 800E2250 0C03B19A */ jal Audio_ResetSequencePlayer -/* B593F4 800E2254 02802025 */ move $a0, $s4 -/* B593F8 800E2258 8FAE0034 */ lw $t6, 0x34($sp) -/* B593FC 800E225C 24040001 */ li $a0, 1 -/* B59400 800E2260 02402825 */ move $a1, $s2 -/* B59404 800E2264 0C0389DA */ jal func_800E2768 -/* B59408 800E2268 A28E0004 */ sb $t6, 4($s4) -/* B5940C 800E226C 92980000 */ lbu $t8, ($s4) -/* B59410 800E2270 A2820005 */ sb $v0, 5($s4) -/* B59414 800E2274 AE900018 */ sw $s0, 0x18($s4) -/* B59418 800E2278 37080080 */ ori $t0, $t8, 0x80 -/* B5941C 800E227C A2880000 */ sb $t0, ($s4) -/* B59420 800E2280 310900BF */ andi $t1, $t0, 0xbf -/* B59424 800E2284 AE900078 */ sw $s0, 0x78($s4) -/* B59428 800E2288 A2800090 */ sb $zero, 0x90($s4) -/* B5942C 800E228C A6800010 */ sh $zero, 0x10($s4) -/* B59430 800E2290 A2890000 */ sb $t1, ($s4) -/* B59434 800E2294 8FAA0030 */ lw $t2, 0x30($sp) -/* B59438 800E2298 02802025 */ move $a0, $s4 -/* B5943C 800E229C 0C03B186 */ jal Audio_ProcessSequence -/* B59440 800E22A0 A28A0007 */ sb $t2, 7($s4) -.L800E22A4: -/* B59444 800E22A4 8FBF002C */ lw $ra, 0x2c($sp) -/* B59448 800E22A8 8FB00018 */ lw $s0, 0x18($sp) -/* B5944C 800E22AC 8FB1001C */ lw $s1, 0x1c($sp) -/* B59450 800E22B0 8FB20020 */ lw $s2, 0x20($sp) -/* B59454 800E22B4 8FB30024 */ lw $s3, 0x24($sp) -/* B59458 800E22B8 8FB40028 */ lw $s4, 0x28($sp) -/* B5945C 800E22BC 03E00008 */ jr $ra -/* B59460 800E22C0 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E22C4.s b/asm/non_matchings/code/code_800E11F0/func_800E22C4.s deleted file mode 100644 index b91f56cb1a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E22C4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800E22C4 -/* B59464 800E22C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B59468 800E22C8 AFBF0014 */ sw $ra, 0x14($sp) -/* B5946C 800E22CC AFA40028 */ sw $a0, 0x28($sp) -/* B59470 800E22D0 8FA50028 */ lw $a1, 0x28($sp) -/* B59474 800E22D4 0C0389DA */ jal func_800E2768 -/* B59478 800E22D8 00002025 */ move $a0, $zero -/* B5947C 800E22DC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) -/* B59480 800E22E0 01C27021 */ addu $t6, $t6, $v0 -/* B59484 800E22E4 91CE2618 */ lbu $t6, %lo(gAudioContext+0x3498)($t6) -/* B59488 800E22E8 24010001 */ li $at, 1 -/* B5948C 800E22EC 00002025 */ move $a0, $zero -/* B59490 800E22F0 15C10003 */ bne $t6, $at, .L800E2300 -/* B59494 800E22F4 8FA50028 */ lw $a1, 0x28($sp) -/* B59498 800E22F8 10000003 */ b .L800E2308 -/* B5949C 800E22FC 00001025 */ move $v0, $zero -.L800E2300: -/* B594A0 800E2300 0C038956 */ jal func_800E2558 -/* B594A4 800E2304 27A60020 */ addiu $a2, $sp, 0x20 -.L800E2308: -/* B594A8 800E2308 8FBF0014 */ lw $ra, 0x14($sp) -/* B594AC 800E230C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B594B0 800E2310 03E00008 */ jr $ra -/* B594B4 800E2314 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2318.s b/asm/non_matchings/code/code_800E11F0/func_800E2318.s deleted file mode 100644 index db7f785a04..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2318.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800E2318 -/* B594B8 800E2318 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B594BC 800E231C AFBF0014 */ sw $ra, 0x14($sp) -/* B594C0 800E2320 0C0388CE */ jal func_800E2338 -/* B594C4 800E2324 24060001 */ li $a2, 1 -/* B594C8 800E2328 8FBF0014 */ lw $ra, 0x14($sp) -/* B594CC 800E232C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B594D0 800E2330 03E00008 */ jr $ra -/* B594D4 800E2334 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2338.s b/asm/non_matchings/code/code_800E11F0/func_800E2338.s deleted file mode 100644 index c818a133ed..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2338.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_800E2338 -/* B594D8 800E2338 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B594DC 800E233C AFBF001C */ sw $ra, 0x1c($sp) -/* B594E0 800E2340 AFA40038 */ sw $a0, 0x38($sp) -/* B594E4 800E2344 AFA5003C */ sw $a1, 0x3c($sp) -/* B594E8 800E2348 AFB00018 */ sw $s0, 0x18($sp) -/* B594EC 800E234C AFA60040 */ sw $a2, 0x40($sp) -/* B594F0 800E2350 8FA50038 */ lw $a1, 0x38($sp) -/* B594F4 800E2354 0C0389DA */ jal func_800E2768 -/* B594F8 800E2358 24040002 */ li $a0, 2 -/* B594FC 800E235C 00408025 */ move $s0, $v0 -/* B59500 800E2360 0C0389FE */ jal func_800E27F8 -/* B59504 800E2364 24040002 */ li $a0, 2 -/* B59508 800E2368 24040002 */ li $a0, 2 -/* B5950C 800E236C 02002825 */ move $a1, $s0 -/* B59510 800E2370 0C0389E9 */ jal func_800E27A4 -/* B59514 800E2374 AFA20030 */ sw $v0, 0x30($sp) -/* B59518 800E2378 8FA30030 */ lw $v1, 0x30($sp) -/* B5951C 800E237C 1040000F */ beqz $v0, .L800E23BC -/* B59520 800E2380 00403025 */ move $a2, $v0 -/* B59524 800E2384 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3438) -/* B59528 800E2388 01D07021 */ addu $t6, $t6, $s0 -/* B5952C 800E238C 91CE25B8 */ lbu $t6, %lo(gAudioContext+0x3438)($t6) -/* B59530 800E2390 24010001 */ li $at, 1 -/* B59534 800E2394 02002025 */ move $a0, $s0 -/* B59538 800E2398 11C10004 */ beq $t6, $at, .L800E23AC -/* B5953C 800E239C 24050002 */ li $a1, 2 -/* B59540 800E23A0 0C0386B6 */ jal func_800E1AD8 -/* B59544 800E23A4 AFA20034 */ sw $v0, 0x34($sp) -/* B59548 800E23A8 8FA60034 */ lw $a2, 0x34($sp) -.L800E23AC: -/* B5954C 800E23AC 8FAF003C */ lw $t7, 0x3c($sp) -/* B59550 800E23B0 00C01025 */ move $v0, $a2 -/* B59554 800E23B4 10000022 */ b .L800E2440 -/* B59558 800E23B8 ADE00000 */ sw $zero, ($t7) -.L800E23BC: -/* B5955C 800E23BC 8FA50038 */ lw $a1, 0x38($sp) -/* B59560 800E23C0 24010004 */ li $at, 4 -/* B59564 800E23C4 8FB90040 */ lw $t9, 0x40($sp) -/* B59568 800E23C8 0005C100 */ sll $t8, $a1, 4 -/* B5956C 800E23CC 00783821 */ addu $a3, $v1, $t8 -/* B59570 800E23D0 80E20019 */ lb $v0, 0x19($a3) -/* B59574 800E23D4 8FA9003C */ lw $t1, 0x3c($sp) -/* B59578 800E23D8 10410003 */ beq $v0, $at, .L800E23E8 -/* B5957C 800E23DC 24010001 */ li $at, 1 -/* B59580 800E23E0 17210007 */ bne $t9, $at, .L800E2400 -/* B59584 800E23E4 24040002 */ li $a0, 2 -.L800E23E8: -/* B59588 800E23E8 80E80018 */ lb $t0, 0x18($a3) -/* B5958C 800E23EC 00105100 */ sll $t2, $s0, 4 -/* B59590 800E23F0 006A5821 */ addu $t3, $v1, $t2 -/* B59594 800E23F4 AD280000 */ sw $t0, ($t1) -/* B59598 800E23F8 10000011 */ b .L800E2440 -/* B5959C 800E23FC 8D620010 */ lw $v0, 0x10($t3) -.L800E2400: -/* B595A0 800E2400 27A60040 */ addiu $a2, $sp, 0x40 -/* B595A4 800E2404 AFA30030 */ sw $v1, 0x30($sp) -/* B595A8 800E2408 0C038956 */ jal func_800E2558 -/* B595AC 800E240C AFA70024 */ sw $a3, 0x24($sp) -/* B595B0 800E2410 8FA30030 */ lw $v1, 0x30($sp) -/* B595B4 800E2414 10400004 */ beqz $v0, .L800E2428 -/* B595B8 800E2418 8FA70024 */ lw $a3, 0x24($sp) -/* B595BC 800E241C 8FAC003C */ lw $t4, 0x3c($sp) -/* B595C0 800E2420 10000007 */ b .L800E2440 -/* B595C4 800E2424 AD800000 */ sw $zero, ($t4) -.L800E2428: -/* B595C8 800E2428 80ED0018 */ lb $t5, 0x18($a3) -/* B595CC 800E242C 8FAE003C */ lw $t6, 0x3c($sp) -/* B595D0 800E2430 00107900 */ sll $t7, $s0, 4 -/* B595D4 800E2434 006FC021 */ addu $t8, $v1, $t7 -/* B595D8 800E2438 ADCD0000 */ sw $t5, ($t6) -/* B595DC 800E243C 8F020010 */ lw $v0, 0x10($t8) -.L800E2440: -/* B595E0 800E2440 8FBF001C */ lw $ra, 0x1c($sp) -/* B595E4 800E2444 8FB00018 */ lw $s0, 0x18($sp) -/* B595E8 800E2448 27BD0038 */ addiu $sp, $sp, 0x38 -/* B595EC 800E244C 03E00008 */ jr $ra -/* B595F0 800E2450 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2454.s b/asm/non_matchings/code/code_800E11F0/func_800E2454.s deleted file mode 100644 index 6b06db16f4..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2454.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_800E2454 -/* B595F4 800E2454 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B595F8 800E2458 AFBF0014 */ sw $ra, 0x14($sp) -/* B595FC 800E245C AFA40048 */ sw $a0, 0x48($sp) -/* B59600 800E2460 8FA50048 */ lw $a1, 0x48($sp) -/* B59604 800E2464 0C0389DA */ jal func_800E2768 -/* B59608 800E2468 24040001 */ li $a0, 1 -/* B5960C 800E246C 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B59610 800E2470 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B59614 800E2474 00A27021 */ addu $t6, $a1, $v0 -/* B59618 800E2478 91CF3468 */ lbu $t7, 0x3468($t6) -/* B5961C 800E247C 24010001 */ li $at, 1 -/* B59620 800E2480 AFA2001C */ sw $v0, 0x1c($sp) -/* B59624 800E2484 15E10003 */ bne $t7, $at, .L800E2494 -/* B59628 800E2488 0002C880 */ sll $t9, $v0, 2 -/* B5962C 800E248C 1000002E */ b .L800E2548 -/* B59630 800E2490 00001025 */ move $v0, $zero -.L800E2494: -/* B59634 800E2494 8CB82844 */ lw $t8, 0x2844($a1) -/* B59638 800E2498 0322C821 */ addu $t9, $t9, $v0 -/* B5963C 800E249C 0019C880 */ sll $t9, $t9, 2 -/* B59640 800E24A0 03191821 */ addu $v1, $t8, $t9 -/* B59644 800E24A4 90640002 */ lbu $a0, 2($v1) -/* B59648 800E24A8 90670003 */ lbu $a3, 3($v1) -/* B5964C 800E24AC 240100FF */ li $at, 255 -/* B59650 800E24B0 AFA40020 */ sw $a0, 0x20($sp) -/* B59654 800E24B4 10810008 */ beq $a0, $at, .L800E24D8 -/* B59658 800E24B8 AFA70024 */ sw $a3, 0x24($sp) -/* B5965C 800E24BC 27A50030 */ addiu $a1, $sp, 0x30 -/* B59660 800E24C0 00003025 */ move $a2, $zero -/* B59664 800E24C4 0C0388CE */ jal func_800E2338 -/* B59668 800E24C8 AFA7003C */ sw $a3, 0x3c($sp) -/* B5966C 800E24CC 8FA7003C */ lw $a3, 0x3c($sp) -/* B59670 800E24D0 10000002 */ b .L800E24DC -/* B59674 800E24D4 AFA20028 */ sw $v0, 0x28($sp) -.L800E24D8: -/* B59678 800E24D8 AFA00028 */ sw $zero, 0x28($sp) -.L800E24DC: -/* B5967C 800E24DC 240100FF */ li $at, 255 -/* B59680 800E24E0 10E10006 */ beq $a3, $at, .L800E24FC -/* B59684 800E24E4 00E02025 */ move $a0, $a3 -/* B59688 800E24E8 27A50034 */ addiu $a1, $sp, 0x34 -/* B5968C 800E24EC 0C0388CE */ jal func_800E2338 -/* B59690 800E24F0 00003025 */ move $a2, $zero -/* B59694 800E24F4 10000002 */ b .L800E2500 -/* B59698 800E24F8 AFA2002C */ sw $v0, 0x2c($sp) -.L800E24FC: -/* B5969C 800E24FC AFA0002C */ sw $zero, 0x2c($sp) -.L800E2500: -/* B596A0 800E2500 24040001 */ li $a0, 1 -/* B596A4 800E2504 8FA50048 */ lw $a1, 0x48($sp) -/* B596A8 800E2508 0C038956 */ jal func_800E2558 -/* B596AC 800E250C 27A60038 */ addiu $a2, $sp, 0x38 -/* B596B0 800E2510 14400003 */ bnez $v0, .L800E2520 -/* B596B4 800E2514 00402825 */ move $a1, $v0 -/* B596B8 800E2518 1000000B */ b .L800E2548 -/* B596BC 800E251C 00001025 */ move $v0, $zero -.L800E2520: -/* B596C0 800E2520 8FA80038 */ lw $t0, 0x38($sp) -/* B596C4 800E2524 24010001 */ li $at, 1 -/* B596C8 800E2528 8FA4001C */ lw $a0, 0x1c($sp) -/* B596CC 800E252C 15010005 */ bne $t0, $at, .L800E2544 -/* B596D0 800E2530 27A60020 */ addiu $a2, $sp, 0x20 -/* B596D4 800E2534 00003825 */ move $a3, $zero -/* B596D8 800E2538 0C039066 */ jal func_800E4198 -/* B596DC 800E253C AFA50044 */ sw $a1, 0x44($sp) -/* B596E0 800E2540 8FA50044 */ lw $a1, 0x44($sp) -.L800E2544: -/* B596E4 800E2544 00A01025 */ move $v0, $a1 -.L800E2548: -/* B596E8 800E2548 8FBF0014 */ lw $ra, 0x14($sp) -/* B596EC 800E254C 27BD0048 */ addiu $sp, $sp, 0x48 -/* B596F0 800E2550 03E00008 */ jr $ra -/* B596F4 800E2554 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2558.s b/asm/non_matchings/code/code_800E11F0/func_800E2558.s deleted file mode 100644 index 420aed9751..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2558.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_800E2558 -/* B596F8 800E2558 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B596FC 800E255C AFBF001C */ sw $ra, 0x1c($sp) -/* B59700 800E2560 AFB00018 */ sw $s0, 0x18($sp) -/* B59704 800E2564 AFA40050 */ sw $a0, 0x50($sp) -/* B59708 800E2568 AFA50054 */ sw $a1, 0x54($sp) -/* B5970C 800E256C 0C0389DA */ jal func_800E2768 -/* B59710 800E2570 AFA60058 */ sw $a2, 0x58($sp) -/* B59714 800E2574 AFA2002C */ sw $v0, 0x2c($sp) -/* B59718 800E2578 8FA40050 */ lw $a0, 0x50($sp) -/* B5971C 800E257C 0C0389E9 */ jal func_800E27A4 -/* B59720 800E2580 00402825 */ move $a1, $v0 -/* B59724 800E2584 10400005 */ beqz $v0, .L800E259C -/* B59728 800E2588 00408025 */ move $s0, $v0 -/* B5972C 800E258C 8FAE0058 */ lw $t6, 0x58($sp) -/* B59730 800E2590 24050002 */ li $a1, 2 -/* B59734 800E2594 1000005A */ b .L800E2700 -/* B59738 800E2598 ADC00000 */ sw $zero, ($t6) -.L800E259C: -/* B5973C 800E259C 0C0389FE */ jal func_800E27F8 -/* B59740 800E25A0 8FA40050 */ lw $a0, 0x50($sp) -/* B59744 800E25A4 8FAF002C */ lw $t7, 0x2c($sp) -/* B59748 800E25A8 AFA20048 */ sw $v0, 0x48($sp) -/* B5974C 800E25AC 8FAB0054 */ lw $t3, 0x54($sp) -/* B59750 800E25B0 000FC100 */ sll $t8, $t7, 4 -/* B59754 800E25B4 00581821 */ addu $v1, $v0, $t8 -/* B59758 800E25B8 8C790014 */ lw $t9, 0x14($v1) -/* B5975C 800E25BC 2401FFF0 */ li $at, -16 -/* B59760 800E25C0 000B6100 */ sll $t4, $t3, 4 -/* B59764 800E25C4 2729000F */ addiu $t1, $t9, 0xf -/* B59768 800E25C8 01215024 */ and $t2, $t1, $at -/* B5976C 800E25CC AFB9004C */ sw $t9, 0x4c($sp) -/* B59770 800E25D0 AFAA004C */ sw $t2, 0x4c($sp) -/* B59774 800E25D4 004C2021 */ addu $a0, $v0, $t4 -/* B59778 800E25D8 808D0018 */ lb $t5, 0x18($a0) -/* B5977C 800E25DC AFAD0040 */ sw $t5, 0x40($sp) -/* B59780 800E25E0 80850019 */ lb $a1, 0x19($a0) -/* B59784 800E25E4 8C6E0010 */ lw $t6, 0x10($v1) -/* B59788 800E25E8 2CA10005 */ sltiu $at, $a1, 5 -/* B5978C 800E25EC AFA50024 */ sw $a1, 0x24($sp) -/* B59790 800E25F0 1020002A */ beqz $at, .L800E269C -/* B59794 800E25F4 AFAE0038 */ sw $t6, 0x38($sp) -/* B59798 800E25F8 00057880 */ sll $t7, $a1, 2 -/* B5979C 800E25FC 3C018015 */ lui $at, %hi(jtbl_80149458) -/* B597A0 800E2600 002F0821 */ addu $at, $at, $t7 -/* B597A4 800E2604 8C2F9458 */ lw $t7, %lo(jtbl_80149458)($at) -/* B597A8 800E2608 01E00008 */ jr $t7 -/* B597AC 800E260C 00000000 */ nop -glabel L800E2610 -/* B597B0 800E2610 8FA40050 */ lw $a0, 0x50($sp) -/* B597B4 800E2614 8FA5002C */ lw $a1, 0x2c($sp) -/* B597B8 800E2618 0C038150 */ jal func_800E0540 -/* B597BC 800E261C 8FA6004C */ lw $a2, 0x4c($sp) -/* B597C0 800E2620 1440001E */ bnez $v0, .L800E269C -/* B597C4 800E2624 00408025 */ move $s0, $v0 -/* B597C8 800E2628 1000004B */ b .L800E2758 -/* B597CC 800E262C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E2630 -/* B597D0 800E2630 8FA40050 */ lw $a0, 0x50($sp) -/* B597D4 800E2634 8FA5004C */ lw $a1, 0x4c($sp) -/* B597D8 800E2638 24060001 */ li $a2, 1 -/* B597DC 800E263C 0C037A38 */ jal Audio_AllocBankOrSeq -/* B597E0 800E2640 8FA7002C */ lw $a3, 0x2c($sp) -/* B597E4 800E2644 14400015 */ bnez $v0, .L800E269C -/* B597E8 800E2648 00408025 */ move $s0, $v0 -/* B597EC 800E264C 10000042 */ b .L800E2758 -/* B597F0 800E2650 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E2654 -/* B597F4 800E2654 8FA40050 */ lw $a0, 0x50($sp) -/* B597F8 800E2658 8FA5004C */ lw $a1, 0x4c($sp) -/* B597FC 800E265C 00003025 */ move $a2, $zero -/* B59800 800E2660 0C037A38 */ jal Audio_AllocBankOrSeq -/* B59804 800E2664 8FA7002C */ lw $a3, 0x2c($sp) -/* B59808 800E2668 1440000C */ bnez $v0, .L800E269C -/* B5980C 800E266C 00408025 */ move $s0, $v0 -/* B59810 800E2670 10000039 */ b .L800E2758 -/* B59814 800E2674 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E2678 -/* B59818 800E2678 8FA40050 */ lw $a0, 0x50($sp) -/* B5981C 800E267C 8FA5004C */ lw $a1, 0x4c($sp) -/* B59820 800E2680 24060002 */ li $a2, 2 -/* B59824 800E2684 0C037A38 */ jal Audio_AllocBankOrSeq -/* B59828 800E2688 8FA7002C */ lw $a3, 0x2c($sp) -/* B5982C 800E268C 14400003 */ bnez $v0, .L800E269C -/* B59830 800E2690 00408025 */ move $s0, $v0 -/* B59834 800E2694 10000030 */ b .L800E2758 -/* B59838 800E2698 8FBF001C */ lw $ra, 0x1c($sp) -.L800E269C: -/* B5983C 800E269C 8FB90058 */ lw $t9, 0x58($sp) -/* B59840 800E26A0 24180001 */ li $t8, 1 -/* B59844 800E26A4 24010001 */ li $at, 1 -/* B59848 800E26A8 AF380000 */ sw $t8, ($t9) -/* B5984C 800E26AC 8FA80040 */ lw $t0, 0x40($sp) -/* B59850 800E26B0 8FA6004C */ lw $a2, 0x4c($sp) -/* B59854 800E26B4 8FA40038 */ lw $a0, 0x38($sp) -/* B59858 800E26B8 15010009 */ bne $t0, $at, .L800E26E0 -/* B5985C 800E26BC 02002825 */ move $a1, $s0 -/* B59860 800E26C0 8FA90048 */ lw $t1, 0x48($sp) -/* B59864 800E26C4 8FA40038 */ lw $a0, 0x38($sp) -/* B59868 800E26C8 02002825 */ move $a1, $s0 -/* B5986C 800E26CC 8FA6004C */ lw $a2, 0x4c($sp) -/* B59870 800E26D0 0C038AF3 */ jal func_800E2BCC -/* B59874 800E26D4 85270002 */ lh $a3, 2($t1) -/* B59878 800E26D8 10000004 */ b .L800E26EC -/* B5987C 800E26DC 8FAA0024 */ lw $t2, 0x24($sp) -.L800E26E0: -/* B59880 800E26E0 0C038AAA */ jal func_800E2AA8 -/* B59884 800E26E4 8FA70040 */ lw $a3, 0x40($sp) -/* B59888 800E26E8 8FAA0024 */ lw $t2, 0x24($sp) -.L800E26EC: -/* B5988C 800E26EC 24050002 */ li $a1, 2 -/* B59890 800E26F0 15400003 */ bnez $t2, .L800E2700 -/* B59894 800E26F4 00000000 */ nop -/* B59898 800E26F8 10000001 */ b .L800E2700 -/* B5989C 800E26FC 24050005 */ li $a1, 5 -.L800E2700: -/* B598A0 800E2700 8FA20050 */ lw $v0, 0x50($sp) -/* B598A4 800E2704 24010001 */ li $at, 1 -/* B598A8 800E2708 10400007 */ beqz $v0, .L800E2728 -/* B598AC 800E270C 00000000 */ nop -/* B598B0 800E2710 10410009 */ beq $v0, $at, .L800E2738 -/* B598B4 800E2714 24010002 */ li $at, 2 -/* B598B8 800E2718 1041000B */ beq $v0, $at, .L800E2748 -/* B598BC 800E271C 00000000 */ nop -/* B598C0 800E2720 1000000C */ b .L800E2754 -/* B598C4 800E2724 02001025 */ move $v0, $s0 -.L800E2728: -/* B598C8 800E2728 0C038692 */ jal Audio_SetSeqLoadStatus -/* B598CC 800E272C 8FA4002C */ lw $a0, 0x2c($sp) -/* B598D0 800E2730 10000008 */ b .L800E2754 -/* B598D4 800E2734 02001025 */ move $v0, $s0 -.L800E2738: -/* B598D8 800E2738 0C038686 */ jal Audio_SetBankLoadStatus -/* B598DC 800E273C 8FA4002C */ lw $a0, 0x2c($sp) -/* B598E0 800E2740 10000004 */ b .L800E2754 -/* B598E4 800E2744 02001025 */ move $v0, $s0 -.L800E2748: -/* B598E8 800E2748 0C03869E */ jal func_800E1A78 -/* B598EC 800E274C 8FA4002C */ lw $a0, 0x2c($sp) -/* B598F0 800E2750 02001025 */ move $v0, $s0 -.L800E2754: -/* B598F4 800E2754 8FBF001C */ lw $ra, 0x1c($sp) -.L800E2758: -/* B598F8 800E2758 8FB00018 */ lw $s0, 0x18($sp) -/* B598FC 800E275C 27BD0050 */ addiu $sp, $sp, 0x50 -/* B59900 800E2760 03E00008 */ jr $ra -/* B59904 800E2764 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2768.s b/asm/non_matchings/code/code_800E11F0/func_800E2768.s deleted file mode 100644 index 3c530ca705..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2768.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800E2768 -/* B59908 800E2768 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5990C 800E276C AFBF0014 */ sw $ra, 0x14($sp) -/* B59910 800E2770 0C0389FE */ jal func_800E27F8 -/* B59914 800E2774 AFA5001C */ sw $a1, 0x1c($sp) -/* B59918 800E2778 8FA5001C */ lw $a1, 0x1c($sp) -/* B5991C 800E277C 8FBF0014 */ lw $ra, 0x14($sp) -/* B59920 800E2780 00057100 */ sll $t6, $a1, 4 -/* B59924 800E2784 004E1821 */ addu $v1, $v0, $t6 -/* B59928 800E2788 8C6F0014 */ lw $t7, 0x14($v1) -/* B5992C 800E278C 55E00003 */ bnezl $t7, .L800E279C -/* B59930 800E2790 00A01025 */ move $v0, $a1 -/* B59934 800E2794 8C650010 */ lw $a1, 0x10($v1) -/* B59938 800E2798 00A01025 */ move $v0, $a1 -.L800E279C: -/* B5993C 800E279C 03E00008 */ jr $ra -/* B59940 800E27A0 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E27A4.s b/asm/non_matchings/code/code_800E11F0/func_800E27A4.s deleted file mode 100644 index 8a26f8821d..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E27A4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800E27A4 -/* B59944 800E27A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B59948 800E27A8 AFBF0014 */ sw $ra, 0x14($sp) -/* B5994C 800E27AC AFA40018 */ sw $a0, 0x18($sp) -/* B59950 800E27B0 0C03813A */ jal func_800E04E8 -/* B59954 800E27B4 AFA5001C */ sw $a1, 0x1c($sp) -/* B59958 800E27B8 10400003 */ beqz $v0, .L800E27C8 -/* B5995C 800E27BC 8FA40018 */ lw $a0, 0x18($sp) -/* B59960 800E27C0 1000000A */ b .L800E27EC -/* B59964 800E27C4 8FBF0014 */ lw $ra, 0x14($sp) -.L800E27C8: -/* B59968 800E27C8 24050002 */ li $a1, 2 -/* B5996C 800E27CC 0C037C1D */ jal func_800DF074 -/* B59970 800E27D0 8FA6001C */ lw $a2, 0x1c($sp) -/* B59974 800E27D4 50400004 */ beql $v0, $zero, .L800E27E8 -/* B59978 800E27D8 00001025 */ move $v0, $zero -/* B5997C 800E27DC 10000003 */ b .L800E27EC -/* B59980 800E27E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B59984 800E27E4 00001025 */ move $v0, $zero -.L800E27E8: -/* B59988 800E27E8 8FBF0014 */ lw $ra, 0x14($sp) -.L800E27EC: -/* B5998C 800E27EC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B59990 800E27F0 03E00008 */ jr $ra -/* B59994 800E27F4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E27F8.s b/asm/non_matchings/code/code_800E11F0/func_800E27F8.s deleted file mode 100644 index c14c692c17..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E27F8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800E27F8 -/* B59998 800E27F8 10800009 */ beqz $a0, .L800E2820 -/* B5999C 800E27FC 3C038017 */ lui $v1, %hi(gAudioContext+0x2830) -/* B599A0 800E2800 24010001 */ li $at, 1 -/* B599A4 800E2804 10810008 */ beq $a0, $at, .L800E2828 -/* B599A8 800E2808 3C038017 */ lui $v1, %hi(gAudioContext+0x2834) -/* B599AC 800E280C 24010002 */ li $at, 2 -/* B599B0 800E2810 10810007 */ beq $a0, $at, .L800E2830 -/* B599B4 800E2814 3C038017 */ lui $v1, %hi(gAudioContext+0x2838) -/* B599B8 800E2818 03E00008 */ jr $ra -/* B599BC 800E281C 00001025 */ move $v0, $zero - -.L800E2820: -/* B599C0 800E2820 03E00008 */ jr $ra -/* B599C4 800E2824 8C6219B0 */ lw $v0, %lo(gAudioContext+0x2830)($v1) - -.L800E2828: -/* B599C8 800E2828 03E00008 */ jr $ra -/* B599CC 800E282C 8C6219B4 */ lw $v0, %lo(gAudioContext+0x2834)($v1) - -.L800E2830: -/* B599D0 800E2830 8C6319B8 */ lw $v1, %lo(gAudioContext+0x2838)($v1) -/* B599D4 800E2834 03E00008 */ jr $ra -/* B599D8 800E2838 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s b/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s deleted file mode 100644 index 69e6819740..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_800E2AA8 -/* B59C48 800E2AA8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B59C4C 800E2AAC AFB20038 */ sw $s2, 0x38($sp) -/* B59C50 800E2AB0 AFB00030 */ sw $s0, 0x30($sp) -/* B59C54 800E2AB4 00809025 */ move $s2, $a0 -/* B59C58 800E2AB8 AFB10034 */ sw $s1, 0x34($sp) -/* B59C5C 800E2ABC 24D0000F */ addiu $s0, $a2, 0xf -/* B59C60 800E2AC0 2401FFF0 */ li $at, -16 -/* B59C64 800E2AC4 00A08825 */ move $s1, $a1 -/* B59C68 800E2AC8 AFBF004C */ sw $ra, 0x4c($sp) -/* B59C6C 800E2ACC AFB50044 */ sw $s5, 0x44($sp) -/* B59C70 800E2AD0 02018024 */ and $s0, $s0, $at -/* B59C74 800E2AD4 00A02025 */ move $a0, $a1 -/* B59C78 800E2AD8 00E0A825 */ move $s5, $a3 -/* B59C7C 800E2ADC AFB60048 */ sw $s6, 0x48($sp) -/* B59C80 800E2AE0 AFB40040 */ sw $s4, 0x40($sp) -/* B59C84 800E2AE4 AFB3003C */ sw $s3, 0x3c($sp) -/* B59C88 800E2AE8 0C039A10 */ jal func_800E6840 -/* B59C8C 800E2AEC 02002825 */ move $a1, $s0 -/* B59C90 800E2AF0 3C168017 */ lui $s6, %hi(gAudioContext+0x2604) # $s6, 0x8017 -/* B59C94 800E2AF4 3C148015 */ lui $s4, %hi(D_8014942C) # $s4, 0x8015 -/* B59C98 800E2AF8 3C138017 */ lui $s3, %hi(gAudioContext+0x25e8) # $s3, 0x8017 -/* B59C9C 800E2AFC 26731768 */ addiu $s3, %lo(gAudioContext+0x25e8) # addiu $s3, $s3, 0x1768 -/* B59CA0 800E2B00 2694942C */ addiu $s4, %lo(D_8014942C) # addiu $s4, $s4, -0x6bd4 -/* B59CA4 800E2B04 26D61784 */ addiu $s6, %lo(gAudioContext+0x2604) # addiu $s6, $s6, 0x1784 -/* B59CA8 800E2B08 2E010400 */ sltiu $at, $s0, 0x400 -/* B59CAC 800E2B0C 14200014 */ bnez $at, .L800E2B60 -.L800E2B10: -/* B59CB0 800E2B10 240E0400 */ li $t6, 1024 -/* B59CB4 800E2B14 AFAE0014 */ sw $t6, 0x14($sp) -/* B59CB8 800E2B18 02C02025 */ move $a0, $s6 -/* B59CBC 800E2B1C 24050001 */ li $a1, 1 -/* B59CC0 800E2B20 00003025 */ move $a2, $zero -/* B59CC4 800E2B24 02403825 */ move $a3, $s2 -/* B59CC8 800E2B28 AFB10010 */ sw $s1, 0x10($sp) -/* B59CCC 800E2B2C AFB30018 */ sw $s3, 0x18($sp) -/* B59CD0 800E2B30 AFB5001C */ sw $s5, 0x1c($sp) -/* B59CD4 800E2B34 0C038AF8 */ jal func_800E2BE0 -/* B59CD8 800E2B38 AFB40020 */ sw $s4, 0x20($sp) -/* B59CDC 800E2B3C 02602025 */ move $a0, $s3 -/* B59CE0 800E2B40 00002825 */ move $a1, $zero -/* B59CE4 800E2B44 0C000CA0 */ jal osRecvMesg -/* B59CE8 800E2B48 24060001 */ li $a2, 1 -/* B59CEC 800E2B4C 2610FC00 */ addiu $s0, $s0, -0x400 -/* B59CF0 800E2B50 2E010400 */ sltiu $at, $s0, 0x400 -/* B59CF4 800E2B54 26520400 */ addiu $s2, $s2, 0x400 -/* B59CF8 800E2B58 1020FFED */ beqz $at, .L800E2B10 -/* B59CFC 800E2B5C 26310400 */ addiu $s1, $s1, 0x400 -.L800E2B60: -/* B59D00 800E2B60 12000010 */ beqz $s0, .L800E2BA4 -/* B59D04 800E2B64 02C02025 */ move $a0, $s6 -/* B59D08 800E2B68 3C0F8015 */ lui $t7, %hi(D_80149438) # $t7, 0x8015 -/* B59D0C 800E2B6C 25EF9438 */ addiu $t7, %lo(D_80149438) # addiu $t7, $t7, -0x6bc8 -/* B59D10 800E2B70 AFAF0020 */ sw $t7, 0x20($sp) -/* B59D14 800E2B74 24050001 */ li $a1, 1 -/* B59D18 800E2B78 00003025 */ move $a2, $zero -/* B59D1C 800E2B7C 02403825 */ move $a3, $s2 -/* B59D20 800E2B80 AFB10010 */ sw $s1, 0x10($sp) -/* B59D24 800E2B84 AFB00014 */ sw $s0, 0x14($sp) -/* B59D28 800E2B88 AFB30018 */ sw $s3, 0x18($sp) -/* B59D2C 800E2B8C 0C038AF8 */ jal func_800E2BE0 -/* B59D30 800E2B90 AFB5001C */ sw $s5, 0x1c($sp) -/* B59D34 800E2B94 02602025 */ move $a0, $s3 -/* B59D38 800E2B98 00002825 */ move $a1, $zero -/* B59D3C 800E2B9C 0C000CA0 */ jal osRecvMesg -/* B59D40 800E2BA0 24060001 */ li $a2, 1 -.L800E2BA4: -/* B59D44 800E2BA4 8FBF004C */ lw $ra, 0x4c($sp) -/* B59D48 800E2BA8 8FB00030 */ lw $s0, 0x30($sp) -/* B59D4C 800E2BAC 8FB10034 */ lw $s1, 0x34($sp) -/* B59D50 800E2BB0 8FB20038 */ lw $s2, 0x38($sp) -/* B59D54 800E2BB4 8FB3003C */ lw $s3, 0x3c($sp) -/* B59D58 800E2BB8 8FB40040 */ lw $s4, 0x40($sp) -/* B59D5C 800E2BBC 8FB50044 */ lw $s5, 0x44($sp) -/* B59D60 800E2BC0 8FB60048 */ lw $s6, 0x48($sp) -/* B59D64 800E2BC4 03E00008 */ jr $ra -/* B59D68 800E2BC8 27BD0050 */ addiu $sp, $sp, 0x50 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2BCC.s b/asm/non_matchings/code/code_800E11F0/func_800E2BCC.s deleted file mode 100644 index 222c0636fd..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2BCC.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800E2BCC -/* B59D6C 800E2BCC AFA40000 */ sw $a0, ($sp) -/* B59D70 800E2BD0 AFA50004 */ sw $a1, 4($sp) -/* B59D74 800E2BD4 AFA60008 */ sw $a2, 8($sp) -/* B59D78 800E2BD8 03E00008 */ jr $ra -/* B59D7C 800E2BDC AFA7000C */ sw $a3, 0xc($sp) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2BE0.s b/asm/non_matchings/code/code_800E11F0/func_800E2BE0.s deleted file mode 100644 index 9527773528..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2BE0.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_800E2BE0 -/* B59D80 800E2BE0 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B59D84 800E2BE4 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B59D88 800E2BE8 8C4E2984 */ lw $t6, 0x2984($v0) -/* B59D8C 800E2BEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59D90 800E2BF0 AFB00018 */ sw $s0, 0x18($sp) -/* B59D94 800E2BF4 2DC10011 */ sltiu $at, $t6, 0x11 -/* B59D98 800E2BF8 00808025 */ move $s0, $a0 -/* B59D9C 800E2BFC AFBF001C */ sw $ra, 0x1c($sp) -/* B59DA0 800E2C00 14200003 */ bnez $at, .L800E2C10 -/* B59DA4 800E2C04 AFA50024 */ sw $a1, 0x24($sp) -/* B59DA8 800E2C08 10000026 */ b .L800E2CA4 -/* B59DAC 800E2C0C 2402FFFF */ li $v0, -1 -.L800E2C10: -/* B59DB0 800E2C10 8FA3003C */ lw $v1, 0x3c($sp) -/* B59DB4 800E2C14 24010002 */ li $at, 2 -/* B59DB8 800E2C18 8FB80024 */ lw $t8, 0x24($sp) -/* B59DBC 800E2C1C 10610005 */ beq $v1, $at, .L800E2C34 -/* B59DC0 800E2C20 24010003 */ li $at, 3 -/* B59DC4 800E2C24 10610005 */ beq $v1, $at, .L800E2C3C -/* B59DC8 800E2C28 00000000 */ nop -/* B59DCC 800E2C2C 1000001D */ b .L800E2CA4 -/* B59DD0 800E2C30 00001025 */ move $v0, $zero -.L800E2C34: -/* B59DD4 800E2C34 10000005 */ b .L800E2C4C -/* B59DD8 800E2C38 8C441E18 */ lw $a0, 0x1e18($v0) -.L800E2C3C: -/* B59DDC 800E2C3C 10000003 */ b .L800E2C4C -/* B59DE0 800E2C40 8C441E1C */ lw $a0, 0x1e1c($v0) -/* B59DE4 800E2C44 10000017 */ b .L800E2CA4 -/* B59DE8 800E2C48 00001025 */ move $v0, $zero -.L800E2C4C: -/* B59DEC 800E2C4C 8FA20034 */ lw $v0, 0x34($sp) -/* B59DF0 800E2C50 2401FFF0 */ li $at, -16 -/* B59DF4 800E2C54 304F000F */ andi $t7, $v0, 0xf -/* B59DF8 800E2C58 51E00004 */ beql $t7, $zero, .L800E2C6C -/* B59DFC 800E2C5C A2180002 */ sb $t8, 2($s0) -/* B59E00 800E2C60 2442000F */ addiu $v0, $v0, 0xf -/* B59E04 800E2C64 00411024 */ and $v0, $v0, $at -/* B59E08 800E2C68 A2180002 */ sb $t8, 2($s0) -.L800E2C6C: -/* B59E0C 800E2C6C 8FB90038 */ lw $t9, 0x38($sp) -/* B59E10 800E2C70 24090002 */ li $t1, 2 -/* B59E14 800E2C74 02002825 */ move $a1, $s0 -/* B59E18 800E2C78 AE190004 */ sw $t9, 4($s0) -/* B59E1C 800E2C7C 8FA80030 */ lw $t0, 0x30($sp) -/* B59E20 800E2C80 AE07000C */ sw $a3, 0xc($s0) -/* B59E24 800E2C84 AE020010 */ sw $v0, 0x10($s0) -/* B59E28 800E2C88 AE080008 */ sw $t0, 8($s0) -/* B59E2C 800E2C8C AC890014 */ sw $t1, 0x14($a0) -/* B59E30 800E2C90 3C198013 */ lui $t9, %hi(D_801304D0) # $t9, 0x8013 -/* B59E34 800E2C94 8F3904D0 */ lw $t9, %lo(D_801304D0)($t9) -/* B59E38 800E2C98 0320F809 */ jalr $t9 -/* B59E3C 800E2C9C 00000000 */ nop -/* B59E40 800E2CA0 00001025 */ move $v0, $zero -.L800E2CA4: -/* B59E44 800E2CA4 8FBF001C */ lw $ra, 0x1c($sp) -/* B59E48 800E2CA8 8FB00018 */ lw $s0, 0x18($sp) -/* B59E4C 800E2CAC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B59E50 800E2CB0 03E00008 */ jr $ra -/* B59E54 800E2CB4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2CB8.s b/asm/non_matchings/code/code_800E11F0/func_800E2CB8.s deleted file mode 100644 index 28c8207328..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2CB8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800E2CB8 -/* B59E58 800E2CB8 03E00008 */ jr $ra -/* B59E5C 800E2CBC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2CC0.s b/asm/non_matchings/code/code_800E11F0/func_800E2CC0.s deleted file mode 100644 index aa7c03eb6c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2CC0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800E2CC0 -/* B59E60 800E2CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59E64 800E2CC4 AFBF0014 */ sw $ra, 0x14($sp) -/* B59E68 800E2CC8 0C038956 */ jal func_800E2558 -/* B59E6C 800E2CCC 27A6001C */ addiu $a2, $sp, 0x1c -/* B59E70 800E2CD0 8FBF0014 */ lw $ra, 0x14($sp) -/* B59E74 800E2CD4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B59E78 800E2CD8 03E00008 */ jr $ra -/* B59E7C 800E2CDC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s b/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s deleted file mode 100644 index 82e9140c1e..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s +++ /dev/null @@ -1,217 +0,0 @@ -glabel func_800E2CE0 -/* B59E80 800E2CE0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B59E84 800E2CE4 AFBF002C */ sw $ra, 0x2c($sp) -/* B59E88 800E2CE8 AFB00028 */ sw $s0, 0x28($sp) -/* B59E8C 800E2CEC 00808025 */ move $s0, $a0 -/* B59E90 800E2CF0 AFA5005C */ sw $a1, 0x5c($sp) -/* B59E94 800E2CF4 AFA60060 */ sw $a2, 0x60($sp) -/* B59E98 800E2CF8 0C0389DA */ jal func_800E2768 -/* B59E9C 800E2CFC AFA70064 */ sw $a3, 0x64($sp) -/* B59EA0 800E2D00 12000009 */ beqz $s0, .L800E2D28 -/* B59EA4 800E2D04 00402825 */ move $a1, $v0 -/* B59EA8 800E2D08 24030001 */ li $v1, 1 -/* B59EAC 800E2D0C 12030010 */ beq $s0, $v1, .L800E2D50 -/* B59EB0 800E2D10 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3468) -/* B59EB4 800E2D14 24010002 */ li $at, 2 -/* B59EB8 800E2D18 12010013 */ beq $s0, $at, .L800E2D68 -/* B59EBC 800E2D1C 3C188017 */ lui $t8, %hi(gAudioContext+0x3438) -/* B59EC0 800E2D20 10000018 */ b .L800E2D84 -/* B59EC4 800E2D24 02002025 */ move $a0, $s0 -.L800E2D28: -/* B59EC8 800E2D28 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) -/* B59ECC 800E2D2C 01C27021 */ addu $t6, $t6, $v0 -/* B59ED0 800E2D30 91CE2618 */ lbu $t6, %lo(gAudioContext+0x3498)($t6) -/* B59ED4 800E2D34 24010001 */ li $at, 1 -/* B59ED8 800E2D38 15C10003 */ bne $t6, $at, .L800E2D48 -/* B59EDC 800E2D3C 00000000 */ nop -/* B59EE0 800E2D40 100000A5 */ b .L800E2FD8 -/* B59EE4 800E2D44 00001025 */ move $v0, $zero -.L800E2D48: -/* B59EE8 800E2D48 1000000E */ b .L800E2D84 -/* B59EEC 800E2D4C 02002025 */ move $a0, $s0 -.L800E2D50: -/* B59EF0 800E2D50 01E27821 */ addu $t7, $t7, $v0 -/* B59EF4 800E2D54 91EF25E8 */ lbu $t7, %lo(gAudioContext+0x3468)($t7) -/* B59EF8 800E2D58 546F000A */ bnel $v1, $t7, .L800E2D84 -/* B59EFC 800E2D5C 02002025 */ move $a0, $s0 -/* B59F00 800E2D60 1000009D */ b .L800E2FD8 -/* B59F04 800E2D64 00001025 */ move $v0, $zero -.L800E2D68: -/* B59F08 800E2D68 0302C021 */ addu $t8, $t8, $v0 -/* B59F0C 800E2D6C 931825B8 */ lbu $t8, %lo(gAudioContext+0x3438)($t8) -/* B59F10 800E2D70 54780004 */ bnel $v1, $t8, .L800E2D84 -/* B59F14 800E2D74 02002025 */ move $a0, $s0 -/* B59F18 800E2D78 10000097 */ b .L800E2FD8 -/* B59F1C 800E2D7C 00001025 */ move $v0, $zero -/* B59F20 800E2D80 02002025 */ move $a0, $s0 -.L800E2D84: -/* B59F24 800E2D84 0C0389E9 */ jal func_800E27A4 -/* B59F28 800E2D88 AFA50034 */ sw $a1, 0x34($sp) -/* B59F2C 800E2D8C 1040000A */ beqz $v0, .L800E2DB8 -/* B59F30 800E2D90 AFA2004C */ sw $v0, 0x4c($sp) -/* B59F34 800E2D94 8FA50064 */ lw $a1, 0x64($sp) -/* B59F38 800E2D98 24190002 */ li $t9, 2 -/* B59F3C 800E2D9C AFB9003C */ sw $t9, 0x3c($sp) -/* B59F40 800E2DA0 8FA40068 */ lw $a0, 0x68($sp) -/* B59F44 800E2DA4 00003025 */ move $a2, $zero -/* B59F48 800E2DA8 0C000C18 */ jal osSendMesg -/* B59F4C 800E2DAC 00052E00 */ sll $a1, $a1, 0x18 -/* B59F50 800E2DB0 10000074 */ b .L800E2F84 -/* B59F54 800E2DB4 00000000 */ nop -.L800E2DB8: -/* B59F58 800E2DB8 0C0389FE */ jal func_800E27F8 -/* B59F5C 800E2DBC 02002025 */ move $a0, $s0 -/* B59F60 800E2DC0 8FA80034 */ lw $t0, 0x34($sp) -/* B59F64 800E2DC4 AFA20050 */ sw $v0, 0x50($sp) -/* B59F68 800E2DC8 8FAE005C */ lw $t6, 0x5c($sp) -/* B59F6C 800E2DCC 00084900 */ sll $t1, $t0, 4 -/* B59F70 800E2DD0 00491821 */ addu $v1, $v0, $t1 -/* B59F74 800E2DD4 8C6A0014 */ lw $t2, 0x14($v1) -/* B59F78 800E2DD8 2401FFF0 */ li $at, -16 -/* B59F7C 800E2DDC 000E7900 */ sll $t7, $t6, 4 -/* B59F80 800E2DE0 254C000F */ addiu $t4, $t2, 0xf -/* B59F84 800E2DE4 01816824 */ and $t5, $t4, $at -/* B59F88 800E2DE8 AFAA0054 */ sw $t2, 0x54($sp) -/* B59F8C 800E2DEC AFAD0054 */ sw $t5, 0x54($sp) -/* B59F90 800E2DF0 004F2021 */ addu $a0, $v0, $t7 -/* B59F94 800E2DF4 80980018 */ lb $t8, 0x18($a0) -/* B59F98 800E2DF8 24080002 */ li $t0, 2 -/* B59F9C 800E2DFC AFB80048 */ sw $t8, 0x48($sp) -/* B59FA0 800E2E00 80850019 */ lb $a1, 0x19($a0) -/* B59FA4 800E2E04 8C790010 */ lw $t9, 0x10($v1) -/* B59FA8 800E2E08 AFA8003C */ sw $t0, 0x3c($sp) -/* B59FAC 800E2E0C 2CA10005 */ sltiu $at, $a1, 5 -/* B59FB0 800E2E10 1020002D */ beqz $at, .L800E2EC8 -/* B59FB4 800E2E14 AFB90040 */ sw $t9, 0x40($sp) -/* B59FB8 800E2E18 00054880 */ sll $t1, $a1, 2 -/* B59FBC 800E2E1C 3C018015 */ lui $at, %hi(jtbl_8014946C) -/* B59FC0 800E2E20 00290821 */ addu $at, $at, $t1 -/* B59FC4 800E2E24 8C29946C */ lw $t1, %lo(jtbl_8014946C)($at) -/* B59FC8 800E2E28 01200008 */ jr $t1 -/* B59FCC 800E2E2C 00000000 */ nop -glabel L800E2E30 -/* B59FD0 800E2E30 02002025 */ move $a0, $s0 -/* B59FD4 800E2E34 8FA50034 */ lw $a1, 0x34($sp) -/* B59FD8 800E2E38 0C038150 */ jal func_800E0540 -/* B59FDC 800E2E3C 8FA60054 */ lw $a2, 0x54($sp) -/* B59FE0 800E2E40 14400003 */ bnez $v0, .L800E2E50 -/* B59FE4 800E2E44 AFA2004C */ sw $v0, 0x4c($sp) -/* B59FE8 800E2E48 10000064 */ b .L800E2FDC -/* B59FEC 800E2E4C 8FBF002C */ lw $ra, 0x2c($sp) -.L800E2E50: -/* B59FF0 800E2E50 240A0005 */ li $t2, 5 -/* B59FF4 800E2E54 1000001C */ b .L800E2EC8 -/* B59FF8 800E2E58 AFAA003C */ sw $t2, 0x3c($sp) -glabel L800E2E5C -/* B59FFC 800E2E5C 02002025 */ move $a0, $s0 -/* B5A000 800E2E60 8FA50054 */ lw $a1, 0x54($sp) -/* B5A004 800E2E64 24060001 */ li $a2, 1 -/* B5A008 800E2E68 0C037A38 */ jal Audio_AllocBankOrSeq -/* B5A00C 800E2E6C 8FA70034 */ lw $a3, 0x34($sp) -/* B5A010 800E2E70 14400015 */ bnez $v0, .L800E2EC8 -/* B5A014 800E2E74 AFA2004C */ sw $v0, 0x4c($sp) -/* B5A018 800E2E78 10000058 */ b .L800E2FDC -/* B5A01C 800E2E7C 8FBF002C */ lw $ra, 0x2c($sp) -glabel L800E2E80 -/* B5A020 800E2E80 02002025 */ move $a0, $s0 -/* B5A024 800E2E84 8FA50054 */ lw $a1, 0x54($sp) -/* B5A028 800E2E88 00003025 */ move $a2, $zero -/* B5A02C 800E2E8C 0C037A38 */ jal Audio_AllocBankOrSeq -/* B5A030 800E2E90 8FA70034 */ lw $a3, 0x34($sp) -/* B5A034 800E2E94 1440000C */ bnez $v0, .L800E2EC8 -/* B5A038 800E2E98 AFA2004C */ sw $v0, 0x4c($sp) -/* B5A03C 800E2E9C 1000004F */ b .L800E2FDC -/* B5A040 800E2EA0 8FBF002C */ lw $ra, 0x2c($sp) -glabel L800E2EA4 -/* B5A044 800E2EA4 02002025 */ move $a0, $s0 -/* B5A048 800E2EA8 8FA50054 */ lw $a1, 0x54($sp) -/* B5A04C 800E2EAC 24060002 */ li $a2, 2 -/* B5A050 800E2EB0 0C037A38 */ jal Audio_AllocBankOrSeq -/* B5A054 800E2EB4 8FA70034 */ lw $a3, 0x34($sp) -/* B5A058 800E2EB8 14400003 */ bnez $v0, .L800E2EC8 -/* B5A05C 800E2EBC AFA2004C */ sw $v0, 0x4c($sp) -/* B5A060 800E2EC0 10000046 */ b .L800E2FDC -/* B5A064 800E2EC4 8FBF002C */ lw $ra, 0x2c($sp) -.L800E2EC8: -/* B5A068 800E2EC8 8FAB0048 */ lw $t3, 0x48($sp) -/* B5A06C 800E2ECC 24010001 */ li $at, 1 -/* B5A070 800E2ED0 8FA40040 */ lw $a0, 0x40($sp) -/* B5A074 800E2ED4 15610018 */ bne $t3, $at, .L800E2F38 -/* B5A078 800E2ED8 8FA5004C */ lw $a1, 0x4c($sp) -/* B5A07C 800E2EDC 8FAC0050 */ lw $t4, 0x50($sp) -/* B5A080 800E2EE0 8FAF0064 */ lw $t7, 0x64($sp) -/* B5A084 800E2EE4 8FA9005C */ lw $t1, 0x5c($sp) -/* B5A088 800E2EE8 85840002 */ lh $a0, 2($t4) -/* B5A08C 800E2EEC 8FAD0060 */ lw $t5, 0x60($sp) -/* B5A090 800E2EF0 AFAB0010 */ sw $t3, 0x10($sp) -/* B5A094 800E2EF4 8FAB003C */ lw $t3, 0x3c($sp) -/* B5A098 800E2EF8 0010CC00 */ sll $t9, $s0, 0x10 -/* B5A09C 800E2EFC 000FC600 */ sll $t8, $t7, 0x18 -/* B5A0A0 800E2F00 03194025 */ or $t0, $t8, $t9 -/* B5A0A4 800E2F04 00095200 */ sll $t2, $t1, 8 -/* B5A0A8 800E2F08 8FAE0068 */ lw $t6, 0x68($sp) -/* B5A0AC 800E2F0C 010A6025 */ or $t4, $t0, $t2 -/* B5A0B0 800E2F10 AFAD0014 */ sw $t5, 0x14($sp) -/* B5A0B4 800E2F14 018B6825 */ or $t5, $t4, $t3 -/* B5A0B8 800E2F18 AFAD001C */ sw $t5, 0x1c($sp) -/* B5A0BC 800E2F1C 8FA50040 */ lw $a1, 0x40($sp) -/* B5A0C0 800E2F20 8FA6004C */ lw $a2, 0x4c($sp) -/* B5A0C4 800E2F24 8FA70054 */ lw $a3, 0x54($sp) -/* B5A0C8 800E2F28 0C038E91 */ jal func_800E3A44 -/* B5A0CC 800E2F2C AFAE0018 */ sw $t6, 0x18($sp) -/* B5A0D0 800E2F30 10000013 */ b .L800E2F80 -/* B5A0D4 800E2F34 240F0001 */ li $t7, 1 -.L800E2F38: -/* B5A0D8 800E2F38 8FB80064 */ lw $t8, 0x64($sp) -/* B5A0DC 800E2F3C 8FAA0034 */ lw $t2, 0x34($sp) -/* B5A0E0 800E2F40 8FAE0060 */ lw $t6, 0x60($sp) -/* B5A0E4 800E2F44 8FAD003C */ lw $t5, 0x3c($sp) -/* B5A0E8 800E2F48 00104C00 */ sll $t1, $s0, 0x10 -/* B5A0EC 800E2F4C 0018CE00 */ sll $t9, $t8, 0x18 -/* B5A0F0 800E2F50 03294025 */ or $t0, $t9, $t1 -/* B5A0F4 800E2F54 000A6200 */ sll $t4, $t2, 8 -/* B5A0F8 800E2F58 8FAF0068 */ lw $t7, 0x68($sp) -/* B5A0FC 800E2F5C 010C5825 */ or $t3, $t0, $t4 -/* B5A100 800E2F60 AFAE0010 */ sw $t6, 0x10($sp) -/* B5A104 800E2F64 016D7025 */ or $t6, $t3, $t5 -/* B5A108 800E2F68 AFAE0018 */ sw $t6, 0x18($sp) -/* B5A10C 800E2F6C 8FA60054 */ lw $a2, 0x54($sp) -/* B5A110 800E2F70 8FA70048 */ lw $a3, 0x48($sp) -/* B5A114 800E2F74 0C038EB2 */ jal func_800E3AC8 -/* B5A118 800E2F78 AFAF0014 */ sw $t7, 0x14($sp) -/* B5A11C 800E2F7C 240F0001 */ li $t7, 1 -.L800E2F80: -/* B5A120 800E2F80 AFAF003C */ sw $t7, 0x3c($sp) -.L800E2F84: -/* B5A124 800E2F84 12000009 */ beqz $s0, .L800E2FAC -/* B5A128 800E2F88 8FA40034 */ lw $a0, 0x34($sp) -/* B5A12C 800E2F8C 24010001 */ li $at, 1 -/* B5A130 800E2F90 1201000A */ beq $s0, $at, .L800E2FBC -/* B5A134 800E2F94 8FA40034 */ lw $a0, 0x34($sp) -/* B5A138 800E2F98 24010002 */ li $at, 2 -/* B5A13C 800E2F9C 1201000B */ beq $s0, $at, .L800E2FCC -/* B5A140 800E2FA0 8FA40034 */ lw $a0, 0x34($sp) -/* B5A144 800E2FA4 1000000C */ b .L800E2FD8 -/* B5A148 800E2FA8 8FA2004C */ lw $v0, 0x4c($sp) -.L800E2FAC: -/* B5A14C 800E2FAC 0C038692 */ jal Audio_SetSeqLoadStatus -/* B5A150 800E2FB0 8FA5003C */ lw $a1, 0x3c($sp) -/* B5A154 800E2FB4 10000008 */ b .L800E2FD8 -/* B5A158 800E2FB8 8FA2004C */ lw $v0, 0x4c($sp) -.L800E2FBC: -/* B5A15C 800E2FBC 0C038686 */ jal Audio_SetBankLoadStatus -/* B5A160 800E2FC0 8FA5003C */ lw $a1, 0x3c($sp) -/* B5A164 800E2FC4 10000004 */ b .L800E2FD8 -/* B5A168 800E2FC8 8FA2004C */ lw $v0, 0x4c($sp) -.L800E2FCC: -/* B5A16C 800E2FCC 0C03869E */ jal func_800E1A78 -/* B5A170 800E2FD0 8FA5003C */ lw $a1, 0x3c($sp) -/* B5A174 800E2FD4 8FA2004C */ lw $v0, 0x4c($sp) -.L800E2FD8: -/* B5A178 800E2FD8 8FBF002C */ lw $ra, 0x2c($sp) -.L800E2FDC: -/* B5A17C 800E2FDC 8FB00028 */ lw $s0, 0x28($sp) -/* B5A180 800E2FE0 27BD0058 */ addiu $sp, $sp, 0x58 -/* B5A184 800E2FE4 03E00008 */ jr $ra -/* B5A188 800E2FE8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2FEC.s b/asm/non_matchings/code/code_800E11F0/func_800E2FEC.s deleted file mode 100644 index 7e70d32b77..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E2FEC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800E2FEC -/* B5A18C 800E2FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5A190 800E2FF0 AFBF0014 */ sw $ra, 0x14($sp) -/* B5A194 800E2FF4 0C038DBB */ jal func_800E36EC -/* B5A198 800E2FF8 AFA40018 */ sw $a0, 0x18($sp) -/* B5A19C 800E2FFC 0C039164 */ jal func_800E4590 -/* B5A1A0 800E3000 8FA40018 */ lw $a0, 0x18($sp) -/* B5A1A4 800E3004 0C038EFB */ jal func_800E3BEC -/* B5A1A8 800E3008 8FA40018 */ lw $a0, 0x18($sp) -/* B5A1AC 800E300C 8FBF0014 */ lw $ra, 0x14($sp) -/* B5A1B0 800E3010 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5A1B4 800E3014 03E00008 */ jr $ra -/* B5A1B8 800E3018 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E301C.s b/asm/non_matchings/code/code_800E11F0/func_800E301C.s deleted file mode 100644 index 029594db0f..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E301C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800E301C -/* B5A1BC 800E301C 3C018013 */ lui $at, %hi(D_801304D0) -/* B5A1C0 800E3020 03E00008 */ jr $ra -/* B5A1C4 800E3024 AC2404D0 */ sw $a0, %lo(D_801304D0)($at) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3028.s b/asm/non_matchings/code/code_800E11F0/func_800E3028.s deleted file mode 100644 index 1cea973585..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3028.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800E3028 -/* B5A1C8 800E3028 3C018013 */ lui $at, %hi(D_801304D4) -/* B5A1CC 800E302C 03E00008 */ jr $ra -/* B5A1D0 800E3030 AC2404D4 */ sw $a0, %lo(D_801304D4)($at) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3034.s b/asm/non_matchings/code/code_800E11F0/func_800E3034.s deleted file mode 100644 index 4d6f8fffc2..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3034.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800E3034 -/* B5A1D4 800E3034 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B5A1D8 800E3038 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B5A1DC 800E303C 8CB82834 */ lw $t8, 0x2834($a1) -/* B5A1E0 800E3040 0004C900 */ sll $t9, $a0, 4 -/* B5A1E4 800E3044 8CAF2844 */ lw $t7, 0x2844($a1) -/* B5A1E8 800E3048 03191821 */ addu $v1, $t8, $t9 -/* B5A1EC 800E304C 8468001A */ lh $t0, 0x1a($v1) -/* B5A1F0 800E3050 00047080 */ sll $t6, $a0, 2 -/* B5A1F4 800E3054 01C47021 */ addu $t6, $t6, $a0 -/* B5A1F8 800E3058 000E7080 */ sll $t6, $t6, 2 -/* B5A1FC 800E305C 01CF1021 */ addu $v0, $t6, $t7 -/* B5A200 800E3060 00085203 */ sra $t2, $t0, 8 -/* B5A204 800E3064 A04A0002 */ sb $t2, 2($v0) -/* B5A208 800E3068 846C001A */ lh $t4, 0x1a($v1) -/* B5A20C 800E306C 24630010 */ addiu $v1, $v1, 0x10 -/* B5A210 800E3070 A04C0003 */ sb $t4, 3($v0) -/* B5A214 800E3074 846D000C */ lh $t5, 0xc($v1) -/* B5A218 800E3078 000D7A03 */ sra $t7, $t5, 8 -/* B5A21C 800E307C A04F0000 */ sb $t7, ($v0) -/* B5A220 800E3080 8479000C */ lh $t9, 0xc($v1) -/* B5A224 800E3084 A0590001 */ sb $t9, 1($v0) -/* B5A228 800E3088 8468000E */ lh $t0, 0xe($v1) -/* B5A22C 800E308C 03E00008 */ jr $ra -/* B5A230 800E3090 A4480004 */ sh $t0, 4($v0) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3094.s b/asm/non_matchings/code/code_800E11F0/func_800E3094.s deleted file mode 100644 index 0a3541c0fb..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3094.s +++ /dev/null @@ -1,237 +0,0 @@ -glabel func_800E3094 -/* B5A234 800E3094 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B5A238 800E3098 AFB10018 */ sw $s1, 0x18($sp) -/* B5A23C 800E309C 3C118017 */ lui $s1, %hi(gAudioContext) # $s1, 0x8017 -/* B5A240 800E30A0 2631F180 */ addiu $s1, %lo(gAudioContext) # addiu $s1, $s1, -0xe80 -/* B5A244 800E30A4 3C018017 */ lui $at, %hi(D_801755D0) # $at, 0x8017 -/* B5A248 800E30A8 AC2055D0 */ sw $zero, %lo(D_801755D0)($at) -/* B5A24C 800E30AC AFBF001C */ sw $ra, 0x1c($sp) -/* B5A250 800E30B0 AFB00014 */ sw $s0, 0x14($sp) -/* B5A254 800E30B4 AFA40070 */ sw $a0, 0x70($sp) -/* B5A258 800E30B8 AFA50074 */ sw $a1, 0x74($sp) -/* B5A25C 800E30BC AE202984 */ sw $zero, 0x2984($s1) -/* B5A260 800E30C0 02201025 */ move $v0, $s1 -/* B5A264 800E30C4 24036450 */ li $v1, 25680 -.L800E30C8: -/* B5A268 800E30C8 2463FFFF */ addiu $v1, $v1, -1 -/* B5A26C 800E30CC A0400000 */ sb $zero, ($v0) -/* B5A270 800E30D0 0461FFFD */ bgez $v1, .L800E30C8 -/* B5A274 800E30D4 24420001 */ addiu $v0, $v0, 1 -/* B5A278 800E30D8 3C028000 */ lui $v0, %hi(osTvType) # $v0, 0x8000 -/* B5A27C 800E30DC 8C420300 */ lw $v0, %lo(osTvType)($v0) -/* B5A280 800E30E0 10400007 */ beqz $v0, .L800E3100 -/* B5A284 800E30E4 24010001 */ li $at, 1 -/* B5A288 800E30E8 10410010 */ beq $v0, $at, .L800E312C -/* B5A28C 800E30EC 24010002 */ li $at, 2 -/* B5A290 800E30F0 10410009 */ beq $v0, $at, .L800E3118 -/* B5A294 800E30F4 240F003C */ li $t7, 60 -/* B5A298 800E30F8 1000000C */ b .L800E312C -/* B5A29C 800E30FC 00000000 */ nop -.L800E3100: -/* B5A2A0 800E3100 3C018015 */ lui $at, %hi(D_80149480) -/* B5A2A4 800E3104 C4249480 */ lwc1 $f4, %lo(D_80149480)($at) -/* B5A2A8 800E3108 240E0032 */ li $t6, 50 -/* B5A2AC 800E310C AE2E2964 */ sw $t6, 0x2964($s1) -/* B5A2B0 800E3110 1000000B */ b .L800E3140 -/* B5A2B4 800E3114 E6242960 */ swc1 $f4, 0x2960($s1) -.L800E3118: -/* B5A2B8 800E3118 3C018015 */ lui $at, %hi(D_80149484) -/* B5A2BC 800E311C C4269484 */ lwc1 $f6, %lo(D_80149484)($at) -/* B5A2C0 800E3120 AE2F2964 */ sw $t7, 0x2964($s1) -/* B5A2C4 800E3124 10000006 */ b .L800E3140 -/* B5A2C8 800E3128 E6262960 */ swc1 $f6, 0x2960($s1) -.L800E312C: -/* B5A2CC 800E312C 3C018015 */ lui $at, %hi(D_80149488) -/* B5A2D0 800E3130 C4289488 */ lwc1 $f8, %lo(D_80149488)($at) -/* B5A2D4 800E3134 2418003C */ li $t8, 60 -/* B5A2D8 800E3138 AE382964 */ sw $t8, 0x2964($s1) -/* B5A2DC 800E313C E6282960 */ swc1 $f8, 0x2960($s1) -.L800E3140: -/* B5A2E0 800E3140 0C039A06 */ jal func_800E6818 -/* B5A2E4 800E3144 00000000 */ nop -/* B5A2E8 800E3148 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5A2EC 800E314C 3C048017 */ lui $a0, %hi(gAudioContext+0x6) # $a0, 0x8017 -/* B5A2F0 800E3150 2484F186 */ addiu $a0, %lo(gAudioContext+0x6) # addiu $a0, $a0, -0xe7a -/* B5A2F4 800E3154 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5A2F8 800E3158 240300A0 */ li $v1, 160 -.L800E315C: -/* B5A2FC 800E315C 24420002 */ addiu $v0, $v0, 2 -/* B5A300 800E3160 0044082B */ sltu $at, $v0, $a0 -/* B5A304 800E3164 1420FFFD */ bnez $at, .L800E315C -/* B5A308 800E3168 A4432972 */ sh $v1, 0x2972($v0) -/* B5A30C 800E316C 3C048017 */ lui $a0, %hi(gAudioContext+0x25e8) # $a0, 0x8017 -/* B5A310 800E3170 3C058017 */ lui $a1, %hi(gAudioContext+0x2600) # $a1, 0x8017 -/* B5A314 800E3174 AE20289C */ sw $zero, 0x289c($s1) -/* B5A318 800E3178 AE2028A4 */ sw $zero, 0x28a4($s1) -/* B5A31C 800E317C AE2028A8 */ sw $zero, 0x28a8($s1) -/* B5A320 800E3180 A220289A */ sb $zero, 0x289a($s1) -/* B5A324 800E3184 AE2028B8 */ sw $zero, 0x28b8($s1) -/* B5A328 800E3188 AE2028F4 */ sw $zero, 0x28f4($s1) -/* B5A32C 800E318C AE202944 */ sw $zero, 0x2944($s1) -/* B5A330 800E3190 24A51780 */ addiu $a1, %lo(gAudioContext+0x2600) # addiu $a1, $a1, 0x1780 -/* B5A334 800E3194 24841768 */ addiu $a0, %lo(gAudioContext+0x25e8) # addiu $a0, $a0, 0x1768 -/* B5A338 800E3198 0C001874 */ jal osCreateMesgQueue -/* B5A33C 800E319C 24060001 */ li $a2, 1 -/* B5A340 800E31A0 3C048017 */ lui $a0, %hi(gAudioContext+0x1ed0) # $a0, 0x8017 -/* B5A344 800E31A4 3C058017 */ lui $a1, %hi(gAudioContext+0x1ee8) # $a1, 0x8017 -/* B5A348 800E31A8 24A51068 */ addiu $a1, %lo(gAudioContext+0x1ee8) # addiu $a1, $a1, 0x1068 -/* B5A34C 800E31AC 24841050 */ addiu $a0, %lo(gAudioContext+0x1ed0) # addiu $a0, $a0, 0x1050 -/* B5A350 800E31B0 0C001874 */ jal osCreateMesgQueue -/* B5A354 800E31B4 24060040 */ li $a2, 64 -/* B5A358 800E31B8 3C048017 */ lui $a0, %hi(gAudioContext+0x1e20) # $a0, 0x8017 -/* B5A35C 800E31BC 3C058017 */ lui $a1, %hi(gAudioContext+0x1e38) # $a1, 0x8017 -/* B5A360 800E31C0 24A50FB8 */ addiu $a1, %lo(gAudioContext+0x1e38) # addiu $a1, $a1, 0xfb8 -/* B5A364 800E31C4 24840FA0 */ addiu $a0, %lo(gAudioContext+0x1e20) # addiu $a0, $a0, 0xfa0 -/* B5A368 800E31C8 0C001874 */ jal osCreateMesgQueue -/* B5A36C 800E31CC 24060010 */ li $a2, 16 -/* B5A370 800E31D0 3C048017 */ lui $a0, %hi(gAudioContext+0x1e78) # $a0, 0x8017 -/* B5A374 800E31D4 3C058017 */ lui $a1, %hi(gAudioContext+0x1e90) # $a1, 0x8017 -/* B5A378 800E31D8 24A51010 */ addiu $a1, %lo(gAudioContext+0x1e90) # addiu $a1, $a1, 0x1010 -/* B5A37C 800E31DC 24840FF8 */ addiu $a0, %lo(gAudioContext+0x1e78) # addiu $a0, $a0, 0xff8 -/* B5A380 800E31E0 0C001874 */ jal osCreateMesgQueue -/* B5A384 800E31E4 24060010 */ li $a2, 16 -/* B5A388 800E31E8 AE2028A0 */ sw $zero, 0x28a0($s1) -/* B5A38C 800E31EC 0C001E44 */ jal osCartRomInit -/* B5A390 800E31F0 AE202620 */ sw $zero, 0x2620($s1) -/* B5A394 800E31F4 8FA30070 */ lw $v1, 0x70($sp) -/* B5A398 800E31F8 AE221E18 */ sw $v0, 0x1e18($s1) -/* B5A39C 800E31FC 3C048015 */ lui $a0, %hi(D_8014A6C8) # $a0, 0x8015 -/* B5A3A0 800E3200 14600007 */ bnez $v1, .L800E3220 -/* B5A3A4 800E3204 3C19801E */ lui $t9, %hi(gAudioHeap) # $t9, 0x801e -/* B5A3A8 800E3208 273989E0 */ addiu $t9, %lo(gAudioHeap) # addiu $t9, $t9, -0x7620 -/* B5A3AC 800E320C AE393524 */ sw $t9, 0x3524($s1) -/* B5A3B0 800E3210 3C088015 */ lui $t0, %hi(D_8014A6C4) # $t0, 0x8015 -/* B5A3B4 800E3214 8D08A6C4 */ lw $t0, %lo(D_8014A6C4)($t0) -/* B5A3B8 800E3218 10000004 */ b .L800E322C -/* B5A3BC 800E321C AE283528 */ sw $t0, 0x3528($s1) -.L800E3220: -/* B5A3C0 800E3220 8FA90074 */ lw $t1, 0x74($sp) -/* B5A3C4 800E3224 AE233524 */ sw $v1, 0x3524($s1) -/* B5A3C8 800E3228 AE293528 */ sw $t1, 0x3528($s1) -.L800E322C: -/* B5A3CC 800E322C 8E2A3528 */ lw $t2, 0x3528($s1) -/* B5A3D0 800E3230 00008025 */ move $s0, $zero -/* B5A3D4 800E3234 05410003 */ bgez $t2, .L800E3244 -/* B5A3D8 800E3238 000A58C3 */ sra $t3, $t2, 3 -/* B5A3DC 800E323C 25410007 */ addiu $at, $t2, 7 -/* B5A3E0 800E3240 000158C3 */ sra $t3, $at, 3 -.L800E3244: -/* B5A3E4 800E3244 19600011 */ blez $t3, .L800E328C -/* B5A3E8 800E3248 00001025 */ move $v0, $zero -/* B5A3EC 800E324C 8E2E3524 */ lw $t6, 0x3524($s1) -.L800E3250: -/* B5A3F0 800E3250 240C0000 */ li $t4, 0 -/* B5A3F4 800E3254 240D0000 */ li $t5, 0 -/* B5A3F8 800E3258 01C27821 */ addu $t7, $t6, $v0 -/* B5A3FC 800E325C ADEC0000 */ sw $t4, ($t7) -/* B5A400 800E3260 ADED0004 */ sw $t5, 4($t7) -/* B5A404 800E3264 8E383528 */ lw $t8, 0x3528($s1) -/* B5A408 800E3268 26100001 */ addiu $s0, $s0, 1 -/* B5A40C 800E326C 24420008 */ addiu $v0, $v0, 8 -/* B5A410 800E3270 07010003 */ bgez $t8, .L800E3280 -/* B5A414 800E3274 0018C8C3 */ sra $t9, $t8, 3 -/* B5A418 800E3278 27010007 */ addiu $at, $t8, 7 -/* B5A41C 800E327C 0001C8C3 */ sra $t9, $at, 3 -.L800E3280: -/* B5A420 800E3280 0219082A */ slt $at, $s0, $t9 -/* B5A424 800E3284 5420FFF2 */ bnezl $at, .L800E3250 -/* B5A428 800E3288 8E2E3524 */ lw $t6, 0x3524($s1) -.L800E328C: -/* B5A42C 800E328C 0C03797C */ jal Audio_InitMainPools -/* B5A430 800E3290 8C84A6C8 */ lw $a0, %lo(D_8014A6C8)($a0) -/* B5A434 800E3294 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5A438 800E3298 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -.L800E329C: -/* B5A43C 800E329C 3C048017 */ lui $a0, %hi(gAudioContext+0x29b0) # $a0, 0x8017 -/* B5A440 800E32A0 24841B30 */ addiu $a0, %lo(gAudioContext+0x29b0) # addiu $a0, $a0, 0x1b30 -/* B5A444 800E32A4 0C0378E0 */ jal Audio_AllocZeroed -/* B5A448 800E32A8 24050B00 */ li $a1, 2816 -/* B5A44C 800E32AC 3C088017 */ lui $t0, %hi(gAudioContext+0xc) # $t0, 0x8017 -/* B5A450 800E32B0 2508F18C */ addiu $t0, %lo(gAudioContext+0xc) # addiu $t0, $t0, -0xe74 -/* B5A454 800E32B4 26100004 */ addiu $s0, $s0, 4 -/* B5A458 800E32B8 0208082B */ sltu $at, $s0, $t0 -/* B5A45C 800E32BC 1420FFF7 */ bnez $at, .L800E329C -/* B5A460 800E32C0 AE022964 */ sw $v0, 0x2964($s0) -/* B5A464 800E32C4 3C098015 */ lui $t1, %hi(D_80155500) # $t1, 0x8015 -/* B5A468 800E32C8 3C0A8015 */ lui $t2, %hi(D_801550D0) # $t2, 0x8015 -/* B5A46C 800E32CC 3C0B8015 */ lui $t3, %hi(D_80155BF0) # $t3, 0x8015 -/* B5A470 800E32D0 3C0E8015 */ lui $t6, %hi(D_80155340) # $t6, 0x8015 -/* B5A474 800E32D4 25295500 */ addiu $t1, %lo(D_80155500) # addiu $t1, $t1, 0x5500 -/* B5A478 800E32D8 254A50D0 */ addiu $t2, %lo(D_801550D0) # addiu $t2, $t2, 0x50d0 -/* B5A47C 800E32DC 256B5BF0 */ addiu $t3, %lo(D_80155BF0) # addiu $t3, $t3, 0x5bf0 -/* B5A480 800E32E0 25CE5340 */ addiu $t6, %lo(D_80155340) # addiu $t6, $t6, 0x5340 -/* B5A484 800E32E4 AE292830 */ sw $t1, 0x2830($s1) -/* B5A488 800E32E8 AE2A2834 */ sw $t2, 0x2834($s1) -/* B5A48C 800E32EC AE2B2838 */ sw $t3, 0x2838($s1) -/* B5A490 800E32F0 AE2E283C */ sw $t6, 0x283c($s1) -/* B5A494 800E32F4 852D0000 */ lh $t5, ($t1) -/* B5A498 800E32F8 240F0001 */ li $t7, 1 -/* B5A49C 800E32FC A2203519 */ sb $zero, 0x3519($s1) -/* B5A4A0 800E3300 A22F3518 */ sb $t7, 0x3518($s1) -/* B5A4A4 800E3304 0C037E3D */ jal Audio_ResetStep -/* B5A4A8 800E3308 A62D2840 */ sh $t5, 0x2840($s1) -/* B5A4AC 800E330C 3C050004 */ lui $a1, %hi(_AudioseqSegmentRomStart) # $a1, 4 -/* B5A4B0 800E3310 24A54DF0 */ addiu $a1, %lo(_AudioseqSegmentRomStart) # addiu $a1, $a1, 0x4df0 -/* B5A4B4 800E3314 8E242830 */ lw $a0, 0x2830($s1) -/* B5A4B8 800E3318 0C0386C2 */ jal func_800E1B08 -/* B5A4BC 800E331C 00003025 */ move $a2, $zero -/* B5A4C0 800E3320 3C050002 */ lui $a1, %hi(_AudiobankSegmentRomStart) # $a1, 2 -/* B5A4C4 800E3324 24A59030 */ addiu $a1, %lo(_AudiobankSegmentRomStart) # addiu $a1, $a1, -0x6fd0 -/* B5A4C8 800E3328 8E242834 */ lw $a0, 0x2834($s1) -/* B5A4CC 800E332C 0C0386C2 */ jal func_800E1B08 -/* B5A4D0 800E3330 00003025 */ move $a2, $zero -/* B5A4D4 800E3334 3C050009 */ lui $a1, %hi(_AudiotableSegmentRomStart) # $a1, 9 -/* B5A4D8 800E3338 24A54870 */ addiu $a1, %lo(_AudiotableSegmentRomStart) # addiu $a1, $a1, 0x4870 -/* B5A4DC 800E333C 8E242838 */ lw $a0, 0x2838($s1) -/* B5A4E0 800E3340 0C0386C2 */ jal func_800E1B08 -/* B5A4E4 800E3344 00003025 */ move $a2, $zero -/* B5A4E8 800E3348 8E382834 */ lw $t8, 0x2834($s1) -/* B5A4EC 800E334C 3C048017 */ lui $a0, %hi(gAudioContext+0x29b0) # $a0, 0x8017 -/* B5A4F0 800E3350 24841B30 */ addiu $a0, %lo(gAudioContext+0x29b0) # addiu $a0, $a0, 0x1b30 -/* B5A4F4 800E3354 87030000 */ lh $v1, ($t8) -/* B5A4F8 800E3358 00032880 */ sll $a1, $v1, 2 -/* B5A4FC 800E335C 00A32821 */ addu $a1, $a1, $v1 -/* B5A500 800E3360 00052880 */ sll $a1, $a1, 2 -/* B5A504 800E3364 0C0378F7 */ jal Audio_Alloc -/* B5A508 800E3368 AFA30024 */ sw $v1, 0x24($sp) -/* B5A50C 800E336C 8FA30024 */ lw $v1, 0x24($sp) -/* B5A510 800E3370 AE222844 */ sw $v0, 0x2844($s1) -/* B5A514 800E3374 00008025 */ move $s0, $zero -/* B5A518 800E3378 18600007 */ blez $v1, .L800E3398 -/* B5A51C 800E337C 02002025 */ move $a0, $s0 -.L800E3380: -/* B5A520 800E3380 0C038C0D */ jal func_800E3034 -/* B5A524 800E3384 AFA30024 */ sw $v1, 0x24($sp) -/* B5A528 800E3388 8FA30024 */ lw $v1, 0x24($sp) -/* B5A52C 800E338C 26100001 */ addiu $s0, $s0, 1 -/* B5A530 800E3390 5603FFFB */ bnel $s0, $v1, .L800E3380 -/* B5A534 800E3394 02002025 */ move $a0, $s0 -.L800E3398: -/* B5A538 800E3398 3C048017 */ lui $a0, %hi(gAudioContext+0x29b0) # $a0, 0x8017 -/* B5A53C 800E339C 3C058015 */ lui $a1, %hi(D_8014A6CC) # $a1, 0x8015 -/* B5A540 800E33A0 8CA5A6CC */ lw $a1, %lo(D_8014A6CC)($a1) -/* B5A544 800E33A4 0C0378F7 */ jal Audio_Alloc -/* B5A548 800E33A8 24841B30 */ addiu $a0, %lo(gAudioContext+0x29b0) # addiu $a0, $a0, 0x1b30 -/* B5A54C 800E33AC 14400003 */ bnez $v0, .L800E33BC -/* B5A550 800E33B0 00402825 */ move $a1, $v0 -/* B5A554 800E33B4 3C018015 */ lui $at, %hi(D_8014A6CC) # $at, 0x8015 -/* B5A558 800E33B8 AC20A6CC */ sw $zero, %lo(D_8014A6CC)($at) -.L800E33BC: -/* B5A55C 800E33BC 3C048017 */ lui $a0, %hi(gAudioContext+0x2d50) # $a0, 0x8017 -/* B5A560 800E33C0 3C068015 */ lui $a2, %hi(D_8014A6CC) # $a2, 0x8015 -/* B5A564 800E33C4 8CC6A6CC */ lw $a2, %lo(D_8014A6CC)($a2) -/* B5A568 800E33C8 0C03790D */ jal Audio_SoundAllocPoolInit -/* B5A56C 800E33CC 24841ED0 */ addiu $a0, %lo(gAudioContext+0x2d50) # addiu $a0, $a0, 0x1ed0 -/* B5A570 800E33D0 24190001 */ li $t9, 1 -/* B5A574 800E33D4 3C018013 */ lui $at, %hi(D_801304D8) # $at, 0x8013 -/* B5A578 800E33D8 AC3904D8 */ sw $t9, %lo(D_801304D8)($at) -/* B5A57C 800E33DC 8E25289C */ lw $a1, 0x289c($s1) -/* B5A580 800E33E0 8E245BE8 */ lw $a0, 0x5be8($s1) -/* B5A584 800E33E4 0C000C18 */ jal osSendMesg -/* B5A588 800E33E8 00003025 */ move $a2, $zero -/* B5A58C 800E33EC 8FBF001C */ lw $ra, 0x1c($sp) -/* B5A590 800E33F0 8FB00014 */ lw $s0, 0x14($sp) -/* B5A594 800E33F4 8FB10018 */ lw $s1, 0x18($sp) -/* B5A598 800E33F8 03E00008 */ jr $ra -/* B5A59C 800E33FC 27BD0070 */ addiu $sp, $sp, 0x70 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3400.s b/asm/non_matchings/code/code_800E11F0/func_800E3400.s deleted file mode 100644 index 222f5f42f4..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3400.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800E3400 -/* B5A5A0 800E3400 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5A5A4 800E3404 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5A5A8 800E3408 AC401D64 */ sw $zero, 0x1d64($v0) -/* B5A5AC 800E340C 03E00008 */ jr $ra -/* B5A5B0 800E3410 AC401DC8 */ sw $zero, 0x1dc8($v0) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3414.s b/asm/non_matchings/code/code_800E11F0/func_800E3414.s deleted file mode 100644 index b616af89c6..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3414.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_800E3414 -/* B5A5B4 800E3414 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5A5B8 800E3418 AFBF0024 */ sw $ra, 0x24($sp) -/* B5A5BC 800E341C AFB00020 */ sw $s0, 0x20($sp) -/* B5A5C0 800E3420 00C08025 */ move $s0, $a2 -/* B5A5C4 800E3424 AFA40030 */ sw $a0, 0x30($sp) -/* B5A5C8 800E3428 0C038D78 */ jal func_800E35E0 -/* B5A5CC 800E342C AFA50034 */ sw $a1, 0x34($sp) -/* B5A5D0 800E3430 14400004 */ bnez $v0, .L800E3444 -/* B5A5D4 800E3434 00404025 */ move $t0, $v0 -/* B5A5D8 800E3438 A2000000 */ sb $zero, ($s0) -/* B5A5DC 800E343C 10000063 */ b .L800E35CC -/* B5A5E0 800E3440 2402FFFF */ li $v0, -1 -.L800E3444: -/* B5A5E4 800E3444 8C4E0000 */ lw $t6, ($v0) -/* B5A5E8 800E3448 3C098017 */ lui $t1, %hi(gAudioContext) # $t1, 0x8017 -/* B5A5EC 800E344C 24190002 */ li $t9, 2 -/* B5A5F0 800E3450 000E7900 */ sll $t7, $t6, 4 -/* B5A5F4 800E3454 000FC782 */ srl $t8, $t7, 0x1e -/* B5A5F8 800E3458 17000004 */ bnez $t8, .L800E346C -/* B5A5FC 800E345C 2529F180 */ addiu $t1, %lo(gAudioContext) # addiu $t1, $t1, -0xe80 -/* B5A600 800E3460 A2190000 */ sb $t9, ($s0) -/* B5A604 800E3464 10000059 */ b .L800E35CC -/* B5A608 800E3468 00001025 */ move $v0, $zero -.L800E346C: -/* B5A60C 800E346C 8D2A1D4C */ lw $t2, 0x1d4c($t1) -/* B5A610 800E3470 24010003 */ li $at, 3 -/* B5A614 800E3474 000A5880 */ sll $t3, $t2, 2 -/* B5A618 800E3478 016A5823 */ subu $t3, $t3, $t2 -/* B5A61C 800E347C 000B58C0 */ sll $t3, $t3, 3 -/* B5A620 800E3480 016A5821 */ addu $t3, $t3, $t2 -/* B5A624 800E3484 000B5880 */ sll $t3, $t3, 2 -/* B5A628 800E3488 012B1821 */ addu $v1, $t1, $t3 -/* B5A62C 800E348C 8C6C1D64 */ lw $t4, 0x1d64($v1) -/* B5A630 800E3490 24631D50 */ addiu $v1, $v1, 0x1d50 -/* B5A634 800E3494 55810003 */ bnel $t4, $at, .L800E34A4 -/* B5A638 800E3498 8D0E0000 */ lw $t6, ($t0) -/* B5A63C 800E349C AC600014 */ sw $zero, 0x14($v1) -/* B5A640 800E34A0 8D0E0000 */ lw $t6, ($t0) -.L800E34A4: -/* B5A644 800E34A4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B5A648 800E34A8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B5A64C 800E34AC AC6E0020 */ sw $t6, 0x20($v1) -/* B5A650 800E34B0 8D0D0004 */ lw $t5, 4($t0) -/* B5A654 800E34B4 AC6D0024 */ sw $t5, 0x24($v1) -/* B5A658 800E34B8 8D0E0008 */ lw $t6, 8($t0) -/* B5A65C 800E34BC AC6E0028 */ sw $t6, 0x28($v1) -/* B5A660 800E34C0 8D0D000C */ lw $t5, 0xc($t0) -/* B5A664 800E34C4 AC70001C */ sw $s0, 0x1c($v1) -/* B5A668 800E34C8 AC6D002C */ sw $t5, 0x2c($v1) -/* B5A66C 800E34CC 8D020000 */ lw $v0, ($t0) -/* B5A670 800E34D0 8D060004 */ lw $a2, 4($t0) -/* B5A674 800E34D4 AFA8002C */ sw $t0, 0x2c($sp) -/* B5A678 800E34D8 00023900 */ sll $a3, $v0, 4 -/* B5A67C 800E34DC 00073F82 */ srl $a3, $a3, 0x1e -/* B5A680 800E34E0 00073E00 */ sll $a3, $a3, 0x18 -/* B5A684 800E34E4 00073E03 */ sra $a3, $a3, 0x18 -/* B5A688 800E34E8 AFA30028 */ sw $v1, 0x28($sp) -/* B5A68C 800E34EC AFA00010 */ sw $zero, 0x10($sp) -/* B5A690 800E34F0 8FA50030 */ lw $a1, 0x30($sp) -/* B5A694 800E34F4 0C038171 */ jal func_800E05C4 -/* B5A698 800E34F8 00412024 */ and $a0, $v0, $at -/* B5A69C 800E34FC 8FA30028 */ lw $v1, 0x28($sp) -/* B5A6A0 800E3500 8FA8002C */ lw $t0, 0x2c($sp) -/* B5A6A4 800E3504 3C098017 */ lui $t1, %hi(gAudioContext) # $t1, 0x8017 -/* B5A6A8 800E3508 2529F180 */ addiu $t1, %lo(gAudioContext) # addiu $t1, $t1, -0xe80 -/* B5A6AC 800E350C 14400010 */ bnez $v0, .L800E3550 -/* B5A6B0 800E3510 AC62000C */ sw $v0, 0xc($v1) -/* B5A6B4 800E3514 8D020000 */ lw $v0, ($t0) -/* B5A6B8 800E3518 24010001 */ li $at, 1 -/* B5A6BC 800E351C 00027900 */ sll $t7, $v0, 4 -/* B5A6C0 800E3520 000FC782 */ srl $t8, $t7, 0x1e -/* B5A6C4 800E3524 13010004 */ beq $t8, $at, .L800E3538 -/* B5A6C8 800E3528 0002CF02 */ srl $t9, $v0, 0x1c -/* B5A6CC 800E352C 24010002 */ li $at, 2 -/* B5A6D0 800E3530 17210004 */ bne $t9, $at, .L800E3544 -/* B5A6D4 800E3534 240A0003 */ li $t2, 3 -.L800E3538: -/* B5A6D8 800E3538 A2000000 */ sb $zero, ($s0) -/* B5A6DC 800E353C 10000023 */ b .L800E35CC -/* B5A6E0 800E3540 2402FFFF */ li $v0, -1 -.L800E3544: -/* B5A6E4 800E3544 A20A0000 */ sb $t2, ($s0) -/* B5A6E8 800E3548 10000020 */ b .L800E35CC -/* B5A6EC 800E354C 2402FFFF */ li $v0, -1 -.L800E3550: -/* B5A6F0 800E3550 24020001 */ li $v0, 1 -/* B5A6F4 800E3554 AC620014 */ sw $v0, 0x14($v1) -/* B5A6F8 800E3558 8D0B0000 */ lw $t3, ($t0) -/* B5A6FC 800E355C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B5A700 800E3560 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B5A704 800E3564 01616024 */ and $t4, $t3, $at -/* B5A708 800E3568 8C6F000C */ lw $t7, 0xc($v1) -/* B5A70C 800E356C 258D000F */ addiu $t5, $t4, 0xf -/* B5A710 800E3570 2401FFF0 */ li $at, -16 -/* B5A714 800E3574 01A17024 */ and $t6, $t5, $at -/* B5A718 800E3578 AC6E0018 */ sw $t6, 0x18($v1) -/* B5A71C 800E357C AC6F0010 */ sw $t7, 0x10($v1) -/* B5A720 800E3580 8D180004 */ lw $t8, 4($t0) -/* B5A724 800E3584 AC780008 */ sw $t8, 8($v1) -/* B5A728 800E3588 8D190000 */ lw $t9, ($t0) -/* B5A72C 800E358C 00195100 */ sll $t2, $t9, 4 -/* B5A730 800E3590 000A5F82 */ srl $t3, $t2, 0x1e -/* B5A734 800E3594 A06B0000 */ sb $t3, ($v1) -/* B5A738 800E3598 8FAC0030 */ lw $t4, 0x30($sp) -/* B5A73C 800E359C 316E00FF */ andi $t6, $t3, 0xff -/* B5A740 800E35A0 A06C0001 */ sb $t4, 1($v1) -/* B5A744 800E35A4 8FAD0034 */ lw $t5, 0x34($sp) -/* B5A748 800E35A8 144E0004 */ bne $v0, $t6, .L800E35BC -/* B5A74C 800E35AC A46D0002 */ sh $t5, 2($v1) -/* B5A750 800E35B0 8D2F2838 */ lw $t7, 0x2838($t1) -/* B5A754 800E35B4 85F80002 */ lh $t8, 2($t7) -/* B5A758 800E35B8 AC780004 */ sw $t8, 4($v1) -.L800E35BC: -/* B5A75C 800E35BC 8D391D4C */ lw $t9, 0x1d4c($t1) -/* B5A760 800E35C0 00001025 */ move $v0, $zero -/* B5A764 800E35C4 3B2A0001 */ xori $t2, $t9, 1 -/* B5A768 800E35C8 AD2A1D4C */ sw $t2, 0x1d4c($t1) -.L800E35CC: -/* B5A76C 800E35CC 8FBF0024 */ lw $ra, 0x24($sp) -/* B5A770 800E35D0 8FB00020 */ lw $s0, 0x20($sp) -/* B5A774 800E35D4 27BD0030 */ addiu $sp, $sp, 0x30 -/* B5A778 800E35D8 03E00008 */ jr $ra -/* B5A77C 800E35DC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E35E0.s b/asm/non_matchings/code/code_800E11F0/func_800E35E0.s deleted file mode 100644 index b2043f1684..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E35E0.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800E35E0 -/* B5A780 800E35E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5A784 800E35E4 28A10080 */ slti $at, $a1, 0x80 -/* B5A788 800E35E8 AFBF0014 */ sw $ra, 0x14($sp) -/* B5A78C 800E35EC 10200009 */ beqz $at, .L800E3614 -/* B5A790 800E35F0 00A03025 */ move $a2, $a1 -/* B5A794 800E35F4 0C039D26 */ jal Audio_GetInstrumentInner -/* B5A798 800E35F8 00000000 */ nop -/* B5A79C 800E35FC 14400003 */ bnez $v0, .L800E360C -/* B5A7A0 800E3600 00000000 */ nop -/* B5A7A4 800E3604 10000016 */ b .L800E3660 -/* B5A7A8 800E3608 00001025 */ move $v0, $zero -.L800E360C: -/* B5A7AC 800E360C 10000013 */ b .L800E365C -/* B5A7B0 800E3610 8C430010 */ lw $v1, 0x10($v0) -.L800E3614: -/* B5A7B4 800E3614 28C10100 */ slti $at, $a2, 0x100 -/* B5A7B8 800E3618 10200009 */ beqz $at, .L800E3640 -/* B5A7BC 800E361C 00000000 */ nop -/* B5A7C0 800E3620 0C039D5B */ jal Audio_GetDrum -/* B5A7C4 800E3624 24C5FF80 */ addiu $a1, $a2, -0x80 -/* B5A7C8 800E3628 14400003 */ bnez $v0, .L800E3638 -/* B5A7CC 800E362C 00000000 */ nop -/* B5A7D0 800E3630 1000000B */ b .L800E3660 -/* B5A7D4 800E3634 00001025 */ move $v0, $zero -.L800E3638: -/* B5A7D8 800E3638 10000008 */ b .L800E365C -/* B5A7DC 800E363C 8C430004 */ lw $v1, 4($v0) -.L800E3640: -/* B5A7E0 800E3640 0C039D94 */ jal Audio_GetSfx -/* B5A7E4 800E3644 24C5FF00 */ addiu $a1, $a2, -0x100 -/* B5A7E8 800E3648 54400004 */ bnezl $v0, .L800E365C -/* B5A7EC 800E364C 8C430000 */ lw $v1, ($v0) -/* B5A7F0 800E3650 10000003 */ b .L800E3660 -/* B5A7F4 800E3654 00001025 */ move $v0, $zero -/* B5A7F8 800E3658 8C430000 */ lw $v1, ($v0) -.L800E365C: -/* B5A7FC 800E365C 00601025 */ move $v0, $v1 -.L800E3660: -/* B5A800 800E3660 8FBF0014 */ lw $ra, 0x14($sp) -/* B5A804 800E3664 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5A808 800E3668 03E00008 */ jr $ra -/* B5A80C 800E366C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3670.s b/asm/non_matchings/code/code_800E11F0/func_800E3670.s deleted file mode 100644 index 94d6bbd32c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3670.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800E3670 -/* B5A810 800E3670 03E00008 */ jr $ra -/* B5A814 800E3674 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3678.s b/asm/non_matchings/code/code_800E11F0/func_800E3678.s deleted file mode 100644 index 830b5c35db..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3678.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800E3678 -/* B5A818 800E3678 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5A81C 800E367C AFBF0014 */ sw $ra, 0x14($sp) -/* B5A820 800E3680 8C8E0024 */ lw $t6, 0x24($a0) -/* B5A824 800E3684 00803025 */ move $a2, $a0 -/* B5A828 800E3688 51C00015 */ beql $t6, $zero, .L800E36E0 -/* B5A82C 800E368C 8FBF0014 */ lw $ra, 0x14($sp) -/* B5A830 800E3690 90840001 */ lbu $a0, 1($a0) -/* B5A834 800E3694 94C50002 */ lhu $a1, 2($a2) -/* B5A838 800E3698 0C038D78 */ jal func_800E35E0 -/* B5A83C 800E369C AFA60018 */ sw $a2, 0x18($sp) -/* B5A840 800E36A0 1040000E */ beqz $v0, .L800E36DC -/* B5A844 800E36A4 8FA60018 */ lw $a2, 0x18($sp) -/* B5A848 800E36A8 8C580000 */ lw $t8, ($v0) -/* B5A84C 800E36AC 8CD90010 */ lw $t9, 0x10($a2) -/* B5A850 800E36B0 ACD80020 */ sw $t8, 0x20($a2) -/* B5A854 800E36B4 8C4F0004 */ lw $t7, 4($v0) -/* B5A858 800E36B8 ACCF0024 */ sw $t7, 0x24($a2) -/* B5A85C 800E36BC 8C580008 */ lw $t8, 8($v0) -/* B5A860 800E36C0 ACD80028 */ sw $t8, 0x28($a2) -/* B5A864 800E36C4 8C4F000C */ lw $t7, 0xc($v0) -/* B5A868 800E36C8 ACCF002C */ sw $t7, 0x2c($a2) -/* B5A86C 800E36CC 90480000 */ lbu $t0, ($v0) -/* B5A870 800E36D0 AC590004 */ sw $t9, 4($v0) -/* B5A874 800E36D4 3109FFF3 */ andi $t1, $t0, 0xfff3 -/* B5A878 800E36D8 A0490000 */ sb $t1, ($v0) -.L800E36DC: -/* B5A87C 800E36DC 8FBF0014 */ lw $ra, 0x14($sp) -.L800E36E0: -/* B5A880 800E36E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5A884 800E36E4 03E00008 */ jr $ra -/* B5A888 800E36E8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E36EC.s b/asm/non_matchings/code/code_800E11F0/func_800E36EC.s deleted file mode 100644 index 13c9d3091a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E36EC.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel func_800E36EC -/* B5A88C 800E36EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B5A890 800E36F0 AFB70030 */ sw $s7, 0x30($sp) -/* B5A894 800E36F4 AFB2001C */ sw $s2, 0x1c($sp) -/* B5A898 800E36F8 AFB6002C */ sw $s6, 0x2c($sp) -/* B5A89C 800E36FC AFB50028 */ sw $s5, 0x28($sp) -/* B5A8A0 800E3700 AFB40024 */ sw $s4, 0x24($sp) -/* B5A8A4 800E3704 AFB30020 */ sw $s3, 0x20($sp) -/* B5A8A8 800E3708 3C128017 */ lui $s2, %hi(gAudioContext) # $s2, 0x8017 -/* B5A8AC 800E370C 3C178017 */ lui $s7, %hi(gAudioContext+0xc8) # $s7, 0x8017 -/* B5A8B0 800E3710 0080B025 */ move $s6, $a0 -/* B5A8B4 800E3714 AFBF0034 */ sw $ra, 0x34($sp) -/* B5A8B8 800E3718 AFB10018 */ sw $s1, 0x18($sp) -/* B5A8BC 800E371C AFB00014 */ sw $s0, 0x14($sp) -/* B5A8C0 800E3720 26F7F248 */ addiu $s7, %lo(gAudioContext+0xc8) # addiu $s7, $s7, -0xdb8 -/* B5A8C4 800E3724 2652F180 */ addiu $s2, %lo(gAudioContext) # addiu $s2, $s2, -0xe80 -/* B5A8C8 800E3728 24130001 */ li $s3, 1 -/* B5A8CC 800E372C 24140002 */ li $s4, 2 -/* B5A8D0 800E3730 24150003 */ li $s5, 3 -/* B5A8D4 800E3734 8E421D64 */ lw $v0, 0x1d64($s2) -.L800E3738: -/* B5A8D8 800E3738 5053000F */ beql $v0, $s3, .L800E3778 -/* B5A8DC 800E373C 26501D50 */ addiu $s0, $s2, 0x1d50 -/* B5A8E0 800E3740 1454003E */ bne $v0, $s4, .L800E383C -/* B5A8E4 800E3744 26501D50 */ addiu $s0, $s2, 0x1d50 -/* B5A8E8 800E3748 920E0000 */ lbu $t6, ($s0) -/* B5A8EC 800E374C 26040030 */ addiu $a0, $s0, 0x30 -/* B5A8F0 800E3750 00002825 */ move $a1, $zero -/* B5A8F4 800E3754 126E0003 */ beq $s3, $t6, .L800E3764 -/* B5A8F8 800E3758 00000000 */ nop -/* B5A8FC 800E375C 0C000CA0 */ jal osRecvMesg -/* B5A900 800E3760 02603025 */ move $a2, $s3 -.L800E3764: -/* B5A904 800E3764 52C00004 */ beql $s6, $zero, .L800E3778 -/* B5A908 800E3768 26501D50 */ addiu $s0, $s2, 0x1d50 -/* B5A90C 800E376C 10000033 */ b .L800E383C -/* B5A910 800E3770 AE150014 */ sw $s5, 0x14($s0) -/* B5A914 800E3774 26501D50 */ addiu $s0, $s2, 0x1d50 -.L800E3778: -/* B5A918 800E3778 8E110018 */ lw $s1, 0x18($s0) -/* B5A91C 800E377C AE140014 */ sw $s4, 0x14($s0) -/* B5A920 800E3780 16200007 */ bnez $s1, .L800E37A0 -/* B5A924 800E3784 2A210400 */ slti $at, $s1, 0x400 -/* B5A928 800E3788 0C038D9E */ jal func_800E3678 -/* B5A92C 800E378C 02002025 */ move $a0, $s0 -/* B5A930 800E3790 8E0F001C */ lw $t7, 0x1c($s0) -/* B5A934 800E3794 AE150014 */ sw $s5, 0x14($s0) -/* B5A938 800E3798 10000028 */ b .L800E383C -/* B5A93C 800E379C A1F30000 */ sb $s3, ($t7) -.L800E37A0: -/* B5A940 800E37A0 50200011 */ beql $at, $zero, .L800E37E8 -/* B5A944 800E37A4 92190000 */ lbu $t9, ($s0) -/* B5A948 800E37A8 92180000 */ lbu $t8, ($s0) -/* B5A94C 800E37AC 02203025 */ move $a2, $s1 -/* B5A950 800E37B0 02002025 */ move $a0, $s0 -/* B5A954 800E37B4 16780007 */ bne $s3, $t8, .L800E37D4 -/* B5A958 800E37B8 00000000 */ nop -/* B5A95C 800E37BC 8E040008 */ lw $a0, 8($s0) -/* B5A960 800E37C0 8E05000C */ lw $a1, 0xc($s0) -/* B5A964 800E37C4 0C038E3E */ jal func_800E38F8 -/* B5A968 800E37C8 8E070004 */ lw $a3, 4($s0) -/* B5A96C 800E37CC 10000003 */ b .L800E37DC -/* B5A970 800E37D0 00000000 */ nop -.L800E37D4: -/* B5A974 800E37D4 0C038E1D */ jal func_800E3874 -/* B5A978 800E37D8 02202825 */ move $a1, $s1 -.L800E37DC: -/* B5A97C 800E37DC 10000017 */ b .L800E383C -/* B5A980 800E37E0 AE000018 */ sw $zero, 0x18($s0) -/* B5A984 800E37E4 92190000 */ lbu $t9, ($s0) -.L800E37E8: -/* B5A988 800E37E8 24060400 */ li $a2, 1024 -/* B5A98C 800E37EC 02002025 */ move $a0, $s0 -/* B5A990 800E37F0 16790007 */ bne $s3, $t9, .L800E3810 -/* B5A994 800E37F4 00000000 */ nop -/* B5A998 800E37F8 8E040008 */ lw $a0, 8($s0) -/* B5A99C 800E37FC 8E05000C */ lw $a1, 0xc($s0) -/* B5A9A0 800E3800 0C038E3E */ jal func_800E38F8 -/* B5A9A4 800E3804 8E070004 */ lw $a3, 4($s0) -/* B5A9A8 800E3808 10000004 */ b .L800E381C -/* B5A9AC 800E380C 8E080018 */ lw $t0, 0x18($s0) -.L800E3810: -/* B5A9B0 800E3810 0C038E1D */ jal func_800E3874 -/* B5A9B4 800E3814 24050400 */ li $a1, 1024 -/* B5A9B8 800E3818 8E080018 */ lw $t0, 0x18($s0) -.L800E381C: -/* B5A9BC 800E381C 8E0A000C */ lw $t2, 0xc($s0) -/* B5A9C0 800E3820 8E0C0008 */ lw $t4, 8($s0) -/* B5A9C4 800E3824 2509FC00 */ addiu $t1, $t0, -0x400 -/* B5A9C8 800E3828 254B0400 */ addiu $t3, $t2, 0x400 -/* B5A9CC 800E382C 258D0400 */ addiu $t5, $t4, 0x400 -/* B5A9D0 800E3830 AE090018 */ sw $t1, 0x18($s0) -/* B5A9D4 800E3834 AE0B000C */ sw $t3, 0xc($s0) -/* B5A9D8 800E3838 AE0D0008 */ sw $t5, 8($s0) -.L800E383C: -/* B5A9DC 800E383C 26520064 */ addiu $s2, $s2, 0x64 -/* B5A9E0 800E3840 5657FFBD */ bnel $s2, $s7, .L800E3738 -/* B5A9E4 800E3844 8E421D64 */ lw $v0, 0x1d64($s2) -/* B5A9E8 800E3848 8FBF0034 */ lw $ra, 0x34($sp) -/* B5A9EC 800E384C 8FB00014 */ lw $s0, 0x14($sp) -/* B5A9F0 800E3850 8FB10018 */ lw $s1, 0x18($sp) -/* B5A9F4 800E3854 8FB2001C */ lw $s2, 0x1c($sp) -/* B5A9F8 800E3858 8FB30020 */ lw $s3, 0x20($sp) -/* B5A9FC 800E385C 8FB40024 */ lw $s4, 0x24($sp) -/* B5AA00 800E3860 8FB50028 */ lw $s5, 0x28($sp) -/* B5AA04 800E3864 8FB6002C */ lw $s6, 0x2c($sp) -/* B5AA08 800E3868 8FB70030 */ lw $s7, 0x30($sp) -/* B5AA0C 800E386C 03E00008 */ jr $ra -/* B5AA10 800E3870 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3874.s b/asm/non_matchings/code/code_800E11F0/func_800E3874.s deleted file mode 100644 index 387e4885fa..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3874.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_800E3874 -/* B5AA14 800E3874 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5AA18 800E3878 AFB00030 */ sw $s0, 0x30($sp) -/* B5AA1C 800E387C 00808025 */ move $s0, $a0 -/* B5AA20 800E3880 AFBF0034 */ sw $ra, 0x34($sp) -/* B5AA24 800E3884 AFA50044 */ sw $a1, 0x44($sp) -/* B5AA28 800E3888 0C039A10 */ jal func_800E6840 -/* B5AA2C 800E388C 8C84000C */ lw $a0, 0xc($a0) -/* B5AA30 800E3890 26040030 */ addiu $a0, $s0, 0x30 -/* B5AA34 800E3894 AFA4003C */ sw $a0, 0x3c($sp) -/* B5AA38 800E3898 26050048 */ addiu $a1, $s0, 0x48 -/* B5AA3C 800E389C 0C001874 */ jal osCreateMesgQueue -/* B5AA40 800E38A0 24060001 */ li $a2, 1 -/* B5AA44 800E38A4 8E0E000C */ lw $t6, 0xc($s0) -/* B5AA48 800E38A8 8FAF0044 */ lw $t7, 0x44($sp) -/* B5AA4C 800E38AC 8FB8003C */ lw $t8, 0x3c($sp) -/* B5AA50 800E38B0 8E070008 */ lw $a3, 8($s0) -/* B5AA54 800E38B4 AFAE0010 */ sw $t6, 0x10($sp) -/* B5AA58 800E38B8 AFAF0014 */ sw $t7, 0x14($sp) -/* B5AA5C 800E38BC AFB80018 */ sw $t8, 0x18($sp) -/* B5AA60 800E38C0 92190000 */ lbu $t9, ($s0) -/* B5AA64 800E38C4 3C088015 */ lui $t0, %hi(D_80149444) # $t0, 0x8015 -/* B5AA68 800E38C8 25089444 */ addiu $t0, %lo(D_80149444) # addiu $t0, $t0, -0x6bbc -/* B5AA6C 800E38CC AFA80020 */ sw $t0, 0x20($sp) -/* B5AA70 800E38D0 2604004C */ addiu $a0, $s0, 0x4c -/* B5AA74 800E38D4 00002825 */ move $a1, $zero -/* B5AA78 800E38D8 00003025 */ move $a2, $zero -/* B5AA7C 800E38DC 0C038AF8 */ jal func_800E2BE0 -/* B5AA80 800E38E0 AFB9001C */ sw $t9, 0x1c($sp) -/* B5AA84 800E38E4 8FBF0034 */ lw $ra, 0x34($sp) -/* B5AA88 800E38E8 8FB00030 */ lw $s0, 0x30($sp) -/* B5AA8C 800E38EC 27BD0040 */ addiu $sp, $sp, 0x40 -/* B5AA90 800E38F0 03E00008 */ jr $ra -/* B5AA94 800E38F4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E38F8.s b/asm/non_matchings/code/code_800E11F0/func_800E38F8.s deleted file mode 100644 index f4b5c3f2ab..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E38F8.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800E38F8 -/* B5AA98 800E38F8 AFA40000 */ sw $a0, ($sp) -/* B5AA9C 800E38FC AFA50004 */ sw $a1, 4($sp) -/* B5AAA0 800E3900 AFA60008 */ sw $a2, 8($sp) -/* B5AAA4 800E3904 03E00008 */ jr $ra -/* B5AAA8 800E3908 AFA7000C */ sw $a3, 0xc($sp) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E390C.s b/asm/non_matchings/code/code_800E11F0/func_800E390C.s deleted file mode 100644 index 2f60e8d11a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E390C.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_800E390C -/* B5AAAC 800E390C 3C088017 */ lui $t0, %hi(gAudioContext) # $t0, 0x8017 -/* B5AAB0 800E3910 2508F180 */ addiu $t0, %lo(gAudioContext) # addiu $t0, $t0, -0xe80 -/* B5AAB4 800E3914 950E2840 */ lhu $t6, 0x2840($t0) -/* B5AAB8 800E3918 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5AABC 800E391C AFBF0014 */ sw $ra, 0x14($sp) -/* B5AAC0 800E3920 008E082A */ slt $at, $a0, $t6 -/* B5AAC4 800E3924 AFA5001C */ sw $a1, 0x1c($sp) -/* B5AAC8 800E3928 AFA60020 */ sw $a2, 0x20($sp) -/* B5AACC 800E392C 14200004 */ bnez $at, .L800E3940 -/* B5AAD0 800E3930 00803825 */ move $a3, $a0 -/* B5AAD4 800E3934 A0C00000 */ sb $zero, ($a2) -/* B5AAD8 800E3938 10000032 */ b .L800E3A04 -/* B5AADC 800E393C 2402FFFF */ li $v0, -1 -.L800E3940: -/* B5AAE0 800E3940 00002025 */ move $a0, $zero -/* B5AAE4 800E3944 0C0389DA */ jal func_800E2768 -/* B5AAE8 800E3948 00E02825 */ move $a1, $a3 -/* B5AAEC 800E394C 00002025 */ move $a0, $zero -/* B5AAF0 800E3950 0C0389FE */ jal func_800E27F8 -/* B5AAF4 800E3954 AFA20018 */ sw $v0, 0x18($sp) -/* B5AAF8 800E3958 3C088017 */ lui $t0, %hi(gAudioContext) # $t0, 0x8017 -/* B5AAFC 800E395C 2508F180 */ addiu $t0, %lo(gAudioContext) # addiu $t0, $t0, -0xe80 -/* B5AB00 800E3960 8D181D4C */ lw $t8, 0x1d4c($t0) -/* B5AB04 800E3964 8FA70018 */ lw $a3, 0x18($sp) -/* B5AB08 800E3968 24010003 */ li $at, 3 -/* B5AB0C 800E396C 0018C880 */ sll $t9, $t8, 2 -/* B5AB10 800E3970 0338C823 */ subu $t9, $t9, $t8 -/* B5AB14 800E3974 0019C8C0 */ sll $t9, $t9, 3 -/* B5AB18 800E3978 0338C821 */ addu $t9, $t9, $t8 -/* B5AB1C 800E397C 0019C880 */ sll $t9, $t9, 2 -/* B5AB20 800E3980 01191821 */ addu $v1, $t0, $t9 -/* B5AB24 800E3984 8C6A1D64 */ lw $t2, 0x1d64($v1) -/* B5AB28 800E3988 24631D50 */ addiu $v1, $v1, 0x1d50 -/* B5AB2C 800E398C 24060001 */ li $a2, 1 -/* B5AB30 800E3990 15410002 */ bne $t2, $at, .L800E399C -/* B5AB34 800E3994 00076100 */ sll $t4, $a3, 4 -/* B5AB38 800E3998 AC600014 */ sw $zero, 0x14($v1) -.L800E399C: -/* B5AB3C 800E399C 8FA9001C */ lw $t1, 0x1c($sp) -/* B5AB40 800E39A0 AC600024 */ sw $zero, 0x24($v1) -/* B5AB44 800E39A4 8FAB0020 */ lw $t3, 0x20($sp) -/* B5AB48 800E39A8 004C2821 */ addu $a1, $v0, $t4 -/* B5AB4C 800E39AC 2401FFF0 */ li $at, -16 -/* B5AB50 800E39B0 AC6B001C */ sw $t3, 0x1c($v1) -/* B5AB54 800E39B4 8CA40014 */ lw $a0, 0x14($a1) -/* B5AB58 800E39B8 AC660014 */ sw $a2, 0x14($v1) -/* B5AB5C 800E39BC AC69000C */ sw $t1, 0xc($v1) -/* B5AB60 800E39C0 2484000F */ addiu $a0, $a0, 0xf -/* B5AB64 800E39C4 00812024 */ and $a0, $a0, $at -/* B5AB68 800E39C8 AC640018 */ sw $a0, 0x18($v1) -/* B5AB6C 800E39CC AC690010 */ sw $t1, 0x10($v1) -/* B5AB70 800E39D0 8CAD0010 */ lw $t5, 0x10($a1) -/* B5AB74 800E39D4 AC6D0008 */ sw $t5, 8($v1) -/* B5AB78 800E39D8 80AE0018 */ lb $t6, 0x18($a1) -/* B5AB7C 800E39DC A0670001 */ sb $a3, 1($v1) -/* B5AB80 800E39E0 31CF00FF */ andi $t7, $t6, 0xff -/* B5AB84 800E39E4 14CF0003 */ bne $a2, $t7, .L800E39F4 -/* B5AB88 800E39E8 A06E0000 */ sb $t6, ($v1) -/* B5AB8C 800E39EC 84580002 */ lh $t8, 2($v0) -/* B5AB90 800E39F0 AC780004 */ sw $t8, 4($v1) -.L800E39F4: -/* B5AB94 800E39F4 8D191D4C */ lw $t9, 0x1d4c($t0) -/* B5AB98 800E39F8 00001025 */ move $v0, $zero -/* B5AB9C 800E39FC 3B2A0001 */ xori $t2, $t9, 1 -/* B5ABA0 800E3A00 AD0A1D4C */ sw $t2, 0x1d4c($t0) -.L800E3A04: -/* B5ABA4 800E3A04 8FBF0014 */ lw $ra, 0x14($sp) -/* B5ABA8 800E3A08 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5ABAC 800E3A0C 03E00008 */ jr $ra -/* B5ABB0 800E3A10 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3A14.s b/asm/non_matchings/code/code_800E11F0/func_800E3A14.s deleted file mode 100644 index 356977ee3f..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3A14.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800E3A14 -/* B5ABB4 800E3A14 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5ABB8 800E3A18 3C028017 */ lui $v0, %hi(gAudioContext+0x580) # $v0, 0x8017 -/* B5ABBC 800E3A1C 2442F700 */ addiu $v0, %lo(gAudioContext+0x580) # addiu $v0, $v0, -0x900 -/* B5ABC0 800E3A20 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -.L800E3A24: -/* B5ABC4 800E3A24 24630160 */ addiu $v1, $v1, 0x160 -/* B5ABC8 800E3A28 A0601668 */ sb $zero, 0x1668($v1) -/* B5ABCC 800E3A2C A06016C0 */ sb $zero, 0x16c0($v1) -/* B5ABD0 800E3A30 A0601718 */ sb $zero, 0x1718($v1) -/* B5ABD4 800E3A34 1462FFFB */ bne $v1, $v0, .L800E3A24 -/* B5ABD8 800E3A38 A0601610 */ sb $zero, 0x1610($v1) -/* B5ABDC 800E3A3C 03E00008 */ jr $ra -/* B5ABE0 800E3A40 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3A44.s b/asm/non_matchings/code/code_800E11F0/func_800E3A44.s deleted file mode 100644 index aa7866177b..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3A44.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800E3A44 -/* B5ABE4 800E3A44 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5ABE8 800E3A48 AFA40030 */ sw $a0, 0x30($sp) -/* B5ABEC 800E3A4C AFA50034 */ sw $a1, 0x34($sp) -/* B5ABF0 800E3A50 00A02025 */ move $a0, $a1 -/* B5ABF4 800E3A54 8FAE0044 */ lw $t6, 0x44($sp) -/* B5ABF8 800E3A58 8FAF0048 */ lw $t7, 0x48($sp) -/* B5ABFC 800E3A5C 8FB8004C */ lw $t8, 0x4c($sp) -/* B5AC00 800E3A60 AFA60038 */ sw $a2, 0x38($sp) -/* B5AC04 800E3A64 00C02825 */ move $a1, $a2 -/* B5AC08 800E3A68 AFBF0024 */ sw $ra, 0x24($sp) -/* B5AC0C 800E3A6C AFA7003C */ sw $a3, 0x3c($sp) -/* B5AC10 800E3A70 00E03025 */ move $a2, $a3 -/* B5AC14 800E3A74 8FA70040 */ lw $a3, 0x40($sp) -/* B5AC18 800E3A78 AFAE0010 */ sw $t6, 0x10($sp) -/* B5AC1C 800E3A7C AFAF0014 */ sw $t7, 0x14($sp) -/* B5AC20 800E3A80 0C038EB2 */ jal func_800E3AC8 -/* B5AC24 800E3A84 AFB80018 */ sw $t8, 0x18($sp) -/* B5AC28 800E3A88 14400003 */ bnez $v0, .L800E3A98 -/* B5AC2C 800E3A8C 00402825 */ move $a1, $v0 -/* B5AC30 800E3A90 10000009 */ b .L800E3AB8 -/* B5AC34 800E3A94 00001025 */ move $v0, $zero -.L800E3A98: -/* B5AC38 800E3A98 3C048017 */ lui $a0, %hi(gAudioContext+0x1cf0) # $a0, 0x8017 -/* B5AC3C 800E3A9C 24840E70 */ addiu $a0, %lo(gAudioContext+0x1cf0) # addiu $a0, $a0, 0xe70 -/* B5AC40 800E3AA0 00003025 */ move $a2, $zero -/* B5AC44 800E3AA4 0C000C18 */ jal osSendMesg -/* B5AC48 800E3AA8 AFA5002C */ sw $a1, 0x2c($sp) -/* B5AC4C 800E3AAC 8FA2002C */ lw $v0, 0x2c($sp) -/* B5AC50 800E3AB0 8FB90030 */ lw $t9, 0x30($sp) -/* B5AC54 800E3AB4 AC590018 */ sw $t9, 0x18($v0) -.L800E3AB8: -/* B5AC58 800E3AB8 8FBF0024 */ lw $ra, 0x24($sp) -/* B5AC5C 800E3ABC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B5AC60 800E3AC0 03E00008 */ jr $ra -/* B5AC64 800E3AC4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s b/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s deleted file mode 100644 index 9250cb61de..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_800E3AC8 -/* B5AC68 800E3AC8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5AC6C 800E3ACC 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5AC70 800E3AD0 3C038017 */ lui $v1, %hi(gAudioContext+0x580) # $v1, 0x8017 -/* B5AC74 800E3AD4 AFBF0014 */ sw $ra, 0x14($sp) -/* B5AC78 800E3AD8 AFA40020 */ sw $a0, 0x20($sp) -/* B5AC7C 800E3ADC 2463F700 */ addiu $v1, %lo(gAudioContext+0x580) # addiu $v1, $v1, -0x900 -/* B5AC80 800E3AE0 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5AC84 800E3AE4 804E1770 */ lb $t6, 0x1770($v0) -.L800E3AE8: -/* B5AC88 800E3AE8 55C00004 */ bnezl $t6, .L800E3AFC -/* B5AC8C 800E3AEC 24420058 */ addiu $v0, $v0, 0x58 -/* B5AC90 800E3AF0 10000005 */ b .L800E3B08 -/* B5AC94 800E3AF4 24431770 */ addiu $v1, $v0, 0x1770 -/* B5AC98 800E3AF8 24420058 */ addiu $v0, $v0, 0x58 -.L800E3AFC: -/* B5AC9C 800E3AFC 5443FFFA */ bnel $v0, $v1, .L800E3AE8 -/* B5ACA0 800E3B00 804E1770 */ lb $t6, 0x1770($v0) -/* B5ACA4 800E3B04 8FA3001C */ lw $v1, 0x1c($sp) -.L800E3B08: -/* B5ACA8 800E3B08 3C0F8017 */ lui $t7, %hi(gAudioContext+0x580) # $t7, 0x8017 -/* B5ACAC 800E3B0C 25EFF700 */ addiu $t7, %lo(gAudioContext+0x580) # addiu $t7, $t7, -0x900 -/* B5ACB0 800E3B10 144F0003 */ bne $v0, $t7, .L800E3B20 -/* B5ACB4 800E3B14 8FA40030 */ lw $a0, 0x30($sp) -/* B5ACB8 800E3B18 10000030 */ b .L800E3BDC -/* B5ACBC 800E3B1C 00001025 */ move $v0, $zero -.L800E3B20: -/* B5ACC0 800E3B20 24020001 */ li $v0, 1 -/* B5ACC4 800E3B24 A0620000 */ sb $v0, ($v1) -/* B5ACC8 800E3B28 8FB80020 */ lw $t8, 0x20($sp) -/* B5ACCC 800E3B2C AC650004 */ sw $a1, 4($v1) -/* B5ACD0 800E3B30 AC65000C */ sw $a1, 0xc($v1) -/* B5ACD4 800E3B34 AC660010 */ sw $a2, 0x10($v1) -/* B5ACD8 800E3B38 14800004 */ bnez $a0, .L800E3B4C -/* B5ACDC 800E3B3C AC780008 */ sw $t8, 8($v1) -/* B5ACE0 800E3B40 24191000 */ li $t9, 4096 -/* B5ACE4 800E3B44 10000018 */ b .L800E3BA8 -/* B5ACE8 800E3B48 AC790014 */ sw $t9, 0x14($v1) -.L800E3B4C: -/* B5ACEC 800E3B4C 14820003 */ bne $a0, $v0, .L800E3B5C -/* B5ACF0 800E3B50 00000000 */ nop -/* B5ACF4 800E3B54 10000014 */ b .L800E3BA8 -/* B5ACF8 800E3B58 AC660014 */ sw $a2, 0x14($v1) -.L800E3B5C: -/* B5ACFC 800E3B5C 00C4001A */ div $zero, $a2, $a0 -/* B5AD00 800E3B60 14800002 */ bnez $a0, .L800E3B6C -/* B5AD04 800E3B64 00000000 */ nop -/* B5AD08 800E3B68 0007000D */ break 7 -.L800E3B6C: -/* B5AD0C 800E3B6C 2401FFFF */ li $at, -1 -/* B5AD10 800E3B70 14810004 */ bne $a0, $at, .L800E3B84 -/* B5AD14 800E3B74 3C018000 */ lui $at, 0x8000 -/* B5AD18 800E3B78 14C10002 */ bne $a2, $at, .L800E3B84 -/* B5AD1C 800E3B7C 00000000 */ nop -/* B5AD20 800E3B80 0006000D */ break 6 -.L800E3B84: -/* B5AD24 800E3B84 00001012 */ mflo $v0 -/* B5AD28 800E3B88 244200FF */ addiu $v0, $v0, 0xff -/* B5AD2C 800E3B8C 2401FF00 */ li $at, -256 -/* B5AD30 800E3B90 00411024 */ and $v0, $v0, $at -/* B5AD34 800E3B94 2C410100 */ sltiu $at, $v0, 0x100 -/* B5AD38 800E3B98 10200003 */ beqz $at, .L800E3BA8 -/* B5AD3C 800E3B9C AC620014 */ sw $v0, 0x14($v1) -/* B5AD40 800E3BA0 24080100 */ li $t0, 256 -/* B5AD44 800E3BA4 AC680014 */ sw $t0, 0x14($v1) -.L800E3BA8: -/* B5AD48 800E3BA8 8FA90034 */ lw $t1, 0x34($sp) -/* B5AD4C 800E3BAC 240A0003 */ li $t2, 3 -/* B5AD50 800E3BB0 A06A0001 */ sb $t2, 1($v1) -/* B5AD54 800E3BB4 A0670002 */ sb $a3, 2($v1) -/* B5AD58 800E3BB8 AC690020 */ sw $t1, 0x20($v1) -/* B5AD5C 800E3BBC 8FAB0038 */ lw $t3, 0x38($sp) -/* B5AD60 800E3BC0 24640024 */ addiu $a0, $v1, 0x24 -/* B5AD64 800E3BC4 2465003C */ addiu $a1, $v1, 0x3c -/* B5AD68 800E3BC8 AC6B001C */ sw $t3, 0x1c($v1) -/* B5AD6C 800E3BCC AFA3001C */ sw $v1, 0x1c($sp) -/* B5AD70 800E3BD0 0C001874 */ jal osCreateMesgQueue -/* B5AD74 800E3BD4 24060001 */ li $a2, 1 -/* B5AD78 800E3BD8 8FA2001C */ lw $v0, 0x1c($sp) -.L800E3BDC: -/* B5AD7C 800E3BDC 8FBF0014 */ lw $ra, 0x14($sp) -/* B5AD80 800E3BE0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B5AD84 800E3BE4 03E00008 */ jr $ra -/* B5AD88 800E3BE8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s b/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s deleted file mode 100644 index e9233c0968..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_800E3BEC -/* B5AD8C 800E3BEC 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5AD90 800E3BF0 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5AD94 800E3BF4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B5AD98 800E3BF8 8C6E2984 */ lw $t6, 0x2984($v1) -/* B5AD9C 800E3BFC AFB30020 */ sw $s3, 0x20($sp) -/* B5ADA0 800E3C00 24010001 */ li $at, 1 -/* B5ADA4 800E3C04 00809825 */ move $s3, $a0 -/* B5ADA8 800E3C08 AFBF0024 */ sw $ra, 0x24($sp) -/* B5ADAC 800E3C0C AFB2001C */ sw $s2, 0x1c($sp) -/* B5ADB0 800E3C10 AFB10018 */ sw $s1, 0x18($sp) -/* B5ADB4 800E3C14 11C10037 */ beq $t6, $at, .L800E3CF4 -/* B5ADB8 800E3C18 AFB00014 */ sw $s0, 0x14($sp) -/* B5ADBC 800E3C1C 8C641D48 */ lw $a0, 0x1d48($v1) -/* B5ADC0 800E3C20 1480001D */ bnez $a0, .L800E3C98 -/* B5ADC4 800E3C24 00000000 */ nop -/* B5ADC8 800E3C28 1260000E */ beqz $s3, .L800E3C64 -/* B5ADCC 800E3C2C 3C108017 */ lui $s0, %hi(gAudioContext+0x1cf0) -/* B5ADD0 800E3C30 3C108017 */ lui $s0, %hi(gAudioContext+0x1cf0) # $s0, 0x8017 -/* B5ADD4 800E3C34 26100E70 */ addiu $s0, %lo(gAudioContext+0x1cf0) # addiu $s0, $s0, 0xe70 -/* B5ADD8 800E3C38 2412FFFF */ li $s2, -1 -/* B5ADDC 800E3C3C 27B10034 */ addiu $s1, $sp, 0x34 -/* B5ADE0 800E3C40 02002025 */ move $a0, $s0 -.L800E3C44: -/* B5ADE4 800E3C44 02202825 */ move $a1, $s1 -/* B5ADE8 800E3C48 0C000CA0 */ jal osRecvMesg -/* B5ADEC 800E3C4C 00003025 */ move $a2, $zero -/* B5ADF0 800E3C50 5452FFFC */ bnel $v0, $s2, .L800E3C44 -/* B5ADF4 800E3C54 02002025 */ move $a0, $s0 -/* B5ADF8 800E3C58 3C048017 */ lui $a0, %hi(gAudioContext+0x1d48) # $a0, 0x8017 -/* B5ADFC 800E3C5C 1000000E */ b .L800E3C98 -/* B5AE00 800E3C60 8C840EC8 */ lw $a0, %lo(gAudioContext+0x1d48)($a0) -.L800E3C64: -/* B5AE04 800E3C64 26040E70 */ addiu $a0, $s0, %lo(gAudioContext+0x1cf0) -/* B5AE08 800E3C68 27A50034 */ addiu $a1, $sp, 0x34 -/* B5AE0C 800E3C6C 0C000CA0 */ jal osRecvMesg -/* B5AE10 800E3C70 00003025 */ move $a2, $zero -/* B5AE14 800E3C74 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5AE18 800E3C78 2412FFFF */ li $s2, -1 -/* B5AE1C 800E3C7C 14520004 */ bne $v0, $s2, .L800E3C90 -/* B5AE20 800E3C80 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5AE24 800E3C84 AC601D48 */ sw $zero, 0x1d48($v1) -/* B5AE28 800E3C88 10000003 */ b .L800E3C98 -/* B5AE2C 800E3C8C 00002025 */ move $a0, $zero -.L800E3C90: -/* B5AE30 800E3C90 8FA40034 */ lw $a0, 0x34($sp) -/* B5AE34 800E3C94 AC641D48 */ sw $a0, 0x1d48($v1) -.L800E3C98: -/* B5AE38 800E3C98 10800003 */ beqz $a0, .L800E3CA8 -/* B5AE3C 800E3C9C 00000000 */ nop -/* B5AE40 800E3CA0 0C038F44 */ jal func_800E3D10 -/* B5AE44 800E3CA4 02602825 */ move $a1, $s3 -.L800E3CA8: -/* B5AE48 800E3CA8 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5AE4C 800E3CAC 3C128017 */ lui $s2, %hi(gAudioContext+0x580) # $s2, 0x8017 -/* B5AE50 800E3CB0 2652F700 */ addiu $s2, %lo(gAudioContext+0x580) # addiu $s2, $s2, -0x900 -/* B5AE54 800E3CB4 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -/* B5AE58 800E3CB8 24110001 */ li $s1, 1 -/* B5AE5C 800E3CBC 82181770 */ lb $t8, 0x1770($s0) -.L800E3CC0: -/* B5AE60 800E3CC0 26191770 */ addiu $t9, $s0, 0x1770 -/* B5AE64 800E3CC4 56380009 */ bnel $s1, $t8, .L800E3CEC -/* B5AE68 800E3CC8 26100058 */ addiu $s0, $s0, 0x58 -/* B5AE6C 800E3CCC AFB90034 */ sw $t9, 0x34($sp) -/* B5AE70 800E3CD0 83290002 */ lb $t1, 2($t9) -/* B5AE74 800E3CD4 03202025 */ move $a0, $t9 -/* B5AE78 800E3CD8 52290004 */ beql $s1, $t1, .L800E3CEC -/* B5AE7C 800E3CDC 26100058 */ addiu $s0, $s0, 0x58 -/* B5AE80 800E3CE0 0C038F96 */ jal func_800E3E58 -/* B5AE84 800E3CE4 02602825 */ move $a1, $s3 -/* B5AE88 800E3CE8 26100058 */ addiu $s0, $s0, 0x58 -.L800E3CEC: -/* B5AE8C 800E3CEC 5612FFF4 */ bnel $s0, $s2, .L800E3CC0 -/* B5AE90 800E3CF0 82181770 */ lb $t8, 0x1770($s0) -.L800E3CF4: -/* B5AE94 800E3CF4 8FBF0024 */ lw $ra, 0x24($sp) -/* B5AE98 800E3CF8 8FB00014 */ lw $s0, 0x14($sp) -/* B5AE9C 800E3CFC 8FB10018 */ lw $s1, 0x18($sp) -/* B5AEA0 800E3D00 8FB2001C */ lw $s2, 0x1c($sp) -/* B5AEA4 800E3D04 8FB30020 */ lw $s3, 0x20($sp) -/* B5AEA8 800E3D08 03E00008 */ jr $ra -/* B5AEAC 800E3D0C 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3D10.s b/asm/non_matchings/code/code_800E11F0/func_800E3D10.s deleted file mode 100644 index da001df99a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3D10.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800E3D10 -/* B5AEB0 800E3D10 AFA40000 */ sw $a0, ($sp) -/* B5AEB4 800E3D14 03E00008 */ jr $ra -/* B5AEB8 800E3D18 AFA50004 */ sw $a1, 4($sp) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s b/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s deleted file mode 100644 index 060b81c026..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_800E3D1C -/* B5AEBC 800E3D1C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B5AEC0 800E3D20 AFBF001C */ sw $ra, 0x1c($sp) -/* B5AEC4 800E3D24 AFB00018 */ sw $s0, 0x18($sp) -/* B5AEC8 800E3D28 8C85001C */ lw $a1, 0x1c($a0) -/* B5AECC 800E3D2C 00808025 */ move $s0, $a0 -/* B5AED0 800E3D30 24010001 */ li $at, 1 -/* B5AED4 800E3D34 00051402 */ srl $v0, $a1, 0x10 -/* B5AED8 800E3D38 304200FF */ andi $v0, $v0, 0xff -/* B5AEDC 800E3D3C 10400008 */ beqz $v0, .L800E3D60 -/* B5AEE0 800E3D40 00A01825 */ move $v1, $a1 -/* B5AEE4 800E3D44 10410011 */ beq $v0, $at, .L800E3D8C -/* B5AEE8 800E3D48 00037202 */ srl $t6, $v1, 8 -/* B5AEEC 800E3D4C 24010002 */ li $at, 2 -/* B5AEF0 800E3D50 10410009 */ beq $v0, $at, .L800E3D78 -/* B5AEF4 800E3D54 00032202 */ srl $a0, $v1, 8 -/* B5AEF8 800E3D58 10000037 */ b .L800E3E38 -/* B5AEFC 800E3D5C A2000000 */ sb $zero, ($s0) -.L800E3D60: -/* B5AF00 800E3D60 00032202 */ srl $a0, $v1, 8 -/* B5AF04 800E3D64 308400FF */ andi $a0, $a0, 0xff -/* B5AF08 800E3D68 0C038692 */ jal Audio_SetSeqLoadStatus -/* B5AF0C 800E3D6C 306500FF */ andi $a1, $v1, 0xff -/* B5AF10 800E3D70 10000030 */ b .L800E3E34 -/* B5AF14 800E3D74 8E05001C */ lw $a1, 0x1c($s0) -.L800E3D78: -/* B5AF18 800E3D78 308400FF */ andi $a0, $a0, 0xff -/* B5AF1C 800E3D7C 0C03869E */ jal func_800E1A78 -/* B5AF20 800E3D80 306500FF */ andi $a1, $v1, 0xff -/* B5AF24 800E3D84 1000002B */ b .L800E3E34 -/* B5AF28 800E3D88 8E05001C */ lw $a1, 0x1c($s0) -.L800E3D8C: -/* B5AF2C 800E3D8C 31CF00FF */ andi $t7, $t6, 0xff -/* B5AF30 800E3D90 3C188017 */ lui $t8, %hi(gAudioContext+0x2844) # $t8, 0x8017 -/* B5AF34 800E3D94 8F1819C4 */ lw $t8, %lo(gAudioContext+0x2844)($t8) -/* B5AF38 800E3D98 000FC880 */ sll $t9, $t7, 2 -/* B5AF3C 800E3D9C 032FC821 */ addu $t9, $t9, $t7 -/* B5AF40 800E3DA0 0019C880 */ sll $t9, $t9, 2 -/* B5AF44 800E3DA4 AFAF0028 */ sw $t7, 0x28($sp) -/* B5AF48 800E3DA8 03191021 */ addu $v0, $t8, $t9 -/* B5AF4C 800E3DAC 90440002 */ lbu $a0, 2($v0) -/* B5AF50 800E3DB0 90460003 */ lbu $a2, 3($v0) -/* B5AF54 800E3DB4 240100FF */ li $at, 255 -/* B5AF58 800E3DB8 AFA40030 */ sw $a0, 0x30($sp) -/* B5AF5C 800E3DBC 10810009 */ beq $a0, $at, .L800E3DE4 -/* B5AF60 800E3DC0 AFA60034 */ sw $a2, 0x34($sp) -/* B5AF64 800E3DC4 27A50040 */ addiu $a1, $sp, 0x40 -/* B5AF68 800E3DC8 AFA3005C */ sw $v1, 0x5c($sp) -/* B5AF6C 800E3DCC 0C0388C6 */ jal func_800E2318 -/* B5AF70 800E3DD0 AFA60048 */ sw $a2, 0x48($sp) -/* B5AF74 800E3DD4 8FA3005C */ lw $v1, 0x5c($sp) -/* B5AF78 800E3DD8 8FA60048 */ lw $a2, 0x48($sp) -/* B5AF7C 800E3DDC 10000002 */ b .L800E3DE8 -/* B5AF80 800E3DE0 AFA20038 */ sw $v0, 0x38($sp) -.L800E3DE4: -/* B5AF84 800E3DE4 AFA00038 */ sw $zero, 0x38($sp) -.L800E3DE8: -/* B5AF88 800E3DE8 240100FF */ li $at, 255 -/* B5AF8C 800E3DEC 10C10007 */ beq $a2, $at, .L800E3E0C -/* B5AF90 800E3DF0 00C02025 */ move $a0, $a2 -/* B5AF94 800E3DF4 27A50044 */ addiu $a1, $sp, 0x44 -/* B5AF98 800E3DF8 0C0388C6 */ jal func_800E2318 -/* B5AF9C 800E3DFC AFA3005C */ sw $v1, 0x5c($sp) -/* B5AFA0 800E3E00 8FA3005C */ lw $v1, 0x5c($sp) -/* B5AFA4 800E3E04 10000002 */ b .L800E3E10 -/* B5AFA8 800E3E08 AFA2003C */ sw $v0, 0x3c($sp) -.L800E3E0C: -/* B5AFAC 800E3E0C AFA0003C */ sw $zero, 0x3c($sp) -.L800E3E10: -/* B5AFB0 800E3E10 8FA40028 */ lw $a0, 0x28($sp) -/* B5AFB4 800E3E14 0C038686 */ jal Audio_SetBankLoadStatus -/* B5AFB8 800E3E18 306500FF */ andi $a1, $v1, 0xff -/* B5AFBC 800E3E1C 8FA40028 */ lw $a0, 0x28($sp) -/* B5AFC0 800E3E20 8E050004 */ lw $a1, 4($s0) -/* B5AFC4 800E3E24 27A60030 */ addiu $a2, $sp, 0x30 -/* B5AFC8 800E3E28 0C039066 */ jal func_800E4198 -/* B5AFCC 800E3E2C 24070001 */ li $a3, 1 -/* B5AFD0 800E3E30 8E05001C */ lw $a1, 0x1c($s0) -.L800E3E34: -/* B5AFD4 800E3E34 A2000000 */ sb $zero, ($s0) -.L800E3E38: -/* B5AFD8 800E3E38 8E040020 */ lw $a0, 0x20($s0) -/* B5AFDC 800E3E3C 0C000C18 */ jal osSendMesg -/* B5AFE0 800E3E40 00003025 */ move $a2, $zero -/* B5AFE4 800E3E44 8FBF001C */ lw $ra, 0x1c($sp) -/* B5AFE8 800E3E48 8FB00018 */ lw $s0, 0x18($sp) -/* B5AFEC 800E3E4C 27BD0060 */ addiu $sp, $sp, 0x60 -/* B5AFF0 800E3E50 03E00008 */ jr $ra -/* B5AFF4 800E3E54 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3E58.s b/asm/non_matchings/code/code_800E11F0/func_800E3E58.s deleted file mode 100644 index 295ad368a1..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3E58.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_800E3E58 -/* B5AFF8 800E3E58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5AFFC 800E3E5C AFBF001C */ sw $ra, 0x1c($sp) -/* B5B000 800E3E60 AFB00018 */ sw $s0, 0x18($sp) -/* B5B004 800E3E64 80820001 */ lb $v0, 1($a0) -/* B5B008 800E3E68 3C038017 */ lui $v1, %hi(gAudioContext+0x2838) # $v1, 0x8017 -/* B5B00C 800E3E6C 00808025 */ move $s0, $a0 -/* B5B010 800E3E70 28410002 */ slti $at, $v0, 2 -/* B5B014 800E3E74 14200004 */ bnez $at, .L800E3E88 -/* B5B018 800E3E78 8C6319B8 */ lw $v1, %lo(gAudioContext+0x2838)($v1) -/* B5B01C 800E3E7C 244EFFFF */ addiu $t6, $v0, -1 -/* B5B020 800E3E80 10000047 */ b .L800E3FA0 -/* B5B024 800E3E84 A08E0001 */ sb $t6, 1($a0) -.L800E3E88: -/* B5B028 800E3E88 24070001 */ li $a3, 1 -/* B5B02C 800E3E8C 14E20003 */ bne $a3, $v0, .L800E3E9C -/* B5B030 800E3E90 00000000 */ nop -/* B5B034 800E3E94 10000011 */ b .L800E3EDC -/* B5B038 800E3E98 A2000001 */ sb $zero, 1($s0) -.L800E3E9C: -/* B5B03C 800E3E9C 10A00007 */ beqz $a1, .L800E3EBC -/* B5B040 800E3EA0 26040024 */ addiu $a0, $s0, 0x24 -/* B5B044 800E3EA4 26040024 */ addiu $a0, $s0, 0x24 -/* B5B048 800E3EA8 00002825 */ move $a1, $zero -/* B5B04C 800E3EAC 0C000CA0 */ jal osRecvMesg -/* B5B050 800E3EB0 24060001 */ li $a2, 1 -/* B5B054 800E3EB4 1000003A */ b .L800E3FA0 -/* B5B058 800E3EB8 A2000000 */ sb $zero, ($s0) -.L800E3EBC: -/* B5B05C 800E3EBC 00002825 */ move $a1, $zero -/* B5B060 800E3EC0 00003025 */ move $a2, $zero -/* B5B064 800E3EC4 0C000CA0 */ jal osRecvMesg -/* B5B068 800E3EC8 AFA30024 */ sw $v1, 0x24($sp) -/* B5B06C 800E3ECC 2401FFFF */ li $at, -1 -/* B5B070 800E3ED0 8FA30024 */ lw $v1, 0x24($sp) -/* B5B074 800E3ED4 10410032 */ beq $v0, $at, .L800E3FA0 -/* B5B078 800E3ED8 24070001 */ li $a3, 1 -.L800E3EDC: -/* B5B07C 800E3EDC 8E0F0010 */ lw $t7, 0x10($s0) -/* B5B080 800E3EE0 15E00005 */ bnez $t7, .L800E3EF8 -/* B5B084 800E3EE4 AFAF0020 */ sw $t7, 0x20($sp) -/* B5B088 800E3EE8 0C038F47 */ jal func_800E3D1C -/* B5B08C 800E3EEC 02002025 */ move $a0, $s0 -/* B5B090 800E3EF0 1000002C */ b .L800E3FA4 -/* B5B094 800E3EF4 8FBF001C */ lw $ra, 0x1c($sp) -.L800E3EF8: -/* B5B098 800E3EF8 8E060014 */ lw $a2, 0x14($s0) -/* B5B09C 800E3EFC 8FB90020 */ lw $t9, 0x20($sp) -/* B5B0A0 800E3F00 0326082B */ sltu $at, $t9, $a2 -/* B5B0A4 800E3F04 50200011 */ beql $at, $zero, .L800E3F4C -/* B5B0A8 800E3F08 82090002 */ lb $t1, 2($s0) -/* B5B0AC 800E3F0C 82080002 */ lb $t0, 2($s0) -/* B5B0B0 800E3F10 03203025 */ move $a2, $t9 -/* B5B0B4 800E3F14 02002025 */ move $a0, $s0 -/* B5B0B8 800E3F18 14E80007 */ bne $a3, $t0, .L800E3F38 -/* B5B0BC 800E3F1C 00000000 */ nop -/* B5B0C0 800E3F20 8E040008 */ lw $a0, 8($s0) -/* B5B0C4 800E3F24 8E05000C */ lw $a1, 0xc($s0) -/* B5B0C8 800E3F28 0C039011 */ jal func_800E4044 -/* B5B0CC 800E3F2C 84670002 */ lh $a3, 2($v1) -/* B5B0D0 800E3F30 10000003 */ b .L800E3F40 -/* B5B0D4 800E3F34 00000000 */ nop -.L800E3F38: -/* B5B0D8 800E3F38 0C038FED */ jal func_800E3FB4 -/* B5B0DC 800E3F3C 8FA50020 */ lw $a1, 0x20($sp) -.L800E3F40: -/* B5B0E0 800E3F40 10000017 */ b .L800E3FA0 -/* B5B0E4 800E3F44 AE000010 */ sw $zero, 0x10($s0) -/* B5B0E8 800E3F48 82090002 */ lb $t1, 2($s0) -.L800E3F4C: -/* B5B0EC 800E3F4C 02002025 */ move $a0, $s0 -/* B5B0F0 800E3F50 14E90007 */ bne $a3, $t1, .L800E3F70 -/* B5B0F4 800E3F54 00000000 */ nop -/* B5B0F8 800E3F58 8E040008 */ lw $a0, 8($s0) -/* B5B0FC 800E3F5C 8E05000C */ lw $a1, 0xc($s0) -/* B5B100 800E3F60 0C039011 */ jal func_800E4044 -/* B5B104 800E3F64 84670002 */ lh $a3, 2($v1) -/* B5B108 800E3F68 10000004 */ b .L800E3F7C -/* B5B10C 800E3F6C 8E060014 */ lw $a2, 0x14($s0) -.L800E3F70: -/* B5B110 800E3F70 0C038FED */ jal func_800E3FB4 -/* B5B114 800E3F74 00C02825 */ move $a1, $a2 -/* B5B118 800E3F78 8E060014 */ lw $a2, 0x14($s0) -.L800E3F7C: -/* B5B11C 800E3F7C 8E0A0010 */ lw $t2, 0x10($s0) -/* B5B120 800E3F80 8E0C0008 */ lw $t4, 8($s0) -/* B5B124 800E3F84 8E0E000C */ lw $t6, 0xc($s0) -/* B5B128 800E3F88 01465823 */ subu $t3, $t2, $a2 -/* B5B12C 800E3F8C 01866821 */ addu $t5, $t4, $a2 -/* B5B130 800E3F90 01C67821 */ addu $t7, $t6, $a2 -/* B5B134 800E3F94 AE0B0010 */ sw $t3, 0x10($s0) -/* B5B138 800E3F98 AE0D0008 */ sw $t5, 8($s0) -/* B5B13C 800E3F9C AE0F000C */ sw $t7, 0xc($s0) -.L800E3FA0: -/* B5B140 800E3FA0 8FBF001C */ lw $ra, 0x1c($sp) -.L800E3FA4: -/* B5B144 800E3FA4 8FB00018 */ lw $s0, 0x18($sp) -/* B5B148 800E3FA8 27BD0028 */ addiu $sp, $sp, 0x28 -/* B5B14C 800E3FAC 03E00008 */ jr $ra -/* B5B150 800E3FB0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3FB4.s b/asm/non_matchings/code/code_800E11F0/func_800E3FB4.s deleted file mode 100644 index b8bb80a1d4..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E3FB4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_800E3FB4 -/* B5B154 800E3FB4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5B158 800E3FB8 AFB00030 */ sw $s0, 0x30($sp) -/* B5B15C 800E3FBC 00808025 */ move $s0, $a0 -/* B5B160 800E3FC0 AFBF0034 */ sw $ra, 0x34($sp) -/* B5B164 800E3FC4 24A5000F */ addiu $a1, $a1, 0xf -/* B5B168 800E3FC8 2401FFF0 */ li $at, -16 -/* B5B16C 800E3FCC 00A12824 */ and $a1, $a1, $at -/* B5B170 800E3FD0 8C84000C */ lw $a0, 0xc($a0) -/* B5B174 800E3FD4 0C039A10 */ jal func_800E6840 -/* B5B178 800E3FD8 AFA50044 */ sw $a1, 0x44($sp) -/* B5B17C 800E3FDC 26040024 */ addiu $a0, $s0, 0x24 -/* B5B180 800E3FE0 AFA4003C */ sw $a0, 0x3c($sp) -/* B5B184 800E3FE4 2605003C */ addiu $a1, $s0, 0x3c -/* B5B188 800E3FE8 0C001874 */ jal osCreateMesgQueue -/* B5B18C 800E3FEC 24060001 */ li $a2, 1 -/* B5B190 800E3FF0 8E0E000C */ lw $t6, 0xc($s0) -/* B5B194 800E3FF4 8FAF0044 */ lw $t7, 0x44($sp) -/* B5B198 800E3FF8 8FB8003C */ lw $t8, 0x3c($sp) -/* B5B19C 800E3FFC 8E070008 */ lw $a3, 8($s0) -/* B5B1A0 800E4000 AFAE0010 */ sw $t6, 0x10($sp) -/* B5B1A4 800E4004 AFAF0014 */ sw $t7, 0x14($sp) -/* B5B1A8 800E4008 AFB80018 */ sw $t8, 0x18($sp) -/* B5B1AC 800E400C 82190002 */ lb $t9, 2($s0) -/* B5B1B0 800E4010 3C088015 */ lui $t0, %hi(D_80149450) # $t0, 0x8015 -/* B5B1B4 800E4014 25089450 */ addiu $t0, %lo(D_80149450) # addiu $t0, $t0, -0x6bb0 -/* B5B1B8 800E4018 AFA80020 */ sw $t0, 0x20($sp) -/* B5B1BC 800E401C 26040040 */ addiu $a0, $s0, 0x40 -/* B5B1C0 800E4020 00002825 */ move $a1, $zero -/* B5B1C4 800E4024 00003025 */ move $a2, $zero -/* B5B1C8 800E4028 0C038AF8 */ jal func_800E2BE0 -/* B5B1CC 800E402C AFB9001C */ sw $t9, 0x1c($sp) -/* B5B1D0 800E4030 8FBF0034 */ lw $ra, 0x34($sp) -/* B5B1D4 800E4034 8FB00030 */ lw $s0, 0x30($sp) -/* B5B1D8 800E4038 27BD0040 */ addiu $sp, $sp, 0x40 -/* B5B1DC 800E403C 03E00008 */ jr $ra -/* B5B1E0 800E4040 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4044.s b/asm/non_matchings/code/code_800E11F0/func_800E4044.s deleted file mode 100644 index 30088a223a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4044.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800E4044 -/* B5B1E4 800E4044 AFA40000 */ sw $a0, ($sp) -/* B5B1E8 800E4048 AFA50004 */ sw $a1, 4($sp) -/* B5B1EC 800E404C AFA60008 */ sw $a2, 8($sp) -/* B5B1F0 800E4050 03E00008 */ jr $ra -/* B5B1F4 800E4054 AFA7000C */ sw $a3, 0xc($sp) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4058.s b/asm/non_matchings/code/code_800E11F0/func_800E4058.s deleted file mode 100644 index 20c1edc83f..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4058.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800E4058 -/* B5B1F8 800E4058 8C820000 */ lw $v0, ($a0) -/* B5B1FC 800E405C 3C018000 */ lui $at, (0x80000001 >> 16) # lui $at, 0x8000 -/* B5B200 800E4060 34210001 */ ori $at, (0x80000001 & 0xFFFF) # ori $at, $at, 1 -/* B5B204 800E4064 0041082B */ sltu $at, $v0, $at -/* B5B208 800E4068 10200049 */ beqz $at, .L800E4190 -/* B5B20C 800E406C 00C03825 */ move $a3, $a2 -/* B5B210 800E4070 00451821 */ addu $v1, $v0, $a1 -/* B5B214 800E4074 AC830000 */ sw $v1, ($a0) -/* B5B218 800E4078 8C6E0000 */ lw $t6, ($v1) -/* B5B21C 800E407C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B5B220 800E4080 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B5B224 800E4084 01C17824 */ and $t7, $t6, $at -/* B5B228 800E4088 11E00041 */ beqz $t7, .L800E4190 -/* B5B22C 800E408C 00603025 */ move $a2, $v1 -/* B5B230 800E4090 90780000 */ lbu $t8, ($v1) -/* B5B234 800E4094 24040001 */ li $a0, 1 -/* B5B238 800E4098 33190001 */ andi $t9, $t8, 1 -/* B5B23C 800E409C 1099003C */ beq $a0, $t9, .L800E4190 -/* B5B240 800E40A0 00000000 */ nop -/* B5B244 800E40A4 8C680008 */ lw $t0, 8($v1) -/* B5B248 800E40A8 8CC20000 */ lw $v0, ($a2) -/* B5B24C 800E40AC 8CC9000C */ lw $t1, 0xc($a2) -/* B5B250 800E40B0 01051821 */ addu $v1, $t0, $a1 -/* B5B254 800E40B4 ACC30008 */ sw $v1, 8($a2) -/* B5B258 800E40B8 00021100 */ sll $v0, $v0, 4 -/* B5B25C 800E40BC 00021782 */ srl $v0, $v0, 0x1e -/* B5B260 800E40C0 01251821 */ addu $v1, $t1, $a1 -/* B5B264 800E40C4 10400009 */ beqz $v0, .L800E40EC -/* B5B268 800E40C8 ACC3000C */ sw $v1, 0xc($a2) -/* B5B26C 800E40CC 10440013 */ beq $v0, $a0, .L800E411C -/* B5B270 800E40D0 24010002 */ li $at, 2 -/* B5B274 800E40D4 1041001C */ beq $v0, $at, .L800E4148 -/* B5B278 800E40D8 24010003 */ li $at, 3 -/* B5B27C 800E40DC 5041001B */ beql $v0, $at, .L800E414C -/* B5B280 800E40E0 90C90000 */ lbu $t1, ($a2) -/* B5B284 800E40E4 10000019 */ b .L800E414C -/* B5B288 800E40E8 90C90000 */ lbu $t1, ($a2) -.L800E40EC: -/* B5B28C 800E40EC 8CCA0004 */ lw $t2, 4($a2) -/* B5B290 800E40F0 8CEB0008 */ lw $t3, 8($a3) -/* B5B294 800E40F4 90D80000 */ lbu $t8, ($a2) -/* B5B298 800E40F8 014B1821 */ addu $v1, $t2, $t3 -/* B5B29C 800E40FC ACC30004 */ sw $v1, 4($a2) -/* B5B2A0 800E4100 8CED0010 */ lw $t5, 0x10($a3) -/* B5B2A4 800E4104 3319FFF3 */ andi $t9, $t8, 0xfff3 -/* B5B2A8 800E4108 000D7080 */ sll $t6, $t5, 2 -/* B5B2AC 800E410C 31CF000C */ andi $t7, $t6, 0xc -/* B5B2B0 800E4110 01F94025 */ or $t0, $t7, $t9 -/* B5B2B4 800E4114 1000000C */ b .L800E4148 -/* B5B2B8 800E4118 A0C80000 */ sb $t0, ($a2) -.L800E411C: -/* B5B2BC 800E411C 8CC90004 */ lw $t1, 4($a2) -/* B5B2C0 800E4120 8CEA000C */ lw $t2, 0xc($a3) -/* B5B2C4 800E4124 90D80000 */ lbu $t8, ($a2) -/* B5B2C8 800E4128 012A1821 */ addu $v1, $t1, $t2 -/* B5B2CC 800E412C ACC30004 */ sw $v1, 4($a2) -/* B5B2D0 800E4130 8CEC0014 */ lw $t4, 0x14($a3) -/* B5B2D4 800E4134 330FFFF3 */ andi $t7, $t8, 0xfff3 -/* B5B2D8 800E4138 000C6880 */ sll $t5, $t4, 2 -/* B5B2DC 800E413C 31AE000C */ andi $t6, $t5, 0xc -/* B5B2E0 800E4140 01CFC825 */ or $t9, $t6, $t7 -/* B5B2E4 800E4144 A0D90000 */ sb $t9, ($a2) -.L800E4148: -/* B5B2E8 800E4148 90C90000 */ lbu $t1, ($a2) -.L800E414C: -/* B5B2EC 800E414C 352A0001 */ ori $t2, $t1, 1 -/* B5B2F0 800E4150 A0CA0000 */ sb $t2, ($a2) -/* B5B2F4 800E4154 8CC20000 */ lw $v0, ($a2) -/* B5B2F8 800E4158 00026180 */ sll $t4, $v0, 6 -/* B5B2FC 800E415C 0581000C */ bgez $t4, .L800E4190 -/* B5B300 800E4160 00026900 */ sll $t5, $v0, 4 -/* B5B304 800E4164 000DC782 */ srl $t8, $t5, 0x1e -/* B5B308 800E4168 13000009 */ beqz $t8, .L800E4190 -/* B5B30C 800E416C 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5B310 800E4170 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5B314 800E4174 8C4E1768 */ lw $t6, 0x1768($v0) -/* B5B318 800E4178 000E7880 */ sll $t7, $t6, 2 -/* B5B31C 800E417C 004FC821 */ addu $t9, $v0, $t7 -/* B5B320 800E4180 AF260B68 */ sw $a2, 0xb68($t9) -/* B5B324 800E4184 8C481768 */ lw $t0, 0x1768($v0) -/* B5B328 800E4188 25090001 */ addiu $t1, $t0, 1 -/* B5B32C 800E418C AC491768 */ sw $t1, 0x1768($v0) -.L800E4190: -/* B5B330 800E4190 03E00008 */ jr $ra -/* B5B334 800E4194 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4744.s b/asm/non_matchings/code/code_800E11F0/func_800E4744.s deleted file mode 100644 index fb09e142cc..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4744.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800E4744 -/* B5B8E4 800E4744 18A0000A */ blez $a1, .L800E4770 -/* B5B8E8 800E4748 00001025 */ move $v0, $zero -/* B5B8EC 800E474C 8C830004 */ lw $v1, 4($a0) -/* B5B8F0 800E4750 00C03825 */ move $a3, $a2 -.L800E4754: -/* B5B8F4 800E4754 8CEE0000 */ lw $t6, ($a3) -/* B5B8F8 800E4758 8DCF0004 */ lw $t7, 4($t6) -/* B5B8FC 800E475C 106F0004 */ beq $v1, $t7, .L800E4770 -/* B5B900 800E4760 00000000 */ nop -/* B5B904 800E4764 24420001 */ addiu $v0, $v0, 1 -/* B5B908 800E4768 1445FFFA */ bne $v0, $a1, .L800E4754 -/* B5B90C 800E476C 24E70004 */ addiu $a3, $a3, 4 -.L800E4770: -/* B5B910 800E4770 14450004 */ bne $v0, $a1, .L800E4784 -/* B5B914 800E4774 0005C080 */ sll $t8, $a1, 2 -/* B5B918 800E4778 00D8C821 */ addu $t9, $a2, $t8 -/* B5B91C 800E477C AF240000 */ sw $a0, ($t9) -/* B5B920 800E4780 24A50001 */ addiu $a1, $a1, 1 -.L800E4784: -/* B5B924 800E4784 03E00008 */ jr $ra -/* B5B928 800E4788 00A01025 */ move $v0, $a1 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E478C.s b/asm/non_matchings/code/code_800E11F0/func_800E478C.s deleted file mode 100644 index c07d5a3d83..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E478C.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800E478C -/* B5B92C 800E478C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B5B930 800E4790 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2844) # $t6, 0x8017 -/* B5B934 800E4794 8DCE19C4 */ lw $t6, %lo(gAudioContext+0x2844)($t6) -/* B5B938 800E4798 00047880 */ sll $t7, $a0, 2 -/* B5B93C 800E479C 01E47821 */ addu $t7, $t7, $a0 -/* B5B940 800E47A0 000F7880 */ sll $t7, $t7, 2 -/* B5B944 800E47A4 AFBF0034 */ sw $ra, 0x34($sp) -/* B5B948 800E47A8 AFB60030 */ sw $s6, 0x30($sp) -/* B5B94C 800E47AC AFB5002C */ sw $s5, 0x2c($sp) -/* B5B950 800E47B0 AFB40028 */ sw $s4, 0x28($sp) -/* B5B954 800E47B4 AFB30024 */ sw $s3, 0x24($sp) -/* B5B958 800E47B8 AFB20020 */ sw $s2, 0x20($sp) -/* B5B95C 800E47BC AFB1001C */ sw $s1, 0x1c($sp) -/* B5B960 800E47C0 AFB00018 */ sw $s0, 0x18($sp) -/* B5B964 800E47C4 01CF1021 */ addu $v0, $t6, $t7 -/* B5B968 800E47C8 90500001 */ lbu $s0, 1($v0) -/* B5B96C 800E47CC 00A09825 */ move $s3, $a1 -/* B5B970 800E47D0 0080A025 */ move $s4, $a0 -/* B5B974 800E47D4 00008825 */ move $s1, $zero -/* B5B978 800E47D8 90560000 */ lbu $s6, ($v0) -/* B5B97C 800E47DC 1A00000E */ blez $s0, .L800E4818 -/* B5B980 800E47E0 00009025 */ move $s2, $zero -/* B5B984 800E47E4 02802025 */ move $a0, $s4 -.L800E47E8: -/* B5B988 800E47E8 0C039D5B */ jal Audio_GetDrum -/* B5B98C 800E47EC 02402825 */ move $a1, $s2 -/* B5B990 800E47F0 10400005 */ beqz $v0, .L800E4808 -/* B5B994 800E47F4 02202825 */ move $a1, $s1 -/* B5B998 800E47F8 8C440004 */ lw $a0, 4($v0) -/* B5B99C 800E47FC 0C0391D1 */ jal func_800E4744 -/* B5B9A0 800E4800 02603025 */ move $a2, $s3 -/* B5B9A4 800E4804 00408825 */ move $s1, $v0 -.L800E4808: -/* B5B9A8 800E4808 26520001 */ addiu $s2, $s2, 1 -/* B5B9AC 800E480C 5650FFF6 */ bnel $s2, $s0, .L800E47E8 -/* B5B9B0 800E4810 02802025 */ move $a0, $s4 -/* B5B9B4 800E4814 00009025 */ move $s2, $zero -.L800E4818: -/* B5B9B8 800E4818 1AC0001E */ blez $s6, .L800E4894 -/* B5B9BC 800E481C 2415007F */ li $s5, 127 -/* B5B9C0 800E4820 02802025 */ move $a0, $s4 -.L800E4824: -/* B5B9C4 800E4824 0C039D26 */ jal Audio_GetInstrumentInner -/* B5B9C8 800E4828 02402825 */ move $a1, $s2 -/* B5B9CC 800E482C 10400016 */ beqz $v0, .L800E4888 -/* B5B9D0 800E4830 00408025 */ move $s0, $v0 -/* B5B9D4 800E4834 90580001 */ lbu $t8, 1($v0) -/* B5B9D8 800E4838 02202825 */ move $a1, $s1 -/* B5B9DC 800E483C 02603025 */ move $a2, $s3 -/* B5B9E0 800E4840 53000005 */ beql $t8, $zero, .L800E4858 -/* B5B9E4 800E4844 92190002 */ lbu $t9, 2($s0) -/* B5B9E8 800E4848 0C0391D1 */ jal func_800E4744 -/* B5B9EC 800E484C 8C440008 */ lw $a0, 8($v0) -/* B5B9F0 800E4850 00408825 */ move $s1, $v0 -/* B5B9F4 800E4854 92190002 */ lbu $t9, 2($s0) -.L800E4858: -/* B5B9F8 800E4858 02202825 */ move $a1, $s1 -/* B5B9FC 800E485C 02603025 */ move $a2, $s3 -/* B5BA00 800E4860 52B90005 */ beql $s5, $t9, .L800E4878 -/* B5BA04 800E4864 8E040010 */ lw $a0, 0x10($s0) -/* B5BA08 800E4868 0C0391D1 */ jal func_800E4744 -/* B5BA0C 800E486C 8E040018 */ lw $a0, 0x18($s0) -/* B5BA10 800E4870 00408825 */ move $s1, $v0 -/* B5BA14 800E4874 8E040010 */ lw $a0, 0x10($s0) -.L800E4878: -/* B5BA18 800E4878 02202825 */ move $a1, $s1 -/* B5BA1C 800E487C 0C0391D1 */ jal func_800E4744 -/* B5BA20 800E4880 02603025 */ move $a2, $s3 -/* B5BA24 800E4884 00408825 */ move $s1, $v0 -.L800E4888: -/* B5BA28 800E4888 26520001 */ addiu $s2, $s2, 1 -/* B5BA2C 800E488C 5656FFE5 */ bnel $s2, $s6, .L800E4824 -/* B5BA30 800E4890 02802025 */ move $a0, $s4 -.L800E4894: -/* B5BA34 800E4894 8FBF0034 */ lw $ra, 0x34($sp) -/* B5BA38 800E4898 02201025 */ move $v0, $s1 -/* B5BA3C 800E489C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5BA40 800E48A0 8FB00018 */ lw $s0, 0x18($sp) -/* B5BA44 800E48A4 8FB20020 */ lw $s2, 0x20($sp) -/* B5BA48 800E48A8 8FB30024 */ lw $s3, 0x24($sp) -/* B5BA4C 800E48AC 8FB40028 */ lw $s4, 0x28($sp) -/* B5BA50 800E48B0 8FB5002C */ lw $s5, 0x2c($sp) -/* B5BA54 800E48B4 8FB60030 */ lw $s6, 0x30($sp) -/* B5BA58 800E48B8 03E00008 */ jr $ra -/* B5BA5C 800E48BC 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E48C0.s b/asm/non_matchings/code/code_800E11F0/func_800E48C0.s deleted file mode 100644 index ef7bf7bbdb..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E48C0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800E48C0 -/* B5BA60 800E48C0 8C820000 */ lw $v0, ($a0) -/* B5BA64 800E48C4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B5BA68 800E48C8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B5BA6C 800E48CC 8C430000 */ lw $v1, ($v0) -/* B5BA70 800E48D0 00617024 */ and $t6, $v1, $at -/* B5BA74 800E48D4 11C0000E */ beqz $t6, .L800E4910 -/* B5BA78 800E48D8 0003C180 */ sll $t8, $v1, 6 -/* B5BA7C 800E48DC 0701000C */ bgez $t8, .L800E4910 -/* B5BA80 800E48E0 0003C900 */ sll $t9, $v1, 4 -/* B5BA84 800E48E4 00194782 */ srl $t0, $t9, 0x1e -/* B5BA88 800E48E8 11000009 */ beqz $t0, .L800E4910 -/* B5BA8C 800E48EC 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5BA90 800E48F0 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5BA94 800E48F4 8C691768 */ lw $t1, 0x1768($v1) -/* B5BA98 800E48F8 00095080 */ sll $t2, $t1, 2 -/* B5BA9C 800E48FC 006A5821 */ addu $t3, $v1, $t2 -/* B5BAA0 800E4900 AD620B68 */ sw $v0, 0xb68($t3) -/* B5BAA4 800E4904 8C6C1768 */ lw $t4, 0x1768($v1) -/* B5BAA8 800E4908 258D0001 */ addiu $t5, $t4, 1 -/* B5BAAC 800E490C AC6D1768 */ sw $t5, 0x1768($v1) -.L800E4910: -/* B5BAB0 800E4910 03E00008 */ jr $ra -/* B5BAB4 800E4914 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4D94.s b/asm/non_matchings/code/code_800E11F0/func_800E4D94.s deleted file mode 100644 index b6f501a176..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4D94.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800E4D94 -/* B5BF34 800E4D94 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B5BF38 800E4D98 AFBF003C */ sw $ra, 0x3c($sp) -/* B5BF3C 800E4D9C AFBE0038 */ sw $fp, 0x38($sp) -/* B5BF40 800E4DA0 AFB70034 */ sw $s7, 0x34($sp) -/* B5BF44 800E4DA4 AFB60030 */ sw $s6, 0x30($sp) -/* B5BF48 800E4DA8 AFB5002C */ sw $s5, 0x2c($sp) -/* B5BF4C 800E4DAC AFB40028 */ sw $s4, 0x28($sp) -/* B5BF50 800E4DB0 AFB30024 */ sw $s3, 0x24($sp) -/* B5BF54 800E4DB4 AFB20020 */ sw $s2, 0x20($sp) -/* B5BF58 800E4DB8 AFB1001C */ sw $s1, 0x1c($sp) -/* B5BF5C 800E4DBC AFB00018 */ sw $s0, 0x18($sp) -/* B5BF60 800E4DC0 0C0389FE */ jal func_800E27F8 -/* B5BF64 800E4DC4 24040002 */ li $a0, 2 -/* B5BF68 800E4DC8 3C158017 */ lui $s5, %hi(gAudioContext) # $s5, 0x8017 -/* B5BF6C 800E4DCC 26B5F180 */ addiu $s5, %lo(gAudioContext) # addiu $s5, $s5, -0xe80 -/* B5BF70 800E4DD0 8EA32D5C */ lw $v1, 0x2d5c($s5) -/* B5BF74 800E4DD4 00409825 */ move $s3, $v0 -/* B5BF78 800E4DD8 00008825 */ move $s1, $zero -/* B5BF7C 800E4DDC 18600031 */ blez $v1, .L800E4EA4 -/* B5BF80 800E4DE0 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5BF84 800E4DE4 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -/* B5BF88 800E4DE8 27BE004C */ addiu $fp, $sp, 0x4c -/* B5BF8C 800E4DEC 24170014 */ li $s7, 20 -/* B5BF90 800E4DF0 24160001 */ li $s6, 1 -/* B5BF94 800E4DF4 241400FF */ li $s4, 255 -.L800E4DF8: -/* B5BF98 800E4DF8 860E2D68 */ lh $t6, 0x2d68($s0) -/* B5BF9C 800E4DFC 02C02025 */ move $a0, $s6 -/* B5BFA0 800E4E00 56CE0025 */ bnel $s6, $t6, .L800E4E98 -/* B5BFA4 800E4E04 26310001 */ addiu $s1, $s1, 1 -/* B5BFA8 800E4E08 0C0389DA */ jal func_800E2768 -/* B5BFAC 800E4E0C 86052D6A */ lh $a1, 0x2d6a($s0) -/* B5BFB0 800E4E10 00570019 */ multu $v0, $s7 -/* B5BFB4 800E4E14 8EAF2844 */ lw $t7, 0x2844($s5) -/* B5BFB8 800E4E18 00409025 */ move $s2, $v0 -/* B5BFBC 800E4E1C 24040002 */ li $a0, 2 -/* B5BFC0 800E4E20 0000C012 */ mflo $t8 -/* B5BFC4 800E4E24 01F81821 */ addu $v1, $t7, $t8 -/* B5BFC8 800E4E28 90790002 */ lbu $t9, 2($v1) -/* B5BFCC 800E4E2C AFB9004C */ sw $t9, 0x4c($sp) -/* B5BFD0 800E4E30 90680003 */ lbu $t0, 3($v1) -/* B5BFD4 800E4E34 13340008 */ beq $t9, $s4, .L800E4E58 -/* B5BFD8 800E4E38 AFA80050 */ sw $t0, 0x50($sp) -/* B5BFDC 800E4E3C 0C0389DA */ jal func_800E2768 -/* B5BFE0 800E4E40 03202825 */ move $a1, $t9 -/* B5BFE4 800E4E44 00025100 */ sll $t2, $v0, 4 -/* B5BFE8 800E4E48 AFA2004C */ sw $v0, 0x4c($sp) -/* B5BFEC 800E4E4C 026A5821 */ addu $t3, $s3, $t2 -/* B5BFF0 800E4E50 816C0018 */ lb $t4, 0x18($t3) -/* B5BFF4 800E4E54 AFAC005C */ sw $t4, 0x5c($sp) -.L800E4E58: -/* B5BFF8 800E4E58 8FA50050 */ lw $a1, 0x50($sp) -/* B5BFFC 800E4E5C 50B40009 */ beql $a1, $s4, .L800E4E84 -/* B5C000 800E4E60 02402025 */ move $a0, $s2 -/* B5C004 800E4E64 0C0389DA */ jal func_800E2768 -/* B5C008 800E4E68 24040002 */ li $a0, 2 -/* B5C00C 800E4E6C 00026900 */ sll $t5, $v0, 4 -/* B5C010 800E4E70 AFA20050 */ sw $v0, 0x50($sp) -/* B5C014 800E4E74 026D7021 */ addu $t6, $s3, $t5 -/* B5C018 800E4E78 81CF0018 */ lb $t7, 0x18($t6) -/* B5C01C 800E4E7C AFAF0060 */ sw $t7, 0x60($sp) -/* B5C020 800E4E80 02402025 */ move $a0, $s2 -.L800E4E84: -/* B5C024 800E4E84 00002825 */ move $a1, $zero -/* B5C028 800E4E88 0C039246 */ jal func_800E4918 -/* B5C02C 800E4E8C 03C03025 */ move $a2, $fp -/* B5C030 800E4E90 8EA32D5C */ lw $v1, 0x2d5c($s5) -/* B5C034 800E4E94 26310001 */ addiu $s1, $s1, 1 -.L800E4E98: -/* B5C038 800E4E98 0223082A */ slt $at, $s1, $v1 -/* B5C03C 800E4E9C 1420FFD6 */ bnez $at, .L800E4DF8 -/* B5C040 800E4EA0 2610000C */ addiu $s0, $s0, 0xc -.L800E4EA4: -/* B5C044 800E4EA4 8FBF003C */ lw $ra, 0x3c($sp) -/* B5C048 800E4EA8 8FB00018 */ lw $s0, 0x18($sp) -/* B5C04C 800E4EAC 8FB1001C */ lw $s1, 0x1c($sp) -/* B5C050 800E4EB0 8FB20020 */ lw $s2, 0x20($sp) -/* B5C054 800E4EB4 8FB30024 */ lw $s3, 0x24($sp) -/* B5C058 800E4EB8 8FB40028 */ lw $s4, 0x28($sp) -/* B5C05C 800E4EBC 8FB5002C */ lw $s5, 0x2c($sp) -/* B5C060 800E4EC0 8FB60030 */ lw $s6, 0x30($sp) -/* B5C064 800E4EC4 8FB70034 */ lw $s7, 0x34($sp) -/* B5C068 800E4EC8 8FBE0038 */ lw $fp, 0x38($sp) -/* B5C06C 800E4ECC 03E00008 */ jr $ra -/* B5C070 800E4ED0 27BD0078 */ addiu $sp, $sp, 0x78 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4ED4.s b/asm/non_matchings/code/code_800E11F0/func_800E4ED4.s deleted file mode 100644 index 2e462578bd..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4ED4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800E4ED4 -/* B5C074 800E4ED4 03E00008 */ jr $ra -/* B5C078 800E4ED8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4EDC.s b/asm/non_matchings/code/code_800E11F0/func_800E4EDC.s deleted file mode 100644 index 04f0f0470e..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4EDC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800E4EDC -/* B5C07C 800E4EDC 03E00008 */ jr $ra -/* B5C080 800E4EE0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4EE4.s b/asm/non_matchings/code/code_800E11F0/func_800E4EE4.s deleted file mode 100644 index 64e4f5c1fa..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4EE4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800E4EE4 -/* B5C084 800E4EE4 03E00008 */ jr $ra -/* B5C088 800E4EE8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4EEC.s b/asm/non_matchings/code/code_800E11F0/func_800E4EEC.s deleted file mode 100644 index 8c9e9d7a36..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4EEC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800E4EEC -/* B5C08C 800E4EEC 3C078013 */ lui $a3, %hi(D_801304DC) # $a3, 0x8013 -/* B5C090 800E4EF0 8CE704DC */ lw $a3, %lo(D_801304DC)($a3) -/* B5C094 800E4EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5C098 800E4EF8 3C018017 */ lui $at, %hi(D_8016B738) -/* B5C09C 800E4EFC 00077880 */ sll $t7, $a3, 2 -/* B5C0A0 800E4F00 002F0821 */ addu $at, $at, $t7 -/* B5C0A4 800E4F04 3C188017 */ lui $t8, %hi(D_8016B6E0) # $t8, 0x8017 -/* B5C0A8 800E4F08 AFBF001C */ sw $ra, 0x1c($sp) -/* B5C0AC 800E4F0C AFA60028 */ sw $a2, 0x28($sp) -/* B5C0B0 800E4F10 AC26B738 */ sw $a2, %lo(D_8016B738)($at) -/* B5C0B4 800E4F14 2718B6E0 */ addiu $t8, %lo(D_8016B6E0) # addiu $t8, $t8, -0x4920 -/* B5C0B8 800E4F18 AFB80010 */ sw $t8, 0x10($sp) -/* B5C0BC 800E4F1C 0C03878D */ jal func_800E1E34 -/* B5C0C0 800E4F20 00003025 */ move $a2, $zero -/* B5C0C4 800E4F24 3C078013 */ lui $a3, %hi(D_801304DC) # $a3, 0x8013 -/* B5C0C8 800E4F28 8CE704DC */ lw $a3, %lo(D_801304DC)($a3) -/* B5C0CC 800E4F2C 3C018013 */ lui $at, %hi(D_801304DC) # $at, 0x8013 -/* B5C0D0 800E4F30 24E70001 */ addiu $a3, $a3, 1 -/* B5C0D4 800E4F34 AC2704DC */ sw $a3, %lo(D_801304DC)($at) -/* B5C0D8 800E4F38 24010010 */ li $at, 16 -/* B5C0DC 800E4F3C 14E10002 */ bne $a3, $at, .L800E4F48 -/* B5C0E0 800E4F40 3C018013 */ lui $at, %hi(D_801304DC) # $at, 0x8013 -/* B5C0E4 800E4F44 AC2004DC */ sw $zero, %lo(D_801304DC)($at) -.L800E4F48: -/* B5C0E8 800E4F48 8FBF001C */ lw $ra, 0x1c($sp) -/* B5C0EC 800E4F4C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B5C0F0 800E4F50 03E00008 */ jr $ra -/* B5C0F4 800E4F54 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4F58.s b/asm/non_matchings/code/code_800E11F0/func_800E4F58.s deleted file mode 100644 index b370ef4f80..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4F58.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800E4F58 -/* B5C0F8 800E4F58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5C0FC 800E4F5C AFBF0014 */ sw $ra, 0x14($sp) -/* B5C100 800E4F60 3C048017 */ lui $a0, %hi(D_8016B6E0) # $a0, 0x8017 -/* B5C104 800E4F64 2484B6E0 */ addiu $a0, %lo(D_8016B6E0) # addiu $a0, $a0, -0x4920 -/* B5C108 800E4F68 27A50020 */ addiu $a1, $sp, 0x20 -/* B5C10C 800E4F6C 0C000CA0 */ jal osRecvMesg -/* B5C110 800E4F70 00003025 */ move $a2, $zero -/* B5C114 800E4F74 2401FFFF */ li $at, -1 -/* B5C118 800E4F78 10410009 */ beq $v0, $at, .L800E4FA0 -/* B5C11C 800E4F7C 8FAE0020 */ lw $t6, 0x20($sp) -/* B5C120 800E4F80 000E7E02 */ srl $t7, $t6, 0x18 -/* B5C124 800E4F84 000FC080 */ sll $t8, $t7, 2 -/* B5C128 800E4F88 3C028017 */ lui $v0, %hi(D_8016B738) -/* B5C12C 800E4F8C 00581021 */ addu $v0, $v0, $t8 -/* B5C130 800E4F90 8C42B738 */ lw $v0, %lo(D_8016B738)($v0) -/* B5C134 800E4F94 50400003 */ beql $v0, $zero, .L800E4FA4 -/* B5C138 800E4F98 8FBF0014 */ lw $ra, 0x14($sp) -/* B5C13C 800E4F9C A0400000 */ sb $zero, ($v0) -.L800E4FA0: -/* B5C140 800E4FA0 8FBF0014 */ lw $ra, 0x14($sp) -.L800E4FA4: -/* B5C144 800E4FA4 27BD0028 */ addiu $sp, $sp, 0x28 -/* B5C148 800E4FA8 03E00008 */ jr $ra -/* B5C14C 800E4FAC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4FB0.s b/asm/non_matchings/code/code_800E11F0/func_800E4FB0.s deleted file mode 100644 index 5e63cad63c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4FB0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800E4FB0 -/* B5C150 800E4FB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5C154 800E4FB4 AFBF0014 */ sw $ra, 0x14($sp) -/* B5C158 800E4FB8 3C048017 */ lui $a0, %hi(D_8016B6E0) # $a0, 0x8017 -/* B5C15C 800E4FBC 3C058017 */ lui $a1, %hi(D_8016B6F8) # $a1, 0x8017 -/* B5C160 800E4FC0 24A5B6F8 */ addiu $a1, %lo(D_8016B6F8) # addiu $a1, $a1, -0x4908 -/* B5C164 800E4FC4 2484B6E0 */ addiu $a0, %lo(D_8016B6E0) # addiu $a0, $a0, -0x4920 -/* B5C168 800E4FC8 0C001874 */ jal osCreateMesgQueue -/* B5C16C 800E4FCC 24060010 */ li $a2, 16 -/* B5C170 800E4FD0 8FBF0014 */ lw $ra, 0x14($sp) -/* B5C174 800E4FD4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5C178 800E4FD8 03E00008 */ jr $ra -/* B5C17C 800E4FDC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4FE0.s b/asm/non_matchings/code/code_800E11F0/func_800E4FE0.s deleted file mode 100644 index 24c4042f4f..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E4FE0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800E4FE0 -/* B5C180 800E4FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5C184 800E4FE4 AFBF0014 */ sw $ra, 0x14($sp) -/* B5C188 800E4FE8 0C039400 */ jal func_800E5000 -/* B5C18C 800E4FEC 00000000 */ nop -/* B5C190 800E4FF0 8FBF0014 */ lw $ra, 0x14($sp) -/* B5C194 800E4FF4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5C198 800E4FF8 03E00008 */ jr $ra -/* B5C19C 800E4FFC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5584.s b/asm/non_matchings/code/code_800E11F0/func_800E5584.s deleted file mode 100644 index 3388cf321e..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5584.s +++ /dev/null @@ -1,278 +0,0 @@ -glabel func_800E5584 -/* B5C724 800E5584 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B5C728 800E5588 AFBF001C */ sw $ra, 0x1c($sp) -/* B5C72C 800E558C AFB00018 */ sw $s0, 0x18($sp) -/* B5C730 800E5590 90830000 */ lbu $v1, ($a0) -/* B5C734 800E5594 00808025 */ move $s0, $a0 -/* B5C738 800E5598 28610091 */ slti $at, $v1, 0x91 -/* B5C73C 800E559C 1420000A */ bnez $at, .L800E55C8 -/* B5C740 800E55A0 00601025 */ move $v0, $v1 -/* B5C744 800E55A4 244EFF20 */ addiu $t6, $v0, -0xe0 -/* B5C748 800E55A8 2DC1001F */ sltiu $at, $t6, 0x1f -/* B5C74C 800E55AC 102000E5 */ beqz $at, .L800E5944 -/* B5C750 800E55B0 000E7080 */ sll $t6, $t6, 2 -/* B5C754 800E55B4 3C018015 */ lui $at, %hi(jtbl_80149490) -/* B5C758 800E55B8 002E0821 */ addu $at, $at, $t6 -/* B5C75C 800E55BC 8C2E9490 */ lw $t6, %lo(jtbl_80149490)($at) -/* B5C760 800E55C0 01C00008 */ jr $t6 -/* B5C764 800E55C4 00000000 */ nop -.L800E55C8: -/* B5C768 800E55C8 244FFF7F */ addiu $t7, $v0, -0x81 -/* B5C76C 800E55CC 2DE10010 */ sltiu $at, $t7, 0x10 -/* B5C770 800E55D0 102000DC */ beqz $at, .L800E5944 -/* B5C774 800E55D4 000F7880 */ sll $t7, $t7, 2 -/* B5C778 800E55D8 3C018015 */ lui $at, %hi(jtbl_8014950C) -/* B5C77C 800E55DC 002F0821 */ addu $at, $at, $t7 -/* B5C780 800E55E0 8C2F950C */ lw $t7, %lo(jtbl_8014950C)($at) -/* B5C784 800E55E4 01E00008 */ jr $t7 -/* B5C788 800E55E8 00000000 */ nop -glabel L800E55EC -/* B5C78C 800E55EC 92040002 */ lbu $a0, 2($s0) -/* B5C790 800E55F0 0C038706 */ jal func_800E1C18 -/* B5C794 800E55F4 92050003 */ lbu $a1, 3($s0) -/* B5C798 800E55F8 100000D3 */ b .L800E5948 -/* B5C79C 800E55FC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5600 -/* B5C7A0 800E5600 92040001 */ lbu $a0, 1($s0) -/* B5C7A4 800E5604 92050002 */ lbu $a1, 2($s0) -/* B5C7A8 800E5608 0C038835 */ jal func_800E20D4 -/* B5C7AC 800E560C 92060003 */ lbu $a2, 3($s0) -/* B5C7B0 800E5610 92040001 */ lbu $a0, 1($s0) -/* B5C7B4 800E5614 0C03966B */ jal func_800E59AC -/* B5C7B8 800E5618 8E050004 */ lw $a1, 4($s0) -/* B5C7BC 800E561C 100000CA */ b .L800E5948 -/* B5C7C0 800E5620 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5624 -/* B5C7C4 800E5624 92040001 */ lbu $a0, 1($s0) -/* B5C7C8 800E5628 92050002 */ lbu $a1, 2($s0) -/* B5C7CC 800E562C 0C038849 */ jal func_800E2124 -/* B5C7D0 800E5630 8E060004 */ lw $a2, 4($s0) -/* B5C7D4 800E5634 100000C4 */ b .L800E5948 -/* B5C7D8 800E5638 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E563C -/* B5C7DC 800E563C 92020001 */ lbu $v0, 1($s0) -/* B5C7E0 800E5640 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5C7E4 800E5644 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5C7E8 800E5648 0002C080 */ sll $t8, $v0, 2 -/* B5C7EC 800E564C 0302C023 */ subu $t8, $t8, $v0 -/* B5C7F0 800E5650 0018C080 */ sll $t8, $t8, 2 -/* B5C7F4 800E5654 0302C023 */ subu $t8, $t8, $v0 -/* B5C7F8 800E5658 0018C140 */ sll $t8, $t8, 5 -/* B5C7FC 800E565C 00F81821 */ addu $v1, $a3, $t8 -/* B5C800 800E5660 8C793530 */ lw $t9, 0x3530($v1) -/* B5C804 800E5664 001947C2 */ srl $t0, $t9, 0x1f -/* B5C808 800E5668 510000B7 */ beql $t0, $zero, .L800E5948 -/* B5C80C 800E566C 8FBF001C */ lw $ra, 0x1c($sp) -/* B5C810 800E5670 8E050004 */ lw $a1, 4($s0) -/* B5C814 800E5674 14A00005 */ bnez $a1, .L800E568C -/* B5C818 800E5678 00000000 */ nop -/* B5C81C 800E567C 0C03A6D1 */ jal Audio_SequencePlayerDisableAsFinished -/* B5C820 800E5680 24643530 */ addiu $a0, $v1, 0x3530 -/* B5C824 800E5684 100000B0 */ b .L800E5948 -/* B5C828 800E5688 8FBF001C */ lw $ra, 0x1c($sp) -.L800E568C: -/* B5C82C 800E568C 0C039656 */ jal func_800E5958 -/* B5C830 800E5690 00402025 */ move $a0, $v0 -/* B5C834 800E5694 100000AC */ b .L800E5948 -/* B5C838 800E5698 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E569C -/* B5C83C 800E569C 8E090004 */ lw $t1, 4($s0) -/* B5C840 800E56A0 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5C844 800E56A4 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5C848 800E56A8 100000A6 */ b .L800E5944 -/* B5C84C 800E56AC A0E9289A */ sb $t1, 0x289a($a3) -glabel L800E56B0 -/* B5C850 800E56B0 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5C854 800E56B4 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5C858 800E56B8 84EA285C */ lh $t2, 0x285c($a3) -/* B5C85C 800E56BC 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5C860 800E56C0 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -/* B5C864 800E56C4 1940009F */ blez $t2, .L800E5944 -/* B5C868 800E56C8 00002825 */ move $a1, $zero -/* B5C86C 800E56CC 920C3530 */ lbu $t4, 0x3530($s0) -.L800E56D0: -/* B5C870 800E56D0 24A50001 */ addiu $a1, $a1, 1 -/* B5C874 800E56D4 26100160 */ addiu $s0, $s0, 0x160 -/* B5C878 800E56D8 358F0020 */ ori $t7, $t4, 0x20 -/* B5C87C 800E56DC A20F33D0 */ sb $t7, 0x33d0($s0) -/* B5C880 800E56E0 35F80004 */ ori $t8, $t7, 4 -/* B5C884 800E56E4 A21833D0 */ sb $t8, 0x33d0($s0) -/* B5C888 800E56E8 84F9285C */ lh $t9, 0x285c($a3) -/* B5C88C 800E56EC 00B9082A */ slt $at, $a1, $t9 -/* B5C890 800E56F0 5420FFF7 */ bnezl $at, .L800E56D0 -/* B5C894 800E56F4 920C3530 */ lbu $t4, 0x3530($s0) -/* B5C898 800E56F8 10000093 */ b .L800E5948 -/* B5C89C 800E56FC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5700 -/* B5C8A0 800E5700 8E080004 */ lw $t0, 4($s0) -/* B5C8A4 800E5704 24010001 */ li $at, 1 -/* B5C8A8 800E5708 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5C8AC 800E570C 1501001E */ bne $t0, $at, .L800E5788 -/* B5C8B0 800E5710 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5C8B4 800E5714 8CE62894 */ lw $a2, 0x2894($a3) -/* B5C8B8 800E5718 00002825 */ move $a1, $zero -/* B5C8BC 800E571C 00002025 */ move $a0, $zero -/* B5C8C0 800E5720 18C00019 */ blez $a2, .L800E5788 -/* B5C8C4 800E5724 00000000 */ nop -.L800E5728: -/* B5C8C8 800E5728 8CE9352C */ lw $t1, 0x352c($a3) -/* B5C8CC 800E572C 24A50001 */ addiu $a1, $a1, 1 -/* B5C8D0 800E5730 00891821 */ addu $v1, $a0, $t1 -/* B5C8D4 800E5734 8C6A00C0 */ lw $t2, 0xc0($v1) -/* B5C8D8 800E5738 000A5FC2 */ srl $t3, $t2, 0x1f -/* B5C8DC 800E573C 51600010 */ beql $t3, $zero, .L800E5780 -/* B5C8E0 800E5740 00A6082A */ slt $at, $a1, $a2 -/* B5C8E4 800E5744 906C0034 */ lbu $t4, 0x34($v1) -/* B5C8E8 800E5748 5580000D */ bnezl $t4, .L800E5780 -/* B5C8EC 800E574C 00A6082A */ slt $at, $a1, $a2 -/* B5C8F0 800E5750 8C6D0044 */ lw $t5, 0x44($v1) -/* B5C8F4 800E5754 246200C0 */ addiu $v0, $v1, 0xc0 -/* B5C8F8 800E5758 8DAE0050 */ lw $t6, 0x50($t5) -/* B5C8FC 800E575C 91CF0003 */ lbu $t7, 3($t6) -/* B5C900 800E5760 31F80008 */ andi $t8, $t7, 8 -/* B5C904 800E5764 53000006 */ beql $t8, $zero, .L800E5780 -/* B5C908 800E5768 00A6082A */ slt $at, $a1, $a2 -/* B5C90C 800E576C 90480000 */ lbu $t0, ($v0) -/* B5C910 800E5770 35090020 */ ori $t1, $t0, 0x20 -/* B5C914 800E5774 A0490000 */ sb $t1, ($v0) -/* B5C918 800E5778 8CE62894 */ lw $a2, 0x2894($a3) -/* B5C91C 800E577C 00A6082A */ slt $at, $a1, $a2 -.L800E5780: -/* B5C920 800E5780 1420FFE9 */ bnez $at, .L800E5728 -/* B5C924 800E5784 248400E0 */ addiu $a0, $a0, 0xe0 -.L800E5788: -/* B5C928 800E5788 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5C92C 800E578C 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5C930 800E5790 84EA285C */ lh $t2, 0x285c($a3) -/* B5C934 800E5794 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5C938 800E5798 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -/* B5C93C 800E579C 19400069 */ blez $t2, .L800E5944 -/* B5C940 800E57A0 00002825 */ move $a1, $zero -/* B5C944 800E57A4 920B3530 */ lbu $t3, 0x3530($s0) -.L800E57A8: -/* B5C948 800E57A8 24A50001 */ addiu $a1, $a1, 1 -/* B5C94C 800E57AC 26100160 */ addiu $s0, $s0, 0x160 -/* B5C950 800E57B0 316EFFDF */ andi $t6, $t3, 0xffdf -/* B5C954 800E57B4 A20E33D0 */ sb $t6, 0x33d0($s0) -/* B5C958 800E57B8 35CF0004 */ ori $t7, $t6, 4 -/* B5C95C 800E57BC A20F33D0 */ sb $t7, 0x33d0($s0) -/* B5C960 800E57C0 84F8285C */ lh $t8, 0x285c($a3) -/* B5C964 800E57C4 00B8082A */ slt $at, $a1, $t8 -/* B5C968 800E57C8 5420FFF7 */ bnezl $at, .L800E57A8 -/* B5C96C 800E57CC 920B3530 */ lbu $t3, 0x3530($s0) -/* B5C970 800E57D0 1000005D */ b .L800E5948 -/* B5C974 800E57D4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E57D8 -/* B5C978 800E57D8 92040001 */ lbu $a0, 1($s0) -/* B5C97C 800E57DC 92050002 */ lbu $a1, 2($s0) -/* B5C980 800E57E0 0C038759 */ jal func_800E1D64 -/* B5C984 800E57E4 92060003 */ lbu $a2, 3($s0) -/* B5C988 800E57E8 10000057 */ b .L800E5948 -/* B5C98C 800E57EC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E57F0 -/* B5C990 800E57F0 3C078017 */ lui $a3, %hi(gAudioContext+0x1e20) # $a3, 0x8017 -/* B5C994 800E57F4 24E70FA0 */ addiu $a3, %lo(gAudioContext+0x1e20) # addiu $a3, $a3, 0xfa0 -/* B5C998 800E57F8 92040001 */ lbu $a0, 1($s0) -/* B5C99C 800E57FC 92050002 */ lbu $a1, 2($s0) -/* B5C9A0 800E5800 0C0387AC */ jal func_800E1EB0 -/* B5C9A4 800E5804 92060003 */ lbu $a2, 3($s0) -/* B5C9A8 800E5808 1000004F */ b .L800E5948 -/* B5C9AC 800E580C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5810 -/* B5C9B0 800E5810 3C078017 */ lui $a3, %hi(gAudioContext+0x1e20) # $a3, 0x8017 -/* B5C9B4 800E5814 24E70FA0 */ addiu $a3, %lo(gAudioContext+0x1e20) # addiu $a3, $a3, 0xfa0 -/* B5C9B8 800E5818 92040001 */ lbu $a0, 1($s0) -/* B5C9BC 800E581C 92050002 */ lbu $a1, 2($s0) -/* B5C9C0 800E5820 0C0387BD */ jal func_800E1EF4 -/* B5C9C4 800E5824 92060003 */ lbu $a2, 3($s0) -/* B5C9C8 800E5828 10000047 */ b .L800E5948 -/* B5C9CC 800E582C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5830 -/* B5C9D0 800E5830 3C078017 */ lui $a3, %hi(gAudioContext+0x1e20) # $a3, 0x8017 -/* B5C9D4 800E5834 24E70FA0 */ addiu $a3, %lo(gAudioContext+0x1e20) # addiu $a3, $a3, 0xfa0 -/* B5C9D8 800E5838 92040001 */ lbu $a0, 1($s0) -/* B5C9DC 800E583C 92050002 */ lbu $a1, 2($s0) -/* B5C9E0 800E5840 0C03879B */ jal func_800E1E6C -/* B5C9E4 800E5844 92060003 */ lbu $a2, 3($s0) -/* B5C9E8 800E5848 1000003F */ b .L800E5948 -/* B5C9EC 800E584C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5850 -/* B5C9F0 800E5850 0C0387DF */ jal func_800E1F7C -/* B5C9F4 800E5854 92040002 */ lbu $a0, 2($s0) -/* B5C9F8 800E5858 1000003B */ b .L800E5948 -/* B5C9FC 800E585C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E5860 -/* B5CA00 800E5860 92080001 */ lbu $t0, 1($s0) -/* B5CA04 800E5864 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5CA08 800E5868 96190004 */ lhu $t9, 4($s0) -/* B5CA0C 800E586C 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5CA10 800E5870 00084840 */ sll $t1, $t0, 1 -/* B5CA14 800E5874 00E95021 */ addu $t2, $a3, $t1 -/* B5CA18 800E5878 10000032 */ b .L800E5944 -/* B5CA1C 800E587C A5595BDC */ sh $t9, 0x5bdc($t2) -glabel L800E5880 -/* B5CA20 800E5880 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5CA24 800E5884 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5CA28 800E5888 240B0005 */ li $t3, 5 -/* B5CA2C 800E588C A0EB3518 */ sb $t3, 0x3518($a3) -/* B5CA30 800E5890 8E0C0004 */ lw $t4, 4($s0) -/* B5CA34 800E5894 1000002B */ b .L800E5944 -/* B5CA38 800E5898 A0EC3519 */ sb $t4, 0x3519($a3) -glabel L800E589C -/* B5CA3C 800E589C 8E0D0004 */ lw $t5, 4($s0) -/* B5CA40 800E58A0 3C018017 */ lui $at, %hi(D_801755D0) # $at, 0x8017 -/* B5CA44 800E58A4 10000027 */ b .L800E5944 -/* B5CA48 800E58A8 AC2D55D0 */ sw $t5, %lo(D_801755D0)($at) -glabel L800E58AC -/* B5CA4C 800E58AC 2464FF20 */ addiu $a0, $v1, -0xe0 -/* B5CA50 800E58B0 92050001 */ lbu $a1, 1($s0) -/* B5CA54 800E58B4 92060002 */ lbu $a2, 2($s0) -/* B5CA58 800E58B8 0C039DD1 */ jal func_800E7744 -/* B5CA5C 800E58BC 8E070004 */ lw $a3, 4($s0) -/* B5CA60 800E58C0 10000021 */ b .L800E5948 -/* B5CA64 800E58C4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E58C8 -/* B5CA68 800E58C8 8E0E0004 */ lw $t6, 4($s0) -/* B5CA6C 800E58CC 24010001 */ li $at, 1 -/* B5CA70 800E58D0 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 -/* B5CA74 800E58D4 15C10015 */ bne $t6, $at, .L800E592C -/* B5CA78 800E58D8 AFAE0024 */ sw $t6, 0x24($sp) -/* B5CA7C 800E58DC 24E7F180 */ addiu $a3, %lo(gAudioContext) # addiu $a3, $a3, -0xe80 -/* B5CA80 800E58E0 84E2285C */ lh $v0, 0x285c($a3) -/* B5CA84 800E58E4 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5CA88 800E58E8 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -/* B5CA8C 800E58EC 1840000F */ blez $v0, .L800E592C -/* B5CA90 800E58F0 00002825 */ move $a1, $zero -.L800E58F4: -/* B5CA94 800E58F4 8E183530 */ lw $t8, 0x3530($s0) -/* B5CA98 800E58F8 26043530 */ addiu $a0, $s0, 0x3530 -/* B5CA9C 800E58FC 001847C2 */ srl $t0, $t8, 0x1f -/* B5CAA0 800E5900 51000007 */ beql $t0, $zero, .L800E5920 -/* B5CAA4 800E5904 24A50001 */ addiu $a1, $a1, 1 -/* B5CAA8 800E5908 0C03A6D1 */ jal Audio_SequencePlayerDisableAsFinished -/* B5CAAC 800E590C AFA50034 */ sw $a1, 0x34($sp) -/* B5CAB0 800E5910 3C028017 */ lui $v0, %hi(gAudioContext+0x285c) # $v0, 0x8017 -/* B5CAB4 800E5914 844219DC */ lh $v0, %lo(gAudioContext+0x285c)($v0) -/* B5CAB8 800E5918 8FA50034 */ lw $a1, 0x34($sp) -/* B5CABC 800E591C 24A50001 */ addiu $a1, $a1, 1 -.L800E5920: -/* B5CAC0 800E5920 00A2082A */ slt $at, $a1, $v0 -/* B5CAC4 800E5924 1420FFF3 */ bnez $at, .L800E58F4 -/* B5CAC8 800E5928 26100160 */ addiu $s0, $s0, 0x160 -.L800E592C: -/* B5CACC 800E592C 0C0399B0 */ jal func_800E66C0 -/* B5CAD0 800E5930 8FA40024 */ lw $a0, 0x24($sp) -/* B5CAD4 800E5934 10000004 */ b .L800E5948 -/* B5CAD8 800E5938 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800E593C -/* B5CADC 800E593C 0C03792C */ jal func_800DE4B0 -/* B5CAE0 800E5940 8E040004 */ lw $a0, 4($s0) -glabel L800E5944 -.L800E5944: -/* B5CAE4 800E5944 8FBF001C */ lw $ra, 0x1c($sp) -.L800E5948: -/* B5CAE8 800E5948 8FB00018 */ lw $s0, 0x18($sp) -/* B5CAEC 800E594C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B5CAF0 800E5950 03E00008 */ jr $ra -/* B5CAF4 800E5954 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5958.s b/asm/non_matchings/code/code_800E11F0/func_800E5958.s deleted file mode 100644 index 733d6a9c31..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5958.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800E5958 -/* B5CAF8 800E5958 14A00002 */ bnez $a1, .L800E5964 -/* B5CAFC 800E595C 00047080 */ sll $t6, $a0, 2 -/* B5CB00 800E5960 24050001 */ li $a1, 1 -.L800E5964: -/* B5CB04 800E5964 44853000 */ mtc1 $a1, $f6 -/* B5CB08 800E5968 01C47023 */ subu $t6, $t6, $a0 -/* B5CB0C 800E596C 000E7080 */ sll $t6, $t6, 2 -/* B5CB10 800E5970 01C47023 */ subu $t6, $t6, $a0 -/* B5CB14 800E5974 46803220 */ cvt.s.w $f8, $f6 -/* B5CB18 800E5978 000E7140 */ sll $t6, $t6, 5 -/* B5CB1C 800E597C 3C188017 */ lui $t8, %hi(gAudioContext) # $t8, 0x8017 -/* B5CB20 800E5980 2718F180 */ addiu $t8, %lo(gAudioContext) # addiu $t8, $t8, -0xe80 -/* B5CB24 800E5984 25CF3530 */ addiu $t7, $t6, 0x3530 -/* B5CB28 800E5988 01F81021 */ addu $v0, $t7, $t8 -/* B5CB2C 800E598C C444001C */ lwc1 $f4, 0x1c($v0) -/* B5CB30 800E5990 24190002 */ li $t9, 2 -/* B5CB34 800E5994 A0590001 */ sb $t9, 1($v0) -/* B5CB38 800E5998 46082283 */ div.s $f10, $f4, $f8 -/* B5CB3C 800E599C A4450012 */ sh $a1, 0x12($v0) -/* B5CB40 800E59A0 46005407 */ neg.s $f16, $f10 -/* B5CB44 800E59A4 03E00008 */ jr $ra -/* B5CB48 800E59A8 E4500020 */ swc1 $f16, 0x20($v0) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E59AC.s b/asm/non_matchings/code/code_800E11F0/func_800E59AC.s deleted file mode 100644 index 3cde7c2eea..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E59AC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800E59AC -/* B5CB4C 800E59AC 10A0000F */ beqz $a1, .L800E59EC -/* B5CB50 800E59B0 00047080 */ sll $t6, $a0, 2 -/* B5CB54 800E59B4 01C47023 */ subu $t6, $t6, $a0 -/* B5CB58 800E59B8 000E7080 */ sll $t6, $t6, 2 -/* B5CB5C 800E59BC 01C47023 */ subu $t6, $t6, $a0 -/* B5CB60 800E59C0 3C0F8017 */ lui $t7, %hi(gAudioContext) -/* B5CB64 800E59C4 25EFF180 */ addiu $t7, %lo(gAudioContext) # addiu $t7, $t7, -0xe80 -/* B5CB68 800E59C8 000E7140 */ sll $t6, $t6, 5 -/* B5CB6C 800E59CC 01CF1021 */ addu $v0, $t6, $t7 -/* B5CB70 800E59D0 44800000 */ mtc1 $zero, $f0 -/* B5CB74 800E59D4 24180001 */ li $t8, 1 -/* B5CB78 800E59D8 A0583531 */ sb $t8, 0x3531($v0) -/* B5CB7C 800E59DC A4453544 */ sh $a1, 0x3544($v0) -/* B5CB80 800E59E0 A4453542 */ sh $a1, 0x3542($v0) -/* B5CB84 800E59E4 E440354C */ swc1 $f0, 0x354c($v0) -/* B5CB88 800E59E8 E4403550 */ swc1 $f0, 0x3550($v0) -.L800E59EC: -/* B5CB8C 800E59EC 03E00008 */ jr $ra -/* B5CB90 800E59F0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E59F4.s b/asm/non_matchings/code/code_800E11F0/func_800E59F4.s deleted file mode 100644 index 2615f0c49c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E59F4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800E59F4 -/* B5CB94 800E59F4 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5CB98 800E59F8 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5CB9C 800E59FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5CBA0 800E5A00 3C0E8017 */ lui $t6, %hi(D_80174D70) -/* B5CBA4 800E5A04 3C0F8017 */ lui $t7, %hi(D_80174D88) # $t7, 0x8017 -/* B5CBA8 800E5A08 3C188017 */ lui $t8, %hi(D_80174DA0) # $t8, 0x8017 -/* B5CBAC 800E5A0C AFBF0014 */ sw $ra, 0x14($sp) -/* B5CBB0 800E5A10 25C44D70 */ addiu $a0, $t6, %lo(D_80174D70) -/* B5CBB4 800E5A14 25EF4D88 */ addiu $t7, %lo(D_80174D88) # addiu $t7, $t7, 0x4d88 -/* B5CBB8 800E5A18 27184DA0 */ addiu $t8, %lo(D_80174DA0) # addiu $t8, $t8, 0x4da0 -/* B5CBBC 800E5A1C 3C058017 */ lui $a1, %hi(D_80174DB8) # $a1, 0x8017 -/* B5CBC0 800E5A20 A0405BD8 */ sb $zero, 0x5bd8($v0) -/* B5CBC4 800E5A24 A0405BD9 */ sb $zero, 0x5bd9($v0) -/* B5CBC8 800E5A28 A0405BDA */ sb $zero, 0x5bda($v0) -/* B5CBCC 800E5A2C AC445BE8 */ sw $a0, 0x5be8($v0) -/* B5CBD0 800E5A30 AC4F5BEC */ sw $t7, 0x5bec($v0) -/* B5CBD4 800E5A34 AC585BE4 */ sw $t8, 0x5be4($v0) -/* B5CBD8 800E5A38 24A54DB8 */ addiu $a1, %lo(D_80174DB8) # addiu $a1, $a1, 0x4db8 -/* B5CBDC 800E5A3C 0C001874 */ jal osCreateMesgQueue -/* B5CBE0 800E5A40 24060001 */ li $a2, 1 -/* B5CBE4 800E5A44 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5CBE8 800E5A48 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5CBEC 800E5A4C 3C058017 */ lui $a1, %hi(D_80174DC0) # $a1, 0x8017 -/* B5CBF0 800E5A50 24A54DC0 */ addiu $a1, %lo(D_80174DC0) # addiu $a1, $a1, 0x4dc0 -/* B5CBF4 800E5A54 8C445BEC */ lw $a0, 0x5bec($v0) -/* B5CBF8 800E5A58 0C001874 */ jal osCreateMesgQueue -/* B5CBFC 800E5A5C 24060004 */ li $a2, 4 -/* B5CC00 800E5A60 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5CC04 800E5A64 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5CC08 800E5A68 3C058017 */ lui $a1, %hi(D_80174DBC) # $a1, 0x8017 -/* B5CC0C 800E5A6C 24A54DBC */ addiu $a1, %lo(D_80174DBC) # addiu $a1, $a1, 0x4dbc -/* B5CC10 800E5A70 8C445BE4 */ lw $a0, 0x5be4($v0) -/* B5CC14 800E5A74 0C001874 */ jal osCreateMesgQueue -/* B5CC18 800E5A78 24060001 */ li $a2, 1 -/* B5CC1C 800E5A7C 8FBF0014 */ lw $ra, 0x14($sp) -/* B5CC20 800E5A80 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5CC24 800E5A84 03E00008 */ jr $ra -/* B5CC28 800E5A88 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5A8C.s b/asm/non_matchings/code/code_800E11F0/func_800E5A8C.s deleted file mode 100644 index 07e2fc06a6..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5A8C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800E5A8C -/* B5CC2C 800E5A8C 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 -/* B5CC30 800E5A90 24C6F180 */ addiu $a2, %lo(gAudioContext) # addiu $a2, $a2, -0xe80 -/* B5CC34 800E5A94 90CF5BD8 */ lbu $t7, 0x5bd8($a2) -/* B5CC38 800E5A98 000FC0C0 */ sll $t8, $t7, 3 -/* B5CC3C 800E5A9C 00D81021 */ addu $v0, $a2, $t8 -/* B5CC40 800E5AA0 AC445C50 */ sw $a0, 0x5c50($v0) -/* B5CC44 800E5AA4 8CB90000 */ lw $t9, ($a1) -/* B5CC48 800E5AA8 24425C50 */ addiu $v0, $v0, 0x5c50 -/* B5CC4C 800E5AAC AC590004 */ sw $t9, 4($v0) -/* B5CC50 800E5AB0 90C85BD8 */ lbu $t0, 0x5bd8($a2) -/* B5CC54 800E5AB4 90CA5BD9 */ lbu $t2, 0x5bd9($a2) -/* B5CC58 800E5AB8 25090001 */ addiu $t1, $t0, 1 -/* B5CC5C 800E5ABC 312300FF */ andi $v1, $t1, 0xff -/* B5CC60 800E5AC0 15430003 */ bne $t2, $v1, .L800E5AD0 -/* B5CC64 800E5AC4 A0C95BD8 */ sb $t1, 0x5bd8($a2) -/* B5CC68 800E5AC8 246BFFFF */ addiu $t3, $v1, -1 -/* B5CC6C 800E5ACC A0CB5BD8 */ sb $t3, 0x5bd8($a2) -.L800E5AD0: -/* B5CC70 800E5AD0 03E00008 */ jr $ra -/* B5CC74 800E5AD4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5AD8.s b/asm/non_matchings/code/code_800E11F0/func_800E5AD8.s deleted file mode 100644 index 7baa6ca978..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5AD8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800E5AD8 -/* B5CC78 800E5AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5CC7C 800E5ADC AFBF0014 */ sw $ra, 0x14($sp) -/* B5CC80 800E5AE0 AFA5001C */ sw $a1, 0x1c($sp) -/* B5CC84 800E5AE4 0C0396A3 */ jal func_800E5A8C -/* B5CC88 800E5AE8 27A5001C */ addiu $a1, $sp, 0x1c -/* B5CC8C 800E5AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* B5CC90 800E5AF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5CC94 800E5AF4 03E00008 */ jr $ra -/* B5CC98 800E5AF8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5AFC.s b/asm/non_matchings/code/code_800E11F0/func_800E5AFC.s deleted file mode 100644 index 1c64db98ea..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5AFC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800E5AFC -/* B5CC9C 800E5AFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5CCA0 800E5B00 AFBF0014 */ sw $ra, 0x14($sp) -/* B5CCA4 800E5B04 AFA5001C */ sw $a1, 0x1c($sp) -/* B5CCA8 800E5B08 0C0396A3 */ jal func_800E5A8C -/* B5CCAC 800E5B0C 27A5001C */ addiu $a1, $sp, 0x1c -/* B5CCB0 800E5B10 8FBF0014 */ lw $ra, 0x14($sp) -/* B5CCB4 800E5B14 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5CCB8 800E5B18 03E00008 */ jr $ra -/* B5CCBC 800E5B1C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5B20.s b/asm/non_matchings/code/code_800E11F0/func_800E5B20.s deleted file mode 100644 index abd7a5c727..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5B20.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800E5B20 -/* B5CCC0 800E5B20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5CCC4 800E5B24 00A03025 */ move $a2, $a1 -/* B5CCC8 800E5B28 AFBF0014 */ sw $ra, 0x14($sp) -/* B5CCCC 800E5B2C AFA50024 */ sw $a1, 0x24($sp) -/* B5CCD0 800E5B30 00067600 */ sll $t6, $a2, 0x18 -/* B5CCD4 800E5B34 AFAE001C */ sw $t6, 0x1c($sp) -/* B5CCD8 800E5B38 0C0396A3 */ jal func_800E5A8C -/* B5CCDC 800E5B3C 27A5001C */ addiu $a1, $sp, 0x1c -/* B5CCE0 800E5B40 8FBF0014 */ lw $ra, 0x14($sp) -/* B5CCE4 800E5B44 27BD0020 */ addiu $sp, $sp, 0x20 -/* B5CCE8 800E5B48 03E00008 */ jr $ra -/* B5CCEC 800E5B4C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5B50.s b/asm/non_matchings/code/code_800E11F0/func_800E5B50.s deleted file mode 100644 index 26ec85ee03..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5B50.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800E5B50 -/* B5CCF0 800E5B50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5CCF4 800E5B54 00A03025 */ move $a2, $a1 -/* B5CCF8 800E5B58 AFBF0014 */ sw $ra, 0x14($sp) -/* B5CCFC 800E5B5C AFA50024 */ sw $a1, 0x24($sp) -/* B5CD00 800E5B60 00067400 */ sll $t6, $a2, 0x10 -/* B5CD04 800E5B64 AFAE001C */ sw $t6, 0x1c($sp) -/* B5CD08 800E5B68 0C0396A3 */ jal func_800E5A8C -/* B5CD0C 800E5B6C 27A5001C */ addiu $a1, $sp, 0x1c -/* B5CD10 800E5B70 8FBF0014 */ lw $ra, 0x14($sp) -/* B5CD14 800E5B74 27BD0020 */ addiu $sp, $sp, 0x20 -/* B5CD18 800E5B78 03E00008 */ jr $ra -/* B5CD1C 800E5B7C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5B80.s b/asm/non_matchings/code/code_800E11F0/func_800E5B80.s deleted file mode 100644 index e5341edebd..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5B80.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800E5B80 -/* B5CD20 800E5B80 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5CD24 800E5B84 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5CD28 800E5B88 90625BD8 */ lbu $v0, 0x5bd8($v1) -/* B5CD2C 800E5B8C 90675BD9 */ lbu $a3, 0x5bd9($v1) -/* B5CD30 800E5B90 3C0E8013 */ lui $t6, %hi(D_801304E8) # $t6, 0x8013 -/* B5CD34 800E5B94 8DCE04E8 */ lw $t6, %lo(D_801304E8)($t6) -/* B5CD38 800E5B98 00472023 */ subu $a0, $v0, $a3 -/* B5CD3C 800E5B9C 24840100 */ addiu $a0, $a0, 0x100 -/* B5CD40 800E5BA0 308400FF */ andi $a0, $a0, 0xff -/* B5CD44 800E5BA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5CD48 800E5BA8 01C4082A */ slt $at, $t6, $a0 -/* B5CD4C 800E5BAC 10200003 */ beqz $at, .L800E5BBC -/* B5CD50 800E5BB0 AFBF0014 */ sw $ra, 0x14($sp) -/* B5CD54 800E5BB4 3C018013 */ lui $at, %hi(D_801304E8) # $at, 0x8013 -/* B5CD58 800E5BB8 AC2404E8 */ sw $a0, %lo(D_801304E8)($at) -.L800E5BBC: -/* B5CD5C 800E5BBC 30EF00FF */ andi $t7, $a3, 0xff -/* B5CD60 800E5BC0 000FC200 */ sll $t8, $t7, 8 -/* B5CD64 800E5BC4 305900FF */ andi $t9, $v0, 0xff -/* B5CD68 800E5BC8 03192825 */ or $a1, $t8, $t9 -/* B5CD6C 800E5BCC 8C645BEC */ lw $a0, 0x5bec($v1) -/* B5CD70 800E5BD0 0C000C18 */ jal osSendMesg -/* B5CD74 800E5BD4 00003025 */ move $a2, $zero -/* B5CD78 800E5BD8 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5CD7C 800E5BDC 2401FFFF */ li $at, -1 -/* B5CD80 800E5BE0 10410005 */ beq $v0, $at, .L800E5BF8 -/* B5CD84 800E5BE4 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5CD88 800E5BE8 90685BD8 */ lbu $t0, 0x5bd8($v1) -/* B5CD8C 800E5BEC 00001025 */ move $v0, $zero -/* B5CD90 800E5BF0 10000003 */ b .L800E5C00 -/* B5CD94 800E5BF4 A0685BD9 */ sb $t0, 0x5bd9($v1) -.L800E5BF8: -/* B5CD98 800E5BF8 10000001 */ b .L800E5C00 -/* B5CD9C 800E5BFC 2402FFFF */ li $v0, -1 -.L800E5C00: -/* B5CDA0 800E5C00 8FBF0014 */ lw $ra, 0x14($sp) -/* B5CDA4 800E5C04 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5CDA8 800E5C08 03E00008 */ jr $ra -/* B5CDAC 800E5C0C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5C10.s b/asm/non_matchings/code/code_800E11F0/func_800E5C10.s deleted file mode 100644 index ce0a0dfd77..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5C10.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800E5C10 -/* B5CDB0 800E5C10 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B5CDB4 800E5C14 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B5CDB8 800E5C18 904E5BD8 */ lbu $t6, 0x5bd8($v0) -/* B5CDBC 800E5C1C A0405BDA */ sb $zero, 0x5bda($v0) -/* B5CDC0 800E5C20 03E00008 */ jr $ra -/* B5CDC4 800E5C24 A04E5BD9 */ sb $t6, 0x5bd9($v0) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5C28.s b/asm/non_matchings/code/code_800E11F0/func_800E5C28.s deleted file mode 100644 index 7ba14d21b3..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5C28.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_800E5C28 -/* B5CDC8 800E5C28 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5CDCC 800E5C2C AFBF002C */ sw $ra, 0x2c($sp) -/* B5CDD0 800E5C30 AFB40028 */ sw $s4, 0x28($sp) -/* B5CDD4 800E5C34 AFB30024 */ sw $s3, 0x24($sp) -/* B5CDD8 800E5C38 AFB20020 */ sw $s2, 0x20($sp) -/* B5CDDC 800E5C3C AFB1001C */ sw $s1, 0x1c($sp) -/* B5CDE0 800E5C40 AFB00018 */ sw $s0, 0x18($sp) -/* B5CDE4 800E5C44 90820000 */ lbu $v0, ($a0) -/* B5CDE8 800E5C48 240100F0 */ li $at, 240 -/* B5CDEC 800E5C4C 00809825 */ move $s3, $a0 -/* B5CDF0 800E5C50 304E00F0 */ andi $t6, $v0, 0xf0 -/* B5CDF4 800E5C54 15C10005 */ bne $t6, $at, .L800E5C6C -/* B5CDF8 800E5C58 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B5CDFC 800E5C5C 0C039561 */ jal func_800E5584 -/* B5CE00 800E5C60 00000000 */ nop -/* B5CE04 800E5C64 1000003A */ b .L800E5D50 -/* B5CE08 800E5C68 8FBF002C */ lw $ra, 0x2c($sp) -.L800E5C6C: -/* B5CE0C 800E5C6C 92640001 */ lbu $a0, 1($s3) -/* B5CE10 800E5C70 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B5CE14 800E5C74 84AF285C */ lh $t7, 0x285c($a1) -/* B5CE18 800E5C78 0004C080 */ sll $t8, $a0, 2 -/* B5CE1C 800E5C7C 0304C023 */ subu $t8, $t8, $a0 -/* B5CE20 800E5C80 008F082A */ slt $at, $a0, $t7 -/* B5CE24 800E5C84 10200031 */ beqz $at, .L800E5D4C -/* B5CE28 800E5C88 0018C080 */ sll $t8, $t8, 2 -/* B5CE2C 800E5C8C 0304C023 */ subu $t8, $t8, $a0 -/* B5CE30 800E5C90 0018C140 */ sll $t8, $t8, 5 -/* B5CE34 800E5C94 00B8A021 */ addu $s4, $a1, $t8 -/* B5CE38 800E5C98 30590080 */ andi $t9, $v0, 0x80 -/* B5CE3C 800E5C9C 13200005 */ beqz $t9, .L800E5CB4 -/* B5CE40 800E5CA0 26943530 */ addiu $s4, $s4, 0x3530 -/* B5CE44 800E5CA4 0C039561 */ jal func_800E5584 -/* B5CE48 800E5CA8 02602025 */ move $a0, $s3 -/* B5CE4C 800E5CAC 10000028 */ b .L800E5D50 -/* B5CE50 800E5CB0 8FBF002C */ lw $ra, 0x2c($sp) -.L800E5CB4: -/* B5CE54 800E5CB4 30480040 */ andi $t0, $v0, 0x40 -/* B5CE58 800E5CB8 51000007 */ beql $t0, $zero, .L800E5CD8 -/* B5CE5C 800E5CBC 92620002 */ lbu $v0, 2($s3) -/* B5CE60 800E5CC0 02802025 */ move $a0, $s4 -/* B5CE64 800E5CC4 0C03984A */ jal func_800E6128 -/* B5CE68 800E5CC8 02602825 */ move $a1, $s3 -/* B5CE6C 800E5CCC 10000020 */ b .L800E5D50 -/* B5CE70 800E5CD0 8FBF002C */ lw $ra, 0x2c($sp) -/* B5CE74 800E5CD4 92620002 */ lbu $v0, 2($s3) -.L800E5CD8: -/* B5CE78 800E5CD8 28410010 */ slti $at, $v0, 0x10 -/* B5CE7C 800E5CDC 10200008 */ beqz $at, .L800E5D00 -/* B5CE80 800E5CE0 00401825 */ move $v1, $v0 -/* B5CE84 800E5CE4 00024880 */ sll $t1, $v0, 2 -/* B5CE88 800E5CE8 02895021 */ addu $t2, $s4, $t1 -/* B5CE8C 800E5CEC 8D440038 */ lw $a0, 0x38($t2) -/* B5CE90 800E5CF0 0C0398C0 */ jal func_800E6300 -/* B5CE94 800E5CF4 02602825 */ move $a1, $s3 -/* B5CE98 800E5CF8 10000015 */ b .L800E5D50 -/* B5CE9C 800E5CFC 8FBF002C */ lw $ra, 0x2c($sp) -.L800E5D00: -/* B5CEA0 800E5D00 240100FF */ li $at, 255 -/* B5CEA4 800E5D04 14610011 */ bne $v1, $at, .L800E5D4C -/* B5CEA8 800E5D08 00045840 */ sll $t3, $a0, 1 -/* B5CEAC 800E5D0C 00AB6021 */ addu $t4, $a1, $t3 -/* B5CEB0 800E5D10 95825BDC */ lhu $v0, 0x5bdc($t4) -/* B5CEB4 800E5D14 00008025 */ move $s0, $zero -/* B5CEB8 800E5D18 24120010 */ li $s2, 16 -.L800E5D1C: -/* B5CEBC 800E5D1C 304D0001 */ andi $t5, $v0, 1 -/* B5CEC0 800E5D20 11A00006 */ beqz $t5, .L800E5D3C -/* B5CEC4 800E5D24 00408825 */ move $s1, $v0 -/* B5CEC8 800E5D28 00107080 */ sll $t6, $s0, 2 -/* B5CECC 800E5D2C 028E7821 */ addu $t7, $s4, $t6 -/* B5CED0 800E5D30 8DE40038 */ lw $a0, 0x38($t7) -/* B5CED4 800E5D34 0C0398C0 */ jal func_800E6300 -/* B5CED8 800E5D38 02602825 */ move $a1, $s3 -.L800E5D3C: -/* B5CEDC 800E5D3C 26100001 */ addiu $s0, $s0, 1 -/* B5CEE0 800E5D40 00111043 */ sra $v0, $s1, 1 -/* B5CEE4 800E5D44 1612FFF5 */ bne $s0, $s2, .L800E5D1C -/* B5CEE8 800E5D48 3042FFFF */ andi $v0, $v0, 0xffff -.L800E5D4C: -/* B5CEEC 800E5D4C 8FBF002C */ lw $ra, 0x2c($sp) -.L800E5D50: -/* B5CEF0 800E5D50 8FB00018 */ lw $s0, 0x18($sp) -/* B5CEF4 800E5D54 8FB1001C */ lw $s1, 0x1c($sp) -/* B5CEF8 800E5D58 8FB20020 */ lw $s2, 0x20($sp) -/* B5CEFC 800E5D5C 8FB30024 */ lw $s3, 0x24($sp) -/* B5CF00 800E5D60 8FB40028 */ lw $s4, 0x28($sp) -/* B5CF04 800E5D64 03E00008 */ jr $ra -/* B5CF08 800E5D68 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5D6C.s b/asm/non_matchings/code/code_800E11F0/func_800E5D6C.s deleted file mode 100644 index 963ec9a904..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5D6C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_800E5D6C -/* B5CF0C 800E5D6C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5CF10 800E5D70 AFB30020 */ sw $s3, 0x20($sp) -/* B5CF14 800E5D74 3C138017 */ lui $s3, %hi(gAudioContext) # $s3, 0x8017 -/* B5CF18 800E5D78 2673F180 */ addiu $s3, %lo(gAudioContext) # addiu $s3, $s3, -0xe80 -/* B5CF1C 800E5D7C 926E5BDA */ lbu $t6, 0x5bda($s3) -/* B5CF20 800E5D80 AFBF0024 */ sw $ra, 0x24($sp) -/* B5CF24 800E5D84 AFB2001C */ sw $s2, 0x1c($sp) -/* B5CF28 800E5D88 AFB10018 */ sw $s1, 0x18($sp) -/* B5CF2C 800E5D8C 15C00004 */ bnez $t6, .L800E5DA0 -/* B5CF30 800E5D90 AFB00014 */ sw $s0, 0x14($sp) -/* B5CF34 800E5D94 00041A02 */ srl $v1, $a0, 8 -/* B5CF38 800E5D98 3C018013 */ lui $at, %hi(D_801304EC) # $at, 0x8013 -/* B5CF3C 800E5D9C A02304EC */ sb $v1, %lo(D_801304EC)($at) -.L800E5DA0: -/* B5CF40 800E5DA0 00808825 */ move $s1, $a0 -/* B5CF44 800E5DA4 323100FF */ andi $s1, $s1, 0xff -/* B5CF48 800E5DA8 241200F8 */ li $s2, 248 -.L800E5DAC: -/* B5CF4C 800E5DAC 3C038013 */ lui $v1, %hi(D_801304EC) # $v1, 0x8013 -/* B5CF50 800E5DB0 906304EC */ lbu $v1, %lo(D_801304EC)($v1) -/* B5CF54 800E5DB4 3C018013 */ lui $at, %hi(D_801304EC) # $at, 0x8013 -/* B5CF58 800E5DB8 16230003 */ bne $s1, $v1, .L800E5DC8 -/* B5CF5C 800E5DBC 00601025 */ move $v0, $v1 -/* B5CF60 800E5DC0 10000010 */ b .L800E5E04 -/* B5CF64 800E5DC4 A2605BDA */ sb $zero, 0x5bda($s3) -.L800E5DC8: -/* B5CF68 800E5DC8 304F00FF */ andi $t7, $v0, 0xff -/* B5CF6C 800E5DCC 000FC0C0 */ sll $t8, $t7, 3 -/* B5CF70 800E5DD0 24630001 */ addiu $v1, $v1, 1 -/* B5CF74 800E5DD4 02788021 */ addu $s0, $s3, $t8 -/* B5CF78 800E5DD8 A02304EC */ sb $v1, %lo(D_801304EC)($at) -/* B5CF7C 800E5DDC 92195C50 */ lbu $t9, 0x5c50($s0) -/* B5CF80 800E5DE0 26105C50 */ addiu $s0, $s0, 0x5c50 -/* B5CF84 800E5DE4 16590003 */ bne $s2, $t9, .L800E5DF4 -/* B5CF88 800E5DE8 24080001 */ li $t0, 1 -/* B5CF8C 800E5DEC 10000005 */ b .L800E5E04 -/* B5CF90 800E5DF0 A2685BDA */ sb $t0, 0x5bda($s3) -.L800E5DF4: -/* B5CF94 800E5DF4 0C03970A */ jal func_800E5C28 -/* B5CF98 800E5DF8 02002025 */ move $a0, $s0 -/* B5CF9C 800E5DFC 1000FFEB */ b .L800E5DAC -/* B5CFA0 800E5E00 A2000000 */ sb $zero, ($s0) -.L800E5E04: -/* B5CFA4 800E5E04 8FBF0024 */ lw $ra, 0x24($sp) -/* B5CFA8 800E5E08 8FB00014 */ lw $s0, 0x14($sp) -/* B5CFAC 800E5E0C 8FB10018 */ lw $s1, 0x18($sp) -/* B5CFB0 800E5E10 8FB2001C */ lw $s2, 0x1c($sp) -/* B5CFB4 800E5E14 8FB30020 */ lw $s3, 0x20($sp) -/* B5CFB8 800E5E18 03E00008 */ jr $ra -/* B5CFBC 800E5E1C 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5E20.s b/asm/non_matchings/code/code_800E11F0/func_800E5E20.s deleted file mode 100644 index 2344f88e9a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5E20.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800E5E20 -/* B5CFC0 800E5E20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5CFC4 800E5E24 AFA40020 */ sw $a0, 0x20($sp) -/* B5CFC8 800E5E28 AFBF0014 */ sw $ra, 0x14($sp) -/* B5CFCC 800E5E2C 3C048017 */ lui $a0, %hi(gAudioContext+0x1e20) # $a0, 0x8017 -/* B5CFD0 800E5E30 24840FA0 */ addiu $a0, %lo(gAudioContext+0x1e20) # addiu $a0, $a0, 0xfa0 -/* B5CFD4 800E5E34 27A5001C */ addiu $a1, $sp, 0x1c -/* B5CFD8 800E5E38 0C000CA0 */ jal osRecvMesg -/* B5CFDC 800E5E3C 00003025 */ move $a2, $zero -/* B5CFE0 800E5E40 2401FFFF */ li $at, -1 -/* B5CFE4 800E5E44 14410004 */ bne $v0, $at, .L800E5E58 -/* B5CFE8 800E5E48 8FA30020 */ lw $v1, 0x20($sp) -/* B5CFEC 800E5E4C AC600000 */ sw $zero, ($v1) -/* B5CFF0 800E5E50 10000008 */ b .L800E5E74 -/* B5CFF4 800E5E54 00001025 */ move $v0, $zero -.L800E5E58: -/* B5CFF8 800E5E58 8FAE001C */ lw $t6, 0x1c($sp) -/* B5CFFC 800E5E5C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B5D000 800E5E60 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B5D004 800E5E64 01C17824 */ and $t7, $t6, $at -/* B5D008 800E5E68 AC6F0000 */ sw $t7, ($v1) -/* B5D00C 800E5E6C 8FA2001C */ lw $v0, 0x1c($sp) -/* B5D010 800E5E70 00021602 */ srl $v0, $v0, 0x18 -.L800E5E74: -/* B5D014 800E5E74 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D018 800E5E78 27BD0020 */ addiu $sp, $sp, 0x20 -/* B5D01C 800E5E7C 03E00008 */ jr $ra -/* B5D020 800E5E80 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5E84.s b/asm/non_matchings/code/code_800E11F0/func_800E5E84.s deleted file mode 100644 index 461e1e76ea..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5E84.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800E5E84 -/* B5D024 800E5E84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D028 800E5E88 AFBF0014 */ sw $ra, 0x14($sp) -/* B5D02C 800E5E8C 0C0387CE */ jal func_800E1F38 -/* B5D030 800E5E90 00000000 */ nop -/* B5D034 800E5E94 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D038 800E5E98 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D03C 800E5E9C 03E00008 */ jr $ra -/* B5D040 800E5EA0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5EA4.s b/asm/non_matchings/code/code_800E11F0/func_800E5EA4.s deleted file mode 100644 index 46f25c3325..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5EA4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800E5EA4 -/* B5D044 800E5EA4 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5D048 800E5EA8 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5D04C 800E5EAC 8C6E2844 */ lw $t6, 0x2844($v1) -/* B5D050 800E5EB0 00041080 */ sll $v0, $a0, 2 -/* B5D054 800E5EB4 00441021 */ addu $v0, $v0, $a0 -/* B5D058 800E5EB8 00021080 */ sll $v0, $v0, 2 -/* B5D05C 800E5EBC 01C27821 */ addu $t7, $t6, $v0 -/* B5D060 800E5EC0 91F80002 */ lbu $t8, 2($t7) -/* B5D064 800E5EC4 ACB80000 */ sw $t8, ($a1) -/* B5D068 800E5EC8 8C792844 */ lw $t9, 0x2844($v1) -/* B5D06C 800E5ECC 03224021 */ addu $t0, $t9, $v0 -/* B5D070 800E5ED0 91090003 */ lbu $t1, 3($t0) -/* B5D074 800E5ED4 03E00008 */ jr $ra -/* B5D078 800E5ED8 ACC90000 */ sw $t1, ($a2) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s b/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s deleted file mode 100644 index eb9f2d4ff8..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800E5EDC -/* B5D07C 800E5EDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5D080 800E5EE0 AFBF0014 */ sw $ra, 0x14($sp) -/* B5D084 800E5EE4 3C048017 */ lui $a0, %hi(D_80174D64) # $a0, 0x8017 -/* B5D088 800E5EE8 8C844D64 */ lw $a0, %lo(D_80174D64)($a0) -/* B5D08C 800E5EEC 27A50018 */ addiu $a1, $sp, 0x18 -/* B5D090 800E5EF0 0C000CA0 */ jal osRecvMesg -/* B5D094 800E5EF4 00003025 */ move $a2, $zero -/* B5D098 800E5EF8 2401FFFF */ li $at, -1 -/* B5D09C 800E5EFC 14410003 */ bne $v0, $at, .L800E5F0C -/* B5D0A0 800E5F00 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D0A4 800E5F04 10000009 */ b .L800E5F2C -/* B5D0A8 800E5F08 00001025 */ move $v0, $zero -.L800E5F0C: -/* B5D0AC 800E5F0C 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3519) # $t7, 0x8017 -/* B5D0B0 800E5F10 91EF2699 */ lbu $t7, %lo(gAudioContext+0x3519)($t7) -/* B5D0B4 800E5F14 8FAE0018 */ lw $t6, 0x18($sp) -/* B5D0B8 800E5F18 24020001 */ li $v0, 1 -/* B5D0BC 800E5F1C 11CF0003 */ beq $t6, $t7, .L800E5F2C -/* B5D0C0 800E5F20 00000000 */ nop -/* B5D0C4 800E5F24 10000001 */ b .L800E5F2C -/* B5D0C8 800E5F28 2402FFFF */ li $v0, -1 -.L800E5F2C: -/* B5D0CC 800E5F2C 03E00008 */ jr $ra -/* B5D0D0 800E5F30 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5F34.s b/asm/non_matchings/code/code_800E11F0/func_800E5F34.s deleted file mode 100644 index 54c41ba909..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5F34.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800E5F34 -/* B5D0D4 800E5F34 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5D0D8 800E5F38 AFB1001C */ sw $s1, 0x1c($sp) -/* B5D0DC 800E5F3C AFB20020 */ sw $s2, 0x20($sp) -/* B5D0E0 800E5F40 AFB00018 */ sw $s0, 0x18($sp) -/* B5D0E4 800E5F44 3C118017 */ lui $s1, %hi(gAudioContext) # $s1, 0x8017 -/* B5D0E8 800E5F48 AFBF0024 */ sw $ra, 0x24($sp) -/* B5D0EC 800E5F4C 2631F180 */ addiu $s1, %lo(gAudioContext) # addiu $s1, $s1, -0xe80 -/* B5D0F0 800E5F50 2410FFFF */ li $s0, -1 -/* B5D0F4 800E5F54 27B20028 */ addiu $s2, $sp, 0x28 -/* B5D0F8 800E5F58 8E245BE4 */ lw $a0, 0x5be4($s1) -.L800E5F5C: -/* B5D0FC 800E5F5C 02402825 */ move $a1, $s2 -/* B5D100 800E5F60 0C000CA0 */ jal osRecvMesg -/* B5D104 800E5F64 00003025 */ move $a2, $zero -/* B5D108 800E5F68 5450FFFC */ bnel $v0, $s0, .L800E5F5C -/* B5D10C 800E5F6C 8E245BE4 */ lw $a0, 0x5be4($s1) -/* B5D110 800E5F70 8FBF0024 */ lw $ra, 0x24($sp) -/* B5D114 800E5F74 8FB00018 */ lw $s0, 0x18($sp) -/* B5D118 800E5F78 8FB1001C */ lw $s1, 0x1c($sp) -/* B5D11C 800E5F7C 8FB20020 */ lw $s2, 0x20($sp) -/* B5D120 800E5F80 03E00008 */ jr $ra -/* B5D124 800E5F84 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5F88.s b/asm/non_matchings/code/code_800E11F0/func_800E5F88.s deleted file mode 100644 index 52d1adb324..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E5F88.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_800E5F88 -/* B5D128 800E5F88 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5D12C 800E5F8C AFBF0014 */ sw $ra, 0x14($sp) -/* B5D130 800E5F90 0C0397CD */ jal func_800E5F34 -/* B5D134 800E5F94 AFA40028 */ sw $a0, 0x28($sp) -/* B5D138 800E5F98 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5D13C 800E5F9C 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5D140 800E5FA0 90623518 */ lbu $v0, 0x3518($v1) -/* B5D144 800E5FA4 10400014 */ beqz $v0, .L800E5FF8 -/* B5D148 800E5FA8 00000000 */ nop -/* B5D14C 800E5FAC 0C039704 */ jal func_800E5C10 -/* B5D150 800E5FB0 AFA20024 */ sw $v0, 0x24($sp) -/* B5D154 800E5FB4 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5D158 800E5FB8 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B5D15C 800E5FBC 8FA70028 */ lw $a3, 0x28($sp) -/* B5D160 800E5FC0 906E3519 */ lbu $t6, 0x3519($v1) -/* B5D164 800E5FC4 8FA20024 */ lw $v0, 0x24($sp) -/* B5D168 800E5FC8 14EE0003 */ bne $a3, $t6, .L800E5FD8 -/* B5D16C 800E5FCC 28410003 */ slti $at, $v0, 3 -/* B5D170 800E5FD0 10000010 */ b .L800E6014 -/* B5D174 800E5FD4 2402FFFE */ li $v0, -2 -.L800E5FD8: -/* B5D178 800E5FD8 14200004 */ bnez $at, .L800E5FEC -/* B5D17C 800E5FDC 27A50020 */ addiu $a1, $sp, 0x20 -/* B5D180 800E5FE0 A0673519 */ sb $a3, 0x3519($v1) -/* B5D184 800E5FE4 1000000B */ b .L800E6014 -/* B5D188 800E5FE8 2402FFFD */ li $v0, -3 -.L800E5FEC: -/* B5D18C 800E5FEC 8C645BE4 */ lw $a0, 0x5be4($v1) -/* B5D190 800E5FF0 0C000CA0 */ jal osRecvMesg -/* B5D194 800E5FF4 24060001 */ li $a2, 1 -.L800E5FF8: -/* B5D198 800E5FF8 0C0397CD */ jal func_800E5F34 -/* B5D19C 800E5FFC 00000000 */ nop -/* B5D1A0 800E6000 3C04F900 */ lui $a0, 0xf900 -/* B5D1A4 800E6004 0C0396BF */ jal func_800E5AFC -/* B5D1A8 800E6008 8FA50028 */ lw $a1, 0x28($sp) -/* B5D1AC 800E600C 0C0396E0 */ jal func_800E5B80 -/* B5D1B0 800E6010 00000000 */ nop -.L800E6014: -/* B5D1B4 800E6014 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D1B8 800E6018 27BD0028 */ addiu $sp, $sp, 0x28 -/* B5D1BC 800E601C 03E00008 */ jr $ra -/* B5D1C0 800E6020 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6024.s b/asm/non_matchings/code/code_800E11F0/func_800E6024.s deleted file mode 100644 index d45cc71883..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6024.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800E6024 -/* B5D1C4 800E6024 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D1C8 800E6028 3C0F8017 */ lui $t7, %hi(gAudioContext) # $t7, 0x8017 -/* B5D1CC 800E602C AFBF0014 */ sw $ra, 0x14($sp) -/* B5D1D0 800E6030 25EFF180 */ addiu $t7, %lo(gAudioContext) # addiu $t7, $t7, -0xe80 -/* B5D1D4 800E6034 240E0001 */ li $t6, 1 -/* B5D1D8 800E6038 ADEE2984 */ sw $t6, 0x2984($t7) -/* B5D1DC 800E603C 3C188013 */ lui $t8, %hi(D_801304D8) # $t8, 0x8013 -/* B5D1E0 800E6040 8F1804D8 */ lw $t8, %lo(D_801304D8)($t8) -/* B5D1E4 800E6044 53000007 */ beql $t8, $zero, .L800E6064 -/* B5D1E8 800E6048 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D1EC 800E604C 0C0397E2 */ jal func_800E5F88 -/* B5D1F0 800E6050 00002025 */ move $a0, $zero -/* B5D1F4 800E6054 3C198017 */ lui $t9, %hi(gAudioContext) # $t9, 0x8017 -/* B5D1F8 800E6058 2739F180 */ addiu $t9, %lo(gAudioContext) # addiu $t9, $t9, -0xe80 -/* B5D1FC 800E605C A3203518 */ sb $zero, 0x3518($t9) -/* B5D200 800E6060 8FBF0014 */ lw $ra, 0x14($sp) -.L800E6064: -/* B5D204 800E6064 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D208 800E6068 03E00008 */ jr $ra -/* B5D20C 800E606C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6070.s b/asm/non_matchings/code/code_800E11F0/func_800E6070.s deleted file mode 100644 index f0902de675..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6070.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800E6070 -/* B5D210 800E6070 00047080 */ sll $t6, $a0, 2 -/* B5D214 800E6074 01C47023 */ subu $t6, $t6, $a0 -/* B5D218 800E6078 000E7080 */ sll $t6, $t6, 2 -/* B5D21C 800E607C 01C47023 */ subu $t6, $t6, $a0 -/* B5D220 800E6080 3C0F8017 */ lui $t7, %hi(gAudioContext) # $t7, 0x8017 -/* B5D224 800E6084 25EFF180 */ addiu $t7, %lo(gAudioContext) # addiu $t7, $t7, -0xe80 -/* B5D228 800E6088 000E7140 */ sll $t6, $t6, 5 -/* B5D22C 800E608C 01CF1821 */ addu $v1, $t6, $t7 -/* B5D230 800E6090 8C783530 */ lw $t8, 0x3530($v1) -/* B5D234 800E6094 00054080 */ sll $t0, $a1, 2 -/* B5D238 800E6098 00684821 */ addu $t1, $v1, $t0 -/* B5D23C 800E609C 0018CFC2 */ srl $t9, $t8, 0x1f -/* B5D240 800E60A0 53200006 */ beql $t9, $zero, .L800E60BC -/* B5D244 800E60A4 2402FFFF */ li $v0, -1 -/* B5D248 800E60A8 8D243568 */ lw $a0, 0x3568($t1) -/* B5D24C 800E60AC 00865021 */ addu $t2, $a0, $a2 -/* B5D250 800E60B0 03E00008 */ jr $ra -/* B5D254 800E60B4 814200C4 */ lb $v0, 0xc4($t2) -/* B5D258 800E60B8 2402FFFF */ li $v0, -1 -.L800E60BC: -/* B5D25C 800E60BC 03E00008 */ jr $ra -/* B5D260 800E60C0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E60C4.s b/asm/non_matchings/code/code_800E11F0/func_800E60C4.s deleted file mode 100644 index e44cf42924..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E60C4.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800E60C4 -/* B5D264 800E60C4 00047080 */ sll $t6, $a0, 2 -/* B5D268 800E60C8 01C47023 */ subu $t6, $t6, $a0 -/* B5D26C 800E60CC 000E7080 */ sll $t6, $t6, 2 -/* B5D270 800E60D0 01C47023 */ subu $t6, $t6, $a0 -/* B5D274 800E60D4 000E7140 */ sll $t6, $t6, 5 -/* B5D278 800E60D8 01C57821 */ addu $t7, $t6, $a1 -/* B5D27C 800E60DC 3C028017 */ lui $v0, %hi(gAudioContext+0x3688) -/* B5D280 800E60E0 004F1021 */ addu $v0, $v0, $t7 -/* B5D284 800E60E4 03E00008 */ jr $ra -/* B5D288 800E60E8 80422808 */ lb $v0, %lo(gAudioContext+0x3688)($v0) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E60EC.s b/asm/non_matchings/code/code_800E11F0/func_800E60EC.s deleted file mode 100644 index 2028272111..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E60EC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800E60EC -/* B5D28C 800E60EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D290 800E60F0 00A03025 */ move $a2, $a1 -/* B5D294 800E60F4 00802825 */ move $a1, $a0 -/* B5D298 800E60F8 AFA40018 */ sw $a0, 0x18($sp) -/* B5D29C 800E60FC AFBF0014 */ sw $ra, 0x14($sp) -/* B5D2A0 800E6100 3C048017 */ lui $a0, %hi(gAudioContext+0x29a0) # $a0, 0x8017 -/* B5D2A4 800E6104 0C03790D */ jal Audio_SoundAllocPoolInit -/* B5D2A8 800E6108 24841B20 */ addiu $a0, %lo(gAudioContext+0x29a0) # addiu $a0, $a0, 0x1b20 -/* B5D2AC 800E610C 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D2B0 800E6110 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D2B4 800E6114 03E00008 */ jr $ra -/* B5D2B8 800E6118 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E611C.s b/asm/non_matchings/code/code_800E11F0/func_800E611C.s deleted file mode 100644 index 2f43f1c779..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E611C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800E611C -/* B5D2BC 800E611C 3C018017 */ lui $at, %hi(gAudioContext+0x29a0) -/* B5D2C0 800E6120 03E00008 */ jr $ra -/* B5D2C4 800E6124 AC201B20 */ sw $zero, %lo(gAudioContext+0x29a0)($at) - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6128.s b/asm/non_matchings/code/code_800E11F0/func_800E6128.s deleted file mode 100644 index 5535585b82..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6128.s +++ /dev/null @@ -1,136 +0,0 @@ -glabel func_800E6128 -/* B5D2C8 800E6128 90AE0000 */ lbu $t6, ($a1) -/* B5D2CC 800E612C 25CFFFBF */ addiu $t7, $t6, -0x41 -/* B5D2D0 800E6130 2DE1000E */ sltiu $at, $t7, 0xe -/* B5D2D4 800E6134 10200070 */ beqz $at, .L800E62F8 -/* B5D2D8 800E6138 000F7880 */ sll $t7, $t7, 2 -/* B5D2DC 800E613C 3C018015 */ lui $at, %hi(jtbl_8014954C) -/* B5D2E0 800E6140 002F0821 */ addu $at, $at, $t7 -/* B5D2E4 800E6144 8C2F954C */ lw $t7, %lo(jtbl_8014954C)($at) -/* B5D2E8 800E6148 01E00008 */ jr $t7 -/* B5D2EC 800E614C 00000000 */ nop -glabel L800E6150 -/* B5D2F0 800E6150 C4A00004 */ lwc1 $f0, 4($a1) -/* B5D2F4 800E6154 C484002C */ lwc1 $f4, 0x2c($a0) -/* B5D2F8 800E6158 46040032 */ c.eq.s $f0, $f4 -/* B5D2FC 800E615C 00000000 */ nop -/* B5D300 800E6160 45010065 */ bc1t .L800E62F8 -/* B5D304 800E6164 00000000 */ nop -/* B5D308 800E6168 90990000 */ lbu $t9, ($a0) -/* B5D30C 800E616C E480002C */ swc1 $f0, 0x2c($a0) -/* B5D310 800E6170 37280004 */ ori $t0, $t9, 4 -/* B5D314 800E6174 03E00008 */ jr $ra -/* B5D318 800E6178 A0880000 */ sb $t0, ($a0) -glabel L800E617C -/* B5D31C 800E617C 8CA90004 */ lw $t1, 4($a1) -/* B5D320 800E6180 00095080 */ sll $t2, $t1, 2 -/* B5D324 800E6184 01495023 */ subu $t2, $t2, $t1 -/* B5D328 800E6188 000A5100 */ sll $t2, $t2, 4 -/* B5D32C 800E618C 03E00008 */ jr $ra -/* B5D330 800E6190 A48A0008 */ sh $t2, 8($a0) -glabel L800E6194 -/* B5D334 800E6194 8CAB0004 */ lw $t3, 4($a1) -/* B5D338 800E6198 000B6080 */ sll $t4, $t3, 2 -/* B5D33C 800E619C 018B6023 */ subu $t4, $t4, $t3 -/* B5D340 800E61A0 000C6100 */ sll $t4, $t4, 4 -/* B5D344 800E61A4 03E00008 */ jr $ra -/* B5D348 800E61A8 A48C000C */ sh $t4, 0xc($a0) -glabel L800E61AC -/* B5D34C 800E61AC 8CAD0004 */ lw $t5, 4($a1) -/* B5D350 800E61B0 03E00008 */ jr $ra -/* B5D354 800E61B4 A48D000C */ sh $t5, 0xc($a0) -glabel L800E61B8 -/* B5D358 800E61B8 80AE0004 */ lb $t6, 4($a1) -/* B5D35C 800E61BC 03E00008 */ jr $ra -/* B5D360 800E61C0 A48E000E */ sh $t6, 0xe($a0) -glabel L800E61C4 -/* B5D364 800E61C4 90B80003 */ lbu $t8, 3($a1) -/* B5D368 800E61C8 80AF0004 */ lb $t7, 4($a1) -/* B5D36C 800E61CC 0098C821 */ addu $t9, $a0, $t8 -/* B5D370 800E61D0 03E00008 */ jr $ra -/* B5D374 800E61D4 A32F0158 */ sb $t7, 0x158($t9) -glabel L800E61D8 -/* B5D378 800E61D8 90A80002 */ lbu $t0, 2($a1) -/* B5D37C 800E61DC 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B5D380 800E61E0 44815000 */ mtc1 $at, $f10 -/* B5D384 800E61E4 44883000 */ mtc1 $t0, $f6 -/* B5D388 800E61E8 00000000 */ nop -/* B5D38C 800E61EC 46803220 */ cvt.s.w $f8, $f6 -/* B5D390 800E61F0 1000000A */ b .L800E621C -/* B5D394 800E61F4 460A4003 */ div.s $f0, $f8, $f10 -glabel L800E61F8 -/* B5D398 800E61F8 90A90002 */ lbu $t1, 2($a1) -/* B5D39C 800E61FC 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -/* B5D3A0 800E6200 44812000 */ mtc1 $at, $f4 -/* B5D3A4 800E6204 44898000 */ mtc1 $t1, $f16 -/* B5D3A8 800E6208 C488001C */ lwc1 $f8, 0x1c($a0) -/* B5D3AC 800E620C 468084A0 */ cvt.s.w $f18, $f16 -/* B5D3B0 800E6210 46049183 */ div.s $f6, $f18, $f4 -/* B5D3B4 800E6214 46083002 */ mul.s $f0, $f6, $f8 -/* B5D3B8 800E6218 00000000 */ nop -.L800E621C: -/* B5D3BC 800E621C 908A0001 */ lbu $t2, 1($a0) -/* B5D3C0 800E6220 24010002 */ li $at, 2 -/* B5D3C4 800E6224 11410034 */ beq $t2, $at, .L800E62F8 -/* B5D3C8 800E6228 00000000 */ nop -/* B5D3CC 800E622C C482001C */ lwc1 $f2, 0x1c($a0) -/* B5D3D0 800E6230 E4820024 */ swc1 $f2, 0x24($a0) -/* B5D3D4 800E6234 8CA20004 */ lw $v0, 4($a1) -/* B5D3D8 800E6238 54400004 */ bnezl $v0, .L800E624C -/* B5D3DC 800E623C 44828000 */ mtc1 $v0, $f16 -/* B5D3E0 800E6240 03E00008 */ jr $ra -/* B5D3E4 800E6244 E480001C */ swc1 $f0, 0x1c($a0) -/* B5D3E8 800E6248 44828000 */ mtc1 $v0, $f16 -.L800E624C: -/* B5D3EC 800E624C 46020281 */ sub.s $f10, $f0, $f2 -/* B5D3F0 800E6250 A0800001 */ sb $zero, 1($a0) -/* B5D3F4 800E6254 A4820012 */ sh $v0, 0x12($a0) -/* B5D3F8 800E6258 468084A0 */ cvt.s.w $f18, $f16 -/* B5D3FC 800E625C 46125103 */ div.s $f4, $f10, $f18 -/* B5D400 800E6260 03E00008 */ jr $ra -/* B5D404 800E6264 E4840020 */ swc1 $f4, 0x20($a0) -glabel L800E6268 -/* B5D408 800E6268 908B0001 */ lbu $t3, 1($a0) -/* B5D40C 800E626C 24010002 */ li $at, 2 -/* B5D410 800E6270 11610021 */ beq $t3, $at, .L800E62F8 -/* B5D414 800E6274 00000000 */ nop -/* B5D418 800E6278 8CA20004 */ lw $v0, 4($a1) -/* B5D41C 800E627C 54400005 */ bnezl $v0, .L800E6294 -/* B5D420 800E6280 44829000 */ mtc1 $v0, $f18 -/* B5D424 800E6284 C4860024 */ lwc1 $f6, 0x24($a0) -/* B5D428 800E6288 03E00008 */ jr $ra -/* B5D42C 800E628C E486001C */ swc1 $f6, 0x1c($a0) -/* B5D430 800E6290 44829000 */ mtc1 $v0, $f18 -.L800E6294: -/* B5D434 800E6294 C4880024 */ lwc1 $f8, 0x24($a0) -/* B5D438 800E6298 C490001C */ lwc1 $f16, 0x1c($a0) -/* B5D43C 800E629C 46809120 */ cvt.s.w $f4, $f18 -/* B5D440 800E62A0 A0800001 */ sb $zero, 1($a0) -/* B5D444 800E62A4 A4820012 */ sh $v0, 0x12($a0) -/* B5D448 800E62A8 46104281 */ sub.s $f10, $f8, $f16 -/* B5D44C 800E62AC 46045183 */ div.s $f6, $f10, $f4 -/* B5D450 800E62B0 03E00008 */ jr $ra -/* B5D454 800E62B4 E4860020 */ swc1 $f6, 0x20($a0) -glabel L800E62B8 -/* B5D458 800E62B8 C4A80004 */ lwc1 $f8, 4($a1) -/* B5D45C 800E62BC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B5D460 800E62C0 44818000 */ mtc1 $at, $f16 -/* B5D464 800E62C4 E4880034 */ swc1 $f8, 0x34($a0) -/* B5D468 800E62C8 C4920034 */ lwc1 $f18, 0x34($a0) -/* B5D46C 800E62CC 46128032 */ c.eq.s $f16, $f18 -/* B5D470 800E62D0 00000000 */ nop -/* B5D474 800E62D4 45020006 */ bc1fl .L800E62F0 -/* B5D478 800E62D8 90980000 */ lbu $t8, ($a0) -/* B5D47C 800E62DC 908C0000 */ lbu $t4, ($a0) -/* B5D480 800E62E0 318DFFFE */ andi $t5, $t4, 0xfffe -/* B5D484 800E62E4 03E00008 */ jr $ra -/* B5D488 800E62E8 A08D0000 */ sb $t5, ($a0) -/* B5D48C 800E62EC 90980000 */ lbu $t8, ($a0) -.L800E62F0: -/* B5D490 800E62F0 370F0001 */ ori $t7, $t8, 1 -/* B5D494 800E62F4 A08F0000 */ sb $t7, ($a0) -.L800E62F8: -glabel L800E62F8 -/* B5D498 800E62F8 03E00008 */ jr $ra -/* B5D49C 800E62FC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6300.s b/asm/non_matchings/code/code_800E11F0/func_800E6300.s deleted file mode 100644 index 4d1f4ead42..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6300.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_800E6300 -/* B5D4A0 800E6300 90AE0000 */ lbu $t6, ($a1) -/* B5D4A4 800E6304 25CFFFFF */ addiu $t7, $t6, -1 -/* B5D4A8 800E6308 2DE1000E */ sltiu $at, $t7, 0xe -/* B5D4AC 800E630C 10200066 */ beqz $at, .L800E64A8 -/* B5D4B0 800E6310 000F7880 */ sll $t7, $t7, 2 -/* B5D4B4 800E6314 3C018015 */ lui $at, %hi(jtbl_80149584) -/* B5D4B8 800E6318 002F0821 */ addu $at, $at, $t7 -/* B5D4BC 800E631C 8C2F9584 */ lw $t7, %lo(jtbl_80149584)($at) -/* B5D4C0 800E6320 01E00008 */ jr $t7 -/* B5D4C4 800E6324 00000000 */ nop -glabel L800E6328 -/* B5D4C8 800E6328 C4A00004 */ lwc1 $f0, 4($a1) -/* B5D4CC 800E632C C4840028 */ lwc1 $f4, 0x28($a0) -/* B5D4D0 800E6330 46040032 */ c.eq.s $f0, $f4 -/* B5D4D4 800E6334 00000000 */ nop -/* B5D4D8 800E6338 4501005B */ bc1t .L800E64A8 -/* B5D4DC 800E633C 00000000 */ nop -/* B5D4E0 800E6340 90990001 */ lbu $t9, 1($a0) -/* B5D4E4 800E6344 E4800028 */ swc1 $f0, 0x28($a0) -/* B5D4E8 800E6348 37280040 */ ori $t0, $t9, 0x40 -/* B5D4EC 800E634C 03E00008 */ jr $ra -/* B5D4F0 800E6350 A0880001 */ sb $t0, 1($a0) -glabel L800E6354 -/* B5D4F4 800E6354 C4A00004 */ lwc1 $f0, 4($a1) -/* B5D4F8 800E6358 C486002C */ lwc1 $f6, 0x2c($a0) -/* B5D4FC 800E635C 46060032 */ c.eq.s $f0, $f6 -/* B5D500 800E6360 00000000 */ nop -/* B5D504 800E6364 45010050 */ bc1t .L800E64A8 -/* B5D508 800E6368 00000000 */ nop -/* B5D50C 800E636C 908A0001 */ lbu $t2, 1($a0) -/* B5D510 800E6370 E480002C */ swc1 $f0, 0x2c($a0) -/* B5D514 800E6374 354B0040 */ ori $t3, $t2, 0x40 -/* B5D518 800E6378 03E00008 */ jr $ra -/* B5D51C 800E637C A08B0001 */ sb $t3, 1($a0) -glabel L800E6380 -/* B5D520 800E6380 80A20004 */ lb $v0, 4($a1) -/* B5D524 800E6384 908C000A */ lbu $t4, 0xa($a0) -/* B5D528 800E6388 104C0047 */ beq $v0, $t4, .L800E64A8 -/* B5D52C 800E638C 00000000 */ nop -/* B5D530 800E6390 908E0001 */ lbu $t6, 1($a0) -/* B5D534 800E6394 A082000A */ sb $v0, 0xa($a0) -/* B5D538 800E6398 35CF0020 */ ori $t7, $t6, 0x20 -/* B5D53C 800E639C 03E00008 */ jr $ra -/* B5D540 800E63A0 A08F0001 */ sb $t7, 1($a0) -glabel L800E63A4 -/* B5D544 800E63A4 80A20004 */ lb $v0, 4($a1) -/* B5D548 800E63A8 9098000A */ lbu $t8, 0xa($a0) -/* B5D54C 800E63AC 1058003E */ beq $v0, $t8, .L800E64A8 -/* B5D550 800E63B0 00000000 */ nop -/* B5D554 800E63B4 90880001 */ lbu $t0, 1($a0) -/* B5D558 800E63B8 A082000B */ sb $v0, 0xb($a0) -/* B5D55C 800E63BC 35090020 */ ori $t1, $t0, 0x20 -/* B5D560 800E63C0 03E00008 */ jr $ra -/* B5D564 800E63C4 A0890001 */ sb $t1, 1($a0) -glabel L800E63C8 -/* B5D568 800E63C8 C4A00004 */ lwc1 $f0, 4($a1) -/* B5D56C 800E63CC C4880038 */ lwc1 $f8, 0x38($a0) -/* B5D570 800E63D0 46080032 */ c.eq.s $f0, $f8 -/* B5D574 800E63D4 00000000 */ nop -/* B5D578 800E63D8 45010033 */ bc1t .L800E64A8 -/* B5D57C 800E63DC 00000000 */ nop -/* B5D580 800E63E0 908B0001 */ lbu $t3, 1($a0) -/* B5D584 800E63E4 E4800038 */ swc1 $f0, 0x38($a0) -/* B5D588 800E63E8 356C0080 */ ori $t4, $t3, 0x80 -/* B5D58C 800E63EC 03E00008 */ jr $ra -/* B5D590 800E63F0 A08C0001 */ sb $t4, 1($a0) -glabel L800E63F4 -/* B5D594 800E63F4 80A20004 */ lb $v0, 4($a1) -/* B5D598 800E63F8 908D0004 */ lbu $t5, 4($a0) -/* B5D59C 800E63FC 104D002A */ beq $v0, $t5, .L800E64A8 -/* B5D5A0 800E6400 00000000 */ nop -/* B5D5A4 800E6404 03E00008 */ jr $ra -/* B5D5A8 800E6408 A0820004 */ sb $v0, 4($a0) -glabel L800E640C -/* B5D5AC 800E640C 90A20003 */ lbu $v0, 3($a1) -/* B5D5B0 800E6410 28410008 */ slti $at, $v0, 8 -/* B5D5B4 800E6414 10200024 */ beqz $at, .L800E64A8 -/* B5D5B8 800E6418 00000000 */ nop -/* B5D5BC 800E641C 80AE0004 */ lb $t6, 4($a1) -/* B5D5C0 800E6420 00827821 */ addu $t7, $a0, $v0 -/* B5D5C4 800E6424 03E00008 */ jr $ra -/* B5D5C8 800E6428 A1EE00C4 */ sb $t6, 0xc4($t7) -glabel L800E642C -/* B5D5CC 800E642C 80B90004 */ lb $t9, 4($a1) -/* B5D5D0 800E6430 908A0000 */ lbu $t2, ($a0) -/* B5D5D4 800E6434 00194100 */ sll $t0, $t9, 4 -/* B5D5D8 800E6438 31090010 */ andi $t1, $t0, 0x10 -/* B5D5DC 800E643C 314BFFEF */ andi $t3, $t2, 0xffef -/* B5D5E0 800E6440 012B6025 */ or $t4, $t1, $t3 -/* B5D5E4 800E6444 03E00008 */ jr $ra -/* B5D5E8 800E6448 A08C0000 */ sb $t4, ($a0) -glabel L800E644C -/* B5D5EC 800E644C 80AD0004 */ lb $t5, 4($a1) -/* B5D5F0 800E6450 03E00008 */ jr $ra -/* B5D5F4 800E6454 A08D0003 */ sb $t5, 3($a0) -glabel L800E6458 -/* B5D5F8 800E6458 90AE0004 */ lbu $t6, 4($a1) -/* B5D5FC 800E645C 24180001 */ li $t8, 1 -/* B5D600 800E6460 A498001A */ sh $t8, 0x1a($a0) -/* B5D604 800E6464 000E78C0 */ sll $t7, $t6, 3 -/* B5D608 800E6468 03E00008 */ jr $ra -/* B5D60C 800E646C A48F0016 */ sh $t7, 0x16($a0) -glabel L800E6470 -/* B5D610 800E6470 90B90004 */ lbu $t9, 4($a1) -/* B5D614 800E6474 240A0001 */ li $t2, 1 -/* B5D618 800E6478 A48A0018 */ sh $t2, 0x18($a0) -/* B5D61C 800E647C 00194140 */ sll $t0, $t9, 5 -/* B5D620 800E6480 03E00008 */ jr $ra -/* B5D624 800E6484 A4880014 */ sh $t0, 0x14($a0) -glabel L800E6488 -/* B5D628 800E6488 90A90004 */ lbu $t1, 4($a1) -/* B5D62C 800E648C 03E00008 */ jr $ra -/* B5D630 800E6490 A089000F */ sb $t1, 0xf($a0) -glabel L800E6494 -/* B5D634 800E6494 94AB0004 */ lhu $t3, 4($a1) -/* B5D638 800E6498 03E00008 */ jr $ra -/* B5D63C 800E649C A48B0020 */ sh $t3, 0x20($a0) -glabel L800E64A0 -/* B5D640 800E64A0 90AC0004 */ lbu $t4, 4($a1) -/* B5D644 800E64A4 A08C00D0 */ sb $t4, 0xd0($a0) -.L800E64A8: -/* B5D648 800E64A8 03E00008 */ jr $ra -/* B5D64C 800E64AC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E64B0.s b/asm/non_matchings/code/code_800E11F0/func_800E64B0.s deleted file mode 100644 index 2933c7307a..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E64B0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_800E64B0 -/* B5D650 800E64B0 308E00FF */ andi $t6, $a0, 0xff -/* B5D654 800E64B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D658 800E64B8 000E7C00 */ sll $t7, $t6, 0x10 -/* B5D65C 800E64BC 3C01FA00 */ lui $at, 0xfa00 -/* B5D660 800E64C0 30A800FF */ andi $t0, $a1, 0xff -/* B5D664 800E64C4 00084A00 */ sll $t1, $t0, 8 -/* B5D668 800E64C8 01E1C025 */ or $t8, $t7, $at -/* B5D66C 800E64CC AFBF0014 */ sw $ra, 0x14($sp) -/* B5D670 800E64D0 AFA5001C */ sw $a1, 0x1c($sp) -/* B5D674 800E64D4 03095025 */ or $t2, $t8, $t1 -/* B5D678 800E64D8 30CB00FF */ andi $t3, $a2, 0xff -/* B5D67C 800E64DC 014B2025 */ or $a0, $t2, $t3 -/* B5D680 800E64E0 0C0396BF */ jal func_800E5AFC -/* B5D684 800E64E4 24050001 */ li $a1, 1 -/* B5D688 800E64E8 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D68C 800E64EC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D690 800E64F0 03E00008 */ jr $ra -/* B5D694 800E64F4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E64F8.s b/asm/non_matchings/code/code_800E11F0/func_800E64F8.s deleted file mode 100644 index c1c028bde6..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E64F8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800E64F8 -/* B5D698 800E64F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D69C 800E64FC AFBF0014 */ sw $ra, 0x14($sp) -/* B5D6A0 800E6500 3C04FA00 */ lui $a0, 0xfa00 -/* B5D6A4 800E6504 0C0396BF */ jal func_800E5AFC -/* B5D6A8 800E6508 00002825 */ move $a1, $zero -/* B5D6AC 800E650C 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D6B0 800E6510 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D6B4 800E6514 03E00008 */ jr $ra -/* B5D6B8 800E6518 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E651C.s b/asm/non_matchings/code/code_800E11F0/func_800E651C.s deleted file mode 100644 index a5513f5cd2..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E651C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800E651C -/* B5D6BC 800E651C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D6C0 800E6520 00A03025 */ move $a2, $a1 -/* B5D6C4 800E6524 00802825 */ move $a1, $a0 -/* B5D6C8 800E6528 AFA40018 */ sw $a0, 0x18($sp) -/* B5D6CC 800E652C AFBF0014 */ sw $ra, 0x14($sp) -/* B5D6D0 800E6530 30C400FF */ andi $a0, $a2, 0xff -/* B5D6D4 800E6534 3C01FD00 */ lui $at, 0xfd00 -/* B5D6D8 800E6538 0C0396BF */ jal func_800E5AFC -/* B5D6DC 800E653C 00812025 */ or $a0, $a0, $at -/* B5D6E0 800E6540 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D6E4 800E6544 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D6E8 800E6548 03E00008 */ jr $ra -/* B5D6EC 800E654C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6550.s b/asm/non_matchings/code/code_800E11F0/func_800E6550.s deleted file mode 100644 index 30986d9b0c..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6550.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800E6550 -/* B5D6F0 800E6550 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D6F4 800E6554 AFBF0014 */ sw $ra, 0x14($sp) -/* B5D6F8 800E6558 3C048017 */ lui $a0, %hi(D_80174D68) # $a0, 0x8017 -/* B5D6FC 800E655C 8C844D68 */ lw $a0, %lo(D_80174D68)($a0) -/* B5D700 800E6560 00002825 */ move $a1, $zero -/* B5D704 800E6564 0C000CA0 */ jal osRecvMesg -/* B5D708 800E6568 00003025 */ move $a2, $zero -/* B5D70C 800E656C 3C048017 */ lui $a0, %hi(D_80174D68) # $a0, 0x8017 -/* B5D710 800E6570 8C844D68 */ lw $a0, %lo(D_80174D68)($a0) -/* B5D714 800E6574 00002825 */ move $a1, $zero -/* B5D718 800E6578 0C000CA0 */ jal osRecvMesg -/* B5D71C 800E657C 24060001 */ li $a2, 1 -/* B5D720 800E6580 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D724 800E6584 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D728 800E6588 03E00008 */ jr $ra -/* B5D72C 800E658C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6680.s b/asm/non_matchings/code/code_800E11F0/func_800E6680.s deleted file mode 100644 index 17033599a0..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6680.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800E6680 -/* B5D820 800E6680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D824 800E6684 AFBF0014 */ sw $ra, 0x14($sp) -/* B5D828 800E6688 0C0399B0 */ jal func_800E66C0 -/* B5D82C 800E668C 00002025 */ move $a0, $zero -/* B5D830 800E6690 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D834 800E6694 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D838 800E6698 03E00008 */ jr $ra -/* B5D83C 800E669C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E66A0.s b/asm/non_matchings/code/code_800E11F0/func_800E66A0.s deleted file mode 100644 index 0a78498d59..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E66A0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800E66A0 -/* B5D840 800E66A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D844 800E66A4 AFBF0014 */ sw $ra, 0x14($sp) -/* B5D848 800E66A8 0C0399B0 */ jal func_800E66C0 -/* B5D84C 800E66AC 24040002 */ li $a0, 2 -/* B5D850 800E66B0 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D854 800E66B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D858 800E66B8 03E00008 */ jr $ra -/* B5D85C 800E66BC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E66C0.s b/asm/non_matchings/code/code_800E11F0/func_800E66C0.s deleted file mode 100644 index 086847c723..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E66C0.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_800E66C0 -/* B5D860 800E66C0 3C0A8017 */ lui $t2, %hi(gAudioContext) # $t2, 0x8017 -/* B5D864 800E66C4 254AF180 */ addiu $t2, %lo(gAudioContext) # addiu $t2, $t2, -0xe80 -/* B5D868 800E66C8 8D452894 */ lw $a1, 0x2894($t2) -/* B5D86C 800E66CC 27BDFFF8 */ addiu $sp, $sp, -8 -/* B5D870 800E66D0 AFB00004 */ sw $s0, 4($sp) -/* B5D874 800E66D4 00808025 */ move $s0, $a0 -/* B5D878 800E66D8 18A00035 */ blez $a1, .L800E67B0 -/* B5D87C 800E66DC 00001825 */ move $v1, $zero -/* B5D880 800E66E0 00002025 */ move $a0, $zero -/* B5D884 800E66E4 240B0001 */ li $t3, 1 -/* B5D888 800E66E8 8D4E352C */ lw $t6, 0x352c($t2) -.L800E66EC: -/* B5D88C 800E66EC 008E1021 */ addu $v0, $a0, $t6 -/* B5D890 800E66F0 8C4F00C0 */ lw $t7, 0xc0($v0) -/* B5D894 800E66F4 248400E0 */ addiu $a0, $a0, 0xe0 -/* B5D898 800E66F8 24460030 */ addiu $a2, $v0, 0x30 -/* B5D89C 800E66FC 000FC7C2 */ srl $t8, $t7, 0x1f -/* B5D8A0 800E6700 53000026 */ beql $t8, $zero, .L800E679C -/* B5D8A4 800E6704 000510C0 */ sll $v0, $a1, 3 -/* B5D8A8 800E6708 90C90040 */ lbu $t1, 0x40($a2) -/* B5D8AC 800E670C 2A010002 */ slti $at, $s0, 2 -/* B5D8B0 800E6710 3139000F */ andi $t9, $t1, 0xf -/* B5D8B4 800E6714 53200021 */ beql $t9, $zero, .L800E679C -/* B5D8B8 800E6718 000510C0 */ sll $v0, $a1, 3 -/* B5D8BC 800E671C 14200016 */ bnez $at, .L800E6778 -/* B5D8C0 800E6720 244700C0 */ addiu $a3, $v0, 0xc0 -/* B5D8C4 800E6724 8CE80010 */ lw $t0, 0x10($a3) -/* B5D8C8 800E6728 000510C0 */ sll $v0, $a1, 3 -/* B5D8CC 800E672C 00451023 */ subu $v0, $v0, $a1 -/* B5D8D0 800E6730 11000005 */ beqz $t0, .L800E6748 -/* B5D8D4 800E6734 00000000 */ nop -/* B5D8D8 800E6738 8CEC0000 */ lw $t4, ($a3) -/* B5D8DC 800E673C 000C7340 */ sll $t6, $t4, 0xd -/* B5D8E0 800E6740 05C30004 */ bgezl $t6, .L800E6754 -/* B5D8E4 800E6744 8D0F0000 */ lw $t7, ($t0) -.L800E6748: -/* B5D8E8 800E6748 10000016 */ b .L800E67A4 -/* B5D8EC 800E674C 00021140 */ sll $v0, $v0, 5 -/* B5D8F0 800E6750 8D0F0000 */ lw $t7, ($t0) -.L800E6754: -/* B5D8F4 800E6754 000510C0 */ sll $v0, $a1, 3 -/* B5D8F8 800E6758 00451023 */ subu $v0, $v0, $a1 -/* B5D8FC 800E675C 8DF80000 */ lw $t8, ($t7) -/* B5D900 800E6760 0018C900 */ sll $t9, $t8, 4 -/* B5D904 800E6764 00196782 */ srl $t4, $t9, 0x1e -/* B5D908 800E6768 55800004 */ bnezl $t4, .L800E677C -/* B5D90C 800E676C 320D0001 */ andi $t5, $s0, 1 -/* B5D910 800E6770 1000000C */ b .L800E67A4 -/* B5D914 800E6774 00021140 */ sll $v0, $v0, 5 -.L800E6778: -/* B5D918 800E6778 320D0001 */ andi $t5, $s0, 1 -.L800E677C: -/* B5D91C 800E677C 156D0006 */ bne $t3, $t5, .L800E6798 -/* B5D920 800E6780 24630001 */ addiu $v1, $v1, 1 -/* B5D924 800E6784 C5442864 */ lwc1 $f4, 0x2864($t2) -/* B5D928 800E6788 352F0010 */ ori $t7, $t1, 0x10 -/* B5D92C 800E678C A0CF0040 */ sb $t7, 0x40($a2) -/* B5D930 800E6790 E4C4004C */ swc1 $f4, 0x4c($a2) -/* B5D934 800E6794 8D452894 */ lw $a1, 0x2894($t2) -.L800E6798: -/* B5D938 800E6798 000510C0 */ sll $v0, $a1, 3 -.L800E679C: -/* B5D93C 800E679C 00451023 */ subu $v0, $v0, $a1 -/* B5D940 800E67A0 00021140 */ sll $v0, $v0, 5 -.L800E67A4: -/* B5D944 800E67A4 0082082A */ slt $at, $a0, $v0 -/* B5D948 800E67A8 5420FFD0 */ bnezl $at, .L800E66EC -/* B5D94C 800E67AC 8D4E352C */ lw $t6, 0x352c($t2) -.L800E67B0: -/* B5D950 800E67B0 8FB00004 */ lw $s0, 4($sp) -/* B5D954 800E67B4 27BD0008 */ addiu $sp, $sp, 8 -/* B5D958 800E67B8 03E00008 */ jr $ra -/* B5D95C 800E67BC 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6818.s b/asm/non_matchings/code/code_800E11F0/func_800E6818.s deleted file mode 100644 index e14ea51558..0000000000 --- a/asm/non_matchings/code/code_800E11F0/func_800E6818.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800E6818 -/* B5D9B8 800E6818 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5D9BC 800E681C AFBF0014 */ sw $ra, 0x14($sp) -/* B5D9C0 800E6820 0C03967D */ jal func_800E59F4 -/* B5D9C4 800E6824 00000000 */ nop -/* B5D9C8 800E6828 8FBF0014 */ lw $ra, 0x14($sp) -/* B5D9CC 800E682C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B5D9D0 800E6830 03E00008 */ jr $ra -/* B5D9D4 800E6834 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5000.s b/asm/non_matchings/code/code_800E4FE0/func_800E5000.s similarity index 98% rename from asm/non_matchings/code/code_800E11F0/func_800E5000.s rename to asm/non_matchings/code/code_800E4FE0/func_800E5000.s index 0757b56beb..39ba6892ac 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E5000.s +++ b/asm/non_matchings/code/code_800E4FE0/func_800E5000.s @@ -180,7 +180,7 @@ glabel func_800E5000 .L800E527C: /* B5C41C 800E527C 0C03847C */ jal func_800E11F0 /* B5C420 800E5280 AE4028A0 */ sw $zero, 0x28a0($s2) -/* B5C424 800E5284 0C038BFB */ jal func_800E2FEC +/* B5C424 800E5284 0C038BFB */ jal Audio_ProcessLoads /* B5C428 800E5288 92443518 */ lbu $a0, 0x3518($s2) /* B5C42C 800E528C 0C0393D6 */ jal func_800E4F58 /* B5C430 800E5290 00000000 */ nop @@ -272,7 +272,7 @@ glabel func_800E5000 /* B5C570 800E53D0 1041000B */ beq $v0, $at, .L800E5400 /* B5C574 800E53D4 00000000 */ nop .L800E53D8: -/* B5C578 800E53D8 0C03975B */ jal func_800E5D6C +/* B5C578 800E53D8 0C03975B */ jal Audio_ProcessCmds /* B5C57C 800E53DC 8FA4004C */ lw $a0, 0x4c($sp) /* B5C580 800E53E0 8E445BEC */ lw $a0, 0x5bec($s2) /* B5C584 800E53E4 02202825 */ move $a1, $s1 @@ -288,14 +288,14 @@ glabel func_800E5000 /* B5C5A8 800E5408 92495BDA */ lbu $t1, 0x5bda($s2) /* B5C5AC 800E540C 51200004 */ beql $t1, $zero, .L800E5420 /* B5C5B0 800E5410 8FA8003C */ lw $t0, 0x3c($sp) -/* B5C5B4 800E5414 0C0396E0 */ jal func_800E5B80 +/* B5C5B4 800E5414 0C0396E0 */ jal Audio_ScheduleProcessCmds /* B5C5B8 800E5418 00000000 */ nop /* B5C5BC 800E541C 8FA8003C */ lw $t0, 0x3c($sp) .L800E5420: /* B5C5C0 800E5420 8E4428B4 */ lw $a0, 0x28b4($s2) /* B5C5C4 800E5424 27A50068 */ addiu $a1, $sp, 0x68 /* B5C5C8 800E5428 8FA60058 */ lw $a2, 0x58($sp) -/* B5C5CC 800E542C 0C036C31 */ jal func_800DB0C4 +/* B5C5CC 800E542C 0C036C31 */ jal AudioSynth_Update /* B5C5D0 800E5430 85072974 */ lh $a3, 0x2974($t0) /* B5C5D4 800E5434 0C001BA8 */ jal osGetCount /* B5C5D8 800E5438 AE4228B4 */ sw $v0, 0x28b4($s2) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E6590.s b/asm/non_matchings/code/code_800E4FE0/func_800E6590.s similarity index 100% rename from asm/non_matchings/code/code_800E11F0/func_800E6590.s rename to asm/non_matchings/code/code_800E4FE0/func_800E6590.s diff --git a/asm/non_matchings/code/code_800EC960/func_800EC960.s b/asm/non_matchings/code/code_800EC960/func_800EC960.s deleted file mode 100644 index 2c05b1bcab..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EC960.s +++ /dev/null @@ -1,54 +0,0 @@ -.rdata -glabel D_80149C60 - .asciz "AUDIO : Ocarina Control Assign Normal\n" - .balign 4 - -glabel D_80149C88 - .asciz "AUDIO : Ocarina Control Assign Custom\n" - .balign 4 - -.text -glabel func_800EC960 -/* B63B00 800EC960 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B63B04 800EC964 AFA40018 */ sw $a0, 0x18($sp) -/* B63B08 800EC968 308400FF */ andi $a0, $a0, 0xff -/* B63B0C 800EC96C 14800011 */ bnez $a0, .L800EC9B4 -/* B63B10 800EC970 AFBF0014 */ sw $ra, 0x14($sp) -/* B63B14 800EC974 3C048015 */ lui $a0, %hi(D_80149C60) # $a0, 0x8015 -/* B63B18 800EC978 0C00084C */ jal osSyncPrintf -/* B63B1C 800EC97C 24849C60 */ addiu $a0, %lo(D_80149C60) # addiu $a0, $a0, -0x63a0 -/* B63B20 800EC980 340E800F */ li $t6, 32783 -/* B63B24 800EC984 3C018013 */ lui $at, %hi(D_80130EFC) # $at, 0x8013 -/* B63B28 800EC988 AC2E0EFC */ sw $t6, %lo(D_80130EFC)($at) -/* B63B2C 800EC98C 3C018013 */ lui $at, %hi(D_80130F00) # $at, 0x8013 -/* B63B30 800EC990 340F8000 */ li $t7, 32768 -/* B63B34 800EC994 AC2F0F00 */ sw $t7, %lo(D_80130F00)($at) -/* B63B38 800EC998 3C018013 */ lui $at, %hi(D_80130F04) # $at, 0x8013 -/* B63B3C 800EC99C 24180008 */ li $t8, 8 -/* B63B40 800EC9A0 AC380F04 */ sw $t8, %lo(D_80130F04)($at) -/* B63B44 800EC9A4 3C018013 */ lui $at, %hi(D_80130F08) # $at, 0x8013 -/* B63B48 800EC9A8 24190004 */ li $t9, 4 -/* B63B4C 800EC9AC 10000010 */ b .L800EC9F0 -/* B63B50 800EC9B0 AC390F08 */ sw $t9, %lo(D_80130F08)($at) -.L800EC9B4: -/* B63B54 800EC9B4 3C048015 */ lui $a0, %hi(D_80149C88) # $a0, 0x8015 -/* B63B58 800EC9B8 0C00084C */ jal osSyncPrintf -/* B63B5C 800EC9BC 24849C88 */ addiu $a0, %lo(D_80149C88) # addiu $a0, $a0, -0x6378 -/* B63B60 800EC9C0 3408C007 */ li $t0, 49159 -/* B63B64 800EC9C4 3C018013 */ lui $at, %hi(D_80130EFC) # $at, 0x8013 -/* B63B68 800EC9C8 AC280EFC */ sw $t0, %lo(D_80130EFC)($at) -/* B63B6C 800EC9CC 3C018013 */ lui $at, %hi(D_80130F00) # $at, 0x8013 -/* B63B70 800EC9D0 24094000 */ li $t1, 16384 -/* B63B74 800EC9D4 AC290F00 */ sw $t1, %lo(D_80130F00)($at) -/* B63B78 800EC9D8 3C018013 */ lui $at, %hi(D_80130F04) # $at, 0x8013 -/* B63B7C 800EC9DC 240A0004 */ li $t2, 4 -/* B63B80 800EC9E0 AC2A0F04 */ sw $t2, %lo(D_80130F04)($at) -/* B63B84 800EC9E4 3C018013 */ lui $at, %hi(D_80130F08) # $at, 0x8013 -/* B63B88 800EC9E8 340B8000 */ li $t3, 32768 -/* B63B8C 800EC9EC AC2B0F08 */ sw $t3, %lo(D_80130F08)($at) -.L800EC9F0: -/* B63B90 800EC9F0 8FBF0014 */ lw $ra, 0x14($sp) -/* B63B94 800EC9F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B63B98 800EC9F8 03E00008 */ jr $ra -/* B63B9C 800EC9FC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECA00.s b/asm/non_matchings/code/code_800EC960/func_800ECA00.s deleted file mode 100644 index 8f4ebd6047..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECA00.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800ECA00 -/* B63BA0 800ECA00 3C0E8017 */ lui $t6, %hi(D_8016BA0C) # $t6, 0x8017 -/* B63BA4 800ECA04 8DCEBA0C */ lw $t6, %lo(D_8016BA0C)($t6) -/* B63BA8 800ECA08 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B63BAC 800ECA0C AFBF0014 */ sw $ra, 0x14($sp) -/* B63BB0 800ECA10 3C048016 */ lui $a0, %hi(gPadMgr) # $a0, 0x8016 -/* B63BB4 800ECA14 248468C0 */ addiu $a0, %lo(gPadMgr) # addiu $a0, $a0, 0x68c0 -/* B63BB8 800ECA18 27A50020 */ addiu $a1, $sp, 0x20 -/* B63BBC 800ECA1C 00003025 */ move $a2, $zero -/* B63BC0 800ECA20 0C031F82 */ jal PadMgr_RequestPadData -/* B63BC4 800ECA24 AFAE0018 */ sw $t6, 0x18($sp) -/* B63BC8 800ECA28 97AF0020 */ lhu $t7, 0x20($sp) -/* B63BCC 800ECA2C 8FB80018 */ lw $t8, 0x18($sp) -/* B63BD0 800ECA30 3C018017 */ lui $at, %hi(D_8016BA0C) # $at, 0x8017 -/* B63BD4 800ECA34 AC2FBA0C */ sw $t7, %lo(D_8016BA0C)($at) -/* B63BD8 800ECA38 8FBF0014 */ lw $ra, 0x14($sp) -/* B63BDC 800ECA3C 3C018017 */ lui $at, %hi(D_8016BA14) # $at, 0x8017 -/* B63BE0 800ECA40 83B90034 */ lb $t9, 0x34($sp) -/* B63BE4 800ECA44 83A80035 */ lb $t0, 0x35($sp) -/* B63BE8 800ECA48 AC38BA14 */ sw $t8, %lo(D_8016BA14)($at) -/* B63BEC 800ECA4C 3C018017 */ lui $at, %hi(D_8016BA08) # $at, 0x8017 -/* B63BF0 800ECA50 27BD0080 */ addiu $sp, $sp, 0x80 -/* B63BF4 800ECA54 A039BA08 */ sb $t9, %lo(D_8016BA08)($at) -/* B63BF8 800ECA58 03E00008 */ jr $ra -/* B63BFC 800ECA5C A028BA09 */ sb $t0, %lo(D_8016BA09)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECA60.s b/asm/non_matchings/code/code_800EC960/func_800ECA60.s deleted file mode 100644 index b481b2c4a4..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECA60.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800ECA60 -/* B63C00 800ECA60 AFA40000 */ sw $a0, ($sp) -/* B63C04 800ECA64 00042600 */ sll $a0, $a0, 0x18 -/* B63C08 800ECA68 00042603 */ sra $a0, $a0, 0x18 -/* B63C0C 800ECA6C 28810041 */ slti $at, $a0, 0x41 -/* B63C10 800ECA70 54200004 */ bnezl $at, .L800ECA84 -/* B63C14 800ECA74 2881FFC0 */ slti $at, $a0, -0x40 -/* B63C18 800ECA78 10000017 */ b .L800ECAD8 -/* B63C1C 800ECA7C 2402007F */ li $v0, 127 -/* B63C20 800ECA80 2881FFC0 */ slti $at, $a0, -0x40 -.L800ECA84: -/* B63C24 800ECA84 10200003 */ beqz $at, .L800ECA94 -/* B63C28 800ECA88 00000000 */ nop -/* B63C2C 800ECA8C 10000012 */ b .L800ECAD8 -/* B63C30 800ECA90 2402FF80 */ li $v0, -128 -.L800ECA94: -/* B63C34 800ECA94 0480000A */ bltz $a0, .L800ECAC0 -/* B63C38 800ECA98 000411C0 */ sll $v0, $a0, 7 -/* B63C3C 800ECA9C 000411C0 */ sll $v0, $a0, 7 -/* B63C40 800ECAA0 00441023 */ subu $v0, $v0, $a0 -/* B63C44 800ECAA4 04410002 */ bgez $v0, .L800ECAB0 -/* B63C48 800ECAA8 00400821 */ addu $at, $v0, $zero -/* B63C4C 800ECAAC 2441003F */ addiu $at, $v0, 0x3f -.L800ECAB0: -/* B63C50 800ECAB0 00011183 */ sra $v0, $at, 6 -/* B63C54 800ECAB4 00021600 */ sll $v0, $v0, 0x18 -/* B63C58 800ECAB8 10000007 */ b .L800ECAD8 -/* B63C5C 800ECABC 00021603 */ sra $v0, $v0, 0x18 -.L800ECAC0: -/* B63C60 800ECAC0 04410002 */ bgez $v0, .L800ECACC -/* B63C64 800ECAC4 00400821 */ addu $at, $v0, $zero -/* B63C68 800ECAC8 2441003F */ addiu $at, $v0, 0x3f -.L800ECACC: -/* B63C6C 800ECACC 00011183 */ sra $v0, $at, 6 -/* B63C70 800ECAD0 00021600 */ sll $v0, $v0, 0x18 -/* B63C74 800ECAD4 00021603 */ sra $v0, $v0, 0x18 -.L800ECAD8: -/* B63C78 800ECAD8 00027080 */ sll $t6, $v0, 2 -/* B63C7C 800ECADC 3C018013 */ lui $at, %hi(D_8012F6B4) -/* B63C80 800ECAE0 002E0821 */ addu $at, $at, $t6 -/* B63C84 800ECAE4 C422F6B4 */ lwc1 $f2, %lo(D_8012F6B4)($at) -/* B63C88 800ECAE8 03E00008 */ jr $ra -/* B63C8C 800ECAEC 46001006 */ mov.s $f0, $f2 - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECAF0.s b/asm/non_matchings/code/code_800EC960/func_800ECAF0.s deleted file mode 100644 index 8d2eda946f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECAF0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800ECAF0 -/* B63C90 800ECAF0 3C048013 */ lui $a0, %hi(D_80131878) # $a0, 0x8013 -/* B63C94 800ECAF4 24841878 */ addiu $a0, %lo(D_80131878) # addiu $a0, $a0, 0x1878 -/* B63C98 800ECAF8 90820000 */ lbu $v0, ($a0) -/* B63C9C 800ECAFC 10400004 */ beqz $v0, .L800ECB10 -/* B63CA0 800ECB00 2443FFFF */ addiu $v1, $v0, -1 -/* B63CA4 800ECB04 306200FF */ andi $v0, $v1, 0xff -/* B63CA8 800ECB08 03E00008 */ jr $ra -/* B63CAC 800ECB0C A0800000 */ sb $zero, ($a0) -.L800ECB10: -/* B63CB0 800ECB10 3C0E8013 */ lui $t6, %hi(D_80130F3C) # $t6, 0x8013 -/* B63CB4 800ECB14 8DCE0F3C */ lw $t6, %lo(D_80130F3C)($t6) -/* B63CB8 800ECB18 51C00004 */ beql $t6, $zero, .L800ECB2C -/* B63CBC 800ECB1C 240300FF */ li $v1, 255 -/* B63CC0 800ECB20 03E00008 */ jr $ra -/* B63CC4 800ECB24 240200FE */ li $v0, 254 -/* B63CC8 800ECB28 240300FF */ li $v1, 255 -.L800ECB2C: -/* B63CCC 800ECB2C 03E00008 */ jr $ra -/* B63CD0 800ECB30 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECB34.s b/asm/non_matchings/code/code_800EC960/func_800ECB34.s deleted file mode 100644 index 6b2c7462b4..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECB34.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800ECB34 -/* B63CD4 800ECB34 AFA40000 */ sw $a0, ($sp) -/* B63CD8 800ECB38 308400FF */ andi $a0, $a0, 0xff -/* B63CDC 800ECB3C 308E003F */ andi $t6, $a0, 0x3f -/* B63CE0 800ECB40 3C038013 */ lui $v1, %hi(D_80131BF0) -/* B63CE4 800ECB44 006E1821 */ addu $v1, $v1, $t6 -/* B63CE8 800ECB48 90631BF0 */ lbu $v1, %lo(D_80131BF0)($v1) -/* B63CEC 800ECB4C 24010005 */ li $at, 5 -/* B63CF0 800ECB50 308F0080 */ andi $t7, $a0, 0x80 -/* B63CF4 800ECB54 14610007 */ bne $v1, $at, .L800ECB74 -/* B63CF8 800ECB58 00601025 */ move $v0, $v1 -/* B63CFC 800ECB5C 11E00003 */ beqz $t7, .L800ECB6C -/* B63D00 800ECB60 00000000 */ nop -/* B63D04 800ECB64 03E00008 */ jr $ra -/* B63D08 800ECB68 24020002 */ li $v0, 2 - -.L800ECB6C: -/* B63D0C 800ECB6C 03E00008 */ jr $ra -/* B63D10 800ECB70 24020003 */ li $v0, 3 - -.L800ECB74: -/* B63D14 800ECB74 03E00008 */ jr $ra -/* B63D18 800ECB78 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECB7C.s b/asm/non_matchings/code/code_800EC960/func_800ECB7C.s deleted file mode 100644 index 6f2cc24246..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECB7C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_800ECB7C -/* B63D1C 800ECB7C AFA40000 */ sw $a0, ($sp) -/* B63D20 800ECB80 308400FF */ andi $a0, $a0, 0xff -/* B63D24 800ECB84 00047080 */ sll $t6, $a0, 2 -/* B63D28 800ECB88 01C47021 */ addu $t6, $t6, $a0 -/* B63D2C 800ECB8C 3C0F8013 */ lui $t7, %hi(D_80130F80) # $t7, 0x8013 -/* B63D30 800ECB90 25EF0F80 */ addiu $t7, %lo(D_80130F80) # addiu $t7, $t7, 0xf80 -/* B63D34 800ECB94 000E7140 */ sll $t6, $t6, 5 -/* B63D38 800ECB98 3C088013 */ lui $t0, %hi(D_80131BF0) # $t0, 0x8013 -/* B63D3C 800ECB9C 3C078013 */ lui $a3, %hi(D_80131C00) # $a3, 0x8013 -/* B63D40 800ECBA0 00001025 */ move $v0, $zero -/* B63D44 800ECBA4 00001825 */ move $v1, $zero -/* B63D48 800ECBA8 24E71C00 */ addiu $a3, %lo(D_80131C00) # addiu $a3, $a3, 0x1c00 -/* B63D4C 800ECBAC 25081BF0 */ addiu $t0, %lo(D_80131BF0) # addiu $t0, $t0, 0x1bf0 -/* B63D50 800ECBB0 01CF2821 */ addu $a1, $t6, $t7 -/* B63D54 800ECBB4 240600FF */ li $a2, 255 -/* B63D58 800ECBB8 0003C0C0 */ sll $t8, $v1, 3 -.L800ECBBC: -/* B63D5C 800ECBBC 00B8C821 */ addu $t9, $a1, $t8 -/* B63D60 800ECBC0 93240000 */ lbu $a0, ($t9) -/* B63D64 800ECBC4 24630001 */ addiu $v1, $v1, 1 -/* B63D68 800ECBC8 306300FF */ andi $v1, $v1, 0xff -/* B63D6C 800ECBCC 10C40006 */ beq $a2, $a0, .L800ECBE8 -/* B63D70 800ECBD0 01044821 */ addu $t1, $t0, $a0 -/* B63D74 800ECBD4 912A0000 */ lbu $t2, ($t1) -/* B63D78 800ECBD8 00E25821 */ addu $t3, $a3, $v0 -/* B63D7C 800ECBDC 24420001 */ addiu $v0, $v0, 1 -/* B63D80 800ECBE0 304200FF */ andi $v0, $v0, 0xff -/* B63D84 800ECBE4 A16A006D */ sb $t2, 0x6d($t3) -.L800ECBE8: -/* B63D88 800ECBE8 28410008 */ slti $at, $v0, 8 -/* B63D8C 800ECBEC 10200003 */ beqz $at, .L800ECBFC -/* B63D90 800ECBF0 28610010 */ slti $at, $v1, 0x10 -/* B63D94 800ECBF4 5420FFF1 */ bnezl $at, .L800ECBBC -/* B63D98 800ECBF8 0003C0C0 */ sll $t8, $v1, 3 -.L800ECBFC: -/* B63D9C 800ECBFC 03E00008 */ jr $ra -/* B63DA0 800ECC00 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECC04.s b/asm/non_matchings/code/code_800EC960/func_800ECC04.s deleted file mode 100644 index 0b988296f7..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECC04.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_800ECC04 -/* B63DA4 800ECC04 3C028013 */ lui $v0, %hi(D_8013170C) # $v0, 0x8013 -/* B63DA8 800ECC08 9042170C */ lbu $v0, %lo(D_8013170C)($v0) -/* B63DAC 800ECC0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B63DB0 800ECC10 AFA40028 */ sw $a0, 0x28($sp) -/* B63DB4 800ECC14 240300FF */ li $v1, 255 -/* B63DB8 800ECC18 3084FFFF */ andi $a0, $a0, 0xffff -/* B63DBC 800ECC1C 10620007 */ beq $v1, $v0, .L800ECC3C -/* B63DC0 800ECC20 AFBF0014 */ sw $ra, 0x14($sp) -/* B63DC4 800ECC24 308E0FFF */ andi $t6, $a0, 0xfff -/* B63DC8 800ECC28 24010FFF */ li $at, 4095 -/* B63DCC 800ECC2C 15C10003 */ bne $t6, $at, .L800ECC3C -/* B63DD0 800ECC30 00804025 */ move $t0, $a0 -/* B63DD4 800ECC34 35041000 */ ori $a0, $t0, 0x1000 -/* B63DD8 800ECC38 3084FFFF */ andi $a0, $a0, 0xffff -.L800ECC3C: -/* B63DDC 800ECC3C 3401CFFF */ li $at, 53247 -/* B63DE0 800ECC40 14810005 */ bne $a0, $at, .L800ECC58 -/* B63DE4 800ECC44 00804025 */ move $t0, $a0 -/* B63DE8 800ECC48 50620004 */ beql $v1, $v0, .L800ECC5C -/* B63DEC 800ECC4C 24010FFF */ li $at, 4095 -/* B63DF0 800ECC50 3404DFFF */ li $a0, 57343 -/* B63DF4 800ECC54 3408DFFF */ li $t0, 57343 -.L800ECC58: -/* B63DF8 800ECC58 24010FFF */ li $at, 4095 -.L800ECC5C: -/* B63DFC 800ECC5C 15010005 */ bne $t0, $at, .L800ECC74 -/* B63E00 800ECC60 2418000E */ li $t8, 14 -/* B63E04 800ECC64 50620004 */ beql $v1, $v0, .L800ECC78 -/* B63E08 800ECC68 3401FFFF */ li $at, 65535 -/* B63E0C 800ECC6C 24041FFF */ li $a0, 8191 -/* B63E10 800ECC70 24081FFF */ li $t0, 8191 -.L800ECC74: -/* B63E14 800ECC74 3401FFFF */ li $at, 65535 -.L800ECC78: -/* B63E18 800ECC78 11010048 */ beq $t0, $at, .L800ECD9C -/* B63E1C 800ECC7C 3C028017 */ lui $v0, %hi(D_8016BA2B) # $v0, 0x8017 -/* B63E20 800ECC80 3C018000 */ lui $at, 0x8000 -/* B63E24 800ECC84 00817821 */ addu $t7, $a0, $at -/* B63E28 800ECC88 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 -/* B63E2C 800ECC8C AC2F0F3C */ sw $t7, %lo(D_80130F3C)($at) -/* B63E30 800ECC90 3C018017 */ lui $at, %hi(D_8016BA2A) # $at, 0x8017 -/* B63E34 800ECC94 A020BA2A */ sb $zero, %lo(D_8016BA2A)($at) -/* B63E38 800ECC98 2442BA2B */ addiu $v0, %lo(D_8016BA2B) # addiu $v0, $v0, -0x45d5 -/* B63E3C 800ECC9C 3401A000 */ li $at, 40960 -/* B63E40 800ECCA0 11010003 */ beq $t0, $at, .L800ECCB0 -/* B63E44 800ECCA4 A0580000 */ sb $t8, ($v0) -/* B63E48 800ECCA8 2709FFFF */ addiu $t1, $t8, -1 -/* B63E4C 800ECCAC A0490000 */ sb $t1, ($v0) -.L800ECCB0: -/* B63E50 800ECCB0 310A3FFF */ andi $t2, $t0, 0x3fff -/* B63E54 800ECCB4 3C018017 */ lui $at, %hi(D_8016BA2C) # $at, 0x8017 -/* B63E58 800ECCB8 A42ABA2C */ sh $t2, %lo(D_8016BA2C)($at) -/* B63E5C 800ECCBC 3C018013 */ lui $at, %hi(D_8013187C) # $at, 0x8013 -/* B63E60 800ECCC0 240B0008 */ li $t3, 8 -/* B63E64 800ECCC4 A02B187C */ sb $t3, %lo(D_8013187C)($at) -/* B63E68 800ECCC8 3C018017 */ lui $at, %hi(D_8016BA29) # $at, 0x8017 -/* B63E6C 800ECCCC A020BA29 */ sb $zero, %lo(D_8016BA29)($at) -/* B63E70 800ECCD0 3C018013 */ lui $at, %hi(D_80131878) # $at, 0x8013 -/* B63E74 800ECCD4 A0201878 */ sb $zero, %lo(D_80131878)($at) -/* B63E78 800ECCD8 3C018017 */ lui $at, %hi(D_8016BA2E) # $at, 0x8017 -/* B63E7C 800ECCDC A020BA2E */ sb $zero, %lo(D_8016BA2E)($at) -/* B63E80 800ECCE0 0C03B2BC */ jal func_800ECAF0 -/* B63E84 800ECCE4 AFA8001C */ sw $t0, 0x1c($sp) -/* B63E88 800ECCE8 3C018017 */ lui $at, %hi(D_8016B9F9) # $at, 0x8017 -/* B63E8C 800ECCEC A022B9F9 */ sb $v0, %lo(D_8016B9F9)($at) -/* B63E90 800ECCF0 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B63E94 800ECCF4 240C0001 */ li $t4, 1 -/* B63E98 800ECCF8 A02C0F0C */ sb $t4, %lo(D_80130F0C)($at) -/* B63E9C 800ECCFC 3C018013 */ lui $at, %hi(D_80130F4C) # $at, 0x8013 -/* B63EA0 800ECD00 3C078017 */ lui $a3, %hi(D_8016BA90) # $a3, 0x8017 -/* B63EA4 800ECD04 3C068017 */ lui $a2, %hi(D_8016BA70) # $a2, 0x8017 -/* B63EA8 800ECD08 3C058017 */ lui $a1, %hi(D_8016BA50) # $a1, 0x8017 -/* B63EAC 800ECD0C 3C048017 */ lui $a0, %hi(D_8016BA30) # $a0, 0x8017 -/* B63EB0 800ECD10 8FA8001C */ lw $t0, 0x1c($sp) -/* B63EB4 800ECD14 A4200F4C */ sh $zero, %lo(D_80130F4C)($at) -/* B63EB8 800ECD18 2484BA30 */ addiu $a0, %lo(D_8016BA30) # addiu $a0, $a0, -0x45d0 -/* B63EBC 800ECD1C 24A5BA50 */ addiu $a1, %lo(D_8016BA50) # addiu $a1, $a1, -0x45b0 -/* B63EC0 800ECD20 24C6BA70 */ addiu $a2, %lo(D_8016BA70) # addiu $a2, $a2, -0x4590 -/* B63EC4 800ECD24 24E7BA90 */ addiu $a3, %lo(D_8016BA90) # addiu $a3, $a3, -0x4570 -/* B63EC8 800ECD28 00001825 */ move $v1, $zero -.L800ECD2C: -/* B63ECC 800ECD2C 00031040 */ sll $v0, $v1, 1 -/* B63ED0 800ECD30 00826821 */ addu $t5, $a0, $v0 -/* B63ED4 800ECD34 00E3C021 */ addu $t8, $a3, $v1 -/* B63ED8 800ECD38 24630001 */ addiu $v1, $v1, 1 -/* B63EDC 800ECD3C A5A00000 */ sh $zero, ($t5) -/* B63EE0 800ECD40 00A27021 */ addu $t6, $a1, $v0 -/* B63EE4 800ECD44 306300FF */ andi $v1, $v1, 0xff -/* B63EE8 800ECD48 A5C00000 */ sh $zero, ($t6) -/* B63EEC 800ECD4C 00C27821 */ addu $t7, $a2, $v0 -/* B63EF0 800ECD50 2861000E */ slti $at, $v1, 0xe -/* B63EF4 800ECD54 A5E00000 */ sh $zero, ($t7) -/* B63EF8 800ECD58 1420FFF4 */ bnez $at, .L800ECD2C -/* B63EFC 800ECD5C A3000000 */ sb $zero, ($t8) -/* B63F00 800ECD60 31198000 */ andi $t9, $t0, 0x8000 -/* B63F04 800ECD64 13200003 */ beqz $t9, .L800ECD74 -/* B63F08 800ECD68 31094000 */ andi $t1, $t0, 0x4000 -/* B63F0C 800ECD6C 3C018013 */ lui $at, %hi(D_8013187C) # $at, 0x8013 -/* B63F10 800ECD70 A020187C */ sb $zero, %lo(D_8013187C)($at) -.L800ECD74: -/* B63F14 800ECD74 11200003 */ beqz $t1, .L800ECD84 -/* B63F18 800ECD78 310AD000 */ andi $t2, $t0, 0xd000 -/* B63F1C 800ECD7C 3C018017 */ lui $at, %hi(D_8016BA28) # $at, 0x8017 -/* B63F20 800ECD80 A020BA28 */ sb $zero, %lo(D_8016BA28)($at) -.L800ECD84: -/* B63F24 800ECD84 5140000A */ beql $t2, $zero, .L800ECDB0 -/* B63F28 800ECD88 8FBF0014 */ lw $ra, 0x14($sp) -/* B63F2C 800ECD8C 0C03B2DF */ jal func_800ECB7C -/* B63F30 800ECD90 2404000C */ li $a0, 12 -/* B63F34 800ECD94 10000006 */ b .L800ECDB0 -/* B63F38 800ECD98 8FBF0014 */ lw $ra, 0x14($sp) -.L800ECD9C: -/* B63F3C 800ECD9C 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 -/* B63F40 800ECDA0 AC200F3C */ sw $zero, %lo(D_80130F3C)($at) -/* B63F44 800ECDA4 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B63F48 800ECDA8 A0200F0C */ sb $zero, %lo(D_80130F0C)($at) -/* B63F4C 800ECDAC 8FBF0014 */ lw $ra, 0x14($sp) -.L800ECDB0: -/* B63F50 800ECDB0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B63F54 800ECDB4 03E00008 */ jr $ra -/* B63F58 800ECDB8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECDBC.s b/asm/non_matchings/code/code_800EC960/func_800ECDBC.s deleted file mode 100644 index 575217130a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ECDBC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800ECDBC -/* B63F5C 800ECDBC 3C0E8013 */ lui $t6, %hi(D_80130F14) # $t6, 0x8013 -/* B63F60 800ECDC0 91CE0F14 */ lbu $t6, %lo(D_80130F14)($t6) -/* B63F64 800ECDC4 240100FF */ li $at, 255 -/* B63F68 800ECDC8 3C028017 */ lui $v0, %hi(D_8016BA29) # $v0, 0x8017 -/* B63F6C 800ECDCC 11C10008 */ beq $t6, $at, .L800ECDF0 -/* B63F70 800ECDD0 2442BA29 */ addiu $v0, %lo(D_8016BA29) # addiu $v0, $v0, -0x45d7 -/* B63F74 800ECDD4 904F0000 */ lbu $t7, ($v0) -/* B63F78 800ECDD8 24180001 */ li $t8, 1 -/* B63F7C 800ECDDC 241900FF */ li $t9, 255 -/* B63F80 800ECDE0 15E00003 */ bnez $t7, .L800ECDF0 -/* B63F84 800ECDE4 3C018013 */ lui $at, %hi(D_80130F20) # $at, 0x8013 -/* B63F88 800ECDE8 A0580000 */ sb $t8, ($v0) -/* B63F8C 800ECDEC A0390F20 */ sb $t9, %lo(D_80130F20)($at) -.L800ECDF0: -/* B63F90 800ECDF0 03E00008 */ jr $ra -/* B63F94 800ECDF4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ECDF8.s b/asm/non_matchings/code/code_800EC960/func_800ECDF8.s index ae19b9ee7d..2a9c81e455 100644 --- a/asm/non_matchings/code/code_800EC960/func_800ECDF8.s +++ b/asm/non_matchings/code/code_800EC960/func_800ECDF8.s @@ -10,14 +10,14 @@ glabel func_800ECDF8 /* B63FB8 800ECE18 A3A0005B */ sb $zero, 0x5b($sp) /* B63FBC 800ECE1C 0C03B36F */ jal func_800ECDBC /* B63FC0 800ECE20 A3A00057 */ sb $zero, 0x57($sp) -/* B63FC4 800ECE24 3C0E8017 */ lui $t6, %hi(D_8016BA29) # $t6, 0x8017 -/* B63FC8 800ECE28 91CEBA29 */ lbu $t6, %lo(D_8016BA29)($t6) +/* B63FC4 800ECE24 3C0E8017 */ lui $t6, %hi(sOcarinaHasStartedSong) # $t6, 0x8017 +/* B63FC8 800ECE28 91CEBA29 */ lbu $t6, %lo(sOcarinaHasStartedSong)($t6) /* B63FCC 800ECE2C 3C028013 */ lui $v0, %hi(D_80130F2C) # $v0, 0x8013 /* B63FD0 800ECE30 51C000EB */ beql $t6, $zero, .L800ED1E0 /* B63FD4 800ECE34 8FBF002C */ lw $ra, 0x2c($sp) /* B63FD8 800ECE38 80420F2C */ lb $v0, %lo(D_80130F2C)($v0) -/* B63FDC 800ECE3C 3C0F8013 */ lui $t7, %hi(D_80130F14) # $t7, 0x8013 -/* B63FE0 800ECE40 3C188013 */ lui $t8, %hi(D_80130F18) # $t8, 0x8013 +/* B63FDC 800ECE3C 3C0F8013 */ lui $t7, %hi(sCurOcarinaBtnVal) # $t7, 0x8013 +/* B63FE0 800ECE40 3C188013 */ lui $t8, %hi(sPrevOcarinaNoteVal) # $t8, 0x8013 /* B63FE4 800ECE44 04410003 */ bgez $v0, .L800ECE54 /* B63FE8 800ECE48 00401825 */ move $v1, $v0 /* B63FEC 800ECE4C 10000001 */ b .L800ECE54 @@ -25,14 +25,14 @@ glabel func_800ECDF8 .L800ECE54: /* B63FF4 800ECE54 28610015 */ slti $at, $v1, 0x15 /* B63FF8 800ECE58 14200004 */ bnez $at, .L800ECE6C -/* B63FFC 800ECE5C 3C1F8017 */ lui $ra, %hi(D_8016BA2A) # $ra, 0x8017 +/* B63FFC 800ECE5C 3C1F8017 */ lui $ra, %hi(gOcarinaSongNotestartIdx) # $ra, 0x8017 /* B64000 800ECE60 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 /* B64004 800ECE64 100000DD */ b .L800ED1DC /* B64008 800ECE68 AC200F3C */ sw $zero, %lo(D_80130F3C)($at) .L800ECE6C: -/* B6400C 800ECE6C 91EF0F14 */ lbu $t7, %lo(D_80130F14)($t7) -/* B64010 800ECE70 93180F18 */ lbu $t8, %lo(D_80130F18)($t8) -/* B64014 800ECE74 3C0E8017 */ lui $t6, %hi(D_8016BA2B) # $t6, 0x8017 +/* B6400C 800ECE6C 91EF0F14 */ lbu $t7, %lo(sCurOcarinaBtnVal)($t7) +/* B64010 800ECE70 93180F18 */ lbu $t8, %lo(sPrevOcarinaNoteVal)($t8) +/* B64014 800ECE74 3C0E8017 */ lui $t6, %hi(sOcarinaSongCnt) # $t6, 0x8017 /* B64018 800ECE78 AFAF0040 */ sw $t7, 0x40($sp) /* B6401C 800ECE7C 11F80003 */ beq $t7, $t8, .L800ECE8C /* B64020 800ECE80 01E0A825 */ move $s5, $t7 @@ -43,24 +43,24 @@ glabel func_800ECDF8 /* B64030 800ECE90 A3B9005B */ sb $t9, 0x5b($sp) /* B64034 800ECE94 240D00FF */ li $t5, 255 .L800ECE98: -/* B64038 800ECE98 93FFBA2A */ lbu $ra, %lo(D_8016BA2A)($ra) -/* B6403C 800ECE9C 91CEBA2B */ lbu $t6, %lo(D_8016BA2B)($t6) -/* B64040 800ECEA0 3C108017 */ lui $s0, %hi(D_8016BA2C) # $s0, 0x8017 +/* B64038 800ECE98 93FFBA2A */ lbu $ra, %lo(gOcarinaSongNotestartIdx)($ra) +/* B6403C 800ECE9C 91CEBA2B */ lbu $t6, %lo(sOcarinaSongCnt)($t6) +/* B64040 800ECEA0 3C108017 */ lui $s0, %hi(sOcarinaAvailSongs) # $s0, 0x8017 /* B64044 800ECEA4 03E03025 */ move $a2, $ra /* B64048 800ECEA8 03EE082A */ slt $at, $ra, $t6 /* B6404C 800ECEAC 102000BE */ beqz $at, .L800ED1A8 /* B64050 800ECEB0 AFAE0034 */ sw $t6, 0x34($sp) -/* B64054 800ECEB4 3C148013 */ lui $s4, %hi(D_80130F80) # $s4, 0x8013 -/* B64058 800ECEB8 3C138017 */ lui $s3, %hi(D_8016BA30) # $s3, 0x8017 -/* B6405C 800ECEBC 3C128013 */ lui $s2, %hi(D_80130F20) # $s2, 0x8013 -/* B64060 800ECEC0 3C118017 */ lui $s1, %hi(D_8016BA90) # $s1, 0x8017 +/* B64054 800ECEB4 3C148013 */ lui $s4, %hi(sOcarinaSongs) # $s4, 0x8013 +/* B64058 800ECEB8 3C138017 */ lui $s3, %hi(sLearnSongPos) # $s3, 0x8017 +/* B6405C 800ECEBC 3C128013 */ lui $s2, %hi(sLearnSongLastBtn) # $s2, 0x8013 +/* B64060 800ECEC0 3C118017 */ lui $s1, %hi(sLearnSongExpectedNote) # $s1, 0x8017 /* B64064 800ECEC4 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 /* B64068 800ECEC8 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 -/* B6406C 800ECECC 2631BA90 */ addiu $s1, %lo(D_8016BA90) # addiu $s1, $s1, -0x4570 -/* B64070 800ECED0 26520F20 */ addiu $s2, %lo(D_80130F20) # addiu $s2, $s2, 0xf20 -/* B64074 800ECED4 2673BA30 */ addiu $s3, %lo(D_8016BA30) # addiu $s3, $s3, -0x45d0 -/* B64078 800ECED8 26940F80 */ addiu $s4, %lo(D_80130F80) # addiu $s4, $s4, 0xf80 -/* B6407C 800ECEDC 9610BA2C */ lhu $s0, %lo(D_8016BA2C)($s0) +/* B6406C 800ECECC 2631BA90 */ addiu $s1, %lo(sLearnSongExpectedNote) # addiu $s1, $s1, -0x4570 +/* B64070 800ECED0 26520F20 */ addiu $s2, %lo(sLearnSongLastBtn) # addiu $s2, $s2, 0xf20 +/* B64074 800ECED4 2673BA30 */ addiu $s3, %lo(sLearnSongPos) # addiu $s3, $s3, -0x45d0 +/* B64078 800ECED8 26940F80 */ addiu $s4, %lo(sOcarinaSongs) # addiu $s4, $s4, 0xf80 +/* B6407C 800ECEDC 9610BA2C */ lhu $s0, %lo(sOcarinaAvailSongs)($s0) .L800ECEE0: /* B64080 800ECEE0 240F0001 */ li $t7, 1 /* B64084 800ECEE4 00CF5804 */ sllv $t3, $t7, $a2 @@ -104,8 +104,8 @@ glabel func_800ECDF8 /* B6411C 800ECF7C 15CF0006 */ bne $t6, $t7, .L800ECF98 /* B64120 800ECF80 00000000 */ nop /* B64124 800ECF84 A0381878 */ sb $t8, %lo(D_80131878)($at) -/* B64128 800ECF88 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B6412C 800ECF8C A0200F0C */ sb $zero, %lo(D_80130F0C)($at) +/* B64128 800ECF88 3C018013 */ lui $at, %hi(sOcarinaInpEnabled) # $at, 0x8013 +/* B6412C 800ECF8C A0200F0C */ sb $zero, %lo(sOcarinaInpEnabled)($at) /* B64130 800ECF90 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 /* B64134 800ECF94 AC200F3C */ sw $zero, %lo(D_80130F3C)($at) .L800ECF98: @@ -126,7 +126,7 @@ glabel func_800ECDF8 /* B6416C 800ECFCC 94E20000 */ lhu $v0, ($a3) /* B64170 800ECFD0 91CF0000 */ lbu $t7, ($t6) /* B64174 800ECFD4 020BC026 */ xor $t8, $s0, $t3 -/* B64178 800ECFD8 3C018017 */ lui $at, %hi(D_8016BA2C) # $at, 0x8017 +/* B64178 800ECFD8 3C018017 */ lui $at, %hi(sOcarinaAvailSongs) # $at, 0x8017 /* B6417C 800ECFDC 144F0006 */ bne $v0, $t7, .L800ECFF8 /* B64180 800ECFE0 00000000 */ nop /* B64184 800ECFE4 2401000C */ li $at, 12 @@ -135,9 +135,9 @@ glabel func_800ECDF8 /* B64190 800ECFF0 10000004 */ b .L800ED004 /* B64194 800ECFF4 A4600000 */ sh $zero, ($v1) .L800ECFF8: -/* B64198 800ECFF8 A438BA2C */ sh $t8, %lo(D_8016BA2C)($at) -/* B6419C 800ECFFC 3C108017 */ lui $s0, %hi(D_8016BA2C) # $s0, 0x8017 -/* B641A0 800ED000 9610BA2C */ lhu $s0, %lo(D_8016BA2C)($s0) +/* B64198 800ECFF8 A438BA2C */ sh $t8, %lo(sOcarinaAvailSongs)($at) +/* B6419C 800ECFFC 3C108017 */ lui $s0, %hi(sOcarinaAvailSongs) # $s0, 0x8017 +/* B641A0 800ED000 9610BA2C */ lhu $s0, %lo(sOcarinaAvailSongs)($s0) .L800ED004: /* B641A4 800ED004 94E20000 */ lhu $v0, ($a3) .L800ED008: @@ -159,10 +159,10 @@ glabel func_800ECDF8 /* B641E4 800ED044 12AE0006 */ beq $s5, $t6, .L800ED060 /* B641E8 800ED048 A0790000 */ sb $t9, ($v1) /* B641EC 800ED04C 020B7826 */ xor $t7, $s0, $t3 -/* B641F0 800ED050 3C018017 */ lui $at, %hi(D_8016BA2C) # $at, 0x8017 -/* B641F4 800ED054 A42FBA2C */ sh $t7, %lo(D_8016BA2C)($at) -/* B641F8 800ED058 3C108017 */ lui $s0, %hi(D_8016BA2C) # $s0, 0x8017 -/* B641FC 800ED05C 9610BA2C */ lhu $s0, %lo(D_8016BA2C)($s0) +/* B641F0 800ED050 3C018017 */ lui $at, %hi(sOcarinaAvailSongs) # $at, 0x8017 +/* B641F4 800ED054 A42FBA2C */ sh $t7, %lo(sOcarinaAvailSongs)($at) +/* B641F8 800ED058 3C108017 */ lui $s0, %hi(sOcarinaAvailSongs) # $s0, 0x8017 +/* B641FC 800ED05C 9610BA2C */ lhu $s0, %lo(sOcarinaAvailSongs)($s0) .L800ED060: /* B64200 800ED060 90980000 */ lbu $t8, ($a0) /* B64204 800ED064 90B90000 */ lbu $t9, ($a1) @@ -213,12 +213,12 @@ glabel func_800ECDF8 /* B642AC 800ED10C A2590000 */ sb $t9, ($s2) .L800ED110: /* B642B0 800ED110 020B7026 */ xor $t6, $s0, $t3 -/* B642B4 800ED114 3C018017 */ lui $at, %hi(D_8016BA2C) # $at, 0x8017 -/* B642B8 800ED118 A42EBA2C */ sh $t6, %lo(D_8016BA2C)($at) -/* B642BC 800ED11C 3C108017 */ lui $s0, %hi(D_8016BA2C) # $s0, 0x8017 +/* B642B4 800ED114 3C018017 */ lui $at, %hi(sOcarinaAvailSongs) # $at, 0x8017 +/* B642B8 800ED118 A42EBA2C */ sh $t6, %lo(sOcarinaAvailSongs)($at) +/* B642BC 800ED11C 3C108017 */ lui $s0, %hi(sOcarinaAvailSongs) # $s0, 0x8017 /* B642C0 800ED120 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 /* B642C4 800ED124 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 -/* B642C8 800ED128 9610BA2C */ lhu $s0, %lo(D_8016BA2C)($s0) +/* B642C8 800ED128 9610BA2C */ lhu $s0, %lo(sOcarinaAvailSongs)($s0) .L800ED12C: /* B642CC 800ED12C 16000018 */ bnez $s0, .L800ED190 /* B642D0 800ED130 3C188013 */ lui $t8, %hi(D_8013187C) # $t8, 0x8013 @@ -229,8 +229,8 @@ glabel func_800ECDF8 /* B642E4 800ED144 8FB90034 */ lw $t9, 0x34($sp) /* B642E8 800ED148 3C028013 */ lui $v0, %hi(D_80130F3C) # $v0, 0x8013 /* B642EC 800ED14C 8C420F3C */ lw $v0, %lo(D_80130F3C)($v0) -/* B642F0 800ED150 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B642F4 800ED154 A0200F0C */ sb $zero, %lo(D_80130F0C)($at) +/* B642F0 800ED150 3C018013 */ lui $at, %hi(sOcarinaInpEnabled) # $at, 0x8013 +/* B642F4 800ED154 A0200F0C */ sb $zero, %lo(sOcarinaInpEnabled)($at) /* B642F8 800ED158 30594000 */ andi $t9, $v0, 0x4000 /* B642FC 800ED15C 13200009 */ beqz $t9, .L800ED184 /* B64300 800ED160 001F7080 */ sll $t6, $ra, 2 @@ -257,8 +257,8 @@ glabel func_800ECDF8 .L800ED1A8: /* B64348 800ED1A8 93AE005B */ lbu $t6, 0x5b($sp) /* B6434C 800ED1AC 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 -/* B64350 800ED1B0 3C128013 */ lui $s2, %hi(D_80130F20) # $s2, 0x8013 -/* B64354 800ED1B4 26520F20 */ addiu $s2, %lo(D_80130F20) # addiu $s2, $s2, 0xf20 +/* B64350 800ED1B0 3C128013 */ lui $s2, %hi(sLearnSongLastBtn) # $s2, 0x8013 +/* B64354 800ED1B4 26520F20 */ addiu $s2, %lo(sLearnSongLastBtn) # addiu $s2, $s2, 0xf20 /* B64358 800ED1B8 15C00008 */ bnez $t6, .L800ED1DC /* B6435C 800ED1BC 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 /* B64360 800ED1C0 8FAF0040 */ lw $t7, 0x40($sp) diff --git a/asm/non_matchings/code/code_800EC960/func_800ED200.s b/asm/non_matchings/code/code_800EC960/func_800ED200.s deleted file mode 100644 index 2eea7b0ae7..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ED200.s +++ /dev/null @@ -1,168 +0,0 @@ -glabel func_800ED200 -/* B643A0 800ED200 3C028017 */ lui $v0, %hi(D_8016BA0C) # $v0, 0x8017 -/* B643A4 800ED204 8C42BA0C */ lw $v0, %lo(D_8016BA0C)($v0) -/* B643A8 800ED208 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B643AC 800ED20C AFBF001C */ sw $ra, 0x1c($sp) -/* B643B0 800ED210 304E0020 */ andi $t6, $v0, 0x20 -/* B643B4 800ED214 11C0000B */ beqz $t6, .L800ED244 -/* B643B8 800ED218 AFB00018 */ sw $s0, 0x18($sp) -/* B643BC 800ED21C 3C0F8013 */ lui $t7, %hi(D_80130EFC) # $t7, 0x8013 -/* B643C0 800ED220 8DEF0EFC */ lw $t7, %lo(D_80130EFC)($t7) -/* B643C4 800ED224 3C048013 */ lui $a0, %hi(D_80130F3E) # $a0, 0x8013 -/* B643C8 800ED228 004FC024 */ and $t8, $v0, $t7 -/* B643CC 800ED22C 13000005 */ beqz $t8, .L800ED244 -/* B643D0 800ED230 00000000 */ nop -/* B643D4 800ED234 0C03B301 */ jal func_800ECC04 -/* B643D8 800ED238 94840F3E */ lhu $a0, %lo(D_80130F3E)($a0) -/* B643DC 800ED23C 10000082 */ b .L800ED448 -/* B643E0 800ED240 8FBF001C */ lw $ra, 0x1c($sp) -.L800ED244: -/* B643E4 800ED244 0C03B36F */ jal func_800ECDBC -/* B643E8 800ED248 00000000 */ nop -/* B643EC 800ED24C 3C198017 */ lui $t9, %hi(D_8016BA29) # $t9, 0x8017 -/* B643F0 800ED250 9339BA29 */ lbu $t9, %lo(D_8016BA29)($t9) -/* B643F4 800ED254 3C058013 */ lui $a1, %hi(D_80130F14) # $a1, 0x8013 -/* B643F8 800ED258 3C0E8013 */ lui $t6, %hi(D_80130F18) # $t6, 0x8013 -/* B643FC 800ED25C 5320007A */ beql $t9, $zero, .L800ED448 -/* B64400 800ED260 8FBF001C */ lw $ra, 0x1c($sp) -/* B64404 800ED264 90A50F14 */ lbu $a1, %lo(D_80130F14)($a1) -/* B64408 800ED268 91CE0F18 */ lbu $t6, %lo(D_80130F18)($t6) -/* B6440C 800ED26C 240100FF */ li $at, 255 -/* B64410 800ED270 50AE0075 */ beql $a1, $t6, .L800ED448 -/* B64414 800ED274 8FBF001C */ lw $ra, 0x1c($sp) -/* B64418 800ED278 10A10072 */ beq $a1, $at, .L800ED444 -/* B6441C 800ED27C 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 -/* B64420 800ED280 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 -/* B64424 800ED284 904F0000 */ lbu $t7, ($v0) -/* B64428 800ED288 3C038017 */ lui $v1, %hi(D_8016BA28) # $v1, 0x8017 -/* B6442C 800ED28C 2463BA28 */ addiu $v1, %lo(D_8016BA28) # addiu $v1, $v1, -0x45d8 -/* B64430 800ED290 25F80001 */ addiu $t8, $t7, 1 -/* B64434 800ED294 331900FF */ andi $t9, $t8, 0xff -/* B64438 800ED298 2B210009 */ slti $at, $t9, 9 -/* B6443C 800ED29C 14200003 */ bnez $at, .L800ED2AC -/* B64440 800ED2A0 A0580000 */ sb $t8, ($v0) -/* B64444 800ED2A4 240E0001 */ li $t6, 1 -/* B64448 800ED2A8 A04E0000 */ sb $t6, ($v0) -.L800ED2AC: -/* B6444C 800ED2AC 90620000 */ lbu $v0, ($v1) -/* B64450 800ED2B0 24010008 */ li $at, 8 -/* B64454 800ED2B4 00005825 */ move $t3, $zero -/* B64458 800ED2B8 1441000F */ bne $v0, $at, .L800ED2F8 -/* B6445C 800ED2BC 00405025 */ move $t2, $v0 -/* B64460 800ED2C0 3C028017 */ lui $v0, %hi(D_8016BA20) # $v0, 0x8017 -/* B64464 800ED2C4 2442BA20 */ addiu $v0, %lo(D_8016BA20) # addiu $v0, $v0, -0x45e0 -/* B64468 800ED2C8 00006025 */ move $t4, $zero -.L800ED2CC: -/* B6446C 800ED2CC 004BC821 */ addu $t9, $v0, $t3 -/* B64470 800ED2D0 256B0001 */ addiu $t3, $t3, 1 -/* B64474 800ED2D4 004C7821 */ addu $t7, $v0, $t4 -/* B64478 800ED2D8 91F80001 */ lbu $t8, 1($t7) -/* B6447C 800ED2DC 316B00FF */ andi $t3, $t3, 0xff -/* B64480 800ED2E0 29610007 */ slti $at, $t3, 7 -/* B64484 800ED2E4 01606025 */ move $t4, $t3 -/* B64488 800ED2E8 1420FFF8 */ bnez $at, .L800ED2CC -/* B6448C 800ED2EC A3380000 */ sb $t8, ($t9) -/* B64490 800ED2F0 10000006 */ b .L800ED30C -/* B64494 800ED2F4 00000000 */ nop -.L800ED2F8: -/* B64498 800ED2F8 244E0001 */ addiu $t6, $v0, 1 -/* B6449C 800ED2FC 3C028017 */ lui $v0, %hi(D_8016BA20) # $v0, 0x8017 -/* B644A0 800ED300 2442BA20 */ addiu $v0, %lo(D_8016BA20) # addiu $v0, $v0, -0x45e0 -/* B644A4 800ED304 A06E0000 */ sb $t6, ($v1) -/* B644A8 800ED308 31CA00FF */ andi $t2, $t6, 0xff -.L800ED30C: -/* B644AC 800ED30C 3C038013 */ lui $v1, %hi(D_80130F2C) # $v1, 0x8013 -/* B644B0 800ED310 80630F2C */ lb $v1, %lo(D_80130F2C)($v1) -/* B644B4 800ED314 3C0B8017 */ lui $t3, %hi(D_8016BA2A) # $t3, 0x8017 -/* B644B8 800ED318 3C0D8017 */ lui $t5, %hi(D_8016BA2B) # $t5, 0x8017 -/* B644BC 800ED31C 04610003 */ bgez $v1, .L800ED32C -/* B644C0 800ED320 00602025 */ move $a0, $v1 -/* B644C4 800ED324 10000001 */ b .L800ED32C -/* B644C8 800ED328 00032023 */ negu $a0, $v1 -.L800ED32C: -/* B644CC 800ED32C 28810015 */ slti $at, $a0, 0x15 -/* B644D0 800ED330 14200005 */ bnez $at, .L800ED348 -/* B644D4 800ED334 004AF821 */ addu $ra, $v0, $t2 -/* B644D8 800ED338 004AF821 */ addu $ra, $v0, $t2 -/* B644DC 800ED33C 240F00FF */ li $t7, 255 -/* B644E0 800ED340 10000002 */ b .L800ED34C -/* B644E4 800ED344 A3EFFFFF */ sb $t7, -1($ra) -.L800ED348: -/* B644E8 800ED348 A3E5FFFF */ sb $a1, -1($ra) -.L800ED34C: -/* B644EC 800ED34C 916BBA2A */ lbu $t3, %lo(D_8016BA2A)($t3) -/* B644F0 800ED350 91ADBA2B */ lbu $t5, %lo(D_8016BA2B)($t5) -/* B644F4 800ED354 3C108017 */ lui $s0, %hi(D_8016BA2C) # $s0, 0x8017 -/* B644F8 800ED358 3C098013 */ lui $t1, %hi(D_80130F6C) # $t1, 0x8013 -/* B644FC 800ED35C 016D082A */ slt $at, $t3, $t5 -/* B64500 800ED360 10200038 */ beqz $at, .L800ED444 -/* B64504 800ED364 01606025 */ move $t4, $t3 -/* B64508 800ED368 9610BA2C */ lhu $s0, %lo(D_8016BA2C)($s0) -/* B6450C 800ED36C 25290F6C */ addiu $t1, %lo(D_80130F6C) # addiu $t1, $t1, 0xf6c -.L800ED370: -/* B64510 800ED370 24180001 */ li $t8, 1 -/* B64514 800ED374 0198C804 */ sllv $t9, $t8, $t4 -/* B64518 800ED378 332EFFFF */ andi $t6, $t9, 0xffff -/* B6451C 800ED37C 020E7824 */ and $t7, $s0, $t6 -/* B64520 800ED380 11E0002B */ beqz $t7, .L800ED430 -/* B64524 800ED384 000BC0C0 */ sll $t8, $t3, 3 -/* B64528 800ED388 3C198013 */ lui $t9, %hi(D_80131C00) # $t9, 0x8013 -/* B6452C 800ED38C 27391C00 */ addiu $t9, %lo(D_80131C00) # addiu $t9, $t9, 0x1c00 -/* B64530 800ED390 030BC021 */ addu $t8, $t8, $t3 -/* B64534 800ED394 03194021 */ addu $t0, $t8, $t9 -/* B64538 800ED398 91060000 */ lbu $a2, ($t0) -/* B6453C 800ED39C 00001825 */ move $v1, $zero -/* B64540 800ED3A0 00002825 */ move $a1, $zero -/* B64544 800ED3A4 18C0001A */ blez $a2, .L800ED410 -/* B64548 800ED3A8 0146082A */ slt $at, $t2, $a2 -/* B6454C 800ED3AC 14200018 */ bnez $at, .L800ED410 -/* B64550 800ED3B0 00067023 */ negu $t6, $a2 -/* B64554 800ED3B4 03EE3821 */ addu $a3, $ra, $t6 -/* B64558 800ED3B8 00002025 */ move $a0, $zero -/* B6455C 800ED3BC 0103C021 */ addu $t8, $t0, $v1 -.L800ED3C0: -/* B64560 800ED3C0 93190001 */ lbu $t9, 1($t8) -/* B64564 800ED3C4 00E47821 */ addu $t7, $a3, $a0 -/* B64568 800ED3C8 91E20000 */ lbu $v0, ($t7) -/* B6456C 800ED3CC 01397021 */ addu $t6, $t1, $t9 -/* B64570 800ED3D0 91CF0000 */ lbu $t7, ($t6) -/* B64574 800ED3D4 544F0006 */ bnel $v0, $t7, .L800ED3F0 -/* B64578 800ED3D8 24A50001 */ addiu $a1, $a1, 1 -/* B6457C 800ED3DC 24630001 */ addiu $v1, $v1, 1 -/* B64580 800ED3E0 306300FF */ andi $v1, $v1, 0xff -/* B64584 800ED3E4 10000003 */ b .L800ED3F4 -/* B64588 800ED3E8 00602025 */ move $a0, $v1 -/* B6458C 800ED3EC 24A50001 */ addiu $a1, $a1, 1 -.L800ED3F0: -/* B64590 800ED3F0 30A500FF */ andi $a1, $a1, 0xff -.L800ED3F4: -/* B64594 800ED3F4 0086082A */ slt $at, $a0, $a2 -/* B64598 800ED3F8 10200005 */ beqz $at, .L800ED410 -/* B6459C 800ED3FC 00000000 */ nop -/* B645A0 800ED400 14A00003 */ bnez $a1, .L800ED410 -/* B645A4 800ED404 0146082A */ slt $at, $t2, $a2 -/* B645A8 800ED408 5020FFED */ beql $at, $zero, .L800ED3C0 -/* B645AC 800ED40C 0103C021 */ addu $t8, $t0, $v1 -.L800ED410: -/* B645B0 800ED410 14660007 */ bne $v1, $a2, .L800ED430 -/* B645B4 800ED414 25980001 */ addiu $t8, $t4, 1 -/* B645B8 800ED418 3C018013 */ lui $at, %hi(D_80131878) # $at, 0x8013 -/* B645BC 800ED41C A0381878 */ sb $t8, %lo(D_80131878)($at) -/* B645C0 800ED420 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B645C4 800ED424 A0200F0C */ sb $zero, %lo(D_80130F0C)($at) -/* B645C8 800ED428 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 -/* B645CC 800ED42C AC200F3C */ sw $zero, %lo(D_80130F3C)($at) -.L800ED430: -/* B645D0 800ED430 256B0001 */ addiu $t3, $t3, 1 -/* B645D4 800ED434 316B00FF */ andi $t3, $t3, 0xff -/* B645D8 800ED438 016D082A */ slt $at, $t3, $t5 -/* B645DC 800ED43C 1420FFCC */ bnez $at, .L800ED370 -/* B645E0 800ED440 01606025 */ move $t4, $t3 -.L800ED444: -/* B645E4 800ED444 8FBF001C */ lw $ra, 0x1c($sp) -.L800ED448: -/* B645E8 800ED448 8FB00018 */ lw $s0, 0x18($sp) -/* B645EC 800ED44C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B645F0 800ED450 03E00008 */ jr $ra -/* B645F4 800ED454 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ED458.s b/asm/non_matchings/code/code_800EC960/func_800ED458.s deleted file mode 100644 index 8c86972b96..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ED458.s +++ /dev/null @@ -1,296 +0,0 @@ -.rdata -glabel D_80149CB0 - .asciz "Presss NA_KEY_D4 %08x\n" - .balign 4 - -glabel D_80149CC8 - .asciz "Presss NA_KEY_F4 %08x\n" - .balign 4 - -glabel D_80149CE0 - .asciz "Presss NA_KEY_A4 %08x\n" - .balign 4 - -glabel D_80149CF8 - .asciz "Presss NA_KEY_B4 %08x\n" - .balign 4 - -glabel D_80149D10 - .asciz "Presss NA_KEY_D5 %08x\n" - .balign 4 - -.text -glabel func_800ED458 -/* B645F8 800ED458 3C0E8013 */ lui $t6, %hi(D_80130F3C) # $t6, 0x8013 -/* B645FC 800ED45C 8DCE0F3C */ lw $t6, %lo(D_80130F3C)($t6) -/* B64600 800ED460 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B64604 800ED464 AFBF001C */ sw $ra, 0x1c($sp) -/* B64608 800ED468 11C00008 */ beqz $t6, .L800ED48C -/* B6460C 800ED46C AFA40020 */ sw $a0, 0x20($sp) -/* B64610 800ED470 3C038013 */ lui $v1, %hi(D_80131880) # $v1, 0x8013 -/* B64614 800ED474 24631880 */ addiu $v1, %lo(D_80131880) # addiu $v1, $v1, 0x1880 -/* B64618 800ED478 90620000 */ lbu $v0, ($v1) -/* B6461C 800ED47C 10400003 */ beqz $v0, .L800ED48C -/* B64620 800ED480 244FFFFF */ addiu $t7, $v0, -1 -/* B64624 800ED484 100000EC */ b .L800ED838 -/* B64628 800ED488 A06F0000 */ sb $t7, ($v1) -.L800ED48C: -/* B6462C 800ED48C 3C048017 */ lui $a0, %hi(D_8016BA10) # $a0, 0x8017 -/* B64630 800ED490 2484BA10 */ addiu $a0, %lo(D_8016BA10) # addiu $a0, $a0, -0x45f0 -/* B64634 800ED494 8C830000 */ lw $v1, ($a0) -/* B64638 800ED498 10600008 */ beqz $v1, .L800ED4BC -/* B6463C 800ED49C 3C028013 */ lui $v0, %hi(D_80130EFC) # $v0, 0x8013 -/* B64640 800ED4A0 8C420EFC */ lw $v0, %lo(D_80130EFC)($v0) -/* B64644 800ED4A4 3C188017 */ lui $t8, %hi(D_8016BA0C) # $t8, 0x8017 -/* B64648 800ED4A8 8F18BA0C */ lw $t8, %lo(D_8016BA0C)($t8) -/* B6464C 800ED4AC 00625824 */ and $t3, $v1, $v0 -/* B64650 800ED4B0 0302C824 */ and $t9, $t8, $v0 -/* B64654 800ED4B4 532B00E1 */ beql $t9, $t3, .L800ED83C -/* B64658 800ED4B8 8FBF001C */ lw $ra, 0x1c($sp) -.L800ED4BC: -/* B6465C 800ED4BC AC800000 */ sw $zero, ($a0) -/* B64660 800ED4C0 3C038017 */ lui $v1, %hi(D_8016BA0C) # $v1, 0x8017 -/* B64664 800ED4C4 3C028013 */ lui $v0, %hi(D_80130EFC) # $v0, 0x8013 -/* B64668 800ED4C8 8C420EFC */ lw $v0, %lo(D_80130EFC)($v0) -/* B6466C 800ED4CC 8C63BA0C */ lw $v1, %lo(D_8016BA0C)($v1) -/* B64670 800ED4D0 3C078013 */ lui $a3, %hi(D_80130F1C) # $a3, 0x8013 -/* B64674 800ED4D4 240900FF */ li $t1, 255 -/* B64678 800ED4D8 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B6467C 800ED4DC 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B64680 800ED4E0 24E70F1C */ addiu $a3, %lo(D_80130F1C) # addiu $a3, $a3, 0xf1c -/* B64684 800ED4E4 A1490000 */ sb $t1, ($t2) -/* B64688 800ED4E8 A0E90000 */ sb $t1, ($a3) -/* B6468C 800ED4EC 3C0C8017 */ lui $t4, %hi(D_8016BA14) # $t4, 0x8017 -/* B64690 800ED4F0 8D8CBA14 */ lw $t4, %lo(D_8016BA14)($t4) -/* B64694 800ED4F4 3C068017 */ lui $a2, %hi(D_8016BA18) # $a2, 0x8017 -/* B64698 800ED4F8 24C6BA18 */ addiu $a2, %lo(D_8016BA18) # addiu $a2, $a2, -0x45e8 -/* B6469C 800ED4FC 8CCE0000 */ lw $t6, ($a2) -/* B646A0 800ED500 00624024 */ and $t0, $v1, $v0 -/* B646A4 800ED504 010C6824 */ and $t5, $t0, $t4 -/* B646A8 800ED508 01A22024 */ and $a0, $t5, $v0 -/* B646AC 800ED50C 01C42824 */ and $a1, $t6, $a0 -/* B646B0 800ED510 14A00005 */ bnez $a1, .L800ED528 -/* B646B4 800ED514 3C048015 */ lui $a0, %hi(D_80149CB0) # $a0, 0x8015 -/* B646B8 800ED518 50600004 */ beql $v1, $zero, .L800ED52C -/* B646BC 800ED51C ACC50000 */ sw $a1, ($a2) -/* B646C0 800ED520 10000002 */ b .L800ED52C -/* B646C4 800ED524 ACC30000 */ sw $v1, ($a2) -.L800ED528: -/* B646C8 800ED528 ACC50000 */ sw $a1, ($a2) -.L800ED52C: -/* B646CC 800ED52C 3C058013 */ lui $a1, %hi(D_80130F00) # $a1, 0x8013 -/* B646D0 800ED530 8CA50F00 */ lw $a1, %lo(D_80130F00)($a1) -/* B646D4 800ED534 8CC20000 */ lw $v0, ($a2) -/* B646D8 800ED538 00457824 */ and $t7, $v0, $a1 -/* B646DC 800ED53C 11E0000B */ beqz $t7, .L800ED56C -/* B646E0 800ED540 00000000 */ nop -/* B646E4 800ED544 0C00084C */ jal osSyncPrintf -/* B646E8 800ED548 24849CB0 */ addiu $a0, %lo(D_80149CB0) # addiu $a0, $a0, -0x6350 -/* B646EC 800ED54C 3C078013 */ lui $a3, %hi(D_80130F1C) # $a3, 0x8013 -/* B646F0 800ED550 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B646F4 800ED554 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B646F8 800ED558 24E70F1C */ addiu $a3, %lo(D_80130F1C) # addiu $a3, $a3, 0xf1c -/* B646FC 800ED55C 24180002 */ li $t8, 2 -/* B64700 800ED560 A1580000 */ sb $t8, ($t2) -/* B64704 800ED564 10000040 */ b .L800ED668 -/* B64708 800ED568 A0E00000 */ sb $zero, ($a3) -.L800ED56C: -/* B6470C 800ED56C 3C058013 */ lui $a1, %hi(D_80130F08) # $a1, 0x8013 -/* B64710 800ED570 8CA50F08 */ lw $a1, %lo(D_80130F08)($a1) -/* B64714 800ED574 3C048015 */ lui $a0, %hi(D_80149CC8) # $a0, 0x8015 -/* B64718 800ED578 304D0001 */ andi $t5, $v0, 1 -/* B6471C 800ED57C 0045C824 */ and $t9, $v0, $a1 -/* B64720 800ED580 1320000C */ beqz $t9, .L800ED5B4 -/* B64724 800ED584 00000000 */ nop -/* B64728 800ED588 0C00084C */ jal osSyncPrintf -/* B6472C 800ED58C 24849CC8 */ addiu $a0, %lo(D_80149CC8) # addiu $a0, $a0, -0x6338 -/* B64730 800ED590 3C078013 */ lui $a3, %hi(D_80130F1C) # $a3, 0x8013 -/* B64734 800ED594 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B64738 800ED598 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B6473C 800ED59C 24E70F1C */ addiu $a3, %lo(D_80130F1C) # addiu $a3, $a3, 0xf1c -/* B64740 800ED5A0 240B0005 */ li $t3, 5 -/* B64744 800ED5A4 240C0001 */ li $t4, 1 -/* B64748 800ED5A8 A14B0000 */ sb $t3, ($t2) -/* B6474C 800ED5AC 1000002E */ b .L800ED668 -/* B64750 800ED5B0 A0EC0000 */ sb $t4, ($a3) -.L800ED5B4: -/* B64754 800ED5B4 11A0000E */ beqz $t5, .L800ED5F0 -/* B64758 800ED5B8 30580002 */ andi $t8, $v0, 2 -/* B6475C 800ED5BC 3C048015 */ lui $a0, %hi(D_80149CE0) # $a0, 0x8015 -/* B64760 800ED5C0 24849CE0 */ addiu $a0, %lo(D_80149CE0) # addiu $a0, $a0, -0x6320 -/* B64764 800ED5C4 0C00084C */ jal osSyncPrintf -/* B64768 800ED5C8 24050001 */ li $a1, 1 -/* B6476C 800ED5CC 3C078013 */ lui $a3, %hi(D_80130F1C) # $a3, 0x8013 -/* B64770 800ED5D0 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B64774 800ED5D4 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B64778 800ED5D8 24E70F1C */ addiu $a3, %lo(D_80130F1C) # addiu $a3, $a3, 0xf1c -/* B6477C 800ED5DC 240E0009 */ li $t6, 9 -/* B64780 800ED5E0 240F0002 */ li $t7, 2 -/* B64784 800ED5E4 A14E0000 */ sb $t6, ($t2) -/* B64788 800ED5E8 1000001F */ b .L800ED668 -/* B6478C 800ED5EC A0EF0000 */ sb $t7, ($a3) -.L800ED5F0: -/* B64790 800ED5F0 1300000E */ beqz $t8, .L800ED62C -/* B64794 800ED5F4 3C058013 */ lui $a1, %hi(D_80130F04) # $a1, 0x8013 -/* B64798 800ED5F8 3C048015 */ lui $a0, %hi(D_80149CF8) # $a0, 0x8015 -/* B6479C 800ED5FC 24849CF8 */ addiu $a0, %lo(D_80149CF8) # addiu $a0, $a0, -0x6308 -/* B647A0 800ED600 0C00084C */ jal osSyncPrintf -/* B647A4 800ED604 24050002 */ li $a1, 2 -/* B647A8 800ED608 3C078013 */ lui $a3, %hi(D_80130F1C) # $a3, 0x8013 -/* B647AC 800ED60C 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B647B0 800ED610 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B647B4 800ED614 24E70F1C */ addiu $a3, %lo(D_80130F1C) # addiu $a3, $a3, 0xf1c -/* B647B8 800ED618 2419000B */ li $t9, 11 -/* B647BC 800ED61C 240B0003 */ li $t3, 3 -/* B647C0 800ED620 A1590000 */ sb $t9, ($t2) -/* B647C4 800ED624 10000010 */ b .L800ED668 -/* B647C8 800ED628 A0EB0000 */ sb $t3, ($a3) -.L800ED62C: -/* B647CC 800ED62C 8CA50F04 */ lw $a1, %lo(D_80130F04)($a1) -/* B647D0 800ED630 3C048015 */ lui $a0, %hi(D_80149D10) # $a0, 0x8015 -/* B647D4 800ED634 00456024 */ and $t4, $v0, $a1 -/* B647D8 800ED638 5180000C */ beql $t4, $zero, .L800ED66C -/* B647DC 800ED63C 91430000 */ lbu $v1, ($t2) -/* B647E0 800ED640 0C00084C */ jal osSyncPrintf -/* B647E4 800ED644 24849D10 */ addiu $a0, %lo(D_80149D10) # addiu $a0, $a0, -0x62f0 -/* B647E8 800ED648 3C078013 */ lui $a3, %hi(D_80130F1C) # $a3, 0x8013 -/* B647EC 800ED64C 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B647F0 800ED650 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B647F4 800ED654 24E70F1C */ addiu $a3, %lo(D_80130F1C) # addiu $a3, $a3, 0xf1c -/* B647F8 800ED658 240D000E */ li $t5, 14 -/* B647FC 800ED65C 240E0004 */ li $t6, 4 -/* B64800 800ED660 A14D0000 */ sb $t5, ($t2) -/* B64804 800ED664 A0EE0000 */ sb $t6, ($a3) -.L800ED668: -/* B64808 800ED668 91430000 */ lbu $v1, ($t2) -.L800ED66C: -/* B6480C 800ED66C 240600FF */ li $a2, 255 -/* B64810 800ED670 3C048013 */ lui $a0, %hi(D_80131858) # $a0, 0x8013 -/* B64814 800ED674 10C30012 */ beq $a2, $v1, .L800ED6C0 -/* B64818 800ED678 00601025 */ move $v0, $v1 -/* B6481C 800ED67C 3C0F8017 */ lui $t7, %hi(D_8016BA0C) # $t7, 0x8017 -/* B64820 800ED680 8DEFBA0C */ lw $t7, %lo(D_8016BA0C)($t7) -/* B64824 800ED684 3C198013 */ lui $t9, %hi(D_80131858) # $t9, 0x8013 -/* B64828 800ED688 31F80010 */ andi $t8, $t7, 0x10 -/* B6482C 800ED68C 5300000D */ beql $t8, $zero, .L800ED6C4 -/* B64830 800ED690 24050002 */ li $a1, 2 -/* B64834 800ED694 93391858 */ lbu $t9, %lo(D_80131858)($t9) -/* B64838 800ED698 24050002 */ li $a1, 2 -/* B6483C 800ED69C 246D0001 */ addiu $t5, $v1, 1 -/* B64840 800ED6A0 50B90008 */ beql $a1, $t9, .L800ED6C4 -/* B64844 800ED6A4 24050002 */ li $a1, 2 -/* B64848 800ED6A8 90EB0000 */ lbu $t3, ($a3) -/* B6484C 800ED6AC 31A300FF */ andi $v1, $t5, 0xff -/* B64850 800ED6B0 00601025 */ move $v0, $v1 -/* B64854 800ED6B4 256C0080 */ addiu $t4, $t3, 0x80 -/* B64858 800ED6B8 A0EC0000 */ sb $t4, ($a3) -/* B6485C 800ED6BC A14D0000 */ sb $t5, ($t2) -.L800ED6C0: -/* B64860 800ED6C0 24050002 */ li $a1, 2 -.L800ED6C4: -/* B64864 800ED6C4 10C2000D */ beq $a2, $v0, .L800ED6FC -/* B64868 800ED6C8 90841858 */ lbu $a0, %lo(D_80131858)($a0) -/* B6486C 800ED6CC 3C0E8017 */ lui $t6, %hi(D_8016BA0C) # $t6, 0x8017 -/* B64870 800ED6D0 8DCEBA0C */ lw $t6, %lo(D_8016BA0C)($t6) -/* B64874 800ED6D4 31CF2000 */ andi $t7, $t6, 0x2000 -/* B64878 800ED6D8 11E00008 */ beqz $t7, .L800ED6FC -/* B6487C 800ED6DC 00000000 */ nop -/* B64880 800ED6E0 10A40006 */ beq $a1, $a0, .L800ED6FC -/* B64884 800ED6E4 00000000 */ nop -/* B64888 800ED6E8 90F80000 */ lbu $t8, ($a3) -/* B6488C 800ED6EC 246BFFFF */ addiu $t3, $v1, -1 -/* B64890 800ED6F0 A14B0000 */ sb $t3, ($t2) -/* B64894 800ED6F4 27190040 */ addiu $t9, $t8, 0x40 -/* B64898 800ED6F8 A0F90000 */ sb $t9, ($a3) -.L800ED6FC: -/* B6489C 800ED6FC 10A4001D */ beq $a1, $a0, .L800ED774 -/* B648A0 800ED700 3C038013 */ lui $v1, %hi(D_80130F2C) -/* B648A4 800ED704 3C0C8017 */ lui $t4, %hi(D_8016BA09) # $t4, 0x8017 -/* B648A8 800ED708 818CBA09 */ lb $t4, %lo(D_8016BA09)($t4) -/* B648AC 800ED70C 3C038013 */ lui $v1, %hi(D_80130F2C) # $v1, 0x8013 -/* B648B0 800ED710 24630F2C */ addiu $v1, %lo(D_80130F2C) # addiu $v1, $v1, 0xf2c -/* B648B4 800ED714 A06C0000 */ sb $t4, ($v1) -/* B648B8 800ED718 0C03B298 */ jal func_800ECA60 -/* B648BC 800ED71C 80640000 */ lb $a0, ($v1) -/* B648C0 800ED720 3C028017 */ lui $v0, %hi(D_8016BA08) # $v0, 0x8017 -/* B648C4 800ED724 8042BA08 */ lb $v0, %lo(D_8016BA08)($v0) -/* B648C8 800ED728 3C018013 */ lui $at, %hi(D_80130F24) -/* B648CC 800ED72C E4200F24 */ swc1 $f0, %lo(D_80130F24)($at) -/* B648D0 800ED730 04410003 */ bgez $v0, .L800ED740 -/* B648D4 800ED734 3C040602 */ lui $a0, (0x06020D06 >> 16) # lui $a0, 0x602 -/* B648D8 800ED738 10000002 */ b .L800ED744 -/* B648DC 800ED73C 00021823 */ negu $v1, $v0 -.L800ED740: -/* B648E0 800ED740 00401825 */ move $v1, $v0 -.L800ED744: -/* B648E4 800ED744 3C028013 */ lui $v0, %hi(D_80130F34) # $v0, 0x8013 -/* B648E8 800ED748 24420F34 */ addiu $v0, %lo(D_80130F34) # addiu $v0, $v0, 0xf34 -/* B648EC 800ED74C 00036883 */ sra $t5, $v1, 2 -/* B648F0 800ED750 A04D0000 */ sb $t5, ($v0) -/* B648F4 800ED754 80450000 */ lb $a1, ($v0) -/* B648F8 800ED758 0C0396C8 */ jal func_800E5B20 -/* B648FC 800ED75C 34840D06 */ ori $a0, (0x06020D06 & 0xFFFF) # ori $a0, $a0, 0xd06 -/* B64900 800ED760 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B64904 800ED764 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B64908 800ED768 91420000 */ lbu $v0, ($t2) -/* B6490C 800ED76C 10000008 */ b .L800ED790 -/* B64910 800ED770 240600FF */ li $a2, 255 -.L800ED774: -/* B64914 800ED774 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B64918 800ED778 44812000 */ mtc1 $at, $f4 -/* B6491C 800ED77C 24630F2C */ addiu $v1, %lo(D_80130F2C) -/* B64920 800ED780 A0600000 */ sb $zero, ($v1) -/* B64924 800ED784 3C018013 */ lui $at, %hi(D_80130F24) -/* B64928 800ED788 E4240F24 */ swc1 $f4, %lo(D_80130F24)($at) -/* B6492C 800ED78C 91420000 */ lbu $v0, ($t2) -.L800ED790: -/* B64930 800ED790 10C20021 */ beq $a2, $v0, .L800ED818 -/* B64934 800ED794 3C0E8013 */ lui $t6, %hi(D_80130F18) # $t6, 0x8013 -/* B64938 800ED798 91CE0F18 */ lbu $t6, %lo(D_80130F18)($t6) -/* B6493C 800ED79C 3C058013 */ lui $a1, %hi(D_80130F10) -/* B64940 800ED7A0 104E001D */ beq $v0, $t6, .L800ED818 -/* B64944 800ED7A4 00000000 */ nop -/* B64948 800ED7A8 80A50F10 */ lb $a1, %lo(D_80130F10)($a1) -/* B6494C 800ED7AC 3C040602 */ lui $a0, (0x06020D07 >> 16) # lui $a0, 0x602 -/* B64950 800ED7B0 34840D07 */ ori $a0, (0x06020D07 & 0xFFFF) # ori $a0, $a0, 0xd07 -/* B64954 800ED7B4 24A5FFFF */ addiu $a1, $a1, -1 -/* B64958 800ED7B8 00052E00 */ sll $a1, $a1, 0x18 -/* B6495C 800ED7BC 0C0396C8 */ jal func_800E5B20 -/* B64960 800ED7C0 00052E03 */ sra $a1, $a1, 0x18 -/* B64964 800ED7C4 3C0A8013 */ lui $t2, %hi(D_80130F14) # $t2, 0x8013 -/* B64968 800ED7C8 254A0F14 */ addiu $t2, %lo(D_80130F14) # addiu $t2, $t2, 0xf14 -/* B6496C 800ED7CC 3C040602 */ lui $a0, (0x06020D05 >> 16) # lui $a0, 0x602 -/* B64970 800ED7D0 34840D05 */ ori $a0, (0x06020D05 & 0xFFFF) # ori $a0, $a0, 0xd05 -/* B64974 800ED7D4 0C0396C8 */ jal func_800E5B20 -/* B64978 800ED7D8 81450000 */ lb $a1, ($t2) -/* B6497C 800ED7DC 3C0F8013 */ lui $t7, %hi(D_80130F28) # $t7, 0x8013 -/* B64980 800ED7E0 3C188013 */ lui $t8, %hi(D_801333E8) # $t8, 0x8013 -/* B64984 800ED7E4 271833E8 */ addiu $t8, %lo(D_801333E8) # addiu $t8, $t8, 0x33e8 -/* B64988 800ED7E8 25EF0F28 */ addiu $t7, %lo(D_80130F28) # addiu $t7, $t7, 0xf28 -/* B6498C 800ED7EC 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B64990 800ED7F0 3C078013 */ lui $a3, %hi(D_80130F24) # $a3, 0x8013 -/* B64994 800ED7F4 24E70F24 */ addiu $a3, %lo(D_80130F24) # addiu $a3, $a3, 0xf24 -/* B64998 800ED7F8 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B6499C 800ED7FC AFAF0010 */ sw $t7, 0x10($sp) -/* B649A0 800ED800 AFB80014 */ sw $t8, 0x14($sp) -/* B649A4 800ED804 24045800 */ li $a0, 22528 -/* B649A8 800ED808 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B649AC 800ED80C 24060004 */ li $a2, 4 -/* B649B0 800ED810 1000000A */ b .L800ED83C -/* B649B4 800ED814 8FBF001C */ lw $ra, 0x1c($sp) -.L800ED818: -/* B649B8 800ED818 3C198013 */ lui $t9, %hi(D_80130F18) # $t9, 0x8013 -/* B649BC 800ED81C 93390F18 */ lbu $t9, %lo(D_80130F18)($t9) -/* B649C0 800ED820 50D90006 */ beql $a2, $t9, .L800ED83C -/* B649C4 800ED824 8FBF001C */ lw $ra, 0x1c($sp) -/* B649C8 800ED828 54C20004 */ bnel $a2, $v0, .L800ED83C -/* B649CC 800ED82C 8FBF001C */ lw $ra, 0x1c($sp) -/* B649D0 800ED830 0C03E341 */ jal func_800F8D04 -/* B649D4 800ED834 24045800 */ li $a0, 22528 -.L800ED838: -/* B649D8 800ED838 8FBF001C */ lw $ra, 0x1c($sp) -.L800ED83C: -/* B649DC 800ED83C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B649E0 800ED840 03E00008 */ jr $ra -/* B649E4 800ED844 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ED848.s b/asm/non_matchings/code/code_800EC960/func_800ED848.s deleted file mode 100644 index 3ccdf54400..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ED848.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_800ED848 -/* B649E8 800ED848 3C018013 */ lui $at, %hi(D_80130F0C) -/* B649EC 800ED84C AFA40000 */ sw $a0, ($sp) -/* B649F0 800ED850 03E00008 */ jr $ra -/* B649F4 800ED854 A0240F0C */ sb $a0, %lo(D_80130F0C)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800ED858.s b/asm/non_matchings/code/code_800EC960/func_800ED858.s deleted file mode 100644 index 37589581d1..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ED858.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_800ED858 -/* B649F8 800ED858 3C0E8013 */ lui $t6, %hi(D_80130F10) # $t6, 0x8013 -/* B649FC 800ED85C 81CE0F10 */ lb $t6, %lo(D_80130F10)($t6) -/* B64A00 800ED860 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B64A04 800ED864 AFA40020 */ sw $a0, 0x20($sp) -/* B64A08 800ED868 308400FF */ andi $a0, $a0, 0xff -/* B64A0C 800ED86C AFBF0014 */ sw $ra, 0x14($sp) -/* B64A10 800ED870 108E002E */ beq $a0, $t6, .L800ED92C -/* B64A14 800ED874 00801025 */ move $v0, $a0 -/* B64A18 800ED878 3C018201 */ lui $at, (0x82010D00 >> 16) # lui $at, 0x8201 -/* B64A1C 800ED87C 34210D00 */ ori $at, (0x82010D00 & 0xFFFF) # ori $at, $at, 0xd00 -/* B64A20 800ED880 00812025 */ or $a0, $a0, $at -/* B64A24 800ED884 0C03E803 */ jal Audio_SetBGM -/* B64A28 800ED888 AFA2001C */ sw $v0, 0x1c($sp) -/* B64A2C 800ED88C 8FA2001C */ lw $v0, 0x1c($sp) -/* B64A30 800ED890 3C018013 */ lui $at, %hi(D_80130F10) # $at, 0x8013 -/* B64A34 800ED894 340FFFFF */ li $t7, 65535 -/* B64A38 800ED898 1440001B */ bnez $v0, .L800ED908 -/* B64A3C 800ED89C A0220F10 */ sb $v0, %lo(D_80130F10)($at) -/* B64A40 800ED8A0 3C018017 */ lui $at, %hi(D_8016BA0C) # $at, 0x8017 -/* B64A44 800ED8A4 AC20BA0C */ sw $zero, %lo(D_8016BA0C)($at) -/* B64A48 800ED8A8 3C018017 */ lui $at, %hi(D_8016BA14) # $at, 0x8017 -/* B64A4C 800ED8AC AC20BA14 */ sw $zero, %lo(D_8016BA14)($at) -/* B64A50 800ED8B0 3C018017 */ lui $at, %hi(D_8016BA18) # $at, 0x8017 -/* B64A54 800ED8B4 AC20BA18 */ sw $zero, %lo(D_8016BA18)($at) -/* B64A58 800ED8B8 3C018017 */ lui $at, %hi(D_8016BA10) # $at, 0x8017 -/* B64A5C 800ED8BC AC2FBA10 */ sw $t7, %lo(D_8016BA10)($at) -/* B64A60 800ED8C0 0C03B516 */ jal func_800ED458 -/* B64A64 800ED8C4 00002025 */ move $a0, $zero -/* B64A68 800ED8C8 0C03E341 */ jal func_800F8D04 -/* B64A6C 800ED8CC 24045800 */ li $a0, 22528 -/* B64A70 800ED8D0 0C03DC98 */ jal func_800F7260 -/* B64A74 800ED8D4 00002025 */ move $a0, $zero -/* B64A78 800ED8D8 3C018013 */ lui $at, %hi(D_80130F38) # $at, 0x8013 -/* B64A7C 800ED8DC A0200F38 */ sb $zero, %lo(D_80130F38)($at) -/* B64A80 800ED8E0 3C018013 */ lui $at, %hi(D_80130F48) # $at, 0x8013 -/* B64A84 800ED8E4 A4200F48 */ sh $zero, %lo(D_80130F48)($at) -/* B64A88 800ED8E8 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B64A8C 800ED8EC A0200F0C */ sb $zero, %lo(D_80130F0C)($at) -/* B64A90 800ED8F0 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 -/* B64A94 800ED8F4 AC200F3C */ sw $zero, %lo(D_80130F3C)($at) -/* B64A98 800ED8F8 0C03DCC7 */ jal func_800F731C -/* B64A9C 800ED8FC 2404000D */ li $a0, 13 -/* B64AA0 800ED900 1000000B */ b .L800ED930 -/* B64AA4 800ED904 8FBF0014 */ lw $ra, 0x14($sp) -.L800ED908: -/* B64AA8 800ED908 3C018017 */ lui $at, %hi(D_8016BA0C) # $at, 0x8017 -/* B64AAC 800ED90C 0C03B280 */ jal func_800ECA00 -/* B64AB0 800ED910 AC20BA0C */ sw $zero, %lo(D_8016BA0C)($at) -/* B64AB4 800ED914 3C188017 */ lui $t8, %hi(D_8016BA0C) # $t8, 0x8017 -/* B64AB8 800ED918 8F18BA0C */ lw $t8, %lo(D_8016BA0C)($t8) -/* B64ABC 800ED91C 3C018017 */ lui $at, %hi(D_8016BA10) # $at, 0x8017 -/* B64AC0 800ED920 2404000D */ li $a0, 13 -/* B64AC4 800ED924 0C03DCAE */ jal func_800F72B8 -/* B64AC8 800ED928 AC38BA10 */ sw $t8, %lo(D_8016BA10)($at) -.L800ED92C: -/* B64ACC 800ED92C 8FBF0014 */ lw $ra, 0x14($sp) -.L800ED930: -/* B64AD0 800ED930 27BD0020 */ addiu $sp, $sp, 0x20 -/* B64AD4 800ED934 03E00008 */ jr $ra -/* B64AD8 800ED938 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800ED93C.s b/asm/non_matchings/code/code_800EC960/func_800ED93C.s deleted file mode 100644 index 9a48788d50..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800ED93C.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_800ED93C -/* B64ADC 800ED93C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B64AE0 800ED940 AFA40018 */ sw $a0, 0x18($sp) -/* B64AE4 800ED944 00042600 */ sll $a0, $a0, 0x18 -/* B64AE8 800ED948 00042603 */ sra $a0, $a0, 0x18 -/* B64AEC 800ED94C 00053600 */ sll $a2, $a1, 0x18 -/* B64AF0 800ED950 00063603 */ sra $a2, $a2, 0x18 -/* B64AF4 800ED954 AFBF0014 */ sw $ra, 0x14($sp) -/* B64AF8 800ED958 14800007 */ bnez $a0, .L800ED978 -/* B64AFC 800ED95C AFA5001C */ sw $a1, 0x1c($sp) -/* B64B00 800ED960 3C018013 */ lui $at, %hi(D_80130F38) # $at, 0x8013 -/* B64B04 800ED964 A0200F38 */ sb $zero, %lo(D_80130F38)($at) -/* B64B08 800ED968 0C03E341 */ jal func_800F8D04 -/* B64B0C 800ED96C 24045800 */ li $a0, 22528 -/* B64B10 800ED970 1000002F */ b .L800EDA30 -/* B64B14 800ED974 8FBF0014 */ lw $ra, 0x14($sp) -.L800ED978: -/* B64B18 800ED978 2881000F */ slti $at, $a0, 0xf -/* B64B1C 800ED97C 1020000C */ beqz $at, .L800ED9B0 -/* B64B20 800ED980 3C038013 */ lui $v1, %hi(D_80130F44) # $v1, 0x8013 -/* B64B24 800ED984 00047080 */ sll $t6, $a0, 2 -/* B64B28 800ED988 01C47021 */ addu $t6, $t6, $a0 -/* B64B2C 800ED98C 000E7140 */ sll $t6, $t6, 5 -/* B64B30 800ED990 3C188013 */ lui $t8, %hi(D_80130F80) # $t8, 0x8013 -/* B64B34 800ED994 3C078013 */ lui $a3, %hi(D_80131840) # $a3, 0x8013 -/* B64B38 800ED998 27180F80 */ addiu $t8, %lo(D_80130F80) # addiu $t8, $t8, 0xf80 -/* B64B3C 800ED99C 25CFFF60 */ addiu $t7, $t6, -0xa0 -/* B64B40 800ED9A0 24E71840 */ addiu $a3, %lo(D_80131840) # addiu $a3, $a3, 0x1840 -/* B64B44 800ED9A4 01F8C821 */ addu $t9, $t7, $t8 -/* B64B48 800ED9A8 10000006 */ b .L800ED9C4 -/* B64B4C 800ED9AC ACF90000 */ sw $t9, ($a3) -.L800ED9B0: -/* B64B50 800ED9B0 3C078013 */ lui $a3, %hi(D_80131840) # $a3, 0x8013 -/* B64B54 800ED9B4 3C088013 */ lui $t0, %hi(D_80131884) # $t0, 0x8013 -/* B64B58 800ED9B8 24E71840 */ addiu $a3, %lo(D_80131840) # addiu $a3, $a3, 0x1840 -/* B64B5C 800ED9BC 25081884 */ addiu $t0, %lo(D_80131884) # addiu $t0, $t0, 0x1884 -/* B64B60 800ED9C0 ACE80000 */ sw $t0, ($a3) -.L800ED9C4: -/* B64B64 800ED9C4 3C018013 */ lui $at, %hi(D_80130F38) # $at, 0x8013 -/* B64B68 800ED9C8 A0260F38 */ sb $a2, %lo(D_80130F38)($at) -/* B64B6C 800ED9CC 3C018013 */ lui $at, %hi(D_80130F40) # $at, 0x8013 -/* B64B70 800ED9D0 AC200F40 */ sw $zero, %lo(D_80130F40)($at) -/* B64B74 800ED9D4 3C018013 */ lui $at, %hi(D_80130F50) # $at, 0x8013 -/* B64B78 800ED9D8 240900FF */ li $t1, 255 -/* B64B7C 800ED9DC A0290F50 */ sb $t1, %lo(D_80130F50)($at) -/* B64B80 800ED9E0 24630F44 */ addiu $v1, %lo(D_80130F44) # addiu $v1, $v1, 0xf44 -/* B64B84 800ED9E4 A4600000 */ sh $zero, ($v1) -/* B64B88 800ED9E8 3C018013 */ lui $at, %hi(D_80130F48) # $at, 0x8013 -/* B64B8C 800ED9EC A4200F48 */ sh $zero, %lo(D_80130F48)($at) -/* B64B90 800ED9F0 94620000 */ lhu $v0, ($v1) -/* B64B94 800ED9F4 8CE40000 */ lw $a0, ($a3) -/* B64B98 800ED9F8 240500FF */ li $a1, 255 -/* B64B9C 800ED9FC 000250C0 */ sll $t2, $v0, 3 -/* B64BA0 800EDA00 008A5821 */ addu $t3, $a0, $t2 -/* B64BA4 800EDA04 916C0000 */ lbu $t4, ($t3) -/* B64BA8 800EDA08 14AC0008 */ bne $a1, $t4, .L800EDA2C -/* B64BAC 800EDA0C 244D0001 */ addiu $t5, $v0, 1 -.L800EDA10: -/* B64BB0 800EDA10 31A2FFFF */ andi $v0, $t5, 0xffff -/* B64BB4 800EDA14 000270C0 */ sll $t6, $v0, 3 -/* B64BB8 800EDA18 008E7821 */ addu $t7, $a0, $t6 -/* B64BBC 800EDA1C A46D0000 */ sh $t5, ($v1) -/* B64BC0 800EDA20 91F80000 */ lbu $t8, ($t7) -/* B64BC4 800EDA24 50B8FFFA */ beql $a1, $t8, .L800EDA10 -/* B64BC8 800EDA28 244D0001 */ addiu $t5, $v0, 1 -.L800EDA2C: -/* B64BCC 800EDA2C 8FBF0014 */ lw $ra, 0x14($sp) -.L800EDA30: -/* B64BD0 800EDA30 27BD0018 */ addiu $sp, $sp, 0x18 -/* B64BD4 800EDA34 03E00008 */ jr $ra -/* B64BD8 800EDA38 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EDA3C.s b/asm/non_matchings/code/code_800EC960/func_800EDA3C.s deleted file mode 100644 index 727cd3e11d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EDA3C.s +++ /dev/null @@ -1,223 +0,0 @@ -glabel func_800EDA3C -/* B64BDC 800EDA3C 3C088013 */ lui $t0, %hi(D_80130F38) # $t0, 0x8013 -/* B64BE0 800EDA40 25080F38 */ addiu $t0, %lo(D_80130F38) # addiu $t0, $t0, 0xf38 -/* B64BE4 800EDA44 91070000 */ lbu $a3, ($t0) -/* B64BE8 800EDA48 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B64BEC 800EDA4C AFBF001C */ sw $ra, 0x1c($sp) -/* B64BF0 800EDA50 10E000C1 */ beqz $a3, .L800EDD58 -/* B64BF4 800EDA54 3C098013 */ lui $t1, %hi(D_80130F48) # $t1, 0x8013 -/* B64BF8 800EDA58 25290F48 */ addiu $t1, %lo(D_80130F48) # addiu $t1, $t1, 0xf48 -/* B64BFC 800EDA5C 952E0000 */ lhu $t6, ($t1) -/* B64C00 800EDA60 3C038013 */ lui $v1, %hi(D_80130F40) # $v1, 0x8013 -/* B64C04 800EDA64 24630F40 */ addiu $v1, %lo(D_80130F40) # addiu $v1, $v1, 0xf40 -/* B64C08 800EDA68 15C00003 */ bnez $t6, .L800EDA78 -/* B64C0C 800EDA6C 3C0F8017 */ lui $t7, %hi(D_8016BA04) # $t7, 0x8017 -/* B64C10 800EDA70 10000005 */ b .L800EDA88 -/* B64C14 800EDA74 24040003 */ li $a0, 3 -.L800EDA78: -/* B64C18 800EDA78 3C188013 */ lui $t8, %hi(D_80130F68) # $t8, 0x8013 -/* B64C1C 800EDA7C 8F180F68 */ lw $t8, %lo(D_80130F68)($t8) -/* B64C20 800EDA80 8DEFBA04 */ lw $t7, %lo(D_8016BA04)($t7) -/* B64C24 800EDA84 01F82023 */ subu $a0, $t7, $t8 -.L800EDA88: -/* B64C28 800EDA88 8C620000 */ lw $v0, ($v1) -/* B64C2C 800EDA8C 3C068013 */ lui $a2, %hi(D_80131840) # $a2, 0x8013 -/* B64C30 800EDA90 3C058013 */ lui $a1, %hi(D_80130F44) # $a1, 0x8013 -/* B64C34 800EDA94 0082082B */ sltu $at, $a0, $v0 -/* B64C38 800EDA98 10200004 */ beqz $at, .L800EDAAC -/* B64C3C 800EDA9C 00825023 */ subu $t2, $a0, $v0 -/* B64C40 800EDAA0 0044C823 */ subu $t9, $v0, $a0 -/* B64C44 800EDAA4 10000003 */ b .L800EDAB4 -/* B64C48 800EDAA8 AC790000 */ sw $t9, ($v1) -.L800EDAAC: -/* B64C4C 800EDAAC AFAA0020 */ sw $t2, 0x20($sp) -/* B64C50 800EDAB0 AC600000 */ sw $zero, ($v1) -.L800EDAB4: -/* B64C54 800EDAB4 8C6B0000 */ lw $t3, ($v1) -/* B64C58 800EDAB8 556000A8 */ bnezl $t3, .L800EDD5C -/* B64C5C 800EDABC 8FBF001C */ lw $ra, 0x1c($sp) -/* B64C60 800EDAC0 94A50F44 */ lhu $a1, %lo(D_80130F44)($a1) -/* B64C64 800EDAC4 8CC61840 */ lw $a2, %lo(D_80131840)($a2) -/* B64C68 800EDAC8 24010001 */ li $at, 1 -/* B64C6C 800EDACC 000560C0 */ sll $t4, $a1, 3 -/* B64C70 800EDAD0 00CC2021 */ addu $a0, $a2, $t4 -/* B64C74 800EDAD4 948D0002 */ lhu $t5, 2($a0) -/* B64C78 800EDAD8 24F8FFFF */ addiu $t8, $a3, -1 -/* B64C7C 800EDADC 14A10003 */ bne $a1, $at, .L800EDAEC -/* B64C80 800EDAE0 AC6D0000 */ sw $t5, ($v1) -/* B64C84 800EDAE4 25AF0001 */ addiu $t7, $t5, 1 -/* B64C88 800EDAE8 AC6F0000 */ sw $t7, ($v1) -.L800EDAEC: -/* B64C8C 800EDAEC 8C620000 */ lw $v0, ($v1) -/* B64C90 800EDAF0 8FAB0020 */ lw $t3, 0x20($sp) -/* B64C94 800EDAF4 331900FF */ andi $t9, $t8, 0xff -/* B64C98 800EDAF8 1440000F */ bnez $v0, .L800EDB38 -/* B64C9C 800EDAFC 004B6023 */ subu $t4, $v0, $t3 -/* B64CA0 800EDB00 13200009 */ beqz $t9, .L800EDB28 -/* B64CA4 800EDB04 A1180000 */ sb $t8, ($t0) -/* B64CA8 800EDB08 3C068013 */ lui $a2, %hi(D_80130F50) # $a2, 0x8013 -/* B64CAC 800EDB0C 3C018013 */ lui $at, %hi(D_80130F44) # $at, 0x8013 -/* B64CB0 800EDB10 24C60F50 */ addiu $a2, %lo(D_80130F50) # addiu $a2, $a2, 0xf50 -/* B64CB4 800EDB14 A4200F44 */ sh $zero, %lo(D_80130F44)($at) -/* B64CB8 800EDB18 240A00FF */ li $t2, 255 -/* B64CBC 800EDB1C A5200000 */ sh $zero, ($t1) -/* B64CC0 800EDB20 1000008D */ b .L800EDD58 -/* B64CC4 800EDB24 A0CA0000 */ sb $t2, ($a2) -.L800EDB28: -/* B64CC8 800EDB28 0C03E341 */ jal func_800F8D04 -/* B64CCC 800EDB2C 24045800 */ li $a0, 22528 -/* B64CD0 800EDB30 1000008A */ b .L800EDD5C -/* B64CD4 800EDB34 8FBF001C */ lw $ra, 0x1c($sp) -.L800EDB38: -/* B64CD8 800EDB38 AC6C0000 */ sw $t4, ($v1) -/* B64CDC 800EDB3C 3C038013 */ lui $v1, %hi(D_80130F54) -/* B64CE0 800EDB40 24630F54 */ addiu $v1, %lo(D_80130F54) # addiu $v1, $v1, 0xf54 -/* B64CE4 800EDB44 906D0000 */ lbu $t5, ($v1) -/* B64CE8 800EDB48 90820004 */ lbu $v0, 4($a0) -/* B64CEC 800EDB4C 11A2000E */ beq $t5, $v0, .L800EDB88 -/* B64CF0 800EDB50 304E00FF */ andi $t6, $v0, 0xff -/* B64CF4 800EDB54 448E2000 */ mtc1 $t6, $f4 -/* B64CF8 800EDB58 A0620000 */ sb $v0, ($v1) -/* B64CFC 800EDB5C 05C10005 */ bgez $t6, .L800EDB74 -/* B64D00 800EDB60 468021A0 */ cvt.s.w $f6, $f4 -/* B64D04 800EDB64 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B64D08 800EDB68 44814000 */ mtc1 $at, $f8 -/* B64D0C 800EDB6C 00000000 */ nop -/* B64D10 800EDB70 46083180 */ add.s $f6, $f6, $f8 -.L800EDB74: -/* B64D14 800EDB74 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B64D18 800EDB78 44815000 */ mtc1 $at, $f10 -/* B64D1C 800EDB7C 3C018013 */ lui $at, %hi(D_80130F64) -/* B64D20 800EDB80 460A3403 */ div.s $f16, $f6, $f10 -/* B64D24 800EDB84 E4300F64 */ swc1 $f16, %lo(D_80130F64)($at) -.L800EDB88: -/* B64D28 800EDB88 3C038013 */ lui $v1, %hi(D_80130F58) # $v1, 0x8013 -/* B64D2C 800EDB8C 24630F58 */ addiu $v1, %lo(D_80130F58) # addiu $v1, $v1, 0xf58 -/* B64D30 800EDB90 906F0000 */ lbu $t7, ($v1) -/* B64D34 800EDB94 90820005 */ lbu $v0, 5($a0) -/* B64D38 800EDB98 11E2000E */ beq $t7, $v0, .L800EDBD4 -/* B64D3C 800EDB9C 00000000 */ nop -/* B64D40 800EDBA0 A0620000 */ sb $v0, ($v1) -/* B64D44 800EDBA4 3C040602 */ lui $a0, (0x06020D06 >> 16) # lui $a0, 0x602 -/* B64D48 800EDBA8 34840D06 */ ori $a0, (0x06020D06 & 0xFFFF) # ori $a0, $a0, 0xd06 -/* B64D4C 800EDBAC 0C0396C8 */ jal func_800E5B20 -/* B64D50 800EDBB0 80650000 */ lb $a1, ($v1) -/* B64D54 800EDBB4 3C058013 */ lui $a1, %hi(D_80130F44) # $a1, 0x8013 -/* B64D58 800EDBB8 94A50F44 */ lhu $a1, %lo(D_80130F44)($a1) -/* B64D5C 800EDBBC 3C068013 */ lui $a2, %hi(D_80131840) # $a2, 0x8013 -/* B64D60 800EDBC0 8CC61840 */ lw $a2, %lo(D_80131840)($a2) -/* B64D64 800EDBC4 3C098013 */ lui $t1, %hi(D_80130F48) # $t1, 0x8013 -/* B64D68 800EDBC8 0005C0C0 */ sll $t8, $a1, 3 -/* B64D6C 800EDBCC 25290F48 */ addiu $t1, %lo(D_80130F48) # addiu $t1, $t1, 0xf48 -/* B64D70 800EDBD0 00D82021 */ addu $a0, $a2, $t8 -.L800EDBD4: -/* B64D74 800EDBD4 3C038013 */ lui $v1, %hi(D_80130F5C) # $v1, 0x8013 -/* B64D78 800EDBD8 24630F5C */ addiu $v1, %lo(D_80130F5C) # addiu $v1, $v1, 0xf5c -/* B64D7C 800EDBDC 80790000 */ lb $t9, ($v1) -/* B64D80 800EDBE0 80820006 */ lb $v0, 6($a0) -/* B64D84 800EDBE4 5322000F */ beql $t9, $v0, .L800EDC24 -/* B64D88 800EDBE8 000558C0 */ sll $t3, $a1, 3 -/* B64D8C 800EDBEC A0620000 */ sb $v0, ($v1) -/* B64D90 800EDBF0 0C03B298 */ jal func_800ECA60 -/* B64D94 800EDBF4 80640000 */ lb $a0, ($v1) -/* B64D98 800EDBF8 3C058013 */ lui $a1, %hi(D_80130F44) # $a1, 0x8013 -/* B64D9C 800EDBFC 94A50F44 */ lhu $a1, %lo(D_80130F44)($a1) -/* B64DA0 800EDC00 3C068013 */ lui $a2, %hi(D_80131840) # $a2, 0x8013 -/* B64DA4 800EDC04 8CC61840 */ lw $a2, %lo(D_80131840)($a2) -/* B64DA8 800EDC08 3C098013 */ lui $t1, %hi(D_80130F48) # $t1, 0x8013 -/* B64DAC 800EDC0C 3C018013 */ lui $at, %hi(D_80130F60) -/* B64DB0 800EDC10 000550C0 */ sll $t2, $a1, 3 -/* B64DB4 800EDC14 E4200F60 */ swc1 $f0, %lo(D_80130F60)($at) -/* B64DB8 800EDC18 25290F48 */ addiu $t1, %lo(D_80130F48) # addiu $t1, $t1, 0xf48 -/* B64DBC 800EDC1C 00CA2021 */ addu $a0, $a2, $t2 -/* B64DC0 800EDC20 000558C0 */ sll $t3, $a1, 3 -.L800EDC24: -/* B64DC4 800EDC24 00CB1021 */ addu $v0, $a2, $t3 -/* B64DC8 800EDC28 904DFFFC */ lbu $t5, -4($v0) -/* B64DCC 800EDC2C 908C0004 */ lbu $t4, 4($a0) -/* B64DD0 800EDC30 2401000A */ li $at, 10 -/* B64DD4 800EDC34 158D000C */ bne $t4, $t5, .L800EDC68 -/* B64DD8 800EDC38 00000000 */ nop -/* B64DDC 800EDC3C 908E0005 */ lbu $t6, 5($a0) -/* B64DE0 800EDC40 904FFFFD */ lbu $t7, -3($v0) -/* B64DE4 800EDC44 15CF0008 */ bne $t6, $t7, .L800EDC68 -/* B64DE8 800EDC48 00000000 */ nop -/* B64DEC 800EDC4C 80980006 */ lb $t8, 6($a0) -/* B64DF0 800EDC50 8059FFFE */ lb $t9, -2($v0) -/* B64DF4 800EDC54 3C068013 */ lui $a2, %hi(D_80130F50) # $a2, 0x8013 -/* B64DF8 800EDC58 24C60F50 */ addiu $a2, %lo(D_80130F50) # addiu $a2, $a2, 0xf50 -/* B64DFC 800EDC5C 17190002 */ bne $t8, $t9, .L800EDC68 -/* B64E00 800EDC60 240A00FE */ li $t2, 254 -/* B64E04 800EDC64 A0CA0000 */ sb $t2, ($a2) -.L800EDC68: -/* B64E08 800EDC68 3C068013 */ lui $a2, %hi(D_80130F50) # $a2, 0x8013 -/* B64E0C 800EDC6C 24C60F50 */ addiu $a2, %lo(D_80130F50) # addiu $a2, $a2, 0xf50 -/* B64E10 800EDC70 90CB0000 */ lbu $t3, ($a2) -/* B64E14 800EDC74 90820000 */ lbu $v0, ($a0) -/* B64E18 800EDC78 11620034 */ beq $t3, $v0, .L800EDD4C -/* B64E1C 800EDC7C 304300FF */ andi $v1, $v0, 0xff -/* B64E20 800EDC80 14610005 */ bne $v1, $at, .L800EDC98 -/* B64E24 800EDC84 00602825 */ move $a1, $v1 -/* B64E28 800EDC88 908C0007 */ lbu $t4, 7($a0) -/* B64E2C 800EDC8C 01856821 */ addu $t5, $t4, $a1 -/* B64E30 800EDC90 10000002 */ b .L800EDC9C -/* B64E34 800EDC94 A0CD0000 */ sb $t5, ($a2) -.L800EDC98: -/* B64E38 800EDC98 A0C30000 */ sb $v1, ($a2) -.L800EDC9C: -/* B64E3C 800EDC9C 90CE0000 */ lbu $t6, ($a2) -/* B64E40 800EDCA0 240100FF */ li $at, 255 -/* B64E44 800EDCA4 11C10025 */ beq $t6, $at, .L800EDD3C -/* B64E48 800EDCA8 00000000 */ nop -/* B64E4C 800EDCAC 952F0000 */ lhu $t7, ($t1) -/* B64E50 800EDCB0 3C058013 */ lui $a1, %hi(D_80130F10) -/* B64E54 800EDCB4 3C040602 */ lui $a0, (0x06020D07 >> 16) # lui $a0, 0x602 -/* B64E58 800EDCB8 25F80001 */ addiu $t8, $t7, 1 -/* B64E5C 800EDCBC A5380000 */ sh $t8, ($t1) -/* B64E60 800EDCC0 80A50F10 */ lb $a1, %lo(D_80130F10)($a1) -/* B64E64 800EDCC4 34840D07 */ ori $a0, (0x06020D07 & 0xFFFF) # ori $a0, $a0, 0xd07 -/* B64E68 800EDCC8 24A5FFFF */ addiu $a1, $a1, -1 -/* B64E6C 800EDCCC 00052E00 */ sll $a1, $a1, 0x18 -/* B64E70 800EDCD0 0C0396C8 */ jal func_800E5B20 -/* B64E74 800EDCD4 00052E03 */ sra $a1, $a1, 0x18 -/* B64E78 800EDCD8 3C068013 */ lui $a2, %hi(D_80130F50) # $a2, 0x8013 -/* B64E7C 800EDCDC 24C60F50 */ addiu $a2, %lo(D_80130F50) # addiu $a2, $a2, 0xf50 -/* B64E80 800EDCE0 90C50000 */ lbu $a1, ($a2) -/* B64E84 800EDCE4 3C040602 */ lui $a0, (0x06020D05 >> 16) # lui $a0, 0x602 -/* B64E88 800EDCE8 34840D05 */ ori $a0, (0x06020D05 & 0xFFFF) # ori $a0, $a0, 0xd05 -/* B64E8C 800EDCEC 30A5003F */ andi $a1, $a1, 0x3f -/* B64E90 800EDCF0 00052E00 */ sll $a1, $a1, 0x18 -/* B64E94 800EDCF4 0C0396C8 */ jal func_800E5B20 -/* B64E98 800EDCF8 00052E03 */ sra $a1, $a1, 0x18 -/* B64E9C 800EDCFC 3C198013 */ lui $t9, %hi(D_80130F64) # $t9, 0x8013 -/* B64EA0 800EDD00 3C0A8013 */ lui $t2, %hi(D_801333E8) # $t2, 0x8013 -/* B64EA4 800EDD04 254A33E8 */ addiu $t2, %lo(D_801333E8) # addiu $t2, $t2, 0x33e8 -/* B64EA8 800EDD08 27390F64 */ addiu $t9, %lo(D_80130F64) # addiu $t9, $t9, 0xf64 -/* B64EAC 800EDD0C 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B64EB0 800EDD10 3C078013 */ lui $a3, %hi(D_80130F60) # $a3, 0x8013 -/* B64EB4 800EDD14 24E70F60 */ addiu $a3, %lo(D_80130F60) # addiu $a3, $a3, 0xf60 -/* B64EB8 800EDD18 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B64EBC 800EDD1C AFB90010 */ sw $t9, 0x10($sp) -/* B64EC0 800EDD20 AFAA0014 */ sw $t2, 0x14($sp) -/* B64EC4 800EDD24 24045800 */ li $a0, 22528 -/* B64EC8 800EDD28 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B64ECC 800EDD2C 24060004 */ li $a2, 4 -/* B64ED0 800EDD30 3C058013 */ lui $a1, %hi(D_80130F44) # $a1, 0x8013 -/* B64ED4 800EDD34 10000005 */ b .L800EDD4C -/* B64ED8 800EDD38 94A50F44 */ lhu $a1, %lo(D_80130F44)($a1) -.L800EDD3C: -/* B64EDC 800EDD3C 0C03E341 */ jal func_800F8D04 -/* B64EE0 800EDD40 24045800 */ li $a0, 22528 -/* B64EE4 800EDD44 3C058013 */ lui $a1, %hi(D_80130F44) # $a1, 0x8013 -/* B64EE8 800EDD48 94A50F44 */ lhu $a1, %lo(D_80130F44)($a1) -.L800EDD4C: -/* B64EEC 800EDD4C 24AB0001 */ addiu $t3, $a1, 1 -/* B64EF0 800EDD50 3C018013 */ lui $at, %hi(D_80130F44) # $at, 0x8013 -/* B64EF4 800EDD54 A42B0F44 */ sh $t3, %lo(D_80130F44)($at) -.L800EDD58: -/* B64EF8 800EDD58 8FBF001C */ lw $ra, 0x1c($sp) -.L800EDD5C: -/* B64EFC 800EDD5C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B64F00 800EDD60 03E00008 */ jr $ra -/* B64F04 800EDD64 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EDD68.s b/asm/non_matchings/code/code_800EC960/func_800EDD68.s deleted file mode 100644 index bbb66a9965..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EDD68.s +++ /dev/null @@ -1,282 +0,0 @@ -glabel func_800EDD68 -/* B64F08 800EDD68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B64F0C 800EDD6C AFBF0014 */ sw $ra, 0x14($sp) -/* B64F10 800EDD70 3C1F8013 */ lui $ra, %hi(D_80131858) # $ra, 0x8013 -/* B64F14 800EDD74 27FF1858 */ addiu $ra, %lo(D_80131858) # addiu $ra, $ra, 0x1858 -/* B64F18 800EDD78 93EE0000 */ lbu $t6, ($ra) -/* B64F1C 800EDD7C 24010001 */ li $at, 1 -/* B64F20 800EDD80 AFA40020 */ sw $a0, 0x20($sp) -/* B64F24 800EDD84 15C10004 */ bne $t6, $at, .L800EDD98 -/* B64F28 800EDD88 3C028013 */ lui $v0, %hi(D_80131864) # $v0, 0x8013 -/* B64F2C 800EDD8C 3C048013 */ lui $a0, %hi(gScarecrowCustomSongPtr) # $a0, 0x8013 -/* B64F30 800EDD90 10000003 */ b .L800EDDA0 -/* B64F34 800EDD94 8C841BE4 */ lw $a0, %lo(gScarecrowCustomSongPtr)($a0) -.L800EDD98: -/* B64F38 800EDD98 3C048013 */ lui $a0, %hi(D_80131BEC) # $a0, 0x8013 -/* B64F3C 800EDD9C 8C841BEC */ lw $a0, %lo(D_80131BEC)($a0) -.L800EDDA0: -/* B64F40 800EDDA0 3C0D8013 */ lui $t5, %hi(D_8013185C) # $t5, 0x8013 -/* B64F44 800EDDA4 25AD185C */ addiu $t5, %lo(D_8013185C) # addiu $t5, $t5, 0x185c -/* B64F48 800EDDA8 91B80000 */ lbu $t8, ($t5) -/* B64F4C 800EDDAC 24421864 */ addiu $v0, %lo(D_80131864) # addiu $v0, $v0, 0x1864 -/* B64F50 800EDDB0 904F0000 */ lbu $t7, ($v0) -/* B64F54 800EDDB4 0018C8C0 */ sll $t9, $t8, 3 -/* B64F58 800EDDB8 00997021 */ addu $t6, $a0, $t9 -/* B64F5C 800EDDBC A1CF0000 */ sb $t7, ($t6) -/* B64F60 800EDDC0 3C198013 */ lui $t9, %hi(D_80131860) # $t9, 0x8013 -/* B64F64 800EDDC4 3C188017 */ lui $t8, %hi(D_8016BA04) # $t8, 0x8017 -/* B64F68 800EDDC8 8F18BA04 */ lw $t8, %lo(D_8016BA04)($t8) -/* B64F6C 800EDDCC 8F391860 */ lw $t9, %lo(D_80131860)($t9) -/* B64F70 800EDDD0 91AE0000 */ lbu $t6, ($t5) -/* B64F74 800EDDD4 3C038013 */ lui $v1, %hi(D_80131868) # $v1, 0x8013 -/* B64F78 800EDDD8 03197823 */ subu $t7, $t8, $t9 -/* B64F7C 800EDDDC 000EC0C0 */ sll $t8, $t6, 3 -/* B64F80 800EDDE0 0098C821 */ addu $t9, $a0, $t8 -/* B64F84 800EDDE4 A72F0002 */ sh $t7, 2($t9) -/* B64F88 800EDDE8 91B80000 */ lbu $t8, ($t5) -/* B64F8C 800EDDEC 24631868 */ addiu $v1, %lo(D_80131868) # addiu $v1, $v1, 0x1868 -/* B64F90 800EDDF0 906E0000 */ lbu $t6, ($v1) -/* B64F94 800EDDF4 001878C0 */ sll $t7, $t8, 3 -/* B64F98 800EDDF8 008FC821 */ addu $t9, $a0, $t7 -/* B64F9C 800EDDFC A32E0004 */ sb $t6, 4($t9) -/* B64FA0 800EDE00 91AF0000 */ lbu $t7, ($t5) -/* B64FA4 800EDE04 3C058013 */ lui $a1, %hi(D_8013186C) # $a1, 0x8013 -/* B64FA8 800EDE08 24A5186C */ addiu $a1, %lo(D_8013186C) # addiu $a1, $a1, 0x186c -/* B64FAC 800EDE0C 90B80000 */ lbu $t8, ($a1) -/* B64FB0 800EDE10 000F70C0 */ sll $t6, $t7, 3 -/* B64FB4 800EDE14 008EC821 */ addu $t9, $a0, $t6 -/* B64FB8 800EDE18 A3380005 */ sb $t8, 5($t9) -/* B64FBC 800EDE1C 91AE0000 */ lbu $t6, ($t5) -/* B64FC0 800EDE20 3C088013 */ lui $t0, %hi(D_80131870) # $t0, 0x8013 -/* B64FC4 800EDE24 25081870 */ addiu $t0, %lo(D_80131870) # addiu $t0, $t0, 0x1870 -/* B64FC8 800EDE28 810F0000 */ lb $t7, ($t0) -/* B64FCC 800EDE2C 000EC0C0 */ sll $t8, $t6, 3 -/* B64FD0 800EDE30 0098C821 */ addu $t9, $a0, $t8 -/* B64FD4 800EDE34 3C098013 */ lui $t1, %hi(D_80131874) # $t1, 0x8013 -/* B64FD8 800EDE38 A32F0006 */ sb $t7, 6($t9) -/* B64FDC 800EDE3C 25291874 */ addiu $t1, %lo(D_80131874) # addiu $t1, $t1, 0x1874 -/* B64FE0 800EDE40 912E0000 */ lbu $t6, ($t1) -/* B64FE4 800EDE44 91AF0000 */ lbu $t7, ($t5) -/* B64FE8 800EDE48 2401006B */ li $at, 107 -/* B64FEC 800EDE4C 31D800C0 */ andi $t8, $t6, 0xc0 -/* B64FF0 800EDE50 000FC8C0 */ sll $t9, $t7, 3 -/* B64FF4 800EDE54 00997021 */ addu $t6, $a0, $t9 -/* B64FF8 800EDE58 A1D80007 */ sb $t8, 7($t6) -/* B64FFC 800EDE5C 3C0F8013 */ lui $t7, %hi(D_80130F14) # $t7, 0x8013 -/* B65000 800EDE60 91EF0F14 */ lbu $t7, %lo(D_80130F14)($t7) -/* B65004 800EDE64 3C198013 */ lui $t9, %hi(D_80130F30) # $t9, 0x8013 -/* B65008 800EDE68 3C188013 */ lui $t8, %hi(D_80130F34) # $t8, 0x8013 -/* B6500C 800EDE6C A04F0000 */ sb $t7, ($v0) -/* B65010 800EDE70 83390F30 */ lb $t9, %lo(D_80130F30)($t9) -/* B65014 800EDE74 3C0E8013 */ lui $t6, %hi(D_80130F2C) # $t6, 0x8013 -/* B65018 800EDE78 3C0F8013 */ lui $t7, %hi(D_80130F1C) # $t7, 0x8013 -/* B6501C 800EDE7C A0790000 */ sb $t9, ($v1) -/* B65020 800EDE80 83180F34 */ lb $t8, %lo(D_80130F34)($t8) -/* B65024 800EDE84 91B90000 */ lbu $t9, ($t5) -/* B65028 800EDE88 A0B80000 */ sb $t8, ($a1) -/* B6502C 800EDE8C 81CE0F2C */ lb $t6, %lo(D_80130F2C)($t6) -/* B65030 800EDE90 27380001 */ addiu $t8, $t9, 1 -/* B65034 800EDE94 330700FF */ andi $a3, $t8, 0xff -/* B65038 800EDE98 A10E0000 */ sb $t6, ($t0) -/* B6503C 800EDE9C 91EF0F1C */ lbu $t7, %lo(D_80130F1C)($t7) -/* B65040 800EDEA0 A1B80000 */ sb $t8, ($t5) -/* B65044 800EDEA4 00E03025 */ move $a2, $a3 -/* B65048 800EDEA8 10E10003 */ beq $a3, $at, .L800EDEB8 -/* B6504C 800EDEAC A12F0000 */ sb $t7, ($t1) -/* B65050 800EDEB0 93AE0023 */ lbu $t6, 0x23($sp) -/* B65054 800EDEB4 11C000AA */ beqz $t6, .L800EE160 -.L800EDEB8: -/* B65058 800EDEB8 30E9FFFF */ andi $t1, $a3, 0xffff -/* B6505C 800EDEBC 1120000B */ beqz $t1, .L800EDEEC -/* B65060 800EDEC0 01201025 */ move $v0, $t1 -/* B65064 800EDEC4 240500FF */ li $a1, 255 -/* B65068 800EDEC8 2529FFFF */ addiu $t1, $t1, -1 -.L800EDECC: -/* B6506C 800EDECC 3129FFFF */ andi $t1, $t1, 0xffff -/* B65070 800EDED0 000978C0 */ sll $t7, $t1, 3 -/* B65074 800EDED4 008FC821 */ addu $t9, $a0, $t7 -/* B65078 800EDED8 01201025 */ move $v0, $t1 -/* B6507C 800EDEDC 11200003 */ beqz $t1, .L800EDEEC -/* B65080 800EDEE0 93230000 */ lbu $v1, ($t9) -/* B65084 800EDEE4 50A3FFF9 */ beql $a1, $v1, .L800EDECC -/* B65088 800EDEE8 2529FFFF */ addiu $t1, $t1, -1 -.L800EDEEC: -/* B6508C 800EDEEC 24580001 */ addiu $t8, $v0, 1 -/* B65090 800EDEF0 13060007 */ beq $t8, $a2, .L800EDF10 -/* B65094 800EDEF4 244E0002 */ addiu $t6, $v0, 2 -/* B65098 800EDEF8 31CF00FF */ andi $t7, $t6, 0xff -/* B6509C 800EDEFC 000FC8C0 */ sll $t9, $t7, 3 -/* B650A0 800EDF00 A1AE0000 */ sb $t6, ($t5) -/* B650A4 800EDF04 0099C021 */ addu $t8, $a0, $t9 -/* B650A8 800EDF08 A700FFFA */ sh $zero, -6($t8) -/* B650AC 800EDF0C 91A70000 */ lbu $a3, ($t5) -.L800EDF10: -/* B650B0 800EDF10 000770C0 */ sll $t6, $a3, 3 -/* B650B4 800EDF14 008E7821 */ addu $t7, $a0, $t6 -/* B650B8 800EDF18 A5E00002 */ sh $zero, 2($t7) -/* B650BC 800EDF1C 93F90000 */ lbu $t9, ($ra) -/* B650C0 800EDF20 24010002 */ li $at, 2 -/* B650C4 800EDF24 3C188017 */ lui $t8, %hi(D_8016BA2E) # $t8, 0x8017 -/* B650C8 800EDF28 5721008D */ bnel $t9, $at, .L800EE160 -/* B650CC 800EDF2C A3E00000 */ sb $zero, ($ra) -/* B650D0 800EDF30 9318BA2E */ lbu $t8, %lo(D_8016BA2E)($t8) -/* B650D4 800EDF34 3C038013 */ lui $v1, %hi(D_80130F80) # $v1, 0x8013 -/* B650D8 800EDF38 24630F80 */ addiu $v1, %lo(D_80130F80) # addiu $v1, $v1, 0xf80 -/* B650DC 800EDF3C 2B010008 */ slti $at, $t8, 8 -/* B650E0 800EDF40 14200085 */ bnez $at, .L800EE158 -/* B650E4 800EDF44 240200FF */ li $v0, 255 -/* B650E8 800EDF48 91AE0000 */ lbu $t6, ($t5) -/* B650EC 800EDF4C 00004825 */ move $t1, $zero -/* B650F0 800EDF50 00001025 */ move $v0, $zero -/* B650F4 800EDF54 19C00014 */ blez $t6, .L800EDFA8 -/* B650F8 800EDF58 0002C0C0 */ sll $t8, $v0, 3 -.L800EDF5C: -/* B650FC 800EDF5C 00987021 */ addu $t6, $a0, $t8 -/* B65100 800EDF60 89D80008 */ lwl $t8, 8($t6) -/* B65104 800EDF64 99D8000B */ lwr $t8, 0xb($t6) -/* B65108 800EDF68 000978C0 */ sll $t7, $t1, 3 -/* B6510C 800EDF6C 008FC821 */ addu $t9, $a0, $t7 -/* B65110 800EDF70 AB380000 */ swl $t8, ($t9) -/* B65114 800EDF74 BB380003 */ swr $t8, 3($t9) -/* B65118 800EDF78 89CF000C */ lwl $t7, 0xc($t6) -/* B6511C 800EDF7C 99CF000F */ lwr $t7, 0xf($t6) -/* B65120 800EDF80 25290001 */ addiu $t1, $t1, 1 -/* B65124 800EDF84 3129FFFF */ andi $t1, $t1, 0xffff -/* B65128 800EDF88 AB2F0004 */ swl $t7, 4($t9) -/* B6512C 800EDF8C BB2F0007 */ swr $t7, 7($t9) -/* B65130 800EDF90 91B90000 */ lbu $t9, ($t5) -/* B65134 800EDF94 01201025 */ move $v0, $t1 -/* B65138 800EDF98 0139082A */ slt $at, $t1, $t9 -/* B6513C 800EDF9C 5420FFEF */ bnezl $at, .L800EDF5C -/* B65140 800EDFA0 0002C0C0 */ sll $t8, $v0, 3 -/* B65144 800EDFA4 00004825 */ move $t1, $zero -.L800EDFA8: -/* B65148 800EDFA8 2404000D */ li $a0, 13 -/* B6514C 800EDFAC 0C03B2DF */ jal func_800ECB7C -/* B65150 800EDFB0 A7A9001E */ sh $t1, 0x1e($sp) -/* B65154 800EDFB4 3C0D8013 */ lui $t5, %hi(D_8013185C) # $t5, 0x8013 -/* B65158 800EDFB8 3C1F8013 */ lui $ra, %hi(D_80131858) # $ra, 0x8013 -/* B6515C 800EDFBC 3C078013 */ lui $a3, %hi(D_80131C00) # $a3, 0x8013 -/* B65160 800EDFC0 27FF1858 */ addiu $ra, %lo(D_80131858) # addiu $ra, $ra, 0x1858 -/* B65164 800EDFC4 25AD185C */ addiu $t5, %lo(D_8013185C) # addiu $t5, $t5, 0x185c -/* B65168 800EDFC8 97A9001E */ lhu $t1, 0x1e($sp) -/* B6516C 800EDFCC 24E71C00 */ addiu $a3, %lo(D_80131C00) # addiu $a3, $a3, 0x1c00 -/* B65170 800EDFD0 240C0009 */ li $t4, 9 -/* B65174 800EDFD4 240B0009 */ li $t3, 9 -.L800EDFD8: -/* B65178 800EDFD8 012C0019 */ multu $t1, $t4 -/* B6517C 800EDFDC 00004025 */ move $t0, $zero -/* B65180 800EDFE0 00007012 */ mflo $t6 -/* B65184 800EDFE4 00EE7821 */ addu $t7, $a3, $t6 -/* B65188 800EDFE8 91E60000 */ lbu $a2, ($t7) -/* B6518C 800EDFEC 01665023 */ subu $t2, $t3, $a2 -/* B65190 800EDFF0 5940002A */ blezl $t2, .L800EE09C -/* B65194 800EDFF4 25290001 */ addiu $t1, $t1, 1 -.L800EDFF8: -/* B65198 800EDFF8 18C0001B */ blez $a2, .L800EE068 -/* B6519C 800EDFFC 00001825 */ move $v1, $zero -/* B651A0 800EE000 29010008 */ slti $at, $t0, 8 -/* B651A4 800EE004 10200018 */ beqz $at, .L800EE068 -/* B651A8 800EE008 01002025 */ move $a0, $t0 -/* B651AC 800EE00C 0009C0C0 */ sll $t8, $t1, 3 -/* B651B0 800EE010 0309C021 */ addu $t8, $t8, $t1 -/* B651B4 800EE014 00F82821 */ addu $a1, $a3, $t8 -/* B651B8 800EE018 00E47021 */ addu $t6, $a3, $a0 -/* B651BC 800EE01C 91CF006D */ lbu $t7, 0x6d($t6) -/* B651C0 800EE020 90B90001 */ lbu $t9, 1($a1) -/* B651C4 800EE024 172F0010 */ bne $t9, $t7, .L800EE068 -/* B651C8 800EE028 00000000 */ nop -/* B651CC 800EE02C 24630001 */ addiu $v1, $v1, 1 -.L800EE030: -/* B651D0 800EE030 306300FF */ andi $v1, $v1, 0xff -/* B651D4 800EE034 0066082A */ slt $at, $v1, $a2 -/* B651D8 800EE038 1020000B */ beqz $at, .L800EE068 -/* B651DC 800EE03C 00601025 */ move $v0, $v1 -/* B651E0 800EE040 0044C021 */ addu $t8, $v0, $a0 -/* B651E4 800EE044 2B010008 */ slti $at, $t8, 8 -/* B651E8 800EE048 10200007 */ beqz $at, .L800EE068 -/* B651EC 800EE04C 00A37021 */ addu $t6, $a1, $v1 -/* B651F0 800EE050 00E27821 */ addu $t7, $a3, $v0 -/* B651F4 800EE054 91D90001 */ lbu $t9, 1($t6) -/* B651F8 800EE058 01E4C021 */ addu $t8, $t7, $a0 -/* B651FC 800EE05C 930E006D */ lbu $t6, 0x6d($t8) -/* B65200 800EE060 532EFFF3 */ beql $t9, $t6, .L800EE030 -/* B65204 800EE064 24630001 */ addiu $v1, $v1, 1 -.L800EE068: -/* B65208 800EE068 14660006 */ bne $v1, $a2, .L800EE084 -/* B6520C 800EE06C 240200FF */ li $v0, 255 -/* B65210 800EE070 3C038013 */ lui $v1, %hi(D_80130F80) # $v1, 0x8013 -/* B65214 800EE074 24630F80 */ addiu $v1, %lo(D_80130F80) # addiu $v1, $v1, 0xf80 -/* B65218 800EE078 A3E20000 */ sb $v0, ($ra) -/* B6521C 800EE07C 10000038 */ b .L800EE160 -/* B65220 800EE080 A062078C */ sb $v0, 0x78c($v1) -.L800EE084: -/* B65224 800EE084 25080001 */ addiu $t0, $t0, 1 -/* B65228 800EE088 310800FF */ andi $t0, $t0, 0xff -/* B6522C 800EE08C 010A082A */ slt $at, $t0, $t2 -/* B65230 800EE090 1420FFD9 */ bnez $at, .L800EDFF8 -/* B65234 800EE094 00000000 */ nop -/* B65238 800EE098 25290001 */ addiu $t1, $t1, 1 -.L800EE09C: -/* B6523C 800EE09C 3129FFFF */ andi $t1, $t1, 0xffff -/* B65240 800EE0A0 2921000C */ slti $at, $t1, 0xc -/* B65244 800EE0A4 1420FFCC */ bnez $at, .L800EDFD8 -/* B65248 800EE0A8 00000000 */ nop -/* B6524C 800EE0AC 24090001 */ li $t1, 1 -/* B65250 800EE0B0 90E3006D */ lbu $v1, 0x6d($a3) -.L800EE0B4: -/* B65254 800EE0B4 00E97821 */ addu $t7, $a3, $t1 -/* B65258 800EE0B8 91F8006D */ lbu $t8, 0x6d($t7) -/* B6525C 800EE0BC 25290001 */ addiu $t1, $t1, 1 -/* B65260 800EE0C0 3129FFFF */ andi $t1, $t1, 0xffff -/* B65264 800EE0C4 10780003 */ beq $v1, $t8, .L800EE0D4 -/* B65268 800EE0C8 00000000 */ nop -/* B6526C 800EE0CC 10000001 */ b .L800EE0D4 -/* B65270 800EE0D0 24090009 */ li $t1, 9 -.L800EE0D4: -/* B65274 800EE0D4 29210008 */ slti $at, $t1, 8 -/* B65278 800EE0D8 1420FFF6 */ bnez $at, .L800EE0B4 -/* B6527C 800EE0DC 01201025 */ move $v0, $t1 -/* B65280 800EE0E0 24010008 */ li $at, 8 -/* B65284 800EE0E4 14410006 */ bne $v0, $at, .L800EE100 -/* B65288 800EE0E8 3C038013 */ lui $v1, %hi(D_80130F80) # $v1, 0x8013 -/* B6528C 800EE0EC 240200FF */ li $v0, 255 -/* B65290 800EE0F0 24630F80 */ addiu $v1, %lo(D_80130F80) # addiu $v1, $v1, 0xf80 -/* B65294 800EE0F4 A3E20000 */ sb $v0, ($ra) -/* B65298 800EE0F8 10000019 */ b .L800EE160 -/* B6529C 800EE0FC A062078C */ sb $v0, 0x78c($v1) -.L800EE100: -/* B652A0 800EE100 91A60000 */ lbu $a2, ($t5) -/* B652A4 800EE104 00004825 */ move $t1, $zero -/* B652A8 800EE108 18C00010 */ blez $a2, .L800EE14C -/* B652AC 800EE10C 3C038013 */ lui $v1, %hi(D_80130F80) # $v1, 0x8013 -/* B652B0 800EE110 24630F80 */ addiu $v1, %lo(D_80130F80) # addiu $v1, $v1, 0xf80 -.L800EE114: -/* B652B4 800EE114 0009C8C0 */ sll $t9, $t1, 3 -/* B652B8 800EE118 00791021 */ addu $v0, $v1, $t9 -/* B652BC 800EE11C 884F0820 */ lwl $t7, 0x820($v0) -/* B652C0 800EE120 884E0824 */ lwl $t6, 0x824($v0) -/* B652C4 800EE124 984F0823 */ lwr $t7, 0x823($v0) -/* B652C8 800EE128 984E0827 */ lwr $t6, 0x827($v0) -/* B652CC 800EE12C 25290001 */ addiu $t1, $t1, 1 -/* B652D0 800EE130 3129FFFF */ andi $t1, $t1, 0xffff -/* B652D4 800EE134 0126082A */ slt $at, $t1, $a2 -/* B652D8 800EE138 A84F0780 */ swl $t7, 0x780($v0) -/* B652DC 800EE13C A84E0784 */ swl $t6, 0x784($v0) -/* B652E0 800EE140 B84F0783 */ swr $t7, 0x783($v0) -/* B652E4 800EE144 1420FFF3 */ bnez $at, .L800EE114 -/* B652E8 800EE148 B84E0787 */ swr $t6, 0x787($v0) -.L800EE14C: -/* B652EC 800EE14C 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B652F0 800EE150 10000002 */ b .L800EE15C -/* B652F4 800EE154 A0200F0C */ sb $zero, %lo(D_80130F0C)($at) -.L800EE158: -/* B652F8 800EE158 A062078C */ sb $v0, 0x78c($v1) -.L800EE15C: -/* B652FC 800EE15C A3E00000 */ sb $zero, ($ra) -.L800EE160: -/* B65300 800EE160 8FBF0014 */ lw $ra, 0x14($sp) -/* B65304 800EE164 27BD0020 */ addiu $sp, $sp, 0x20 -/* B65308 800EE168 03E00008 */ jr $ra -/* B6530C 800EE16C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE170.s b/asm/non_matchings/code/code_800EC960/func_800EE170.s deleted file mode 100644 index 659bb8a8be..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE170.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_800EE170 -/* B65310 800EE170 3C028013 */ lui $v0, %hi(D_80131858) # $v0, 0x8013 -/* B65314 800EE174 90421858 */ lbu $v0, %lo(D_80131858)($v0) -/* B65318 800EE178 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6531C 800EE17C 308500FF */ andi $a1, $a0, 0xff -/* B65320 800EE180 AFBF0014 */ sw $ra, 0x14($sp) -/* B65324 800EE184 10A20041 */ beq $a1, $v0, .L800EE28C -/* B65328 800EE188 AFA40018 */ sw $a0, 0x18($sp) -/* B6532C 800EE18C 10A00023 */ beqz $a1, .L800EE21C -/* B65330 800EE190 3C0C8013 */ lui $t4, %hi(D_8013185C) # $t4, 0x8013 -/* B65334 800EE194 3C0E8017 */ lui $t6, %hi(D_8016BA04) # $t6, 0x8017 -/* B65338 800EE198 8DCEBA04 */ lw $t6, %lo(D_8016BA04)($t6) -/* B6533C 800EE19C 3C018013 */ lui $at, %hi(D_80131860) # $at, 0x8013 -/* B65340 800EE1A0 240F00FF */ li $t7, 255 -/* B65344 800EE1A4 AC2E1860 */ sw $t6, %lo(D_80131860)($at) -/* B65348 800EE1A8 3C018013 */ lui $at, %hi(D_80131864) # $at, 0x8013 -/* B6534C 800EE1AC A02F1864 */ sb $t7, %lo(D_80131864)($at) -/* B65350 800EE1B0 3C018013 */ lui $at, %hi(D_80131868) # $at, 0x8013 -/* B65354 800EE1B4 24180057 */ li $t8, 87 -/* B65358 800EE1B8 A0381868 */ sb $t8, %lo(D_80131868)($at) -/* B6535C 800EE1BC 3C018013 */ lui $at, %hi(D_8013186C) # $at, 0x8013 -/* B65360 800EE1C0 A020186C */ sb $zero, %lo(D_8013186C)($at) -/* B65364 800EE1C4 3C018013 */ lui $at, %hi(D_80131870) # $at, 0x8013 -/* B65368 800EE1C8 A0201870 */ sb $zero, %lo(D_80131870)($at) -/* B6536C 800EE1CC 3C018013 */ lui $at, %hi(D_80131874) # $at, 0x8013 -/* B65370 800EE1D0 A0201874 */ sb $zero, %lo(D_80131874)($at) -/* B65374 800EE1D4 3C018013 */ lui $at, %hi(D_8013185C) # $at, 0x8013 -/* B65378 800EE1D8 A020185C */ sb $zero, %lo(D_8013185C)($at) -/* B6537C 800EE1DC 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B65380 800EE1E0 24190001 */ li $t9, 1 -/* B65384 800EE1E4 A0390F0C */ sb $t9, %lo(D_80130F0C)($at) -/* B65388 800EE1E8 3C018017 */ lui $at, %hi(D_8016BA2E) # $at, 0x8017 -/* B6538C 800EE1EC 3C098013 */ lui $t1, %hi(D_8013188C) # $t1, 0x8013 -/* B65390 800EE1F0 A020BA2E */ sb $zero, %lo(D_8016BA2E)($at) -/* B65394 800EE1F4 2529188C */ addiu $t1, %lo(D_8013188C) # addiu $t1, $t1, 0x188c -/* B65398 800EE1F8 892B0000 */ lwl $t3, ($t1) -/* B6539C 800EE1FC 892A0004 */ lwl $t2, 4($t1) -/* B653A0 800EE200 992B0003 */ lwr $t3, 3($t1) -/* B653A4 800EE204 992A0007 */ lwr $t2, 7($t1) -/* B653A8 800EE208 3C088017 */ lui $t0, %hi(D_8016BAA0) # $t0, 0x8017 -/* B653AC 800EE20C 2508BAA0 */ addiu $t0, %lo(D_8016BAA0) # addiu $t0, $t0, -0x4560 -/* B653B0 800EE210 AD0B0000 */ sw $t3, ($t0) -/* B653B4 800EE214 1000001B */ b .L800EE284 -/* B653B8 800EE218 AD0A0004 */ sw $t2, 4($t0) -.L800EE21C: -/* B653BC 800EE21C 918C185C */ lbu $t4, %lo(D_8013185C)($t4) -/* B653C0 800EE220 3C0D8013 */ lui $t5, %hi(D_8013188C) # $t5, 0x8013 -/* B653C4 800EE224 24010002 */ li $at, 2 -/* B653C8 800EE228 1580000B */ bnez $t4, .L800EE258 -/* B653CC 800EE22C 24040001 */ li $a0, 1 -/* B653D0 800EE230 3C0E8017 */ lui $t6, %hi(D_8016BAA0) # $t6, 0x8017 -/* B653D4 800EE234 25CEBAA0 */ addiu $t6, %lo(D_8016BAA0) # addiu $t6, $t6, -0x4560 -/* B653D8 800EE238 8DD80000 */ lw $t8, ($t6) -/* B653DC 800EE23C 8DCF0004 */ lw $t7, 4($t6) -/* B653E0 800EE240 25AD188C */ addiu $t5, %lo(D_8013188C) # addiu $t5, $t5, 0x188c -/* B653E4 800EE244 A9B80000 */ swl $t8, ($t5) -/* B653E8 800EE248 A9AF0004 */ swl $t7, 4($t5) -/* B653EC 800EE24C B9B80003 */ swr $t8, 3($t5) -/* B653F0 800EE250 10000008 */ b .L800EE274 -/* B653F4 800EE254 B9AF0007 */ swr $t7, 7($t5) -.L800EE258: -/* B653F8 800EE258 14410003 */ bne $v0, $at, .L800EE268 -/* B653FC 800EE25C 24190001 */ li $t9, 1 -/* B65400 800EE260 3C018017 */ lui $at, %hi(D_8016BA2E) # $at, 0x8017 -/* B65404 800EE264 A039BA2E */ sb $t9, %lo(D_8016BA2E)($at) -.L800EE268: -/* B65408 800EE268 0C03B75A */ jal func_800EDD68 -/* B6540C 800EE26C A3A5001B */ sb $a1, 0x1b($sp) -/* B65410 800EE270 93A5001B */ lbu $a1, 0x1b($sp) -.L800EE274: -/* B65414 800EE274 3C018013 */ lui $at, %hi(D_80130F0C) # $at, 0x8013 -/* B65418 800EE278 A0200F0C */ sb $zero, %lo(D_80130F0C)($at) -/* B6541C 800EE27C 3C018017 */ lui $at, %hi(D_8016BA2E) # $at, 0x8017 -/* B65420 800EE280 A020BA2E */ sb $zero, %lo(D_8016BA2E)($at) -.L800EE284: -/* B65424 800EE284 3C018013 */ lui $at, %hi(D_80131858) # $at, 0x8013 -/* B65428 800EE288 A0251858 */ sb $a1, %lo(D_80131858)($at) -.L800EE28C: -/* B6542C 800EE28C 8FBF0014 */ lw $ra, 0x14($sp) -/* B65430 800EE290 27BD0018 */ addiu $sp, $sp, 0x18 -/* B65434 800EE294 03E00008 */ jr $ra -/* B65438 800EE298 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE29C.s b/asm/non_matchings/code/code_800EC960/func_800EE29C.s deleted file mode 100644 index 3263f32299..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE29C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800EE29C -/* B6543C 800EE29C 3C048013 */ lui $a0, %hi(D_80131858) # $a0, 0x8013 -/* B65440 800EE2A0 24841858 */ addiu $a0, %lo(D_80131858) # addiu $a0, $a0, 0x1858 -/* B65444 800EE2A4 90820000 */ lbu $v0, ($a0) -/* B65448 800EE2A8 3C038017 */ lui $v1, %hi(D_8016BA00) # $v1, 0x8017 -/* B6544C 800EE2AC 2463BA00 */ addiu $v1, %lo(D_8016BA00) # addiu $v1, $v1, -0x4600 -/* B65450 800EE2B0 3C0E8017 */ lui $t6, %hi(D_8016BA2E) # $t6, 0x8017 -/* B65454 800EE2B4 A0620001 */ sb $v0, 1($v1) -/* B65458 800EE2B8 91CEBA2E */ lbu $t6, %lo(D_8016BA2E)($t6) -/* B6545C 800EE2BC 240100FF */ li $at, 255 -/* B65460 800EE2C0 14410002 */ bne $v0, $at, .L800EE2CC -/* B65464 800EE2C4 A06E0002 */ sb $t6, 2($v1) -/* B65468 800EE2C8 A0800000 */ sb $zero, ($a0) -.L800EE2CC: -/* B6546C 800EE2CC 03E00008 */ jr $ra -/* B65470 800EE2D0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE2D4.s b/asm/non_matchings/code/code_800EC960/func_800EE2D4.s deleted file mode 100644 index e5460a4679..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE2D4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800EE2D4 -/* B65474 800EE2D4 3C0E8013 */ lui $t6, %hi(D_80130F1C) # $t6, 0x8013 -/* B65478 800EE2D8 91CE0F1C */ lbu $t6, %lo(D_80130F1C)($t6) -/* B6547C 800EE2DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B65480 800EE2E0 AFBF0014 */ sw $ra, 0x14($sp) -/* B65484 800EE2E4 3C018017 */ lui $at, %hi(D_8016B9F8) # $at, 0x8017 -/* B65488 800EE2E8 31CF003F */ andi $t7, $t6, 0x3f -/* B6548C 800EE2EC 0C03B2BC */ jal func_800ECAF0 -/* B65490 800EE2F0 A02FB9F8 */ sb $t7, %lo(D_8016B9F8)($at) -/* B65494 800EE2F4 3C038017 */ lui $v1, %hi(D_8016B9F8) # $v1, 0x8017 -/* B65498 800EE2F8 2463B9F8 */ addiu $v1, %lo(D_8016B9F8) # addiu $v1, $v1, -0x4608 -/* B6549C 800EE2FC 8FBF0014 */ lw $ra, 0x14($sp) -/* B654A0 800EE300 A0620001 */ sb $v0, 1($v1) -/* B654A4 800EE304 3C188017 */ lui $t8, %hi(D_8016BA2E) # $t8, 0x8017 -/* B654A8 800EE308 9318BA2E */ lbu $t8, %lo(D_8016BA2E)($t8) -/* B654AC 800EE30C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B654B0 800EE310 03E00008 */ jr $ra -/* B654B4 800EE314 A0780002 */ sb $t8, 2($v1) - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE318.s b/asm/non_matchings/code/code_800EC960/func_800EE318.s deleted file mode 100644 index 4663c99e33..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE318.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800EE318 -/* B654B8 800EE318 3C048013 */ lui $a0, %hi(D_80130F50) # $a0, 0x8013 -/* B654BC 800EE31C 90840F50 */ lbu $a0, %lo(D_80130F50)($a0) -/* B654C0 800EE320 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B654C4 800EE324 AFBF0014 */ sw $ra, 0x14($sp) -/* B654C8 800EE328 308E003F */ andi $t6, $a0, 0x3f -/* B654CC 800EE32C 29C10010 */ slti $at, $t6, 0x10 -/* B654D0 800EE330 10200006 */ beqz $at, .L800EE34C -/* B654D4 800EE334 00000000 */ nop -/* B654D8 800EE338 0C03B2CD */ jal func_800ECB34 -/* B654DC 800EE33C 00000000 */ nop -/* B654E0 800EE340 3C038017 */ lui $v1, %hi(D_8016B9FC) # $v1, 0x8017 -/* B654E4 800EE344 2463B9FC */ addiu $v1, %lo(D_8016B9FC) # addiu $v1, $v1, -0x4604 -/* B654E8 800EE348 A0620000 */ sb $v0, ($v1) -.L800EE34C: -/* B654EC 800EE34C 3C0F8013 */ lui $t7, %hi(D_80130F38) # $t7, 0x8013 -/* B654F0 800EE350 91EF0F38 */ lbu $t7, %lo(D_80130F38)($t7) -/* B654F4 800EE354 3C038017 */ lui $v1, %hi(D_8016B9FC) # $v1, 0x8017 -/* B654F8 800EE358 2463B9FC */ addiu $v1, %lo(D_8016B9FC) # addiu $v1, $v1, -0x4604 -/* B654FC 800EE35C 3C188013 */ lui $t8, %hi(D_80131840) # $t8, 0x8013 -/* B65500 800EE360 A06F0001 */ sb $t7, 1($v1) -/* B65504 800EE364 8F181840 */ lw $t8, %lo(D_80131840)($t8) -/* B65508 800EE368 3C198013 */ lui $t9, %hi(D_80131884) # $t9, 0x8013 -/* B6550C 800EE36C 27391884 */ addiu $t9, %lo(D_80131884) # addiu $t9, $t9, 0x1884 -/* B65510 800EE370 13190005 */ beq $t8, $t9, .L800EE388 -/* B65514 800EE374 3C028013 */ lui $v0, %hi(D_80130F48) # $v0, 0x8013 -/* B65518 800EE378 3C088013 */ lui $t0, %hi(D_80130F48) # $t0, 0x8013 -/* B6551C 800EE37C 95080F48 */ lhu $t0, %lo(D_80130F48)($t0) -/* B65520 800EE380 1000000D */ b .L800EE3B8 -/* B65524 800EE384 A0680002 */ sb $t0, 2($v1) -.L800EE388: -/* B65528 800EE388 94420F48 */ lhu $v0, %lo(D_80130F48)($v0) -/* B6552C 800EE38C 14400003 */ bnez $v0, .L800EE39C -/* B65530 800EE390 2449FFFF */ addiu $t1, $v0, -1 -/* B65534 800EE394 10000008 */ b .L800EE3B8 -/* B65538 800EE398 A0600002 */ sb $zero, 2($v1) -.L800EE39C: -/* B6553C 800EE39C 05210004 */ bgez $t1, .L800EE3B0 -/* B65540 800EE3A0 312A0007 */ andi $t2, $t1, 7 -/* B65544 800EE3A4 11400002 */ beqz $t2, .L800EE3B0 -/* B65548 800EE3A8 00000000 */ nop -/* B6554C 800EE3AC 254AFFF8 */ addiu $t2, $t2, -8 -.L800EE3B0: -/* B65550 800EE3B0 254B0001 */ addiu $t3, $t2, 1 -/* B65554 800EE3B4 A06B0002 */ sb $t3, 2($v1) -.L800EE3B8: -/* B65558 800EE3B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6555C 800EE3BC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B65560 800EE3C0 03E00008 */ jr $ra -/* B65564 800EE3C4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE3C8.s b/asm/non_matchings/code/code_800EC960/func_800EE3C8.s deleted file mode 100644 index 977cca98c7..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE3C8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800EE3C8 -/* B65568 800EE3C8 3C028017 */ lui $v0, %hi(D_8016BA00) -/* B6556C 800EE3CC 03E00008 */ jr $ra -/* B65570 800EE3D0 2442BA00 */ addiu $v0, %lo(D_8016BA00) - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE3D4.s b/asm/non_matchings/code/code_800EC960/func_800EE3D4.s deleted file mode 100644 index e6311c7bd7..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE3D4.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800EE3D4 -/* B65574 800EE3D4 3C038017 */ lui $v1, %hi(D_8016B9F8) # $v1, 0x8017 -/* B65578 800EE3D8 2463B9F8 */ addiu $v1, %lo(D_8016B9F8) # addiu $v1, $v1, -0x4608 -/* B6557C 800EE3DC 906E0001 */ lbu $t6, 1($v1) -/* B65580 800EE3E0 29C100FE */ slti $at, $t6, 0xfe -/* B65584 800EE3E4 10200002 */ beqz $at, .L800EE3F0 -/* B65588 800EE3E8 3C018013 */ lui $at, %hi(D_80130F3C) # $at, 0x8013 -/* B6558C 800EE3EC AC200F3C */ sw $zero, %lo(D_80130F3C)($at) -.L800EE3F0: -/* B65590 800EE3F0 03E00008 */ jr $ra -/* B65594 800EE3F4 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE3F8.s b/asm/non_matchings/code/code_800EC960/func_800EE3F8.s deleted file mode 100644 index 699b4ee18c..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE3F8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800EE3F8 -/* B65598 800EE3F8 3C028017 */ lui $v0, %hi(D_8016B9FC) -/* B6559C 800EE3FC 03E00008 */ jr $ra -/* B655A0 800EE400 2442B9FC */ addiu $v0, %lo(D_8016B9FC) - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE404.s b/asm/non_matchings/code/code_800EC960/func_800EE404.s deleted file mode 100644 index 6bd77c8e3f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE404.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_800EE404 -/* B655A4 800EE404 3C048013 */ lui $a0, %hi(D_80131858) # $a0, 0x8013 -/* B655A8 800EE408 90841858 */ lbu $a0, %lo(D_80131858)($a0) -/* B655AC 800EE40C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B655B0 800EE410 AFBF0014 */ sw $ra, 0x14($sp) -/* B655B4 800EE414 10800055 */ beqz $a0, .L800EE56C -/* B655B8 800EE418 3C0E8017 */ lui $t6, %hi(D_8016BA04) # $t6, 0x8017 -/* B655BC 800EE41C 3C0F8013 */ lui $t7, %hi(D_80131860) # $t7, 0x8013 -/* B655C0 800EE420 8DEF1860 */ lw $t7, %lo(D_80131860)($t7) -/* B655C4 800EE424 8DCEBA04 */ lw $t6, %lo(D_8016BA04)($t6) -/* B655C8 800EE428 3C038013 */ lui $v1, %hi(D_80130F14) # $v1, 0x8013 -/* B655CC 800EE42C 3C198013 */ lui $t9, %hi(D_80131864) # $t9, 0x8013 -/* B655D0 800EE430 01CFC023 */ subu $t8, $t6, $t7 -/* B655D4 800EE434 2F010003 */ sltiu $at, $t8, 3 -/* B655D8 800EE438 5420004D */ bnezl $at, .L800EE570 -/* B655DC 800EE43C 8FBF0014 */ lw $ra, 0x14($sp) -/* B655E0 800EE440 90630F14 */ lbu $v1, %lo(D_80130F14)($v1) -/* B655E4 800EE444 93391864 */ lbu $t9, %lo(D_80131864)($t9) -/* B655E8 800EE448 00001025 */ move $v0, $zero -/* B655EC 800EE44C 3C0F8013 */ lui $t7, %hi(D_80130F30) # $t7, 0x8013 -/* B655F0 800EE450 10790029 */ beq $v1, $t9, .L800EE4F8 -/* B655F4 800EE454 3C188013 */ lui $t8, %hi(D_80131868) # $t8, 0x8013 -/* B655F8 800EE458 240100FF */ li $at, 255 -/* B655FC 800EE45C 1061000B */ beq $v1, $at, .L800EE48C -/* B65600 800EE460 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 -/* B65604 800EE464 3C088013 */ lui $t0, %hi(D_80130F1C) # $t0, 0x8013 -/* B65608 800EE468 91080F1C */ lbu $t0, %lo(D_80130F1C)($t0) -/* B6560C 800EE46C 3C018017 */ lui $at, %hi(D_8016BA00) # $at, 0x8017 -/* B65610 800EE470 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 -/* B65614 800EE474 3109003F */ andi $t1, $t0, 0x3f -/* B65618 800EE478 A029BA00 */ sb $t1, %lo(D_8016BA00)($at) -/* B6561C 800EE47C 904A0000 */ lbu $t2, ($v0) -/* B65620 800EE480 254B0001 */ addiu $t3, $t2, 1 -/* B65624 800EE484 1000000D */ b .L800EE4BC -/* B65628 800EE488 A04B0000 */ sb $t3, ($v0) -.L800EE48C: -/* B6562C 800EE48C 24010002 */ li $at, 2 -/* B65630 800EE490 1481000A */ bne $a0, $at, .L800EE4BC -/* B65634 800EE494 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 -/* B65638 800EE498 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 -/* B6563C 800EE49C 904C0000 */ lbu $t4, ($v0) -/* B65640 800EE4A0 24010008 */ li $at, 8 -/* B65644 800EE4A4 15810005 */ bne $t4, $at, .L800EE4BC -/* B65648 800EE4A8 00000000 */ nop -/* B6564C 800EE4AC 0C03B75A */ jal func_800EDD68 -/* B65650 800EE4B0 24040001 */ li $a0, 1 -/* B65654 800EE4B4 1000002E */ b .L800EE570 -/* B65658 800EE4B8 8FBF0014 */ lw $ra, 0x14($sp) -.L800EE4BC: -/* B6565C 800EE4BC 3C028017 */ lui $v0, %hi(D_8016BA2E) # $v0, 0x8017 -/* B65660 800EE4C0 2442BA2E */ addiu $v0, %lo(D_8016BA2E) # addiu $v0, $v0, -0x45d2 -/* B65664 800EE4C4 904D0000 */ lbu $t5, ($v0) -/* B65668 800EE4C8 29A10009 */ slti $at, $t5, 9 -/* B6566C 800EE4CC 14200008 */ bnez $at, .L800EE4F0 -/* B65670 800EE4D0 24010002 */ li $at, 2 -/* B65674 800EE4D4 14810005 */ bne $a0, $at, .L800EE4EC -/* B65678 800EE4D8 240E0001 */ li $t6, 1 -/* B6567C 800EE4DC 0C03B75A */ jal func_800EDD68 -/* B65680 800EE4E0 24040001 */ li $a0, 1 -/* B65684 800EE4E4 10000022 */ b .L800EE570 -/* B65688 800EE4E8 8FBF0014 */ lw $ra, 0x14($sp) -.L800EE4EC: -/* B6568C 800EE4EC A04E0000 */ sb $t6, ($v0) -.L800EE4F0: -/* B65690 800EE4F0 10000016 */ b .L800EE54C -/* B65694 800EE4F4 24020001 */ li $v0, 1 -.L800EE4F8: -/* B65698 800EE4F8 81EF0F30 */ lb $t7, %lo(D_80130F30)($t7) -/* B6569C 800EE4FC 93181868 */ lbu $t8, %lo(D_80131868)($t8) -/* B656A0 800EE500 3C198013 */ lui $t9, %hi(D_80130F34) # $t9, 0x8013 -/* B656A4 800EE504 3C088013 */ lui $t0, %hi(D_8013186C) # $t0, 0x8013 -/* B656A8 800EE508 11F80003 */ beq $t7, $t8, .L800EE518 -/* B656AC 800EE50C 00000000 */ nop -/* B656B0 800EE510 1000000E */ b .L800EE54C -/* B656B4 800EE514 24020001 */ li $v0, 1 -.L800EE518: -/* B656B8 800EE518 83390F34 */ lb $t9, %lo(D_80130F34)($t9) -/* B656BC 800EE51C 9108186C */ lbu $t0, %lo(D_8013186C)($t0) -/* B656C0 800EE520 3C098013 */ lui $t1, %hi(D_80130F2C) # $t1, 0x8013 -/* B656C4 800EE524 3C0A8013 */ lui $t2, %hi(D_80131870) # $t2, 0x8013 -/* B656C8 800EE528 13280003 */ beq $t9, $t0, .L800EE538 -/* B656CC 800EE52C 00000000 */ nop -/* B656D0 800EE530 10000006 */ b .L800EE54C -/* B656D4 800EE534 24020001 */ li $v0, 1 -.L800EE538: -/* B656D8 800EE538 81290F2C */ lb $t1, %lo(D_80130F2C)($t1) -/* B656DC 800EE53C 814A1870 */ lb $t2, %lo(D_80131870)($t2) -/* B656E0 800EE540 112A0002 */ beq $t1, $t2, .L800EE54C -/* B656E4 800EE544 00000000 */ nop -/* B656E8 800EE548 24020001 */ li $v0, 1 -.L800EE54C: -/* B656EC 800EE54C 50400008 */ beql $v0, $zero, .L800EE570 -/* B656F0 800EE550 8FBF0014 */ lw $ra, 0x14($sp) -/* B656F4 800EE554 0C03B75A */ jal func_800EDD68 -/* B656F8 800EE558 00002025 */ move $a0, $zero -/* B656FC 800EE55C 3C0B8017 */ lui $t3, %hi(D_8016BA04) # $t3, 0x8017 -/* B65700 800EE560 8D6BBA04 */ lw $t3, %lo(D_8016BA04)($t3) -/* B65704 800EE564 3C018013 */ lui $at, %hi(D_80131860) # $at, 0x8013 -/* B65708 800EE568 AC2B1860 */ sw $t3, %lo(D_80131860)($at) -.L800EE56C: -/* B6570C 800EE56C 8FBF0014 */ lw $ra, 0x14($sp) -.L800EE570: -/* B65710 800EE570 27BD0018 */ addiu $sp, $sp, 0x18 -/* B65714 800EE574 03E00008 */ jr $ra -/* B65718 800EE578 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE57C.s b/asm/non_matchings/code/code_800EC960/func_800EE57C.s deleted file mode 100644 index 0dc61f3435..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE57C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800EE57C -/* B6571C 800EE57C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B65720 800EE580 AFA40020 */ sw $a0, 0x20($sp) -/* B65724 800EE584 308400FF */ andi $a0, $a0, 0xff -/* B65728 800EE588 28810003 */ slti $at, $a0, 3 -/* B6572C 800EE58C AFBF001C */ sw $ra, 0x1c($sp) -/* B65730 800EE590 14200002 */ bnez $at, .L800EE59C -/* B65734 800EE594 AFB00018 */ sw $s0, 0x18($sp) -/* B65738 800EE598 24040002 */ li $a0, 2 -.L800EE59C: -/* B6573C 800EE59C 3C0E8013 */ lui $t6, %hi(D_80130F7C) -/* B65740 800EE5A0 01C47021 */ addu $t6, $t6, $a0 -/* B65744 800EE5A4 91CE0F7C */ lbu $t6, %lo(D_80130F7C)($t6) -/* B65748 800EE5A8 3C018013 */ lui $at, %hi(D_80130F74) # $at, 0x8013 -/* B6574C 800EE5AC A0200F74 */ sb $zero, %lo(D_80130F74)($at) -/* B65750 800EE5B0 3C018013 */ lui $at, %hi(D_80130F78) # $at, 0x8013 -/* B65754 800EE5B4 00008025 */ move $s0, $zero -/* B65758 800EE5B8 A02E0F78 */ sb $t6, %lo(D_80130F78)($at) -.L800EE5BC: -/* B6575C 800EE5BC 0C03B97B */ jal func_800EE5EC -/* B65760 800EE5C0 00000000 */ nop -/* B65764 800EE5C4 26100001 */ addiu $s0, $s0, 1 -/* B65768 800EE5C8 321000FF */ andi $s0, $s0, 0xff -/* B6576C 800EE5CC 2A010003 */ slti $at, $s0, 3 -/* B65770 800EE5D0 1420FFFA */ bnez $at, .L800EE5BC -/* B65774 800EE5D4 00000000 */ nop -/* B65778 800EE5D8 8FBF001C */ lw $ra, 0x1c($sp) -/* B6577C 800EE5DC 8FB00018 */ lw $s0, 0x18($sp) -/* B65780 800EE5E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B65784 800EE5E4 03E00008 */ jr $ra -/* B65788 800EE5E8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE5EC.s b/asm/non_matchings/code/code_800EC960/func_800EE5EC.s deleted file mode 100644 index 5a954530e3..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE5EC.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_800EE5EC -/* B6578C 800EE5EC 3C068013 */ lui $a2, %hi(D_80130F74) # $a2, 0x8013 -/* B65790 800EE5F0 24C60F74 */ addiu $a2, %lo(D_80130F74) # addiu $a2, $a2, 0xf74 -/* B65794 800EE5F4 3C0E8013 */ lui $t6, %hi(D_80130F78) # $t6, 0x8013 -/* B65798 800EE5F8 91CE0F78 */ lbu $t6, %lo(D_80130F78)($t6) -/* B6579C 800EE5FC 90CF0000 */ lbu $t7, ($a2) -/* B657A0 800EE600 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B657A4 800EE604 AFBF0014 */ sw $ra, 0x14($sp) -/* B657A8 800EE608 15CF0003 */ bne $t6, $t7, .L800EE618 -/* B657AC 800EE60C 00000000 */ nop -/* B657B0 800EE610 10000034 */ b .L800EE6E4 -/* B657B4 800EE614 24020001 */ li $v0, 1 -.L800EE618: -/* B657B8 800EE618 0C0399F0 */ jal Audio_NextRandom -/* B657BC 800EE61C 00000000 */ nop -/* B657C0 800EE620 24080005 */ li $t0, 5 -/* B657C4 800EE624 0048001B */ divu $zero, $v0, $t0 -/* B657C8 800EE628 3C068013 */ lui $a2, %hi(D_80130F74) # $a2, 0x8013 -/* B657CC 800EE62C 24C60F74 */ addiu $a2, %lo(D_80130F74) # addiu $a2, $a2, 0xf74 -/* B657D0 800EE630 90C30000 */ lbu $v1, ($a2) -/* B657D4 800EE634 3C048013 */ lui $a0, %hi(D_80130F6C) # $a0, 0x8013 -/* B657D8 800EE638 3C078013 */ lui $a3, %hi(D_80130F80) # $a3, 0x8013 -/* B657DC 800EE63C 24E70F80 */ addiu $a3, %lo(D_80130F80) # addiu $a3, $a3, 0xf80 -/* B657E0 800EE640 24840F6C */ addiu $a0, %lo(D_80130F6C) # addiu $a0, $a0, 0xf6c -/* B657E4 800EE644 0000C010 */ mfhi $t8 -/* B657E8 800EE648 000348C0 */ sll $t1, $v1, 3 -/* B657EC 800EE64C 0098C821 */ addu $t9, $a0, $t8 -/* B657F0 800EE650 00E95021 */ addu $t2, $a3, $t1 -/* B657F4 800EE654 93250000 */ lbu $a1, ($t9) -/* B657F8 800EE658 914B0818 */ lbu $t3, 0x818($t2) -/* B657FC 800EE65C 15000002 */ bnez $t0, .L800EE668 -/* B65800 800EE660 00000000 */ nop -/* B65804 800EE664 0007000D */ break 7 -.L800EE668: -/* B65808 800EE668 2418002D */ li $t8, 45 -/* B6580C 800EE66C 14AB0009 */ bne $a1, $t3, .L800EE694 -/* B65810 800EE670 000378C0 */ sll $t7, $v1, 3 -/* B65814 800EE674 244C0001 */ addiu $t4, $v0, 1 -/* B65818 800EE678 0188001B */ divu $zero, $t4, $t0 -/* B6581C 800EE67C 00006810 */ mfhi $t5 -/* B65820 800EE680 008D7021 */ addu $t6, $a0, $t5 -/* B65824 800EE684 91C50000 */ lbu $a1, ($t6) -/* B65828 800EE688 15000002 */ bnez $t0, .L800EE694 -/* B6582C 800EE68C 00000000 */ nop -/* B65830 800EE690 0007000D */ break 7 -.L800EE694: -/* B65834 800EE694 00EF1021 */ addu $v0, $a3, $t7 -/* B65838 800EE698 24690001 */ addiu $t1, $v1, 1 -/* B6583C 800EE69C 24190050 */ li $t9, 80 -/* B65840 800EE6A0 312300FF */ andi $v1, $t1, 0xff -/* B65844 800EE6A4 A0450820 */ sb $a1, 0x820($v0) -/* B65848 800EE6A8 A4580822 */ sh $t8, 0x822($v0) -/* B6584C 800EE6AC A0590824 */ sb $t9, 0x824($v0) -/* B65850 800EE6B0 A0400825 */ sb $zero, 0x825($v0) -/* B65854 800EE6B4 A0400826 */ sb $zero, 0x826($v0) -/* B65858 800EE6B8 000350C0 */ sll $t2, $v1, 3 -/* B6585C 800EE6BC 00EA1021 */ addu $v0, $a3, $t2 -/* B65860 800EE6C0 240800FF */ li $t0, 255 -/* B65864 800EE6C4 A0480820 */ sb $t0, 0x820($v0) -/* B65868 800EE6C8 A4400822 */ sh $zero, 0x822($v0) -/* B6586C 800EE6CC 000358C0 */ sll $t3, $v1, 3 -/* B65870 800EE6D0 00EB2021 */ addu $a0, $a3, $t3 -/* B65874 800EE6D4 A0C90000 */ sb $t1, ($a2) -/* B65878 800EE6D8 A0880828 */ sb $t0, 0x828($a0) -/* B6587C 800EE6DC A480082A */ sh $zero, 0x82a($a0) -/* B65880 800EE6E0 00001025 */ move $v0, $zero -.L800EE6E4: -/* B65884 800EE6E4 8FBF0014 */ lw $ra, 0x14($sp) -/* B65888 800EE6E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6588C 800EE6EC 03E00008 */ jr $ra -/* B65890 800EE6F0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE6F4.s b/asm/non_matchings/code/code_800EC960/func_800EE6F4.s deleted file mode 100644 index e655fc968e..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE6F4.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_800EE6F4 -/* B65894 800EE6F4 3C0F8013 */ lui $t7, %hi(D_80130F10) # $t7, 0x8013 -/* B65898 800EE6F8 81EF0F10 */ lb $t7, %lo(D_80130F10)($t7) -/* B6589C 800EE6FC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x289c) # $t6, 0x8017 -/* B658A0 800EE700 8DCE1A1C */ lw $t6, %lo(gAudioContext+0x289c)($t6) -/* B658A4 800EE704 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B658A8 800EE708 3C018017 */ lui $at, %hi(D_8016BA04) # $at, 0x8017 -/* B658AC 800EE70C AFBF0014 */ sw $ra, 0x14($sp) -/* B658B0 800EE710 11E0003A */ beqz $t7, .L800EE7FC -/* B658B4 800EE714 AC2EBA04 */ sw $t6, %lo(D_8016BA04)($at) -/* B658B8 800EE718 3C188013 */ lui $t8, %hi(D_80130F0C) # $t8, 0x8013 -/* B658BC 800EE71C 93180F0C */ lbu $t8, %lo(D_80130F0C)($t8) -/* B658C0 800EE720 24010001 */ li $at, 1 -/* B658C4 800EE724 17010003 */ bne $t8, $at, .L800EE734 -/* B658C8 800EE728 00000000 */ nop -/* B658CC 800EE72C 0C03B280 */ jal func_800ECA00 -/* B658D0 800EE730 00000000 */ nop -.L800EE734: -/* B658D4 800EE734 3C198013 */ lui $t9, %hi(D_80130F38) # $t9, 0x8013 -/* B658D8 800EE738 93390F38 */ lbu $t9, %lo(D_80130F38)($t9) -/* B658DC 800EE73C 3C088013 */ lui $t0, %hi(D_80130F0C) # $t0, 0x8013 -/* B658E0 800EE740 17200007 */ bnez $t9, .L800EE760 -/* B658E4 800EE744 00000000 */ nop -/* B658E8 800EE748 91080F0C */ lbu $t0, %lo(D_80130F0C)($t0) -/* B658EC 800EE74C 24010001 */ li $at, 1 -/* B658F0 800EE750 15010003 */ bne $t0, $at, .L800EE760 -/* B658F4 800EE754 00000000 */ nop -/* B658F8 800EE758 0C03B516 */ jal func_800ED458 -/* B658FC 800EE75C 00002025 */ move $a0, $zero -.L800EE760: -/* B65900 800EE760 3C028013 */ lui $v0, %hi(D_80130F3C) # $v0, 0x8013 -/* B65904 800EE764 8C420F3C */ lw $v0, %lo(D_80130F3C)($v0) -/* B65908 800EE768 10400009 */ beqz $v0, .L800EE790 -/* B6590C 800EE76C 30494000 */ andi $t1, $v0, 0x4000 -/* B65910 800EE770 11200005 */ beqz $t1, .L800EE788 -/* B65914 800EE774 00000000 */ nop -/* B65918 800EE778 0C03B480 */ jal func_800ED200 -/* B6591C 800EE77C 00000000 */ nop -/* B65920 800EE780 10000003 */ b .L800EE790 -/* B65924 800EE784 00000000 */ nop -.L800EE788: -/* B65928 800EE788 0C03B37E */ jal func_800ECDF8 -/* B6592C 800EE78C 00000000 */ nop -.L800EE790: -/* B65930 800EE790 0C03B68F */ jal func_800EDA3C -/* B65934 800EE794 00000000 */ nop -/* B65938 800EE798 3C0B8013 */ lui $t3, %hi(D_80130F38) # $t3, 0x8013 -/* B6593C 800EE79C 916B0F38 */ lbu $t3, %lo(D_80130F38)($t3) -/* B65940 800EE7A0 3C0A8017 */ lui $t2, %hi(D_8016BA04) # $t2, 0x8017 -/* B65944 800EE7A4 8D4ABA04 */ lw $t2, %lo(D_8016BA04)($t2) -/* B65948 800EE7A8 3C018013 */ lui $at, %hi(D_80130F68) # $at, 0x8013 -/* B6594C 800EE7AC 15600003 */ bnez $t3, .L800EE7BC -/* B65950 800EE7B0 AC2A0F68 */ sw $t2, %lo(D_80130F68)($at) -/* B65954 800EE7B4 0C03B901 */ jal func_800EE404 -/* B65958 800EE7B8 00000000 */ nop -.L800EE7BC: -/* B6595C 800EE7BC 3C0C8013 */ lui $t4, %hi(D_80130F3C) # $t4, 0x8013 -/* B65960 800EE7C0 8D8C0F3C */ lw $t4, %lo(D_80130F3C)($t4) -/* B65964 800EE7C4 3C0D8013 */ lui $t5, %hi(D_80130F14) # $t5, 0x8013 -/* B65968 800EE7C8 3C0E8013 */ lui $t6, %hi(D_80130F18) # $t6, 0x8013 -/* B6596C 800EE7CC 11800008 */ beqz $t4, .L800EE7F0 -/* B65970 800EE7D0 3C188013 */ lui $t8, %hi(D_80130F14) # $t8, 0x8013 -/* B65974 800EE7D4 91AD0F14 */ lbu $t5, %lo(D_80130F14)($t5) -/* B65978 800EE7D8 91CE0F18 */ lbu $t6, %lo(D_80130F18)($t6) -/* B6597C 800EE7DC 240F0001 */ li $t7, 1 -/* B65980 800EE7E0 3C018013 */ lui $at, %hi(D_80131880) # $at, 0x8013 -/* B65984 800EE7E4 11AE0002 */ beq $t5, $t6, .L800EE7F0 -/* B65988 800EE7E8 00000000 */ nop -/* B6598C 800EE7EC A02F1880 */ sb $t7, %lo(D_80131880)($at) -.L800EE7F0: -/* B65990 800EE7F0 93180F14 */ lbu $t8, %lo(D_80130F14)($t8) -/* B65994 800EE7F4 3C018013 */ lui $at, %hi(D_80130F18) # $at, 0x8013 -/* B65998 800EE7F8 A0380F18 */ sb $t8, %lo(D_80130F18)($at) -.L800EE7FC: -/* B6599C 800EE7FC 0C03B8B5 */ jal func_800EE2D4 -/* B659A0 800EE800 00000000 */ nop -/* B659A4 800EE804 0C03B8C6 */ jal func_800EE318 -/* B659A8 800EE808 00000000 */ nop -/* B659AC 800EE80C 0C03B8A7 */ jal func_800EE29C -/* B659B0 800EE810 00000000 */ nop -/* B659B4 800EE814 8FBF0014 */ lw $ra, 0x14($sp) -/* B659B8 800EE818 27BD0018 */ addiu $sp, $sp, 0x18 -/* B659BC 800EE81C 03E00008 */ jr $ra -/* B659C0 800EE820 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE824.s b/asm/non_matchings/code/code_800EC960/func_800EE824.s index 3ae5a88818..04ed12436d 100644 --- a/asm/non_matchings/code/code_800EC960/func_800EE824.s +++ b/asm/non_matchings/code/code_800EC960/func_800EE824.s @@ -60,7 +60,7 @@ glabel func_800EE824 /* B65A9C 800EE8FC 10000008 */ b .L800EE920 /* B65AA0 800EE900 A0251C80 */ sb $a1, %lo(D_80131C80)($at) .L800EE904: -/* B65AA4 800EE904 0C03B8FE */ jal func_800EE3F8 +/* B65AA4 800EE904 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B65AA8 800EE908 00000000 */ nop /* B65AAC 800EE90C 90590001 */ lbu $t9, 1($v0) /* B65AB0 800EE910 3C018013 */ lui $at, %hi(D_80131C80) # $at, 0x8013 diff --git a/asm/non_matchings/code/code_800EC960/func_800EE930.s b/asm/non_matchings/code/code_800EC960/func_800EE930.s deleted file mode 100644 index 9a8f6ea46c..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE930.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800EE930 -/* B65AD0 800EE930 240300FF */ li $v1, 255 -/* B65AD4 800EE934 3C028017 */ lui $v0, %hi(D_8016B9F8) # $v0, 0x8017 -/* B65AD8 800EE938 3C048017 */ lui $a0, %hi(D_8016B9FC) # $a0, 0x8017 -/* B65ADC 800EE93C 3C058017 */ lui $a1, %hi(D_8016BA00) # $a1, 0x8017 -/* B65AE0 800EE940 24A5BA00 */ addiu $a1, %lo(D_8016BA00) # addiu $a1, $a1, -0x4600 -/* B65AE4 800EE944 2484B9FC */ addiu $a0, %lo(D_8016B9FC) # addiu $a0, $a0, -0x4604 -/* B65AE8 800EE948 2442B9F8 */ addiu $v0, %lo(D_8016B9F8) # addiu $v0, $v0, -0x4608 -/* B65AEC 800EE94C A0430000 */ sb $v1, ($v0) -/* B65AF0 800EE950 A0430001 */ sb $v1, 1($v0) -/* B65AF4 800EE954 A0400002 */ sb $zero, 2($v0) -/* B65AF8 800EE958 A0830000 */ sb $v1, ($a0) -/* B65AFC 800EE95C A0800001 */ sb $zero, 1($a0) -/* B65B00 800EE960 A0800002 */ sb $zero, 2($a0) -/* B65B04 800EE964 A0A30000 */ sb $v1, ($a1) -/* B65B08 800EE968 A0A30001 */ sb $v1, 1($a1) -/* B65B0C 800EE96C A0A00002 */ sb $zero, 2($a1) -/* B65B10 800EE970 3C018013 */ lui $at, %hi(D_80131880) -/* B65B14 800EE974 03E00008 */ jr $ra -/* B65B18 800EE978 A0201880 */ sb $zero, %lo(D_80131880)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE97C.s b/asm/non_matchings/code/code_800EC960/func_800EE97C.s deleted file mode 100644 index 6573f88344..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE97C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800EE97C -/* B65B1C 800EE97C 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B65B20 800EE980 AFBF0014 */ sw $ra, 0x14($sp) -/* B65B24 800EE984 3C048016 */ lui $a0, %hi(gPadMgr) # $a0, 0x8016 -/* B65B28 800EE988 248468C0 */ addiu $a0, %lo(gPadMgr) # addiu $a0, $a0, 0x68c0 -/* B65B2C 800EE98C 27A50020 */ addiu $a1, $sp, 0x20 -/* B65B30 800EE990 0C031F82 */ jal PadMgr_RequestPadData -/* B65B34 800EE994 00003025 */ move $a2, $zero -/* B65B38 800EE998 97AE0068 */ lhu $t6, 0x68($sp) -/* B65B3C 800EE99C 3C038017 */ lui $v1, %hi(D_8016BAB4) # $v1, 0x8017 -/* B65B40 800EE9A0 3C018017 */ lui $at, %hi(D_8016BAB0) # $at, 0x8017 -/* B65B44 800EE9A4 2463BAB4 */ addiu $v1, %lo(D_8016BAB4) # addiu $v1, $v1, -0x454c -/* B65B48 800EE9A8 AC2EBAB0 */ sw $t6, %lo(D_8016BAB0)($at) -/* B65B4C 800EE9AC 8C6F0000 */ lw $t7, ($v1) -/* B65B50 800EE9B0 8FBF0014 */ lw $ra, 0x14($sp) -/* B65B54 800EE9B4 3C018017 */ lui $at, %hi(D_8016BAB8) # $at, 0x8017 -/* B65B58 800EE9B8 01CFC026 */ xor $t8, $t6, $t7 -/* B65B5C 800EE9BC 030EC824 */ and $t9, $t8, $t6 -/* B65B60 800EE9C0 AC39BAB8 */ sw $t9, %lo(D_8016BAB8)($at) -/* B65B64 800EE9C4 27BD0080 */ addiu $sp, $sp, 0x80 -/* B65B68 800EE9C8 03E00008 */ jr $ra -/* B65B6C 800EE9CC AC6E0000 */ sw $t6, ($v1) - diff --git a/asm/non_matchings/code/code_800EC960/func_800EE9D0.s b/asm/non_matchings/code/code_800EC960/func_800EE9D0.s deleted file mode 100644 index 9de109d6ab..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800EE9D0.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_800EE9D0 -/* B65B70 800EE9D0 AFA50004 */ sw $a1, 4($sp) -/* B65B74 800EE9D4 30A500FF */ andi $a1, $a1, 0xff -/* B65B78 800EE9D8 24020001 */ li $v0, 1 -/* B65B7C 800EE9DC 00A03025 */ move $a2, $a1 -/* B65B80 800EE9E0 18A00016 */ blez $a1, .L800EEA3C -/* B65B84 800EE9E4 00001825 */ move $v1, $zero -/* B65B88 800EE9E8 3C0E8017 */ lui $t6, %hi(D_8016B9B8) # $t6, 0x8017 -/* B65B8C 800EE9EC 25CEB9B8 */ addiu $t6, %lo(D_8016B9B8) # addiu $t6, $t6, -0x4648 -/* B65B90 800EE9F0 00CE3821 */ addu $a3, $a2, $t6 -/* B65B94 800EE9F4 00004025 */ move $t0, $zero -/* B65B98 800EE9F8 240A0030 */ li $t2, 48 -/* B65B9C 800EE9FC 24090031 */ li $t1, 49 -.L800EEA00: -/* B65BA0 800EEA00 00827824 */ and $t7, $a0, $v0 -/* B65BA4 800EEA04 11E00005 */ beqz $t7, .L800EEA1C -/* B65BA8 800EEA08 00021040 */ sll $v0, $v0, 1 -/* B65BAC 800EEA0C 0008C023 */ negu $t8, $t0 -/* B65BB0 800EEA10 00F8C821 */ addu $t9, $a3, $t8 -/* B65BB4 800EEA14 10000004 */ b .L800EEA28 -/* B65BB8 800EEA18 A329FFFF */ sb $t1, -1($t9) -.L800EEA1C: -/* B65BBC 800EEA1C 00085823 */ negu $t3, $t0 -/* B65BC0 800EEA20 00EB6021 */ addu $t4, $a3, $t3 -/* B65BC4 800EEA24 A18AFFFF */ sb $t2, -1($t4) -.L800EEA28: -/* B65BC8 800EEA28 24630001 */ addiu $v1, $v1, 1 -/* B65BCC 800EEA2C 306300FF */ andi $v1, $v1, 0xff -/* B65BD0 800EEA30 0066082A */ slt $at, $v1, $a2 -/* B65BD4 800EEA34 1420FFF2 */ bnez $at, .L800EEA00 -/* B65BD8 800EEA38 00604025 */ move $t0, $v1 -.L800EEA3C: -/* B65BDC 800EEA3C 3C038017 */ lui $v1, %hi(D_8016B9B8) -/* B65BE0 800EEA40 2462B9B8 */ addiu $v0, $v1, %lo(D_8016B9B8) -/* B65BE4 800EEA44 00456821 */ addu $t5, $v0, $a1 -/* B65BE8 800EEA48 03E00008 */ jr $ra -/* B65BEC 800EEA4C A1A00000 */ sb $zero, ($t5) - diff --git a/asm/non_matchings/code/code_800EC960/func_800EEA50.s b/asm/non_matchings/code/code_800EC960/func_800EEA50.s index adf4fa67af..fa3320bb6d 100644 --- a/asm/non_matchings/code/code_800EC960/func_800EEA50.s +++ b/asm/non_matchings/code/code_800EC960/func_800EEA50.s @@ -526,9 +526,10 @@ glabel jtbl_8014A484 .word L800F17F8 glabel D_8014A4C0 - .float 127.1 - - .word 0 # forced padding + .double 5.31283964854272E14 + # .float 127.1 + #.word 0 # forced padding double? + glabel D_8014A4C8 .double 127.1 @@ -607,13 +608,13 @@ glabel func_800EEA50 /* B65CFC 800EEB5C 8FA400B0 */ lw $a0, 0xb0($sp) /* B65D00 800EEB60 3C058013 */ lui $a1, %hi(D_80133414) # $a1, 0x8013 /* B65D04 800EEB64 90A53414 */ lbu $a1, %lo(D_80133414)($a1) -/* B65D08 800EEB68 3C048013 */ lui $a0, %hi(D_801337CD) +/* B65D08 800EEB68 3C048013 */ lui $a0, %hi(gAudioSessionPresets) /* B65D0C 800EEB6C 3C188017 */ lui $t8, %hi(D_8016B9E0) # $t8, 0x8017 /* B65D10 800EEB70 0005C8C0 */ sll $t9, $a1, 3 /* B65D14 800EEB74 0325C823 */ subu $t9, $t9, $a1 /* B65D18 800EEB78 0019C8C0 */ sll $t9, $t9, 3 /* B65D1C 800EEB7C 00992021 */ addu $a0, $a0, $t9 -/* B65D20 800EEB80 908437CD */ lbu $a0, %lo(D_801337CD)($a0) +/* B65D20 800EEB80 908437CD */ lbu $a0, %lo(gAudioSessionPresets+0x5)($a0) /* B65D24 800EEB84 0000B025 */ move $s6, $zero /* B65D28 800EEB88 3C0E8013 */ lui $t6, %hi(D_80131F68) # $t6, 0x8013 /* B65D2C 800EEB8C 18800013 */ blez $a0, .L800EEBDC @@ -3252,8 +3253,8 @@ glabel L800F12F0 /* B684F0 800F1350 24050003 */ li $a1, 3 /* B684F4 800F1354 0C03ED07 */ jal GfxPrint_SetPos /* B684F8 800F1358 24060004 */ li $a2, 4 -/* B684FC 800F135C 3C028017 */ lui $v0, %hi(D_8016B9FC) # $v0, 0x8017 -/* B68500 800F1360 2442B9FC */ addiu $v0, %lo(D_8016B9FC) # addiu $v0, $v0, -0x4604 +/* B684FC 800F135C 3C028017 */ lui $v0, %hi(sDisplayedStaff) # $v0, 0x8017 +/* B68500 800F1360 2442B9FC */ addiu $v0, %lo(sDisplayedStaff) # addiu $v0, $v0, -0x4604 /* B68504 800F1364 904D0002 */ lbu $t5, 2($v0) /* B68508 800F1368 3C058015 */ lui $a1, %hi(D_8014A290) # $a1, 0x8015 /* B6850C 800F136C 24A5A290 */ addiu $a1, %lo(D_8014A290) # addiu $a1, $a1, -0x5d70 @@ -3325,10 +3326,10 @@ glabel L800F12F0 /* B6860C 800F146C 24050003 */ li $a1, 3 /* B68610 800F1470 0C03ED07 */ jal GfxPrint_SetPos /* B68614 800F1474 24060018 */ li $a2, 24 -/* B68618 800F1478 3C0A8013 */ lui $t2, %hi(D_80130F38) # $t2, 0x8013 +/* B68618 800F1478 3C0A8013 */ lui $t2, %hi(sPlaybackState) # $t2, 0x8013 /* B6861C 800F147C 3C0B8013 */ lui $t3, %hi(D_80131858) # $t3, 0x8013 /* B68620 800F1480 916B1858 */ lbu $t3, %lo(D_80131858)($t3) -/* B68624 800F1484 914A0F38 */ lbu $t2, %lo(D_80130F38)($t2) +/* B68624 800F1484 914A0F38 */ lbu $t2, %lo(sPlaybackState)($t2) /* B68628 800F1488 3C058015 */ lui $a1, %hi(D_8014A2E4) # $a1, 0x8015 /* B6862C 800F148C 3C068013 */ lui $a2, %hi(D_80130F10) # $a2, 0x8013 /* B68630 800F1490 3C078013 */ lui $a3, %hi(D_80130F3C) # $a3, 0x8013 @@ -3590,15 +3591,15 @@ glabel L800F17F8 /* B68A28 800F1888 8FA400B0 */ lw $a0, 0xb0($sp) /* B68A2C 800F188C 0C03EF2D */ jal GfxPrint_Printf /* B68A30 800F1890 AFB90010 */ sw $t9, 0x10($sp) -/* B68A34 800F1894 3C0A8017 */ lui $t2, %hi(D_8016BAC0) # $t2, 0x8017 -/* B68A38 800F1898 3C0B8017 */ lui $t3, %hi(D_8016BABC) # $t3, 0x8017 -/* B68A3C 800F189C 8D6BBABC */ lw $t3, %lo(D_8016BABC)($t3) -/* B68A40 800F18A0 8D4ABAC0 */ lw $t2, %lo(D_8016BAC0)($t2) +/* B68A34 800F1894 3C0A8017 */ lui $t2, %hi(sAudioUpdateTaskEnd) # $t2, 0x8017 +/* B68A38 800F1898 3C0B8017 */ lui $t3, %hi(sAudioUpdateTaskStart) # $t3, 0x8017 +/* B68A3C 800F189C 8D6BBABC */ lw $t3, %lo(sAudioUpdateTaskStart)($t3) +/* B68A40 800F18A0 8D4ABAC0 */ lw $t2, %lo(sAudioUpdateTaskEnd)($t2) /* B68A44 800F18A4 154B0020 */ bne $t2, $t3, .L800F1928 -/* B68A48 800F18A8 3C0D8017 */ lui $t5, %hi(D_8016B7A4) # $t5, 0x8017 -/* B68A4C 800F18AC 3C0C8017 */ lui $t4, %hi(D_8016B7A0) # $t4, 0x8017 -/* B68A50 800F18B0 8D8CB7A0 */ lw $t4, %lo(D_8016B7A0)($t4) -/* B68A54 800F18B4 8DADB7A4 */ lw $t5, %lo(D_8016B7A4)($t5) +/* B68A48 800F18A8 3C0D8017 */ lui $t5, %hi(sAudioUpdateEndTime) # $t5, 0x8017 +/* B68A4C 800F18AC 3C0C8017 */ lui $t4, %hi(sAudioUpdateStartTime) # $t4, 0x8017 +/* B68A50 800F18B0 8D8CB7A0 */ lw $t4, %lo(sAudioUpdateStartTime)($t4) +/* B68A54 800F18B4 8DADB7A4 */ lw $t5, %lo(sAudioUpdateEndTime)($t5) /* B68A58 800F18B8 24040000 */ li $a0, 0 /* B68A5C 800F18BC 24060000 */ li $a2, 0 /* B68A60 800F18C0 24070040 */ li $a3, 64 diff --git a/asm/non_matchings/code/code_800EC960/func_800F1BDC.s b/asm/non_matchings/code/code_800EC960/func_800F1BDC.s deleted file mode 100644 index 14ce312a13..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F1BDC.s +++ /dev/null @@ -1,412 +0,0 @@ -.late_rodata -glabel jtbl_8014A4D4 - .word L800F1E70 - .word L800F1E70 - .word L800F1EA4 - .word L800F1EA4 - .word L800F1F00 - .word L800F1F2C - .word L800F1F64 - .word L800F1FE4 - .word L800F2048 - .word L800F2048 - .word L800F2010 - -glabel jtbl_8014A500 - .word L800F2078 - .word L800F2078 - .word L800F20C0 - .word L800F20C0 - .word L800F20D8 - .word L800F20D8 - .word L800F20D8 - .word L800F20A0 - -.text -glabel func_800F1BDC -/* B68D7C 800F1BDC 3C028017 */ lui $v0, %hi(D_8016BAB0) # $v0, 0x8017 -/* B68D80 800F1BE0 8C42BAB0 */ lw $v0, %lo(D_8016BAB0)($v0) -/* B68D84 800F1BE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B68D88 800F1BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* B68D8C 800F1BEC 304E0004 */ andi $t6, $v0, 4 -/* B68D90 800F1BF0 11C0000E */ beqz $t6, .L800F1C2C -/* B68D94 800F1BF4 24090001 */ li $t1, 1 -/* B68D98 800F1BF8 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B68D9C 800F1BFC 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B68DA0 800F1C00 916F0000 */ lbu $t7, ($t3) -/* B68DA4 800F1C04 3C0A8013 */ lui $t2, %hi(D_80131E20) # $t2, 0x8013 -/* B68DA8 800F1C08 254A1E20 */ addiu $t2, %lo(D_80131E20) # addiu $t2, $t2, 0x1e20 -/* B68DAC 800F1C0C 000FC040 */ sll $t8, $t7, 1 -/* B68DB0 800F1C10 0158C821 */ addu $t9, $t2, $t8 -/* B68DB4 800F1C14 972C0000 */ lhu $t4, ($t9) -/* B68DB8 800F1C18 29810010 */ slti $at, $t4, 0x10 -/* B68DBC 800F1C1C 14200019 */ bnez $at, .L800F1C84 -/* B68DC0 800F1C20 00000000 */ nop -/* B68DC4 800F1C24 10000017 */ b .L800F1C84 -/* B68DC8 800F1C28 24090010 */ li $t1, 16 -.L800F1C2C: -/* B68DCC 800F1C2C 304D0002 */ andi $t5, $v0, 2 -/* B68DD0 800F1C30 11A0000C */ beqz $t5, .L800F1C64 -/* B68DD4 800F1C34 3C0E8013 */ lui $t6, %hi(D_80131CA4) # $t6, 0x8013 -/* B68DD8 800F1C38 91CE1CA4 */ lbu $t6, %lo(D_80131CA4)($t6) -/* B68DDC 800F1C3C 3C0A8013 */ lui $t2, %hi(D_80131E20) # $t2, 0x8013 -/* B68DE0 800F1C40 254A1E20 */ addiu $t2, %lo(D_80131E20) # addiu $t2, $t2, 0x1e20 -/* B68DE4 800F1C44 000E7840 */ sll $t7, $t6, 1 -/* B68DE8 800F1C48 014FC021 */ addu $t8, $t2, $t7 -/* B68DEC 800F1C4C 97190000 */ lhu $t9, ($t8) -/* B68DF0 800F1C50 2B210010 */ slti $at, $t9, 0x10 -/* B68DF4 800F1C54 1420000B */ bnez $at, .L800F1C84 -/* B68DF8 800F1C58 00000000 */ nop -/* B68DFC 800F1C5C 10000009 */ b .L800F1C84 -/* B68E00 800F1C60 24090008 */ li $t1, 8 -.L800F1C64: -/* B68E04 800F1C64 304C0008 */ andi $t4, $v0, 8 -/* B68E08 800F1C68 11800006 */ beqz $t4, .L800F1C84 -/* B68E0C 800F1C6C 3C0D8013 */ lui $t5, %hi(D_80131CA4) # $t5, 0x8013 -/* B68E10 800F1C70 91AD1CA4 */ lbu $t5, %lo(D_80131CA4)($t5) -/* B68E14 800F1C74 3C018013 */ lui $at, %hi(D_80131E08) -/* B68E18 800F1C78 000D7040 */ sll $t6, $t5, 1 -/* B68E1C 800F1C7C 002E0821 */ addu $at, $at, $t6 -/* B68E20 800F1C80 A4201E08 */ sh $zero, %lo(D_80131E08)($at) -.L800F1C84: -/* B68E24 800F1C84 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B68E28 800F1C88 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -/* B68E2C 800F1C8C 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B68E30 800F1C90 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B68E34 800F1C94 3C0A8013 */ lui $t2, %hi(D_80131E20) # $t2, 0x8013 -/* B68E38 800F1C98 308F0800 */ andi $t7, $a0, 0x800 -/* B68E3C 800F1C9C 254A1E20 */ addiu $t2, %lo(D_80131E20) # addiu $t2, $t2, 0x1e20 -/* B68E40 800F1CA0 11E00009 */ beqz $t7, .L800F1CC8 -/* B68E44 800F1CA4 91620000 */ lbu $v0, ($t3) -/* B68E48 800F1CA8 18400005 */ blez $v0, .L800F1CC0 -/* B68E4C 800F1CAC 2419000A */ li $t9, 10 -/* B68E50 800F1CB0 2458FFFF */ addiu $t8, $v0, -1 -/* B68E54 800F1CB4 A1780000 */ sb $t8, ($t3) -/* B68E58 800F1CB8 10000003 */ b .L800F1CC8 -/* B68E5C 800F1CBC 330200FF */ andi $v0, $t8, 0xff -.L800F1CC0: -/* B68E60 800F1CC0 A1790000 */ sb $t9, ($t3) -/* B68E64 800F1CC4 332200FF */ andi $v0, $t9, 0xff -.L800F1CC8: -/* B68E68 800F1CC8 308C0400 */ andi $t4, $a0, 0x400 -/* B68E6C 800F1CCC 11800009 */ beqz $t4, .L800F1CF4 -/* B68E70 800F1CD0 308E0200 */ andi $t6, $a0, 0x200 -/* B68E74 800F1CD4 2841000A */ slti $at, $v0, 0xa -/* B68E78 800F1CD8 10200004 */ beqz $at, .L800F1CEC -/* B68E7C 800F1CDC 244D0001 */ addiu $t5, $v0, 1 -/* B68E80 800F1CE0 A16D0000 */ sb $t5, ($t3) -/* B68E84 800F1CE4 10000003 */ b .L800F1CF4 -/* B68E88 800F1CE8 31A200FF */ andi $v0, $t5, 0xff -.L800F1CEC: -/* B68E8C 800F1CEC A1600000 */ sb $zero, ($t3) -/* B68E90 800F1CF0 300200FF */ andi $v0, $zero, 0xff -.L800F1CF4: -/* B68E94 800F1CF4 11C00010 */ beqz $t6, .L800F1D38 -/* B68E98 800F1CF8 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B68E9C 800F1CFC 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B68EA0 800F1D00 00021840 */ sll $v1, $v0, 1 -/* B68EA4 800F1D04 01032821 */ addu $a1, $t0, $v1 -/* B68EA8 800F1D08 94A60000 */ lhu $a2, ($a1) -/* B68EAC 800F1D0C 01203825 */ move $a3, $t1 -/* B68EB0 800F1D10 0143C021 */ addu $t8, $t2, $v1 -/* B68EB4 800F1D14 00C9082A */ slt $at, $a2, $t1 -/* B68EB8 800F1D18 14200003 */ bnez $at, .L800F1D28 -/* B68EBC 800F1D1C 00C77823 */ subu $t7, $a2, $a3 -/* B68EC0 800F1D20 10000005 */ b .L800F1D38 -/* B68EC4 800F1D24 A4AF0000 */ sh $t7, ($a1) -.L800F1D28: -/* B68EC8 800F1D28 97190000 */ lhu $t9, ($t8) -/* B68ECC 800F1D2C 00D96021 */ addu $t4, $a2, $t9 -/* B68ED0 800F1D30 01876823 */ subu $t5, $t4, $a3 -/* B68ED4 800F1D34 A4AD0000 */ sh $t5, ($a1) -.L800F1D38: -/* B68ED8 800F1D38 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B68EDC 800F1D3C 308E0100 */ andi $t6, $a0, 0x100 -/* B68EE0 800F1D40 11C0000D */ beqz $t6, .L800F1D78 -/* B68EE4 800F1D44 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B68EE8 800F1D48 00021840 */ sll $v1, $v0, 1 -/* B68EEC 800F1D4C 01032821 */ addu $a1, $t0, $v1 -/* B68EF0 800F1D50 94AF0000 */ lhu $t7, ($a1) -/* B68EF4 800F1D54 0143C021 */ addu $t8, $t2, $v1 -/* B68EF8 800F1D58 97060000 */ lhu $a2, ($t8) -/* B68EFC 800F1D5C 01E92021 */ addu $a0, $t7, $t1 -/* B68F00 800F1D60 0086082A */ slt $at, $a0, $a2 -/* B68F04 800F1D64 10200003 */ beqz $at, .L800F1D74 -/* B68F08 800F1D68 0086C823 */ subu $t9, $a0, $a2 -/* B68F0C 800F1D6C 10000002 */ b .L800F1D78 -/* B68F10 800F1D70 A4A40000 */ sh $a0, ($a1) -.L800F1D74: -/* B68F14 800F1D74 A4B90000 */ sh $t9, ($a1) -.L800F1D78: -/* B68F18 800F1D78 24010008 */ li $at, 8 -/* B68F1C 800F1D7C 14410019 */ bne $v0, $at, .L800F1DE4 -/* B68F20 800F1D80 00401825 */ move $v1, $v0 -/* B68F24 800F1D84 00026040 */ sll $t4, $v0, 1 -/* B68F28 800F1D88 010C6821 */ addu $t5, $t0, $t4 -/* B68F2C 800F1D8C 95AE0000 */ lhu $t6, ($t5) -/* B68F30 800F1D90 11C0000B */ beqz $t6, .L800F1DC0 -/* B68F34 800F1D94 00000000 */ nop -/* B68F38 800F1D98 0C03DA0A */ jal func_800F6828 -/* B68F3C 800F1D9C 24040020 */ li $a0, 32 -/* B68F40 800F1DA0 3C028013 */ lui $v0, %hi(D_80131CA4) # $v0, 0x8013 -/* B68F44 800F1DA4 90421CA4 */ lbu $v0, %lo(D_80131CA4)($v0) -/* B68F48 800F1DA8 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B68F4C 800F1DAC 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B68F50 800F1DB0 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B68F54 800F1DB4 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B68F58 800F1DB8 1000000A */ b .L800F1DE4 -/* B68F5C 800F1DBC 00401825 */ move $v1, $v0 -.L800F1DC0: -/* B68F60 800F1DC0 0C03DA0A */ jal func_800F6828 -/* B68F64 800F1DC4 00002025 */ move $a0, $zero -/* B68F68 800F1DC8 3C028013 */ lui $v0, %hi(D_80131CA4) # $v0, 0x8013 -/* B68F6C 800F1DCC 90421CA4 */ lbu $v0, %lo(D_80131CA4)($v0) -/* B68F70 800F1DD0 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B68F74 800F1DD4 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B68F78 800F1DD8 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B68F7C 800F1DDC 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B68F80 800F1DE0 00401825 */ move $v1, $v0 -.L800F1DE4: -/* B68F84 800F1DE4 24010009 */ li $at, 9 -/* B68F88 800F1DE8 14610012 */ bne $v1, $at, .L800F1E34 -/* B68F8C 800F1DEC 00027840 */ sll $t7, $v0, 1 -/* B68F90 800F1DF0 010FC021 */ addu $t8, $t0, $t7 -/* B68F94 800F1DF4 97190000 */ lhu $t9, ($t8) -/* B68F98 800F1DF8 13200008 */ beqz $t9, .L800F1E1C -/* B68F9C 800F1DFC 00000000 */ nop -/* B68FA0 800F1E00 0C03D9E8 */ jal func_800F67A0 -/* B68FA4 800F1E04 24040020 */ li $a0, 32 -/* B68FA8 800F1E08 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B68FAC 800F1E0C 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B68FB0 800F1E10 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B68FB4 800F1E14 10000007 */ b .L800F1E34 -/* B68FB8 800F1E18 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -.L800F1E1C: -/* B68FBC 800F1E1C 0C03D9E8 */ jal func_800F67A0 -/* B68FC0 800F1E20 00002025 */ move $a0, $zero -/* B68FC4 800F1E24 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B68FC8 800F1E28 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B68FCC 800F1E2C 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B68FD0 800F1E30 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -.L800F1E34: -/* B68FD4 800F1E34 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B68FD8 800F1E38 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -/* B68FDC 800F1E3C 308C8000 */ andi $t4, $a0, 0x8000 -/* B68FE0 800F1E40 51800082 */ beql $t4, $zero, .L800F204C -/* B68FE4 800F1E44 308E4000 */ andi $t6, $a0, 0x4000 -/* B68FE8 800F1E48 91620000 */ lbu $v0, ($t3) -/* B68FEC 800F1E4C 2C41000B */ sltiu $at, $v0, 0xb -/* B68FF0 800F1E50 1020007D */ beqz $at, .L800F2048 -/* B68FF4 800F1E54 00401825 */ move $v1, $v0 -/* B68FF8 800F1E58 00036880 */ sll $t5, $v1, 2 -/* B68FFC 800F1E5C 3C018015 */ lui $at, %hi(jtbl_8014A4D4) -/* B69000 800F1E60 002D0821 */ addu $at, $at, $t5 -/* B69004 800F1E64 8C2DA4D4 */ lw $t5, %lo(jtbl_8014A4D4)($at) -/* B69008 800F1E68 01A00008 */ jr $t5 -/* B6900C 800F1E6C 00000000 */ nop -glabel L800F1E70 -/* B69010 800F1E70 00027040 */ sll $t6, $v0, 1 -/* B69014 800F1E74 010E7821 */ addu $t7, $t0, $t6 -/* B69018 800F1E78 95F80000 */ lhu $t8, ($t7) -/* B6901C 800F1E7C 0003CE00 */ sll $t9, $v1, 0x18 -/* B69020 800F1E80 0C03E803 */ jal Audio_SetBGM -/* B69024 800F1E84 03192025 */ or $a0, $t8, $t9 -/* B69028 800F1E88 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B6902C 800F1E8C 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B69030 800F1E90 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B69034 800F1E94 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B69038 800F1E98 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B6903C 800F1E9C 1000006A */ b .L800F2048 -/* B69040 800F1EA0 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F1EA4 -/* B69044 800F1EA4 950D0004 */ lhu $t5, 4($t0) -/* B69048 800F1EA8 950C0006 */ lhu $t4, 6($t0) -/* B6904C 800F1EAC 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B69050 800F1EB0 000D7B00 */ sll $t7, $t5, 0xc -/* B69054 800F1EB4 3C188013 */ lui $t8, %hi(D_801333E8) # $t8, 0x8013 -/* B69058 800F1EB8 018F2021 */ addu $a0, $t4, $t7 -/* B6905C 800F1EBC 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B69060 800F1EC0 24840800 */ addiu $a0, $a0, 0x800 -/* B69064 800F1EC4 271833E8 */ addiu $t8, %lo(D_801333E8) # addiu $t8, $t8, 0x33e8 -/* B69068 800F1EC8 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B6906C 800F1ECC 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B69070 800F1ED0 AFB80014 */ sw $t8, 0x14($sp) -/* B69074 800F1ED4 3084FFFF */ andi $a0, $a0, 0xffff -/* B69078 800F1ED8 AFA70010 */ sw $a3, 0x10($sp) -/* B6907C 800F1EDC 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B69080 800F1EE0 24060004 */ li $a2, 4 -/* B69084 800F1EE4 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69088 800F1EE8 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B6908C 800F1EEC 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B69090 800F1EF0 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B69094 800F1EF4 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B69098 800F1EF8 10000053 */ b .L800F2048 -/* B6909C 800F1EFC 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F1F00 -/* B690A0 800F1F00 0002C840 */ sll $t9, $v0, 1 -/* B690A4 800F1F04 01196821 */ addu $t5, $t0, $t9 -/* B690A8 800F1F08 0C03D9C0 */ jal func_800F6700 -/* B690AC 800F1F0C 81A40001 */ lb $a0, 1($t5) -/* B690B0 800F1F10 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B690B4 800F1F14 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B690B8 800F1F18 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B690BC 800F1F1C 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B690C0 800F1F20 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B690C4 800F1F24 10000048 */ b .L800F2048 -/* B690C8 800F1F28 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F1F2C -/* B690CC 800F1F2C 00027040 */ sll $t6, $v0, 1 -/* B690D0 800F1F30 010E6021 */ addu $t4, $t0, $t6 -/* B690D4 800F1F34 95840000 */ lhu $a0, ($t4) -/* B690D8 800F1F38 3C01E000 */ lui $at, (0xE0000100 >> 16) # lui $at, 0xe000 -/* B690DC 800F1F3C 34210100 */ ori $at, (0xE0000100 & 0xFFFF) # ori $at, $at, 0x100 -/* B690E0 800F1F40 0C03E803 */ jal Audio_SetBGM -/* B690E4 800F1F44 00812025 */ or $a0, $a0, $at -/* B690E8 800F1F48 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B690EC 800F1F4C 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B690F0 800F1F50 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B690F4 800F1F54 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B690F8 800F1F58 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B690FC 800F1F5C 1000003A */ b .L800F2048 -/* B69100 800F1F60 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F1F64 -/* B69104 800F1F64 00027840 */ sll $t7, $v0, 1 -/* B69108 800F1F68 010FC021 */ addu $t8, $t0, $t7 -/* B6910C 800F1F6C 93040001 */ lbu $a0, 1($t8) -/* B69110 800F1F70 3C01F000 */ lui $at, 0xf000 -/* B69114 800F1F74 0C03E803 */ jal Audio_SetBGM -/* B69118 800F1F78 00812025 */ or $a0, $a0, $at -/* B6911C 800F1F7C 3C198013 */ lui $t9, %hi(D_80131E14) # $t9, 0x8013 -/* B69120 800F1F80 97391E14 */ lhu $t9, %lo(D_80131E14)($t9) -/* B69124 800F1F84 3C038013 */ lui $v1, %hi(D_80131EFC) # $v1, 0x8013 -/* B69128 800F1F88 24631EFC */ addiu $v1, %lo(D_80131EFC) # addiu $v1, $v1, 0x1efc -/* B6912C 800F1F8C 332D00FF */ andi $t5, $t9, 0xff -/* B69130 800F1F90 000D70C0 */ sll $t6, $t5, 3 -/* B69134 800F1F94 01CD7023 */ subu $t6, $t6, $t5 -/* B69138 800F1F98 000E70C0 */ sll $t6, $t6, 3 -/* B6913C 800F1F9C 3C028013 */ lui $v0, %hi(D_801337CE) -/* B69140 800F1FA0 3C048013 */ lui $a0, %hi(D_80131F28) # $a0, 0x8013 -/* B69144 800F1FA4 004E1021 */ addu $v0, $v0, $t6 -/* B69148 800F1FA8 A0790000 */ sb $t9, ($v1) -/* B6914C 800F1FAC 904237CE */ lbu $v0, %lo(D_801337CE)($v0) -/* B69150 800F1FB0 24841F28 */ addiu $a0, %lo(D_80131F28) # addiu $a0, $a0, 0x1f28 -/* B69154 800F1FB4 908C0000 */ lbu $t4, ($a0) -/* B69158 800F1FB8 2442FFFF */ addiu $v0, $v0, -1 -/* B6915C 800F1FBC 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B69160 800F1FC0 004C082A */ slt $at, $v0, $t4 -/* B69164 800F1FC4 10200002 */ beqz $at, .L800F1FD0 -/* B69168 800F1FC8 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B6916C 800F1FCC A0820000 */ sb $v0, ($a0) -.L800F1FD0: -/* B69170 800F1FD0 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69174 800F1FD4 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B69178 800F1FD8 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B6917C 800F1FDC 1000001A */ b .L800F2048 -/* B69180 800F1FE0 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F1FE4 -/* B69184 800F1FE4 00027840 */ sll $t7, $v0, 1 -/* B69188 800F1FE8 010FC021 */ addu $t8, $t0, $t7 -/* B6918C 800F1FEC 0C03DBED */ jal func_800F6FB4 -/* B69190 800F1FF0 93040001 */ lbu $a0, 1($t8) -/* B69194 800F1FF4 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69198 800F1FF8 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B6919C 800F1FFC 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B691A0 800F2000 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B691A4 800F2004 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B691A8 800F2008 1000000F */ b .L800F2048 -/* B691AC 800F200C 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F2010 -/* B691B0 800F2010 0002C840 */ sll $t9, $v0, 1 -/* B691B4 800F2014 01196821 */ addu $t5, $t0, $t9 -/* B691B8 800F2018 95A40000 */ lhu $a0, ($t5) -/* B691BC 800F201C 00800821 */ addu $at, $a0, $zero -/* B691C0 800F2020 000421C0 */ sll $a0, $a0, 7 -/* B691C4 800F2024 00812023 */ subu $a0, $a0, $at -/* B691C8 800F2028 0C03DC98 */ jal func_800F7260 -/* B691CC 800F202C 3084FFFF */ andi $a0, $a0, 0xffff -/* B691D0 800F2030 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B691D4 800F2034 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B691D8 800F2038 3C088013 */ lui $t0, %hi(D_80131E08) # $t0, 0x8013 -/* B691DC 800F203C 25081E08 */ addiu $t0, %lo(D_80131E08) # addiu $t0, $t0, 0x1e08 -/* B691E0 800F2040 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B691E4 800F2044 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F2048 -.L800F2048: -/* B691E8 800F2048 308E4000 */ andi $t6, $a0, 0x4000 -.L800F204C: -/* B691EC 800F204C 51C00023 */ beql $t6, $zero, .L800F20DC -/* B691F0 800F2050 308F0004 */ andi $t7, $a0, 4 -/* B691F4 800F2054 91630000 */ lbu $v1, ($t3) -/* B691F8 800F2058 2C610008 */ sltiu $at, $v1, 8 -/* B691FC 800F205C 1020001E */ beqz $at, .L800F20D8 -/* B69200 800F2060 00036080 */ sll $t4, $v1, 2 -/* B69204 800F2064 3C018015 */ lui $at, %hi(jtbl_8014A500) -/* B69208 800F2068 002C0821 */ addu $at, $at, $t4 -/* B6920C 800F206C 8C2CA500 */ lw $t4, %lo(jtbl_8014A500)($at) -/* B69210 800F2070 01800008 */ jr $t4 -/* B69214 800F2074 00000000 */ nop -glabel L800F2078 -/* B69218 800F2078 3C011000 */ lui $at, (0x100000FF >> 16) # lui $at, 0x1000 -/* B6921C 800F207C 342100FF */ ori $at, (0x100000FF & 0xFFFF) # ori $at, $at, 0xff -/* B69220 800F2080 00032600 */ sll $a0, $v1, 0x18 -/* B69224 800F2084 0C03E803 */ jal Audio_SetBGM -/* B69228 800F2088 00812025 */ or $a0, $a0, $at -/* B6922C 800F208C 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69230 800F2090 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B69234 800F2094 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B69238 800F2098 1000000F */ b .L800F20D8 -/* B6923C 800F209C 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F20A0 -/* B69240 800F20A0 3C041000 */ lui $a0, (0x100000FF >> 16) # lui $a0, 0x1000 -/* B69244 800F20A4 0C03E803 */ jal Audio_SetBGM -/* B69248 800F20A8 348400FF */ ori $a0, (0x100000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6924C 800F20AC 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69250 800F20B0 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B69254 800F20B4 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B69258 800F20B8 10000007 */ b .L800F20D8 -/* B6925C 800F20BC 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F20C0 -/* B69260 800F20C0 0C03E1E8 */ jal func_800F87A0 -/* B69264 800F20C4 91040005 */ lbu $a0, 5($t0) -/* B69268 800F20C8 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B6926C 800F20CC 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B69270 800F20D0 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B69274 800F20D4 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -glabel L800F20D8 -.L800F20D8: -/* B69278 800F20D8 308F0004 */ andi $t7, $a0, 4 -.L800F20DC: -/* B6927C 800F20DC 51E0000E */ beql $t7, $zero, .L800F2118 -/* B69280 800F20E0 308D0001 */ andi $t5, $a0, 1 -/* B69284 800F20E4 91620000 */ lbu $v0, ($t3) -/* B69288 800F20E8 3C198013 */ lui $t9, %hi(D_80131E08) # $t9, 0x8013 -/* B6928C 800F20EC 27391E08 */ addiu $t9, %lo(D_80131E08) # addiu $t9, $t9, 0x1e08 -/* B69290 800F20F0 14400008 */ bnez $v0, .L800F2114 -/* B69294 800F20F4 0002C040 */ sll $t8, $v0, 1 -/* B69298 800F20F8 03192821 */ addu $a1, $t8, $t9 -/* B6929C 800F20FC 0C03D657 */ jal func_800F595C -/* B692A0 800F2100 94A40000 */ lhu $a0, ($a1) -/* B692A4 800F2104 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B692A8 800F2108 3C0B8013 */ lui $t3, %hi(D_80131CA4) # $t3, 0x8013 -/* B692AC 800F210C 256B1CA4 */ addiu $t3, %lo(D_80131CA4) # addiu $t3, $t3, 0x1ca4 -/* B692B0 800F2110 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -.L800F2114: -/* B692B4 800F2114 308D0001 */ andi $t5, $a0, 1 -.L800F2118: -/* B692B8 800F2118 51A0000A */ beql $t5, $zero, .L800F2144 -/* B692BC 800F211C 8FBF001C */ lw $ra, 0x1c($sp) -/* B692C0 800F2120 91620000 */ lbu $v0, ($t3) -/* B692C4 800F2124 3C0C8013 */ lui $t4, %hi(D_80131E08) # $t4, 0x8013 -/* B692C8 800F2128 258C1E08 */ addiu $t4, %lo(D_80131E08) # addiu $t4, $t4, 0x1e08 -/* B692CC 800F212C 14400004 */ bnez $v0, .L800F2140 -/* B692D0 800F2130 00027040 */ sll $t6, $v0, 1 -/* B692D4 800F2134 01CC2821 */ addu $a1, $t6, $t4 -/* B692D8 800F2138 0C03D6B3 */ jal func_800F5ACC -/* B692DC 800F213C 94A40000 */ lhu $a0, ($a1) -.L800F2140: -/* B692E0 800F2140 8FBF001C */ lw $ra, 0x1c($sp) -.L800F2144: -/* B692E4 800F2144 27BD0020 */ addiu $sp, $sp, 0x20 -/* B692E8 800F2148 03E00008 */ jr $ra -/* B692EC 800F214C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F2150.s b/asm/non_matchings/code/code_800EC960/func_800F2150.s deleted file mode 100644 index e4f5e054a6..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F2150.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_800F2150 -/* B692F0 800F2150 3C028017 */ lui $v0, %hi(D_8016BAB8) # $v0, 0x8017 -/* B692F4 800F2154 8C42BAB8 */ lw $v0, %lo(D_8016BAB8)($v0) -/* B692F8 800F2158 3C038013 */ lui $v1, %hi(D_80131EC0) # $v1, 0x8013 -/* B692FC 800F215C 24631EC0 */ addiu $v1, %lo(D_80131EC0) # addiu $v1, $v1, 0x1ec0 -/* B69300 800F2160 304E0008 */ andi $t6, $v0, 8 -/* B69304 800F2164 11C00004 */ beqz $t6, .L800F2178 -/* B69308 800F2168 30590004 */ andi $t9, $v0, 4 -/* B6930C 800F216C 806F0000 */ lb $t7, ($v1) -/* B69310 800F2170 25F8FFFF */ addiu $t8, $t7, -1 -/* B69314 800F2174 A0780000 */ sb $t8, ($v1) -.L800F2178: -/* B69318 800F2178 3C038013 */ lui $v1, %hi(D_80131EC0) # $v1, 0x8013 -/* B6931C 800F217C 13200004 */ beqz $t9, .L800F2190 -/* B69320 800F2180 24631EC0 */ addiu $v1, %lo(D_80131EC0) # addiu $v1, $v1, 0x1ec0 -/* B69324 800F2184 80680000 */ lb $t0, ($v1) -/* B69328 800F2188 25090001 */ addiu $t1, $t0, 1 -/* B6932C 800F218C A0690000 */ sb $t1, ($v1) -.L800F2190: -/* B69330 800F2190 304A0002 */ andi $t2, $v0, 2 -/* B69334 800F2194 11400006 */ beqz $t2, .L800F21B0 -/* B69338 800F2198 304D0001 */ andi $t5, $v0, 1 -/* B6933C 800F219C 3C048013 */ lui $a0, %hi(D_80131EBC) # $a0, 0x8013 -/* B69340 800F21A0 24841EBC */ addiu $a0, %lo(D_80131EBC) # addiu $a0, $a0, 0x1ebc -/* B69344 800F21A4 808B0000 */ lb $t3, ($a0) -/* B69348 800F21A8 256CFFFF */ addiu $t4, $t3, -1 -/* B6934C 800F21AC A08C0000 */ sb $t4, ($a0) -.L800F21B0: -/* B69350 800F21B0 3C048013 */ lui $a0, %hi(D_80131EBC) # $a0, 0x8013 -/* B69354 800F21B4 11A00004 */ beqz $t5, .L800F21C8 -/* B69358 800F21B8 24841EBC */ addiu $a0, %lo(D_80131EBC) # addiu $a0, $a0, 0x1ebc -/* B6935C 800F21BC 808E0000 */ lb $t6, ($a0) -/* B69360 800F21C0 25CF0001 */ addiu $t7, $t6, 1 -/* B69364 800F21C4 A08F0000 */ sb $t7, ($a0) -.L800F21C8: -/* B69368 800F21C8 30584000 */ andi $t8, $v0, 0x4000 -/* B6936C 800F21CC 13000003 */ beqz $t8, .L800F21DC -/* B69370 800F21D0 30590800 */ andi $t9, $v0, 0x800 -/* B69374 800F21D4 A0800000 */ sb $zero, ($a0) -/* B69378 800F21D8 A0600000 */ sb $zero, ($v1) -.L800F21DC: -/* B6937C 800F21DC 13200007 */ beqz $t9, .L800F21FC -/* B69380 800F21E0 30490400 */ andi $t1, $v0, 0x400 -/* B69384 800F21E4 3C058013 */ lui $a1, %hi(D_80131EC4) # $a1, 0x8013 -/* B69388 800F21E8 24A51EC4 */ addiu $a1, %lo(D_80131EC4) # addiu $a1, $a1, 0x1ec4 -/* B6938C 800F21EC 80A30000 */ lb $v1, ($a1) -/* B69390 800F21F0 18600002 */ blez $v1, .L800F21FC -/* B69394 800F21F4 2468FFFF */ addiu $t0, $v1, -1 -/* B69398 800F21F8 A0A80000 */ sb $t0, ($a1) -.L800F21FC: -/* B6939C 800F21FC 3C058013 */ lui $a1, %hi(D_80131EC4) # $a1, 0x8013 -/* B693A0 800F2200 11200006 */ beqz $t1, .L800F221C -/* B693A4 800F2204 24A51EC4 */ addiu $a1, %lo(D_80131EC4) # addiu $a1, $a1, 0x1ec4 -/* B693A8 800F2208 80A30000 */ lb $v1, ($a1) -/* B693AC 800F220C 28610006 */ slti $at, $v1, 6 -/* B693B0 800F2210 10200002 */ beqz $at, .L800F221C -/* B693B4 800F2214 246A0001 */ addiu $t2, $v1, 1 -/* B693B8 800F2218 A0AA0000 */ sb $t2, ($a1) -.L800F221C: -/* B693BC 800F221C 304B0200 */ andi $t3, $v0, 0x200 -/* B693C0 800F2220 11600009 */ beqz $t3, .L800F2248 -/* B693C4 800F2224 304F0100 */ andi $t7, $v0, 0x100 -/* B693C8 800F2228 80AC0000 */ lb $t4, ($a1) -/* B693CC 800F222C 3C0D8013 */ lui $t5, %hi(D_80131EC8) # $t5, 0x8013 -/* B693D0 800F2230 25AD1EC8 */ addiu $t5, %lo(D_80131EC8) # addiu $t5, $t5, 0x1ec8 -/* B693D4 800F2234 018D1821 */ addu $v1, $t4, $t5 -/* B693D8 800F2238 80640000 */ lb $a0, ($v1) -/* B693DC 800F223C 18800002 */ blez $a0, .L800F2248 -/* B693E0 800F2240 248EFFFF */ addiu $t6, $a0, -1 -/* B693E4 800F2244 A06E0000 */ sb $t6, ($v1) -.L800F2248: -/* B693E8 800F2248 11E0000A */ beqz $t7, .L800F2274 -/* B693EC 800F224C 00000000 */ nop -/* B693F0 800F2250 80B80000 */ lb $t8, ($a1) -/* B693F4 800F2254 3C198013 */ lui $t9, %hi(D_80131EC8) # $t9, 0x8013 -/* B693F8 800F2258 27391EC8 */ addiu $t9, %lo(D_80131EC8) # addiu $t9, $t9, 0x1ec8 -/* B693FC 800F225C 03191821 */ addu $v1, $t8, $t9 -/* B69400 800F2260 80640000 */ lb $a0, ($v1) -/* B69404 800F2264 28810004 */ slti $at, $a0, 4 -/* B69408 800F2268 10200002 */ beqz $at, .L800F2274 -/* B6940C 800F226C 24880001 */ addiu $t0, $a0, 1 -/* B69410 800F2270 A0680000 */ sb $t0, ($v1) -.L800F2274: -/* B69414 800F2274 03E00008 */ jr $ra -/* B69418 800F2278 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F227C.s b/asm/non_matchings/code/code_800EC960/func_800F227C.s deleted file mode 100644 index 62b37d3c47..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F227C.s +++ /dev/null @@ -1,139 +0,0 @@ -glabel func_800F227C -/* B6941C 800F227C 3C068013 */ lui $a2, %hi(D_80131EE4) # $a2, 0x8013 -/* B69420 800F2280 24C61EE4 */ addiu $a2, %lo(D_80131EE4) # addiu $a2, $a2, 0x1ee4 -/* B69424 800F2284 90CE0000 */ lbu $t6, ($a2) -/* B69428 800F2288 3C028017 */ lui $v0, %hi(D_8016BAB8) # $v0, 0x8017 -/* B6942C 800F228C 11C0002C */ beqz $t6, .L800F2340 -/* B69430 800F2290 00000000 */ nop -/* B69434 800F2294 8C42BAB8 */ lw $v0, %lo(D_8016BAB8)($v0) -/* B69438 800F2298 3C038013 */ lui $v1, %hi(D_80131EE0) # $v1, 0x8013 -/* B6943C 800F229C 24631EE0 */ addiu $v1, %lo(D_80131EE0) # addiu $v1, $v1, 0x1ee0 -/* B69440 800F22A0 304F0008 */ andi $t7, $v0, 8 -/* B69444 800F22A4 11E00004 */ beqz $t7, .L800F22B8 -/* B69448 800F22A8 30480004 */ andi $t0, $v0, 4 -/* B6944C 800F22AC 80780000 */ lb $t8, ($v1) -/* B69450 800F22B0 2719FFFF */ addiu $t9, $t8, -1 -/* B69454 800F22B4 A0790000 */ sb $t9, ($v1) -.L800F22B8: -/* B69458 800F22B8 3C038013 */ lui $v1, %hi(D_80131EE0) # $v1, 0x8013 -/* B6945C 800F22BC 11000004 */ beqz $t0, .L800F22D0 -/* B69460 800F22C0 24631EE0 */ addiu $v1, %lo(D_80131EE0) # addiu $v1, $v1, 0x1ee0 -/* B69464 800F22C4 80690000 */ lb $t1, ($v1) -/* B69468 800F22C8 252A0001 */ addiu $t2, $t1, 1 -/* B6946C 800F22CC A06A0000 */ sb $t2, ($v1) -.L800F22D0: -/* B69470 800F22D0 304B0002 */ andi $t3, $v0, 2 -/* B69474 800F22D4 11600006 */ beqz $t3, .L800F22F0 -/* B69478 800F22D8 304E0001 */ andi $t6, $v0, 1 -/* B6947C 800F22DC 3C048013 */ lui $a0, %hi(D_80131EDC) # $a0, 0x8013 -/* B69480 800F22E0 24841EDC */ addiu $a0, %lo(D_80131EDC) # addiu $a0, $a0, 0x1edc -/* B69484 800F22E4 808C0000 */ lb $t4, ($a0) -/* B69488 800F22E8 258DFFFF */ addiu $t5, $t4, -1 -/* B6948C 800F22EC A08D0000 */ sb $t5, ($a0) -.L800F22F0: -/* B69490 800F22F0 3C048013 */ lui $a0, %hi(D_80131EDC) # $a0, 0x8013 -/* B69494 800F22F4 11C00004 */ beqz $t6, .L800F2308 -/* B69498 800F22F8 24841EDC */ addiu $a0, %lo(D_80131EDC) # addiu $a0, $a0, 0x1edc -/* B6949C 800F22FC 808F0000 */ lb $t7, ($a0) -/* B694A0 800F2300 25F80001 */ addiu $t8, $t7, 1 -/* B694A4 800F2304 A0980000 */ sb $t8, ($a0) -.L800F2308: -/* B694A8 800F2308 30598000 */ andi $t9, $v0, 0x8000 -/* B694AC 800F230C 13200007 */ beqz $t9, .L800F232C -/* B694B0 800F2310 304B4000 */ andi $t3, $v0, 0x4000 -/* B694B4 800F2314 2408001A */ li $t0, 26 -/* B694B8 800F2318 24090001 */ li $t1, 1 -/* B694BC 800F231C 240A0006 */ li $t2, 6 -/* B694C0 800F2320 A0880000 */ sb $t0, ($a0) -/* B694C4 800F2324 A0690000 */ sb $t1, ($v1) -/* B694C8 800F2328 A0CA0002 */ sb $t2, 2($a2) -.L800F232C: -/* B694CC 800F232C 11600004 */ beqz $t3, .L800F2340 -/* B694D0 800F2330 3C018013 */ lui $at, %hi(D_80131ED4) # $at, 0x8013 -/* B694D4 800F2334 A0201ED4 */ sb $zero, %lo(D_80131ED4)($at) -/* B694D8 800F2338 3C018013 */ lui $at, %hi(D_80131ED8) # $at, 0x8013 -/* B694DC 800F233C A0201ED8 */ sb $zero, %lo(D_80131ED8)($at) -.L800F2340: -/* B694E0 800F2340 3C028017 */ lui $v0, %hi(D_8016BAB8) # $v0, 0x8017 -/* B694E4 800F2344 8C42BAB8 */ lw $v0, %lo(D_8016BAB8)($v0) -/* B694E8 800F2348 3C078013 */ lui $a3, %hi(D_80131ED0) # $a3, 0x8013 -/* B694EC 800F234C 24E71ED0 */ addiu $a3, %lo(D_80131ED0) # addiu $a3, $a3, 0x1ed0 -/* B694F0 800F2350 304C0800 */ andi $t4, $v0, 0x800 -/* B694F4 800F2354 11800008 */ beqz $t4, .L800F2378 -/* B694F8 800F2358 304F0400 */ andi $t7, $v0, 0x400 -/* B694FC 800F235C 90E30000 */ lbu $v1, ($a3) -/* B69500 800F2360 240E000A */ li $t6, 10 -/* B69504 800F2364 18600003 */ blez $v1, .L800F2374 -/* B69508 800F2368 246DFFFF */ addiu $t5, $v1, -1 -/* B6950C 800F236C 10000002 */ b .L800F2378 -/* B69510 800F2370 A0ED0000 */ sb $t5, ($a3) -.L800F2374: -/* B69514 800F2374 A0EE0000 */ sb $t6, ($a3) -.L800F2378: -/* B69518 800F2378 3C078013 */ lui $a3, %hi(D_80131ED0) # $a3, 0x8013 -/* B6951C 800F237C 11E00008 */ beqz $t7, .L800F23A0 -/* B69520 800F2380 24E71ED0 */ addiu $a3, %lo(D_80131ED0) # addiu $a3, $a3, 0x1ed0 -/* B69524 800F2384 90E30000 */ lbu $v1, ($a3) -/* B69528 800F2388 2861000A */ slti $at, $v1, 0xa -/* B6952C 800F238C 10200003 */ beqz $at, .L800F239C -/* B69530 800F2390 24780001 */ addiu $t8, $v1, 1 -/* B69534 800F2394 10000002 */ b .L800F23A0 -/* B69538 800F2398 A0F80000 */ sb $t8, ($a3) -.L800F239C: -/* B6953C 800F239C A0E00000 */ sb $zero, ($a3) -.L800F23A0: -/* B69540 800F23A0 30590200 */ andi $t9, $v0, 0x200 -/* B69544 800F23A4 1320000D */ beqz $t9, .L800F23DC -/* B69548 800F23A8 304B0100 */ andi $t3, $v0, 0x100 -/* B6954C 800F23AC 90E30000 */ lbu $v1, ($a3) -/* B69550 800F23B0 3C098013 */ lui $t1, %hi(D_80131EF0) -/* B69554 800F23B4 00C32021 */ addu $a0, $a2, $v1 -/* B69558 800F23B8 90850000 */ lbu $a1, ($a0) -/* B6955C 800F23BC 01234821 */ addu $t1, $t1, $v1 -/* B69560 800F23C0 18A00003 */ blez $a1, .L800F23D0 -/* B69564 800F23C4 24A8FFFF */ addiu $t0, $a1, -1 -/* B69568 800F23C8 10000004 */ b .L800F23DC -/* B6956C 800F23CC A0880000 */ sb $t0, ($a0) -.L800F23D0: -/* B69570 800F23D0 91291EF0 */ lbu $t1, %lo(D_80131EF0)($t1) -/* B69574 800F23D4 252AFFFF */ addiu $t2, $t1, -1 -/* B69578 800F23D8 A08A0000 */ sb $t2, ($a0) -.L800F23DC: -/* B6957C 800F23DC 5160000F */ beql $t3, $zero, .L800F241C -/* B69580 800F23E0 90CF0008 */ lbu $t7, 8($a2) -/* B69584 800F23E4 90E30000 */ lbu $v1, ($a3) -/* B69588 800F23E8 3C0C8013 */ lui $t4, %hi(D_80131EF0) -/* B6958C 800F23EC 01836021 */ addu $t4, $t4, $v1 -/* B69590 800F23F0 918C1EF0 */ lbu $t4, %lo(D_80131EF0)($t4) -/* B69594 800F23F4 00C32021 */ addu $a0, $a2, $v1 -/* B69598 800F23F8 90850000 */ lbu $a1, ($a0) -/* B6959C 800F23FC 258DFFFF */ addiu $t5, $t4, -1 -/* B695A0 800F2400 00AD082A */ slt $at, $a1, $t5 -/* B695A4 800F2404 10200003 */ beqz $at, .L800F2414 -/* B695A8 800F2408 24AE0001 */ addiu $t6, $a1, 1 -/* B695AC 800F240C 10000002 */ b .L800F2418 -/* B695B0 800F2410 A08E0000 */ sb $t6, ($a0) -.L800F2414: -/* B695B4 800F2414 A0800000 */ sb $zero, ($a0) -.L800F2418: -/* B695B8 800F2418 90CF0008 */ lbu $t7, 8($a2) -.L800F241C: -/* B695BC 800F241C 90D90003 */ lbu $t9, 3($a2) -/* B695C0 800F2420 90C90004 */ lbu $t1, 4($a2) -/* B695C4 800F2424 000FC140 */ sll $t8, $t7, 5 -/* B695C8 800F2428 90CC0005 */ lbu $t4, 5($a2) -/* B695CC 800F242C 90CF0006 */ lbu $t7, 6($a2) -/* B695D0 800F2430 03194021 */ addu $t0, $t8, $t9 -/* B695D4 800F2434 00095040 */ sll $t2, $t1, 1 -/* B695D8 800F2438 90C90007 */ lbu $t1, 7($a2) -/* B695DC 800F243C 010A5821 */ addu $t3, $t0, $t2 -/* B695E0 800F2440 000C6880 */ sll $t5, $t4, 2 -/* B695E4 800F2444 016D7021 */ addu $t6, $t3, $t5 -/* B695E8 800F2448 000FC0C0 */ sll $t8, $t7, 3 -/* B695EC 800F244C 01D8C821 */ addu $t9, $t6, $t8 -/* B695F0 800F2450 00094100 */ sll $t0, $t1, 4 -/* B695F4 800F2454 03285021 */ addu $t2, $t9, $t0 -/* B695F8 800F2458 3C018013 */ lui $at, %hi(D_801333F0) -/* B695FC 800F245C 03E00008 */ jr $ra -/* B69600 800F2460 A02A33F0 */ sb $t2, %lo(D_801333F0)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F2464.s b/asm/non_matchings/code/code_800EC960/func_800F2464.s index cf44dcc96f..78024c6496 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F2464.s +++ b/asm/non_matchings/code/code_800EC960/func_800F2464.s @@ -3,10 +3,10 @@ glabel func_800F2464 /* B69608 800F2468 24A51F00 */ addiu $a1, %lo(D_80131F00) # addiu $a1, $a1, 0x1f00 /* B6960C 800F246C 90AE0000 */ lbu $t6, ($a1) /* B69610 800F2470 27BDFFF8 */ addiu $sp, $sp, -8 -/* B69614 800F2474 3C028017 */ lui $v0, %hi(D_8016BAB8) # $v0, 0x8017 +/* B69614 800F2474 3C028017 */ lui $v0, %hi(sDebugPadPress) # $v0, 0x8017 /* B69618 800F2478 15C0003F */ bnez $t6, .L800F2578 /* B6961C 800F247C 00000000 */ nop -/* B69620 800F2480 8C42BAB8 */ lw $v0, %lo(D_8016BAB8)($v0) +/* B69620 800F2480 8C42BAB8 */ lw $v0, %lo(sDebugPadPress)($v0) /* B69624 800F2484 3C048013 */ lui $a0, %hi(D_80131F04) # $a0, 0x8013 /* B69628 800F2488 24841F04 */ addiu $a0, %lo(D_80131F04) # addiu $a0, $a0, 0x1f04 /* B6962C 800F248C 304F0800 */ andi $t7, $v0, 0x800 @@ -77,8 +77,8 @@ glabel func_800F2464 /* B69710 800F2570 10000078 */ b .L800F2754 /* B69714 800F2574 A50F0000 */ sh $t7, ($t0) .L800F2578: -/* B69718 800F2578 3C028017 */ lui $v0, %hi(D_8016BAB8) # $v0, 0x8017 -/* B6971C 800F257C 8C42BAB8 */ lw $v0, %lo(D_8016BAB8)($v0) +/* B69718 800F2578 3C028017 */ lui $v0, %hi(sDebugPadPress) # $v0, 0x8017 +/* B6971C 800F257C 8C42BAB8 */ lw $v0, %lo(sDebugPadPress)($v0) /* B69720 800F2580 30580200 */ andi $t8, $v0, 0x200 /* B69724 800F2584 1300000A */ beqz $t8, .L800F25B0 /* B69728 800F2588 304D0100 */ andi $t5, $v0, 0x100 diff --git a/asm/non_matchings/code/code_800EC960/func_800F27A0.s b/asm/non_matchings/code/code_800EC960/func_800F27A0.s deleted file mode 100644 index 62d26ecb40..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F27A0.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_800F27A0 -/* B69940 800F27A0 3C028017 */ lui $v0, %hi(D_8016BAB8) # $v0, 0x8017 -/* B69944 800F27A4 8C42BAB8 */ lw $v0, %lo(D_8016BAB8)($v0) -/* B69948 800F27A8 3C048013 */ lui $a0, %hi(D_80131F28) # $a0, 0x8013 -/* B6994C 800F27AC 24841F28 */ addiu $a0, %lo(D_80131F28) # addiu $a0, $a0, 0x1f28 -/* B69950 800F27B0 304E0400 */ andi $t6, $v0, 0x400 -/* B69954 800F27B4 11C00010 */ beqz $t6, .L800F27F8 -/* B69958 800F27B8 304A0800 */ andi $t2, $v0, 0x800 -/* B6995C 800F27BC 90830000 */ lbu $v1, ($a0) -/* B69960 800F27C0 3C188013 */ lui $t8, %hi(D_80131EFC) # $t8, 0x8013 -/* B69964 800F27C4 10600003 */ beqz $v1, .L800F27D4 -/* B69968 800F27C8 246FFFFF */ addiu $t7, $v1, -1 -/* B6996C 800F27CC 1000000A */ b .L800F27F8 -/* B69970 800F27D0 A08F0000 */ sb $t7, ($a0) -.L800F27D4: -/* B69974 800F27D4 93181EFC */ lbu $t8, %lo(D_80131EFC)($t8) -/* B69978 800F27D8 3C088013 */ lui $t0, %hi(D_801337CE) -/* B6997C 800F27DC 0018C8C0 */ sll $t9, $t8, 3 -/* B69980 800F27E0 0338C823 */ subu $t9, $t9, $t8 -/* B69984 800F27E4 0019C8C0 */ sll $t9, $t9, 3 -/* B69988 800F27E8 01194021 */ addu $t0, $t0, $t9 -/* B6998C 800F27EC 910837CE */ lbu $t0, %lo(D_801337CE)($t0) -/* B69990 800F27F0 2509FFFF */ addiu $t1, $t0, -1 -/* B69994 800F27F4 A0890000 */ sb $t1, ($a0) -.L800F27F8: -/* B69998 800F27F8 3C048013 */ lui $a0, %hi(D_80131F28) # $a0, 0x8013 -/* B6999C 800F27FC 11400012 */ beqz $t2, .L800F2848 -/* B699A0 800F2800 24841F28 */ addiu $a0, %lo(D_80131F28) # addiu $a0, $a0, 0x1f28 -/* B699A4 800F2804 3C0B8013 */ lui $t3, %hi(D_80131EFC) # $t3, 0x8013 -/* B699A8 800F2808 916B1EFC */ lbu $t3, %lo(D_80131EFC)($t3) -/* B699AC 800F280C 3C0D8013 */ lui $t5, %hi(D_801337CE) -/* B699B0 800F2810 90830000 */ lbu $v1, ($a0) -/* B699B4 800F2814 000B60C0 */ sll $t4, $t3, 3 -/* B699B8 800F2818 018B6023 */ subu $t4, $t4, $t3 -/* B699BC 800F281C 000C60C0 */ sll $t4, $t4, 3 -/* B699C0 800F2820 01AC6821 */ addu $t5, $t5, $t4 -/* B699C4 800F2824 91AD37CE */ lbu $t5, %lo(D_801337CE)($t5) -/* B699C8 800F2828 246F0001 */ addiu $t7, $v1, 1 -/* B699CC 800F282C 25AEFFFF */ addiu $t6, $t5, -1 -/* B699D0 800F2830 006E082A */ slt $at, $v1, $t6 -/* B699D4 800F2834 50200004 */ beql $at, $zero, .L800F2848 -/* B699D8 800F2838 A0800000 */ sb $zero, ($a0) -/* B699DC 800F283C 10000002 */ b .L800F2848 -/* B699E0 800F2840 A08F0000 */ sb $t7, ($a0) -/* B699E4 800F2844 A0800000 */ sb $zero, ($a0) -.L800F2848: -/* B699E8 800F2848 30580200 */ andi $t8, $v0, 0x200 -/* B699EC 800F284C 13000007 */ beqz $t8, .L800F286C -/* B699F0 800F2850 304A0100 */ andi $t2, $v0, 0x100 -/* B699F4 800F2854 3C038013 */ lui $v1, %hi(D_80131F2C) # $v1, 0x8013 -/* B699F8 800F2858 24631F2C */ addiu $v1, %lo(D_80131F2C) # addiu $v1, $v1, 0x1f2c -/* B699FC 800F285C 90790000 */ lbu $t9, ($v1) -/* B69A00 800F2860 2728FFFF */ addiu $t0, $t9, -1 -/* B69A04 800F2864 3109000F */ andi $t1, $t0, 0xf -/* B69A08 800F2868 A0690000 */ sb $t1, ($v1) -.L800F286C: -/* B69A0C 800F286C 3C038013 */ lui $v1, %hi(D_80131F2C) # $v1, 0x8013 -/* B69A10 800F2870 11400005 */ beqz $t2, .L800F2888 -/* B69A14 800F2874 24631F2C */ addiu $v1, %lo(D_80131F2C) # addiu $v1, $v1, 0x1f2c -/* B69A18 800F2878 906B0000 */ lbu $t3, ($v1) -/* B69A1C 800F287C 256C0001 */ addiu $t4, $t3, 1 -/* B69A20 800F2880 318D000F */ andi $t5, $t4, 0xf -/* B69A24 800F2884 A06D0000 */ sb $t5, ($v1) -.L800F2888: -/* B69A28 800F2888 304E1000 */ andi $t6, $v0, 0x1000 -/* B69A2C 800F288C 11C00005 */ beqz $t6, .L800F28A4 -/* B69A30 800F2890 00000000 */ nop -/* B69A34 800F2894 908F0000 */ lbu $t7, ($a0) -/* B69A38 800F2898 3C018013 */ lui $at, %hi(D_80131F30) -/* B69A3C 800F289C 002F0821 */ addu $at, $at, $t7 -/* B69A40 800F28A0 A0201F30 */ sb $zero, %lo(D_80131F30)($at) -.L800F28A4: -/* B69A44 800F28A4 03E00008 */ jr $ra -/* B69A48 800F28A8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F28AC.s b/asm/non_matchings/code/code_800EC960/func_800F28AC.s deleted file mode 100644 index 2267912663..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F28AC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800F28AC -/* B69A4C 800F28AC 03E00008 */ jr $ra -/* B69A50 800F28B0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F28B4.s b/asm/non_matchings/code/code_800EC960/func_800F28B4.s deleted file mode 100644 index 84d4840fdc..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F28B4.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_800F28B4 -/* B69A54 800F28B4 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69A58 800F28B8 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -/* B69A5C 800F28BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B69A60 800F28C0 AFBF0014 */ sw $ra, 0x14($sp) -/* B69A64 800F28C4 308E0800 */ andi $t6, $a0, 0x800 -/* B69A68 800F28C8 11C0000A */ beqz $t6, .L800F28F4 -/* B69A6C 800F28CC 30990400 */ andi $t9, $a0, 0x400 -/* B69A70 800F28D0 3C058013 */ lui $a1, %hi(D_80131F50) # $a1, 0x8013 -/* B69A74 800F28D4 24A51F50 */ addiu $a1, %lo(D_80131F50) # addiu $a1, $a1, 0x1f50 -/* B69A78 800F28D8 90A20000 */ lbu $v0, ($a1) -/* B69A7C 800F28DC 24180001 */ li $t8, 1 -/* B69A80 800F28E0 18400003 */ blez $v0, .L800F28F0 -/* B69A84 800F28E4 244FFFFF */ addiu $t7, $v0, -1 -/* B69A88 800F28E8 10000002 */ b .L800F28F4 -/* B69A8C 800F28EC A0AF0000 */ sb $t7, ($a1) -.L800F28F0: -/* B69A90 800F28F0 A0B80000 */ sb $t8, ($a1) -.L800F28F4: -/* B69A94 800F28F4 3C058013 */ lui $a1, %hi(D_80131F50) # $a1, 0x8013 -/* B69A98 800F28F8 13200007 */ beqz $t9, .L800F2918 -/* B69A9C 800F28FC 24A51F50 */ addiu $a1, %lo(D_80131F50) # addiu $a1, $a1, 0x1f50 -/* B69AA0 800F2900 90A20000 */ lbu $v0, ($a1) -/* B69AA4 800F2904 1C400003 */ bgtz $v0, .L800F2914 -/* B69AA8 800F2908 24480001 */ addiu $t0, $v0, 1 -/* B69AAC 800F290C 10000002 */ b .L800F2918 -/* B69AB0 800F2910 A0A80000 */ sb $t0, ($a1) -.L800F2914: -/* B69AB4 800F2914 A0A00000 */ sb $zero, ($a1) -.L800F2918: -/* B69AB8 800F2918 30890200 */ andi $t1, $a0, 0x200 -/* B69ABC 800F291C 11200010 */ beqz $t1, .L800F2960 -/* B69AC0 800F2920 00000000 */ nop -/* B69AC4 800F2924 90A20000 */ lbu $v0, ($a1) -/* B69AC8 800F2928 3C068013 */ lui $a2, %hi(D_80131F4C) # $a2, 0x8013 -/* B69ACC 800F292C 24C61F4C */ addiu $a2, %lo(D_80131F4C) # addiu $a2, $a2, 0x1f4c -/* B69AD0 800F2930 00C21821 */ addu $v1, $a2, $v0 -/* B69AD4 800F2934 906A0000 */ lbu $t2, ($v1) -/* B69AD8 800F2938 24010001 */ li $at, 1 -/* B69ADC 800F293C 254BFFFF */ addiu $t3, $t2, -1 -/* B69AE0 800F2940 14410007 */ bne $v0, $at, .L800F2960 -/* B69AE4 800F2944 A06B0000 */ sb $t3, ($v1) -/* B69AE8 800F2948 0C03D7A4 */ jal func_800F5E90 -/* B69AEC 800F294C 90C40001 */ lbu $a0, 1($a2) -/* B69AF0 800F2950 3C058013 */ lui $a1, %hi(D_80131F50) # $a1, 0x8013 -/* B69AF4 800F2954 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69AF8 800F2958 24A51F50 */ addiu $a1, %lo(D_80131F50) # addiu $a1, $a1, 0x1f50 -/* B69AFC 800F295C 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -.L800F2960: -/* B69B00 800F2960 3C068013 */ lui $a2, %hi(D_80131F4C) # $a2, 0x8013 -/* B69B04 800F2964 308C0100 */ andi $t4, $a0, 0x100 -/* B69B08 800F2968 1180000E */ beqz $t4, .L800F29A4 -/* B69B0C 800F296C 24C61F4C */ addiu $a2, %lo(D_80131F4C) # addiu $a2, $a2, 0x1f4c -/* B69B10 800F2970 90A20000 */ lbu $v0, ($a1) -/* B69B14 800F2974 24010001 */ li $at, 1 -/* B69B18 800F2978 00C21821 */ addu $v1, $a2, $v0 -/* B69B1C 800F297C 906D0000 */ lbu $t5, ($v1) -/* B69B20 800F2980 25AE0001 */ addiu $t6, $t5, 1 -/* B69B24 800F2984 14410007 */ bne $v0, $at, .L800F29A4 -/* B69B28 800F2988 A06E0000 */ sb $t6, ($v1) -/* B69B2C 800F298C 0C03D7A4 */ jal func_800F5E90 -/* B69B30 800F2990 90C40001 */ lbu $a0, 1($a2) -/* B69B34 800F2994 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69B38 800F2998 3C068013 */ lui $a2, %hi(D_80131F4C) # $a2, 0x8013 -/* B69B3C 800F299C 24C61F4C */ addiu $a2, %lo(D_80131F4C) # addiu $a2, $a2, 0x1f4c -/* B69B40 800F29A0 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -.L800F29A4: -/* B69B44 800F29A4 308F8000 */ andi $t7, $a0, 0x8000 -/* B69B48 800F29A8 51E0000C */ beql $t7, $zero, .L800F29DC -/* B69B4C 800F29AC 30984000 */ andi $t8, $a0, 0x4000 -/* B69B50 800F29B0 3C044600 */ lui $a0, 0x4600 -/* B69B54 800F29B4 0C0396C8 */ jal func_800E5B20 -/* B69B58 800F29B8 80C50001 */ lb $a1, 1($a2) -/* B69B5C 800F29BC 3C048013 */ lui $a0, %hi(D_80131F4C) # $a0, 0x8013 -/* B69B60 800F29C0 90841F4C */ lbu $a0, %lo(D_80131F4C)($a0) -/* B69B64 800F29C4 3C010001 */ lui $at, 1 -/* B69B68 800F29C8 0C03E803 */ jal Audio_SetBGM -/* B69B6C 800F29CC 00812025 */ or $a0, $a0, $at -/* B69B70 800F29D0 3C048017 */ lui $a0, %hi(D_8016BAB8) # $a0, 0x8017 -/* B69B74 800F29D4 8C84BAB8 */ lw $a0, %lo(D_8016BAB8)($a0) -/* B69B78 800F29D8 30984000 */ andi $t8, $a0, 0x4000 -.L800F29DC: -/* B69B7C 800F29DC 13000003 */ beqz $t8, .L800F29EC -/* B69B80 800F29E0 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001 -/* B69B84 800F29E4 0C03E803 */ jal Audio_SetBGM -/* B69B88 800F29E8 348400FF */ ori $a0, (0x100100FF & 0xFFFF) # ori $a0, $a0, 0xff -.L800F29EC: -/* B69B8C 800F29EC 8FBF0014 */ lw $ra, 0x14($sp) -/* B69B90 800F29F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B69B94 800F29F4 03E00008 */ jr $ra -/* B69B98 800F29F8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F29FC.s b/asm/non_matchings/code/code_800EC960/func_800F29FC.s deleted file mode 100644 index a4dac84b6d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F29FC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800F29FC -/* B69B9C 800F29FC 03E00008 */ jr $ra -/* B69BA0 800F2A00 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F2A04.s b/asm/non_matchings/code/code_800EC960/func_800F2A04.s deleted file mode 100644 index 30128d0262..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F2A04.s +++ /dev/null @@ -1,241 +0,0 @@ -glabel func_800F2A04 -/* B69BA4 800F2A04 3C0E8017 */ lui $t6, %hi(D_8016BAB0) # $t6, 0x8017 -/* B69BA8 800F2A08 8DCEBAB0 */ lw $t6, %lo(D_8016BAB0)($t6) -/* B69BAC 800F2A0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B69BB0 800F2A10 AFBF001C */ sw $ra, 0x1c($sp) -/* B69BB4 800F2A14 31CF0002 */ andi $t7, $t6, 2 -/* B69BB8 800F2A18 11E00003 */ beqz $t7, .L800F2A28 -/* B69BBC 800F2A1C 3C058017 */ lui $a1, %hi(D_8016BAB8) # $a1, 0x8017 -/* B69BC0 800F2A20 10000002 */ b .L800F2A2C -/* B69BC4 800F2A24 24060008 */ li $a2, 8 -.L800F2A28: -/* B69BC8 800F2A28 24060001 */ li $a2, 1 -.L800F2A2C: -/* B69BCC 800F2A2C 8CA5BAB8 */ lw $a1, %lo(D_8016BAB8)($a1) -/* B69BD0 800F2A30 3C098013 */ lui $t1, %hi(D_80131F18) # $t1, 0x8013 -/* B69BD4 800F2A34 25291F18 */ addiu $t1, %lo(D_80131F18) # addiu $t1, $t1, 0x1f18 -/* B69BD8 800F2A38 30B80800 */ andi $t8, $a1, 0x800 -/* B69BDC 800F2A3C 13000008 */ beqz $t8, .L800F2A60 -/* B69BE0 800F2A40 30AC0400 */ andi $t4, $a1, 0x400 -/* B69BE4 800F2A44 91230000 */ lbu $v1, ($t1) -/* B69BE8 800F2A48 240B0003 */ li $t3, 3 -/* B69BEC 800F2A4C 18600003 */ blez $v1, .L800F2A5C -/* B69BF0 800F2A50 2479FFFF */ addiu $t9, $v1, -1 -/* B69BF4 800F2A54 10000002 */ b .L800F2A60 -/* B69BF8 800F2A58 A1390000 */ sb $t9, ($t1) -.L800F2A5C: -/* B69BFC 800F2A5C A12B0000 */ sb $t3, ($t1) -.L800F2A60: -/* B69C00 800F2A60 3C098013 */ lui $t1, %hi(D_80131F18) # $t1, 0x8013 -/* B69C04 800F2A64 11800008 */ beqz $t4, .L800F2A88 -/* B69C08 800F2A68 25291F18 */ addiu $t1, %lo(D_80131F18) # addiu $t1, $t1, 0x1f18 -/* B69C0C 800F2A6C 91230000 */ lbu $v1, ($t1) -/* B69C10 800F2A70 28610003 */ slti $at, $v1, 3 -/* B69C14 800F2A74 10200003 */ beqz $at, .L800F2A84 -/* B69C18 800F2A78 246D0001 */ addiu $t5, $v1, 1 -/* B69C1C 800F2A7C 10000002 */ b .L800F2A88 -/* B69C20 800F2A80 A12D0000 */ sb $t5, ($t1) -.L800F2A84: -/* B69C24 800F2A84 A1200000 */ sb $zero, ($t1) -.L800F2A88: -/* B69C28 800F2A88 30AE0200 */ andi $t6, $a1, 0x200 -/* B69C2C 800F2A8C 11C00036 */ beqz $t6, .L800F2B68 -/* B69C30 800F2A90 00000000 */ nop -/* B69C34 800F2A94 91230000 */ lbu $v1, ($t1) -/* B69C38 800F2A98 28610002 */ slti $at, $v1, 2 -/* B69C3C 800F2A9C 1020001A */ beqz $at, .L800F2B08 -/* B69C40 800F2AA0 00602025 */ move $a0, $v1 -/* B69C44 800F2AA4 1460000F */ bnez $v1, .L800F2AE4 -/* B69C48 800F2AA8 3C088013 */ lui $t0, %hi(D_80131F20) -/* B69C4C 800F2AAC 3C088013 */ lui $t0, %hi(D_80131F20) # $t0, 0x8013 -/* B69C50 800F2AB0 25081F20 */ addiu $t0, %lo(D_80131F20) # addiu $t0, $t0, 0x1f20 -/* B69C54 800F2AB4 00037840 */ sll $t7, $v1, 1 -/* B69C58 800F2AB8 010F1021 */ addu $v0, $t0, $t7 -/* B69C5C 800F2ABC 94440000 */ lhu $a0, ($v0) -/* B69C60 800F2AC0 3C198013 */ lui $t9, %hi(D_80131E24) # $t9, 0x8013 -/* B69C64 800F2AC4 18800003 */ blez $a0, .L800F2AD4 -/* B69C68 800F2AC8 2498FFFF */ addiu $t8, $a0, -1 -/* B69C6C 800F2ACC 10000026 */ b .L800F2B68 -/* B69C70 800F2AD0 A4580000 */ sh $t8, ($v0) -.L800F2AD4: -/* B69C74 800F2AD4 97391E24 */ lhu $t9, %lo(D_80131E24)($t9) -/* B69C78 800F2AD8 272BFFFF */ addiu $t3, $t9, -1 -/* B69C7C 800F2ADC 10000022 */ b .L800F2B68 -/* B69C80 800F2AE0 A44B0000 */ sh $t3, ($v0) -.L800F2AE4: -/* B69C84 800F2AE4 25081F20 */ addiu $t0, %lo(D_80131F20) -/* B69C88 800F2AE8 00036040 */ sll $t4, $v1, 1 -/* B69C8C 800F2AEC 010C1021 */ addu $v0, $t0, $t4 -/* B69C90 800F2AF0 944D0000 */ lhu $t5, ($v0) -/* B69C94 800F2AF4 01A67823 */ subu $t7, $t5, $a2 -/* B69C98 800F2AF8 A44F0000 */ sh $t7, ($v0) -/* B69C9C 800F2AFC 31F801FF */ andi $t8, $t7, 0x1ff -/* B69CA0 800F2B00 10000019 */ b .L800F2B68 -/* B69CA4 800F2B04 A4580000 */ sh $t8, ($v0) -.L800F2B08: -/* B69CA8 800F2B08 24010003 */ li $at, 3 -/* B69CAC 800F2B0C 14810010 */ bne $a0, $at, .L800F2B50 -/* B69CB0 800F2B10 3C088013 */ lui $t0, %hi(D_80131F20) # $t0, 0x8013 -/* B69CB4 800F2B14 25081F20 */ addiu $t0, %lo(D_80131F20) # addiu $t0, $t0, 0x1f20 -/* B69CB8 800F2B18 95190000 */ lhu $t9, ($t0) -/* B69CBC 800F2B1C 3C0C8013 */ lui $t4, %hi(D_8013331C) -/* B69CC0 800F2B20 950D0002 */ lhu $t5, 2($t0) -/* B69CC4 800F2B24 00195880 */ sll $t3, $t9, 2 -/* B69CC8 800F2B28 018B6021 */ addu $t4, $t4, $t3 -/* B69CCC 800F2B2C 8D8C331C */ lw $t4, %lo(D_8013331C)($t4) -/* B69CD0 800F2B30 000D7080 */ sll $t6, $t5, 2 -/* B69CD4 800F2B34 3C058017 */ lui $a1, %hi(D_8016BAB8) # $a1, 0x8017 -/* B69CD8 800F2B38 018E1021 */ addu $v0, $t4, $t6 -/* B69CDC 800F2B3C 904F0000 */ lbu $t7, ($v0) -/* B69CE0 800F2B40 01E6C023 */ subu $t8, $t7, $a2 -/* B69CE4 800F2B44 A0580000 */ sb $t8, ($v0) -/* B69CE8 800F2B48 10000007 */ b .L800F2B68 -/* B69CEC 800F2B4C 8CA5BAB8 */ lw $a1, %lo(D_8016BAB8)($a1) -.L800F2B50: -/* B69CF0 800F2B50 3C0A8013 */ lui $t2, %hi(D_80131F1C) # $t2, 0x8013 -/* B69CF4 800F2B54 254A1F1C */ addiu $t2, %lo(D_80131F1C) # addiu $t2, $t2, 0x1f1c -/* B69CF8 800F2B58 91590000 */ lbu $t9, ($t2) -/* B69CFC 800F2B5C 272BFFFF */ addiu $t3, $t9, -1 -/* B69D00 800F2B60 316D000F */ andi $t5, $t3, 0xf -/* B69D04 800F2B64 A14D0000 */ sb $t5, ($t2) -.L800F2B68: -/* B69D08 800F2B68 3C088013 */ lui $t0, %hi(D_80131F20) # $t0, 0x8013 -/* B69D0C 800F2B6C 3C0A8013 */ lui $t2, %hi(D_80131F1C) # $t2, 0x8013 -/* B69D10 800F2B70 30AC0100 */ andi $t4, $a1, 0x100 -/* B69D14 800F2B74 254A1F1C */ addiu $t2, %lo(D_80131F1C) # addiu $t2, $t2, 0x1f1c -/* B69D18 800F2B78 1180002E */ beqz $t4, .L800F2C34 -/* B69D1C 800F2B7C 25081F20 */ addiu $t0, %lo(D_80131F20) # addiu $t0, $t0, 0x1f20 -/* B69D20 800F2B80 91230000 */ lbu $v1, ($t1) -/* B69D24 800F2B84 28610002 */ slti $at, $v1, 2 -/* B69D28 800F2B88 10200015 */ beqz $at, .L800F2BE0 -/* B69D2C 800F2B8C 00602025 */ move $a0, $v1 -/* B69D30 800F2B90 00037040 */ sll $t6, $v1, 1 -/* B69D34 800F2B94 1460000C */ bnez $v1, .L800F2BC8 -/* B69D38 800F2B98 010E1021 */ addu $v0, $t0, $t6 -/* B69D3C 800F2B9C 3C0F8013 */ lui $t7, %hi(D_80131E24) # $t7, 0x8013 -/* B69D40 800F2BA0 95EF1E24 */ lhu $t7, %lo(D_80131E24)($t7) -/* B69D44 800F2BA4 94440000 */ lhu $a0, ($v0) -/* B69D48 800F2BA8 25F8FFFF */ addiu $t8, $t7, -1 -/* B69D4C 800F2BAC 0098082A */ slt $at, $a0, $t8 -/* B69D50 800F2BB0 10200003 */ beqz $at, .L800F2BC0 -/* B69D54 800F2BB4 24990001 */ addiu $t9, $a0, 1 -/* B69D58 800F2BB8 1000001E */ b .L800F2C34 -/* B69D5C 800F2BBC A4590000 */ sh $t9, ($v0) -.L800F2BC0: -/* B69D60 800F2BC0 1000001C */ b .L800F2C34 -/* B69D64 800F2BC4 A4400000 */ sh $zero, ($v0) -.L800F2BC8: -/* B69D68 800F2BC8 944B0000 */ lhu $t3, ($v0) -/* B69D6C 800F2BCC 01666021 */ addu $t4, $t3, $a2 -/* B69D70 800F2BD0 A44C0000 */ sh $t4, ($v0) -/* B69D74 800F2BD4 318E01FF */ andi $t6, $t4, 0x1ff -/* B69D78 800F2BD8 10000016 */ b .L800F2C34 -/* B69D7C 800F2BDC A44E0000 */ sh $t6, ($v0) -.L800F2BE0: -/* B69D80 800F2BE0 24010003 */ li $at, 3 -/* B69D84 800F2BE4 54810010 */ bnel $a0, $at, .L800F2C28 -/* B69D88 800F2BE8 914F0000 */ lbu $t7, ($t2) -/* B69D8C 800F2BEC 950F0000 */ lhu $t7, ($t0) -/* B69D90 800F2BF0 3C198013 */ lui $t9, %hi(D_8013331C) -/* B69D94 800F2BF4 950B0002 */ lhu $t3, 2($t0) -/* B69D98 800F2BF8 000FC080 */ sll $t8, $t7, 2 -/* B69D9C 800F2BFC 0338C821 */ addu $t9, $t9, $t8 -/* B69DA0 800F2C00 8F39331C */ lw $t9, %lo(D_8013331C)($t9) -/* B69DA4 800F2C04 000B6880 */ sll $t5, $t3, 2 -/* B69DA8 800F2C08 3C058017 */ lui $a1, %hi(D_8016BAB8) # $a1, 0x8017 -/* B69DAC 800F2C0C 032D1021 */ addu $v0, $t9, $t5 -/* B69DB0 800F2C10 904C0000 */ lbu $t4, ($v0) -/* B69DB4 800F2C14 01867021 */ addu $t6, $t4, $a2 -/* B69DB8 800F2C18 A04E0000 */ sb $t6, ($v0) -/* B69DBC 800F2C1C 10000005 */ b .L800F2C34 -/* B69DC0 800F2C20 8CA5BAB8 */ lw $a1, %lo(D_8016BAB8)($a1) -/* B69DC4 800F2C24 914F0000 */ lbu $t7, ($t2) -.L800F2C28: -/* B69DC8 800F2C28 25F80001 */ addiu $t8, $t7, 1 -/* B69DCC 800F2C2C 330B000F */ andi $t3, $t8, 0xf -/* B69DD0 800F2C30 A14B0000 */ sb $t3, ($t2) -.L800F2C34: -/* B69DD4 800F2C34 30B98000 */ andi $t9, $a1, 0x8000 -/* B69DD8 800F2C38 5320001A */ beql $t9, $zero, .L800F2CA4 -/* B69DDC 800F2C3C 30AB4000 */ andi $t3, $a1, 0x4000 -/* B69DE0 800F2C40 950C0000 */ lhu $t4, ($t0) -/* B69DE4 800F2C44 950D0002 */ lhu $t5, 2($t0) -/* B69DE8 800F2C48 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B69DEC 800F2C4C 000C7B00 */ sll $t7, $t4, 0xc -/* B69DF0 800F2C50 3C188013 */ lui $t8, %hi(D_801333E8) # $t8, 0x8013 -/* B69DF4 800F2C54 01AF2021 */ addu $a0, $t5, $t7 -/* B69DF8 800F2C58 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B69DFC 800F2C5C 24840800 */ addiu $a0, $a0, 0x800 -/* B69E00 800F2C60 271833E8 */ addiu $t8, %lo(D_801333E8) # addiu $t8, $t8, 0x33e8 -/* B69E04 800F2C64 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B69E08 800F2C68 3084FFFF */ andi $a0, $a0, 0xffff -/* B69E0C 800F2C6C 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B69E10 800F2C70 AFB80014 */ sw $t8, 0x14($sp) -/* B69E14 800F2C74 AFA70010 */ sw $a3, 0x10($sp) -/* B69E18 800F2C78 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B69E1C 800F2C7C 24060004 */ li $a2, 4 -/* B69E20 800F2C80 3C088013 */ lui $t0, %hi(D_80131F20) # $t0, 0x8013 -/* B69E24 800F2C84 3C098013 */ lui $t1, %hi(D_80131F18) # $t1, 0x8013 -/* B69E28 800F2C88 3C0A8013 */ lui $t2, %hi(D_80131F1C) # $t2, 0x8013 -/* B69E2C 800F2C8C 3C058017 */ lui $a1, %hi(D_8016BAB8) # $a1, 0x8017 -/* B69E30 800F2C90 8CA5BAB8 */ lw $a1, %lo(D_8016BAB8)($a1) -/* B69E34 800F2C94 254A1F1C */ addiu $t2, %lo(D_80131F1C) # addiu $t2, $t2, 0x1f1c -/* B69E38 800F2C98 25291F18 */ addiu $t1, %lo(D_80131F18) # addiu $t1, $t1, 0x1f18 -/* B69E3C 800F2C9C 25081F20 */ addiu $t0, %lo(D_80131F20) # addiu $t0, $t0, 0x1f20 -/* B69E40 800F2CA0 30AB4000 */ andi $t3, $a1, 0x4000 -.L800F2CA4: -/* B69E44 800F2CA4 5160000C */ beql $t3, $zero, .L800F2CD8 -/* B69E48 800F2CA8 30B90004 */ andi $t9, $a1, 4 -/* B69E4C 800F2CAC 0C03E1E8 */ jal func_800F87A0 -/* B69E50 800F2CB0 91040001 */ lbu $a0, 1($t0) -/* B69E54 800F2CB4 3C088013 */ lui $t0, %hi(D_80131F20) # $t0, 0x8013 -/* B69E58 800F2CB8 3C098013 */ lui $t1, %hi(D_80131F18) # $t1, 0x8013 -/* B69E5C 800F2CBC 3C0A8013 */ lui $t2, %hi(D_80131F1C) # $t2, 0x8013 -/* B69E60 800F2CC0 3C058017 */ lui $a1, %hi(D_8016BAB8) # $a1, 0x8017 -/* B69E64 800F2CC4 8CA5BAB8 */ lw $a1, %lo(D_8016BAB8)($a1) -/* B69E68 800F2CC8 254A1F1C */ addiu $t2, %lo(D_80131F1C) # addiu $t2, $t2, 0x1f1c -/* B69E6C 800F2CCC 25291F18 */ addiu $t1, %lo(D_80131F18) # addiu $t1, $t1, 0x1f18 -/* B69E70 800F2CD0 25081F20 */ addiu $t0, %lo(D_80131F20) # addiu $t0, $t0, 0x1f20 -/* B69E74 800F2CD4 30B90004 */ andi $t9, $a1, 4 -.L800F2CD8: -/* B69E78 800F2CD8 53200018 */ beql $t9, $zero, .L800F2D3C -/* B69E7C 800F2CDC 30AE0008 */ andi $t6, $a1, 8 -/* B69E80 800F2CE0 912C0000 */ lbu $t4, ($t1) -/* B69E84 800F2CE4 24010002 */ li $at, 2 -/* B69E88 800F2CE8 3C0F8013 */ lui $t7, %hi(D_8013331C) -/* B69E8C 800F2CEC 55810013 */ bnel $t4, $at, .L800F2D3C -/* B69E90 800F2CF0 30AE0008 */ andi $t6, $a1, 8 -/* B69E94 800F2CF4 950E0000 */ lhu $t6, ($t0) -/* B69E98 800F2CF8 95180002 */ lhu $t8, 2($t0) -/* B69E9C 800F2CFC 914C0000 */ lbu $t4, ($t2) -/* B69EA0 800F2D00 000E6880 */ sll $t5, $t6, 2 -/* B69EA4 800F2D04 01ED7821 */ addu $t7, $t7, $t5 -/* B69EA8 800F2D08 8DEF331C */ lw $t7, %lo(D_8013331C)($t7) -/* B69EAC 800F2D0C 00185880 */ sll $t3, $t8, 2 -/* B69EB0 800F2D10 240E000F */ li $t6, 15 -/* B69EB4 800F2D14 01EB1021 */ addu $v0, $t7, $t3 -/* B69EB8 800F2D18 94590002 */ lhu $t9, 2($v0) -/* B69EBC 800F2D1C 24180001 */ li $t8, 1 -/* B69EC0 800F2D20 01CC6823 */ subu $t5, $t6, $t4 -/* B69EC4 800F2D24 01B87804 */ sllv $t7, $t8, $t5 -/* B69EC8 800F2D28 032F5826 */ xor $t3, $t9, $t7 -/* B69ECC 800F2D2C A44B0002 */ sh $t3, 2($v0) -/* B69ED0 800F2D30 3C058017 */ lui $a1, %hi(D_8016BAB8) # $a1, 0x8017 -/* B69ED4 800F2D34 8CA5BAB8 */ lw $a1, %lo(D_8016BAB8)($a1) -/* B69ED8 800F2D38 30AE0008 */ andi $t6, $a1, 8 -.L800F2D3C: -/* B69EDC 800F2D3C 51C00008 */ beql $t6, $zero, .L800F2D60 -/* B69EE0 800F2D40 8FBF001C */ lw $ra, 0x1c($sp) -/* B69EE4 800F2D44 91230000 */ lbu $v1, ($t1) -/* B69EE8 800F2D48 28610002 */ slti $at, $v1, 2 -/* B69EEC 800F2D4C 10200003 */ beqz $at, .L800F2D5C -/* B69EF0 800F2D50 00036040 */ sll $t4, $v1, 1 -/* B69EF4 800F2D54 010CC021 */ addu $t8, $t0, $t4 -/* B69EF8 800F2D58 A7000000 */ sh $zero, ($t8) -.L800F2D5C: -/* B69EFC 800F2D5C 8FBF001C */ lw $ra, 0x1c($sp) -.L800F2D60: -/* B69F00 800F2D60 27BD0020 */ addiu $sp, $sp, 0x20 -/* B69F04 800F2D64 03E00008 */ jr $ra -/* B69F08 800F2D68 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F2D6C.s b/asm/non_matchings/code/code_800EC960/func_800F2D6C.s deleted file mode 100644 index 665daa5d56..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F2D6C.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_800F2D6C -/* B69F0C 800F2D6C 3C078013 */ lui $a3, %hi(D_80131ED4) # $a3, 0x8013 -/* B69F10 800F2D70 24E71ED4 */ addiu $a3, %lo(D_80131ED4) # addiu $a3, $a3, 0x1ed4 -/* B69F14 800F2D74 90E30000 */ lbu $v1, ($a3) -/* B69F18 800F2D78 3C018017 */ lui $at, %hi(D_8016B7EE) -/* B69F1C 800F2D7C AFA50004 */ sw $a1, 4($sp) -/* B69F20 800F2D80 000370C0 */ sll $t6, $v1, 3 -/* B69F24 800F2D84 002E0821 */ addu $at, $at, $t6 -/* B69F28 800F2D88 A425B7EE */ sh $a1, %lo(D_8016B7EE)($at) -/* B69F2C 800F2D8C 808F0000 */ lb $t7, ($a0) -/* B69F30 800F2D90 00001025 */ move $v0, $zero -/* B69F34 800F2D94 3C198017 */ lui $t9, %hi(D_8016B7E8) # $t9, 0x8017 -/* B69F38 800F2D98 11E0000C */ beqz $t7, .L800F2DCC -/* B69F3C 800F2D9C 0003C0C0 */ sll $t8, $v1, 3 -/* B69F40 800F2DA0 2739B7E8 */ addiu $t9, %lo(D_8016B7E8) # addiu $t9, $t9, -0x4818 -/* B69F44 800F2DA4 03192821 */ addu $a1, $t8, $t9 -/* B69F48 800F2DA8 80860000 */ lb $a2, ($a0) -/* B69F4C 800F2DAC 00A24021 */ addu $t0, $a1, $v0 -.L800F2DB0: -/* B69F50 800F2DB0 24420001 */ addiu $v0, $v0, 1 -/* B69F54 800F2DB4 304200FF */ andi $v0, $v0, 0xff -/* B69F58 800F2DB8 00444821 */ addu $t1, $v0, $a0 -/* B69F5C 800F2DBC A1060000 */ sb $a2, ($t0) -/* B69F60 800F2DC0 81260000 */ lb $a2, ($t1) -/* B69F64 800F2DC4 54C0FFFA */ bnezl $a2, .L800F2DB0 -/* B69F68 800F2DC8 00A24021 */ addu $t0, $a1, $v0 -.L800F2DCC: -/* B69F6C 800F2DCC 28410005 */ slti $at, $v0, 5 -/* B69F70 800F2DD0 1020000A */ beqz $at, .L800F2DFC -/* B69F74 800F2DD4 000350C0 */ sll $t2, $v1, 3 -/* B69F78 800F2DD8 3C0B8017 */ lui $t3, %hi(D_8016B7E8) # $t3, 0x8017 -/* B69F7C 800F2DDC 256BB7E8 */ addiu $t3, %lo(D_8016B7E8) # addiu $t3, $t3, -0x4818 -/* B69F80 800F2DE0 014B2821 */ addu $a1, $t2, $t3 -.L800F2DE4: -/* B69F84 800F2DE4 00A26021 */ addu $t4, $a1, $v0 -/* B69F88 800F2DE8 24420001 */ addiu $v0, $v0, 1 -/* B69F8C 800F2DEC 304200FF */ andi $v0, $v0, 0xff -/* B69F90 800F2DF0 28410005 */ slti $at, $v0, 5 -/* B69F94 800F2DF4 1420FFFB */ bnez $at, .L800F2DE4 -/* B69F98 800F2DF8 A1800000 */ sb $zero, ($t4) -.L800F2DFC: -/* B69F9C 800F2DFC 28610018 */ slti $at, $v1, 0x18 -/* B69FA0 800F2E00 10200004 */ beqz $at, .L800F2E14 -/* B69FA4 800F2E04 240E0001 */ li $t6, 1 -/* B69FA8 800F2E08 246D0001 */ addiu $t5, $v1, 1 -/* B69FAC 800F2E0C 03E00008 */ jr $ra -/* B69FB0 800F2E10 A0ED0000 */ sb $t5, ($a3) - -.L800F2E14: -/* B69FB4 800F2E14 A0E00000 */ sb $zero, ($a3) -/* B69FB8 800F2E18 3C018013 */ lui $at, %hi(D_80131ED8) # $at, 0x8013 -/* B69FBC 800F2E1C A02E1ED8 */ sb $t6, %lo(D_80131ED8)($at) -/* B69FC0 800F2E20 03E00008 */ jr $ra -/* B69FC4 800F2E24 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F2E28.s b/asm/non_matchings/code/code_800EC960/func_800F2E28.s deleted file mode 100644 index 3ff02af1bb..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F2E28.s +++ /dev/null @@ -1,181 +0,0 @@ -.late_rodata -glabel jtbl_8014A520 - .word L800F2F08 - .word L800F2FAC - .word L800F3034 - .word L800F2FFC - .word L800F3034 - .word L800F2FEC - .word L800F3034 - .word L800F2FBC - .word L800F2FDC - .word L800F300C - .word L800F3034 - .word L800F301C - .word L800F302C - .word L800F2FCC - .word L800F3034 - -.text -glabel func_800F2E28 -/* B69FC8 800F2E28 3C0E8013 */ lui $t6, %hi(D_80131C98) # $t6, 0x8013 -/* B69FCC 800F2E2C 91CE1C98 */ lbu $t6, %lo(D_80131C98)($t6) -/* B69FD0 800F2E30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B69FD4 800F2E34 AFBF0014 */ sw $ra, 0x14($sp) -/* B69FD8 800F2E38 11C00082 */ beqz $t6, .L800F3044 -/* B69FDC 800F2E3C 3C058013 */ lui $a1, %hi(D_80131C9C) # $a1, 0x8013 -/* B69FE0 800F2E40 24A51C9C */ addiu $a1, %lo(D_80131C9C) # addiu $a1, $a1, 0x1c9c -/* B69FE4 800F2E44 90AF0000 */ lbu $t7, ($a1) -/* B69FE8 800F2E48 11E00005 */ beqz $t7, .L800F2E60 -/* B69FEC 800F2E4C 00000000 */ nop -/* B69FF0 800F2E50 0C03DC98 */ jal func_800F7260 -/* B69FF4 800F2E54 2404006F */ li $a0, 111 -/* B69FF8 800F2E58 3C058013 */ lui $a1, %hi(D_80131C9C) # $a1, 0x8013 -/* B69FFC 800F2E5C 24A51C9C */ addiu $a1, %lo(D_80131C9C) # addiu $a1, $a1, 0x1c9c -.L800F2E60: -/* B6A000 800F2E60 3C038017 */ lui $v1, %hi(D_8016BAB8) # $v1, 0x8017 -/* B6A004 800F2E64 8C63BAB8 */ lw $v1, %lo(D_8016BAB8)($v1) -/* B6A008 800F2E68 3C048013 */ lui $a0, %hi(D_80131CA0) # $a0, 0x8013 -/* B6A00C 800F2E6C 24841CA0 */ addiu $a0, %lo(D_80131CA0) # addiu $a0, $a0, 0x1ca0 -/* B6A010 800F2E70 30780020 */ andi $t8, $v1, 0x20 -/* B6A014 800F2E74 13000008 */ beqz $t8, .L800F2E98 -/* B6A018 800F2E78 30680010 */ andi $t0, $v1, 0x10 -/* B6A01C 800F2E7C 90820000 */ lbu $v0, ($a0) -/* B6A020 800F2E80 2841000E */ slti $at, $v0, 0xe -/* B6A024 800F2E84 10200003 */ beqz $at, .L800F2E94 -/* B6A028 800F2E88 24590001 */ addiu $t9, $v0, 1 -/* B6A02C 800F2E8C 10000002 */ b .L800F2E98 -/* B6A030 800F2E90 A0990000 */ sb $t9, ($a0) -.L800F2E94: -/* B6A034 800F2E94 A0800000 */ sb $zero, ($a0) -.L800F2E98: -/* B6A038 800F2E98 3C048013 */ lui $a0, %hi(D_80131CA0) # $a0, 0x8013 -/* B6A03C 800F2E9C 11000008 */ beqz $t0, .L800F2EC0 -/* B6A040 800F2EA0 24841CA0 */ addiu $a0, %lo(D_80131CA0) # addiu $a0, $a0, 0x1ca0 -/* B6A044 800F2EA4 90820000 */ lbu $v0, ($a0) -/* B6A048 800F2EA8 240A000E */ li $t2, 14 -/* B6A04C 800F2EAC 18400003 */ blez $v0, .L800F2EBC -/* B6A050 800F2EB0 2449FFFF */ addiu $t1, $v0, -1 -/* B6A054 800F2EB4 10000002 */ b .L800F2EC0 -/* B6A058 800F2EB8 A0890000 */ sb $t1, ($a0) -.L800F2EBC: -/* B6A05C 800F2EBC A08A0000 */ sb $t2, ($a0) -.L800F2EC0: -/* B6A060 800F2EC0 306B2000 */ andi $t3, $v1, 0x2000 -/* B6A064 800F2EC4 11600007 */ beqz $t3, .L800F2EE4 -/* B6A068 800F2EC8 3C028013 */ lui $v0, %hi(D_80131CA8) # $v0, 0x8013 -/* B6A06C 800F2ECC 24421CA8 */ addiu $v0, %lo(D_80131CA8) # addiu $v0, $v0, 0x1ca8 -/* B6A070 800F2ED0 904C0000 */ lbu $t4, ($v0) -/* B6A074 800F2ED4 258E0001 */ addiu $t6, $t4, 1 -/* B6A078 800F2ED8 A04E0000 */ sb $t6, ($v0) -/* B6A07C 800F2EDC 31CF0007 */ andi $t7, $t6, 7 -/* B6A080 800F2EE0 A04F0000 */ sb $t7, ($v0) -.L800F2EE4: -/* B6A084 800F2EE4 90980000 */ lbu $t8, ($a0) -/* B6A088 800F2EE8 2F01000F */ sltiu $at, $t8, 0xf -/* B6A08C 800F2EEC 10200051 */ beqz $at, .L800F3034 -/* B6A090 800F2EF0 0018C080 */ sll $t8, $t8, 2 -/* B6A094 800F2EF4 3C018015 */ lui $at, %hi(jtbl_8014A520) -/* B6A098 800F2EF8 00380821 */ addu $at, $at, $t8 -/* B6A09C 800F2EFC 8C38A520 */ lw $t8, %lo(jtbl_8014A520)($at) -/* B6A0A0 800F2F00 03000008 */ jr $t8 -/* B6A0A4 800F2F04 00000000 */ nop -glabel L800F2F08 -/* B6A0A8 800F2F08 30798000 */ andi $t9, $v1, 0x8000 -/* B6A0AC 800F2F0C 1320001B */ beqz $t9, .L800F2F7C -/* B6A0B0 800F2F10 3C028013 */ lui $v0, %hi(D_80131E08) # $v0, 0x8013 -/* B6A0B4 800F2F14 24421E08 */ addiu $v0, %lo(D_80131E08) # addiu $v0, $v0, 0x1e08 -/* B6A0B8 800F2F18 9448000A */ lhu $t0, 0xa($v0) -/* B6A0BC 800F2F1C 3C01E000 */ lui $at, (0xE0000100 >> 16) # lui $at, 0xe000 -/* B6A0C0 800F2F20 34210100 */ ori $at, (0xE0000100 & 0xFFFF) # ori $at, $at, 0x100 -/* B6A0C4 800F2F24 39090001 */ xori $t1, $t0, 1 -/* B6A0C8 800F2F28 3124FFFF */ andi $a0, $t1, 0xffff -/* B6A0CC 800F2F2C A449000A */ sh $t1, 0xa($v0) -/* B6A0D0 800F2F30 0C03E803 */ jal Audio_SetBGM -/* B6A0D4 800F2F34 00812025 */ or $a0, $a0, $at -/* B6A0D8 800F2F38 0C03E82D */ jal func_800FA0B4 -/* B6A0DC 800F2F3C 00002025 */ move $a0, $zero -/* B6A0E0 800F2F40 24010001 */ li $at, 1 -/* B6A0E4 800F2F44 10410003 */ beq $v0, $at, .L800F2F54 -/* B6A0E8 800F2F48 3C041000 */ lui $a0, (0x100000FF >> 16) # lui $a0, 0x1000 -/* B6A0EC 800F2F4C 0C03E803 */ jal Audio_SetBGM -/* B6A0F0 800F2F50 348400FF */ ori $a0, (0x100000FF & 0xFFFF) # ori $a0, $a0, 0xff -.L800F2F54: -/* B6A0F4 800F2F54 3C041100 */ lui $a0, (0x110000FF >> 16) # lui $a0, 0x1100 -/* B6A0F8 800F2F58 0C03E803 */ jal Audio_SetBGM -/* B6A0FC 800F2F5C 348400FF */ ori $a0, (0x110000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6A100 800F2F60 3C041300 */ lui $a0, (0x130000FF >> 16) # lui $a0, 0x1300 -/* B6A104 800F2F64 0C03E803 */ jal Audio_SetBGM -/* B6A108 800F2F68 348400FF */ ori $a0, (0x130000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6A10C 800F2F6C 3C038017 */ lui $v1, %hi(D_8016BAB8) # $v1, 0x8017 -/* B6A110 800F2F70 3C058013 */ lui $a1, %hi(D_80131C9C) # $a1, 0x8013 -/* B6A114 800F2F74 24A51C9C */ addiu $a1, %lo(D_80131C9C) # addiu $a1, $a1, 0x1c9c -/* B6A118 800F2F78 8C63BAB8 */ lw $v1, %lo(D_8016BAB8)($v1) -.L800F2F7C: -/* B6A11C 800F2F7C 306A4000 */ andi $t2, $v1, 0x4000 -/* B6A120 800F2F80 1140002C */ beqz $t2, .L800F3034 -/* B6A124 800F2F84 00000000 */ nop -/* B6A128 800F2F88 90AB0000 */ lbu $t3, ($a1) -/* B6A12C 800F2F8C 396C0001 */ xori $t4, $t3, 1 -/* B6A130 800F2F90 318D00FF */ andi $t5, $t4, 0xff -/* B6A134 800F2F94 15A00027 */ bnez $t5, .L800F3034 -/* B6A138 800F2F98 A0AC0000 */ sb $t4, ($a1) -/* B6A13C 800F2F9C 0C03DC98 */ jal func_800F7260 -/* B6A140 800F2FA0 00002025 */ move $a0, $zero -/* B6A144 800F2FA4 10000023 */ b .L800F3034 -/* B6A148 800F2FA8 00000000 */ nop -glabel L800F2FAC -/* B6A14C 800F2FAC 0C03C6F7 */ jal func_800F1BDC -/* B6A150 800F2FB0 00000000 */ nop -/* B6A154 800F2FB4 1000001F */ b .L800F3034 -/* B6A158 800F2FB8 00000000 */ nop -glabel L800F2FBC -/* B6A15C 800F2FBC 0C03C854 */ jal func_800F2150 -/* B6A160 800F2FC0 00000000 */ nop -/* B6A164 800F2FC4 1000001B */ b .L800F3034 -/* B6A168 800F2FC8 00000000 */ nop -glabel L800F2FCC -/* B6A16C 800F2FCC 0C03C89F */ jal func_800F227C -/* B6A170 800F2FD0 00000000 */ nop -/* B6A174 800F2FD4 10000017 */ b .L800F3034 -/* B6A178 800F2FD8 00000000 */ nop -glabel L800F2FDC -/* B6A17C 800F2FDC 0C03C919 */ jal func_800F2464 -/* B6A180 800F2FE0 00000000 */ nop -/* B6A184 800F2FE4 10000013 */ b .L800F3034 -/* B6A188 800F2FE8 00000000 */ nop -glabel L800F2FEC -/* B6A18C 800F2FEC 0C03C9E8 */ jal func_800F27A0 -/* B6A190 800F2FF0 00000000 */ nop -/* B6A194 800F2FF4 1000000F */ b .L800F3034 -/* B6A198 800F2FF8 00000000 */ nop -glabel L800F2FFC -/* B6A19C 800F2FFC 0C03CA2B */ jal func_800F28AC -/* B6A1A0 800F3000 00000000 */ nop -/* B6A1A4 800F3004 1000000B */ b .L800F3034 -/* B6A1A8 800F3008 00000000 */ nop -glabel L800F300C -/* B6A1AC 800F300C 0C03CA2D */ jal func_800F28B4 -/* B6A1B0 800F3010 00000000 */ nop -/* B6A1B4 800F3014 10000007 */ b .L800F3034 -/* B6A1B8 800F3018 00000000 */ nop -glabel L800F301C -/* B6A1BC 800F301C 0C03CA7F */ jal func_800F29FC -/* B6A1C0 800F3020 00000000 */ nop -/* B6A1C4 800F3024 10000003 */ b .L800F3034 -/* B6A1C8 800F3028 00000000 */ nop -glabel L800F302C -/* B6A1CC 800F302C 0C03CA81 */ jal func_800F2A04 -/* B6A1D0 800F3030 00000000 */ nop -glabel L800F3034 -.L800F3034: -/* B6A1D4 800F3034 3C0E8013 */ lui $t6, %hi(D_80131EEE) # $t6, 0x8013 -/* B6A1D8 800F3038 91CE1EEE */ lbu $t6, %lo(D_80131EEE)($t6) -/* B6A1DC 800F303C 3C018013 */ lui $at, %hi(D_8013340C) # $at, 0x8013 -/* B6A1E0 800F3040 A02E340C */ sb $t6, %lo(D_8013340C)($at) -.L800F3044: -/* B6A1E4 800F3044 8FBF0014 */ lw $ra, 0x14($sp) -/* B6A1E8 800F3048 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6A1EC 800F304C 03E00008 */ jr $ra -/* B6A1F0 800F3050 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3054.s b/asm/non_matchings/code/code_800EC960/func_800F3054.s deleted file mode 100644 index db22132cbb..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3054.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_800F3054 -/* B6A1F4 800F3054 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6A1F8 800F3058 AFBF0014 */ sw $ra, 0x14($sp) -/* B6A1FC 800F305C 0C03EB4D */ jal func_800FAD34 -/* B6A200 800F3060 00000000 */ nop -/* B6A204 800F3064 14400030 */ bnez $v0, .L800F3128 -/* B6A208 800F3068 3C0E8017 */ lui $t6, %hi(gAudioContext+0x289c) # $t6, 0x8017 -/* B6A20C 800F306C 8DCE1A1C */ lw $t6, %lo(gAudioContext+0x289c)($t6) -/* B6A210 800F3070 3C018017 */ lui $at, %hi(D_8016BABC) # $at, 0x8017 -/* B6A214 800F3074 0C001A78 */ jal osGetTime -/* B6A218 800F3078 AC2EBABC */ sw $t6, %lo(D_8016BABC)($at) -/* B6A21C 800F307C 3C018017 */ lui $at, %hi(D_8016B7A0) # $at, 0x8017 -/* B6A220 800F3080 0C03B9BD */ jal func_800EE6F4 -/* B6A224 800F3084 AC23B7A0 */ sw $v1, %lo(D_8016B7A0)($at) -/* B6A228 800F3088 3C048017 */ lui $a0, %hi(D_8016B7B8) # $a0, 0x8017 -/* B6A22C 800F308C 0C03D1E1 */ jal func_800F4784 -/* B6A230 800F3090 2484B7B8 */ addiu $a0, %lo(D_8016B7B8) # addiu $a0, $a0, -0x4848 -/* B6A234 800F3094 3C048017 */ lui $a0, %hi(D_8016B7C8) # $a0, 0x8017 -/* B6A238 800F3098 0C03D1E1 */ jal func_800F4784 -/* B6A23C 800F309C 2484B7C8 */ addiu $a0, %lo(D_8016B7C8) # addiu $a0, $a0, -0x4838 -/* B6A240 800F30A0 0C03D29C */ jal func_800F4A70 -/* B6A244 800F30A4 00000000 */ nop -/* B6A248 800F30A8 0C03D5AA */ jal func_800F56A8 -/* B6A24C 800F30AC 00000000 */ nop -/* B6A250 800F30B0 0C03D73E */ jal func_800F5CF8 -/* B6A254 800F30B4 00000000 */ nop -/* B6A258 800F30B8 3C188013 */ lui $t8, %hi(D_80133414) # $t8, 0x8013 -/* B6A25C 800F30BC 93183414 */ lbu $t8, %lo(D_80133414)($t8) -/* B6A260 800F30C0 24010007 */ li $at, 7 -/* B6A264 800F30C4 17010003 */ bne $t8, $at, .L800F30D4 -/* B6A268 800F30C8 00000000 */ nop -/* B6A26C 800F30CC 0C03D433 */ jal func_800F50CC -/* B6A270 800F30D0 00000000 */ nop -.L800F30D4: -/* B6A274 800F30D4 0C03E38F */ jal func_800F8E3C -/* B6A278 800F30D8 00000000 */ nop -/* B6A27C 800F30DC 0C03E80D */ jal func_800FA034 -/* B6A280 800F30E0 00000000 */ nop -/* B6A284 800F30E4 0C03E3E2 */ jal func_800F8F88 -/* B6A288 800F30E8 00000000 */ nop -/* B6A28C 800F30EC 0C03E8F7 */ jal func_800FA3DC -/* B6A290 800F30F0 00000000 */ nop -/* B6A294 800F30F4 0C03BA5F */ jal func_800EE97C -/* B6A298 800F30F8 00000000 */ nop -/* B6A29C 800F30FC 0C03CB8A */ jal func_800F2E28 -/* B6A2A0 800F3100 00000000 */ nop -/* B6A2A4 800F3104 0C0396E0 */ jal func_800E5B80 -/* B6A2A8 800F3108 00000000 */ nop -/* B6A2AC 800F310C 3C198017 */ lui $t9, %hi(gAudioContext+0x289c) # $t9, 0x8017 -/* B6A2B0 800F3110 8F391A1C */ lw $t9, %lo(gAudioContext+0x289c)($t9) -/* B6A2B4 800F3114 3C018017 */ lui $at, %hi(D_8016BAC0) # $at, 0x8017 -/* B6A2B8 800F3118 0C001A78 */ jal osGetTime -/* B6A2BC 800F311C AC39BAC0 */ sw $t9, %lo(D_8016BAC0)($at) -/* B6A2C0 800F3120 3C018017 */ lui $at, %hi(D_8016B7A4) # $at, 0x8017 -/* B6A2C4 800F3124 AC23B7A4 */ sw $v1, %lo(D_8016B7A4)($at) -.L800F3128: -/* B6A2C8 800F3128 8FBF0014 */ lw $ra, 0x14($sp) -/* B6A2CC 800F312C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6A2D0 800F3130 03E00008 */ jr $ra -/* B6A2D4 800F3134 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3138.s b/asm/non_matchings/code/code_800EC960/func_800F3138.s deleted file mode 100644 index f14ea515d5..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3138.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800F3138 -/* B6A2D8 800F3138 03E00008 */ jr $ra -/* B6A2DC 800F313C AFA40000 */ sw $a0, ($sp) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3140.s b/asm/non_matchings/code/code_800EC960/func_800F3140.s deleted file mode 100644 index 33c04edc11..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3140.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800F3140 -/* B6A2E0 800F3140 AFA40000 */ sw $a0, ($sp) -/* B6A2E4 800F3144 03E00008 */ jr $ra -/* B6A2E8 800F3148 AFA50004 */ sw $a1, 4($sp) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F314C.s b/asm/non_matchings/code/code_800EC960/func_800F314C.s deleted file mode 100644 index 7dd89037b5..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F314C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800F314C -/* B6A2EC 800F314C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6A2F0 800F3150 AFA40018 */ sw $a0, 0x18($sp) -/* B6A2F4 800F3154 00803025 */ move $a2, $a0 -/* B6A2F8 800F3158 00C02025 */ move $a0, $a2 -/* B6A2FC 800F315C 308400FF */ andi $a0, $a0, 0xff -/* B6A300 800F3160 AFBF0014 */ sw $ra, 0x14($sp) -/* B6A304 800F3164 00042200 */ sll $a0, $a0, 8 -/* B6A308 800F3168 3C018200 */ lui $at, 0x8200 -/* B6A30C 800F316C 00812025 */ or $a0, $a0, $at -/* B6A310 800F3170 0C0396BF */ jal func_800E5AFC -/* B6A314 800F3174 24050001 */ li $a1, 1 -/* B6A318 800F3178 8FBF0014 */ lw $ra, 0x14($sp) -/* B6A31C 800F317C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6A320 800F3180 03E00008 */ jr $ra -/* B6A324 800F3184 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3188.s b/asm/non_matchings/code/code_800EC960/func_800F3188.s deleted file mode 100644 index ba9d7ea3de..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3188.s +++ /dev/null @@ -1,127 +0,0 @@ -.late_rodata -glabel D_8014A55C - .float 10000 - -glabel D_8014A560 - .float 666.6667 - -glabel D_8014A564 - .float 952.381 - -glabel D_8014A568 - .float 3846.154 - -glabel D_8014A56C - .float 0.19 - -glabel D_8014A570 - .float 0.81 - -glabel D_8014A574 - .float 0.81 - -.text -glabel func_800F3188 -/* B6A328 800F3188 AFA40000 */ sw $a0, ($sp) -/* B6A32C 800F318C 308400FF */ andi $a0, $a0, 0xff -/* B6A330 800F3190 AFA50004 */ sw $a1, 4($sp) -/* B6A334 800F3194 00047080 */ sll $t6, $a0, 2 -/* B6A338 800F3198 3C0F8013 */ lui $t7, %hi(gSoundBanks) -/* B6A33C 800F319C 30A500FF */ andi $a1, $a1, 0xff -/* B6A340 800F31A0 01EE7821 */ addu $t7, $t7, $t6 -/* B6A344 800F31A4 8DEF33A8 */ lw $t7, %lo(gSoundBanks)($t7) -/* B6A348 800F31A8 0005C080 */ sll $t8, $a1, 2 -/* B6A34C 800F31AC 0305C023 */ subu $t8, $t8, $a1 -/* B6A350 800F31B0 0018C100 */ sll $t8, $t8, 4 -/* B6A354 800F31B4 01F81021 */ addu $v0, $t7, $t8 -/* B6A358 800F31B8 94430026 */ lhu $v1, 0x26($v0) -/* B6A35C 800F31BC 3C018015 */ lui $at, %hi(D_8014A55C) -/* B6A360 800F31C0 30792000 */ andi $t9, $v1, 0x2000 -/* B6A364 800F31C4 13200005 */ beqz $t9, .L800F31DC -/* B6A368 800F31C8 00000000 */ nop -/* B6A36C 800F31CC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6A370 800F31D0 44810000 */ mtc1 $at, $f0 -/* B6A374 800F31D4 03E00008 */ jr $ra -/* B6A378 800F31D8 00000000 */ nop - -.L800F31DC: -/* B6A37C 800F31DC C430A55C */ lwc1 $f16, %lo(D_8014A55C)($at) -/* B6A380 800F31E0 C442001C */ lwc1 $f2, 0x1c($v0) -/* B6A384 800F31E4 30620003 */ andi $v0, $v1, 3 -/* B6A388 800F31E8 24010001 */ li $at, 1 -/* B6A38C 800F31EC 4602803C */ c.lt.s $f16, $f2 -/* B6A390 800F31F0 00000000 */ nop -/* B6A394 800F31F4 45000004 */ bc1f .L800F3208 -/* B6A398 800F31F8 00000000 */ nop -/* B6A39C 800F31FC 44806000 */ mtc1 $zero, $f12 -/* B6A3A0 800F3200 10000039 */ b .L800F32E8 -/* B6A3A4 800F3204 46006006 */ mov.s $f0, $f12 -.L800F3208: -/* B6A3A8 800F3208 10410008 */ beq $v0, $at, .L800F322C -/* B6A3AC 800F320C 24010002 */ li $at, 2 -/* B6A3B0 800F3210 10410009 */ beq $v0, $at, .L800F3238 -/* B6A3B4 800F3214 24010003 */ li $at, 3 -/* B6A3B8 800F3218 1041000A */ beq $v0, $at, .L800F3244 -/* B6A3BC 800F321C 3C0143FA */ li $at, 0x43FA0000 # 0.000000 -/* B6A3C0 800F3220 44810000 */ mtc1 $at, $f0 -/* B6A3C4 800F3224 1000000A */ b .L800F3250 -/* B6A3C8 800F3228 3C0140A0 */ lui $at, 0x40a0 -.L800F322C: -/* B6A3CC 800F322C 3C018015 */ lui $at, %hi(D_8014A560) -/* B6A3D0 800F3230 10000006 */ b .L800F324C -/* B6A3D4 800F3234 C420A560 */ lwc1 $f0, %lo(D_8014A560)($at) -.L800F3238: -/* B6A3D8 800F3238 3C018015 */ lui $at, %hi(D_8014A564) -/* B6A3DC 800F323C 10000003 */ b .L800F324C -/* B6A3E0 800F3240 C420A564 */ lwc1 $f0, %lo(D_8014A564)($at) -.L800F3244: -/* B6A3E4 800F3244 3C018015 */ lui $at, %hi(D_8014A568) -/* B6A3E8 800F3248 C420A568 */ lwc1 $f0, %lo(D_8014A568)($at) -.L800F324C: -/* B6A3EC 800F324C 3C0140A0 */ li $at, 0x40A00000 # 0.000000 -.L800F3250: -/* B6A3F0 800F3250 44812000 */ mtc1 $at, $f4 -/* B6A3F4 800F3254 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6A3F8 800F3258 46040383 */ div.s $f14, $f0, $f4 -/* B6A3FC 800F325C 460E103C */ c.lt.s $f2, $f14 -/* B6A400 800F3260 00000000 */ nop -/* B6A404 800F3264 45020005 */ bc1fl .L800F327C -/* B6A408 800F3268 4600103C */ c.lt.s $f2, $f0 -/* B6A40C 800F326C 44816000 */ mtc1 $at, $f12 -/* B6A410 800F3270 1000001A */ b .L800F32DC -/* B6A414 800F3274 00000000 */ nop -/* B6A418 800F3278 4600103C */ c.lt.s $f2, $f0 -.L800F327C: -/* B6A41C 800F327C 00000000 */ nop -/* B6A420 800F3280 4502000D */ bc1fl .L800F32B8 -/* B6A424 800F3284 46001201 */ sub.s $f8, $f2, $f0 -/* B6A428 800F3288 460E0401 */ sub.s $f16, $f0, $f14 -/* B6A42C 800F328C 3C018015 */ lui $at, %hi(D_8014A56C) -/* B6A430 800F3290 C432A56C */ lwc1 $f18, %lo(D_8014A56C)($at) -/* B6A434 800F3294 460E1181 */ sub.s $f6, $f2, $f14 -/* B6A438 800F3298 3C018015 */ lui $at, %hi(D_8014A570) -/* B6A43C 800F329C 46068201 */ sub.s $f8, $f16, $f6 -/* B6A440 800F32A0 C426A570 */ lwc1 $f6, %lo(D_8014A570)($at) -/* B6A444 800F32A4 46104283 */ div.s $f10, $f8, $f16 -/* B6A448 800F32A8 46125102 */ mul.s $f4, $f10, $f18 -/* B6A44C 800F32AC 1000000B */ b .L800F32DC -/* B6A450 800F32B0 46062300 */ add.s $f12, $f4, $f6 -/* B6A454 800F32B4 46001201 */ sub.s $f8, $f2, $f0 -.L800F32B8: -/* B6A458 800F32B8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6A45C 800F32BC 44812000 */ mtc1 $at, $f4 -/* B6A460 800F32C0 46008281 */ sub.s $f10, $f16, $f0 -/* B6A464 800F32C4 3C018015 */ lui $at, %hi(D_8014A574) -/* B6A468 800F32C8 460A4483 */ div.s $f18, $f8, $f10 -/* B6A46C 800F32CC C428A574 */ lwc1 $f8, %lo(D_8014A574)($at) -/* B6A470 800F32D0 46122181 */ sub.s $f6, $f4, $f18 -/* B6A474 800F32D4 46083302 */ mul.s $f12, $f6, $f8 -/* B6A478 800F32D8 00000000 */ nop -.L800F32DC: -/* B6A47C 800F32DC 460C6302 */ mul.s $f12, $f12, $f12 -/* B6A480 800F32E0 00000000 */ nop -/* B6A484 800F32E4 46006006 */ mov.s $f0, $f12 -.L800F32E8: -/* B6A488 800F32E8 03E00008 */ jr $ra -/* B6A48C 800F32EC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F32F0.s b/asm/non_matchings/code/code_800EC960/func_800F32F0.s deleted file mode 100644 index 153f6a6d35..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F32F0.s +++ /dev/null @@ -1,108 +0,0 @@ -.late_rodata -glabel D_8014A578 - .float 2500 - -.text -glabel func_800F32F0 -/* B6A490 800F32F0 AFA40000 */ sw $a0, ($sp) -/* B6A494 800F32F4 308400FF */ andi $a0, $a0, 0xff -/* B6A498 800F32F8 AFA50004 */ sw $a1, 4($sp) -/* B6A49C 800F32FC 00047080 */ sll $t6, $a0, 2 -/* B6A4A0 800F3300 3C0F8013 */ lui $t7, %hi(gSoundBanks) -/* B6A4A4 800F3304 30A500FF */ andi $a1, $a1, 0xff -/* B6A4A8 800F3308 01EE7821 */ addu $t7, $t7, $t6 -/* B6A4AC 800F330C 8DEF33A8 */ lw $t7, %lo(gSoundBanks)($t7) -/* B6A4B0 800F3310 0005C080 */ sll $t8, $a1, 2 -/* B6A4B4 800F3314 0305C023 */ subu $t8, $t8, $a1 -/* B6A4B8 800F3318 0018C100 */ sll $t8, $t8, 4 -/* B6A4BC 800F331C AFA60008 */ sw $a2, 8($sp) -/* B6A4C0 800F3320 01F83821 */ addu $a3, $t7, $t8 -/* B6A4C4 800F3324 94F90026 */ lhu $t9, 0x26($a3) -/* B6A4C8 800F3328 30C600FF */ andi $a2, $a2, 0xff -/* B6A4CC 800F332C 00001025 */ move $v0, $zero -/* B6A4D0 800F3330 33281000 */ andi $t0, $t9, 0x1000 -/* B6A4D4 800F3334 15000026 */ bnez $t0, .L800F33D0 -/* B6A4D8 800F3338 00001825 */ move $v1, $zero -/* B6A4DC 800F333C 3C018015 */ lui $at, %hi(D_8014A578) -/* B6A4E0 800F3340 C422A578 */ lwc1 $f2, %lo(D_8014A578)($at) -/* B6A4E4 800F3344 C4E0001C */ lwc1 $f0, 0x1c($a3) -/* B6A4E8 800F3348 24020046 */ li $v0, 70 -/* B6A4EC 800F334C 4602003C */ c.lt.s $f0, $f2 -/* B6A4F0 800F3350 00000000 */ nop -/* B6A4F4 800F3354 4500001E */ bc1f .L800F33D0 -/* B6A4F8 800F3358 00000000 */ nop -/* B6A4FC 800F335C 8CE90008 */ lw $t1, 8($a3) -/* B6A500 800F3360 44802000 */ mtc1 $zero, $f4 -/* B6A504 800F3364 C5260000 */ lwc1 $f6, ($t1) -/* B6A508 800F3368 4606203C */ c.lt.s $f4, $f6 -/* B6A50C 800F336C 00000000 */ nop -/* B6A510 800F3370 4502000D */ bc1fl .L800F33A8 -/* B6A514 800F3374 46020103 */ div.s $f4, $f0, $f2 -/* B6A518 800F3378 46020203 */ div.s $f8, $f0, $f2 -/* B6A51C 800F337C 3C01428C */ li $at, 0x428C0000 # 0.000000 -/* B6A520 800F3380 44815000 */ mtc1 $at, $f10 -/* B6A524 800F3384 00000000 */ nop -/* B6A528 800F3388 460A4402 */ mul.s $f16, $f8, $f10 -/* B6A52C 800F338C 4600848D */ trunc.w.s $f18, $f16 -/* B6A530 800F3390 44029000 */ mfc1 $v0, $f18 -/* B6A534 800F3394 00000000 */ nop -/* B6A538 800F3398 00021600 */ sll $v0, $v0, 0x18 -/* B6A53C 800F339C 1000000C */ b .L800F33D0 -/* B6A540 800F33A0 00021603 */ sra $v0, $v0, 0x18 -/* B6A544 800F33A4 46020103 */ div.s $f4, $f0, $f2 -.L800F33A8: -/* B6A548 800F33A8 3C0142B6 */ li $at, 0x42B60000 # 0.000000 -/* B6A54C 800F33AC 44813000 */ mtc1 $at, $f6 -/* B6A550 800F33B0 00000000 */ nop -/* B6A554 800F33B4 46062202 */ mul.s $f8, $f4, $f6 -/* B6A558 800F33B8 4600428D */ trunc.w.s $f10, $f8 -/* B6A55C 800F33BC 44025000 */ mfc1 $v0, $f10 -/* B6A560 800F33C0 00000000 */ nop -/* B6A564 800F33C4 00021600 */ sll $v0, $v0, 0x18 -/* B6A568 800F33C8 10000001 */ b .L800F33D0 -/* B6A56C 800F33CC 00021603 */ sra $v0, $v0, 0x18 -.L800F33D0: -/* B6A570 800F33D0 00066080 */ sll $t4, $a2, 2 -/* B6A574 800F33D4 3C058017 */ lui $a1, %hi(gAudioContext+0x3828) -/* B6A578 800F33D8 00AC2821 */ addu $a1, $a1, $t4 -/* B6A57C 800F33DC 8CA529A8 */ lw $a1, %lo(gAudioContext+0x3828)($a1) -/* B6A580 800F33E0 3C0D8017 */ lui $t5, %hi(gAudioContext+0x5AB0) # $t5, 0x8017 -/* B6A584 800F33E4 25AD4C30 */ addiu $t5, %lo(gAudioContext+0x5AB0) # addiu $t5, $t5, 0x4c30 -/* B6A588 800F33E8 11A50005 */ beq $t5, $a1, .L800F3400 -/* B6A58C 800F33EC 3C098013 */ lui $t1, %hi(D_80130614) # $t1, 0x8013 -/* B6A590 800F33F0 80A300C5 */ lb $v1, 0xc5($a1) -/* B6A594 800F33F4 04630003 */ bgezl $v1, .L800F3404 -/* B6A598 800F33F8 8CEE0018 */ lw $t6, 0x18($a3) -/* B6A59C 800F33FC 00001825 */ move $v1, $zero -.L800F3400: -/* B6A5A0 800F3400 8CEE0018 */ lw $t6, 0x18($a3) -.L800F3404: -/* B6A5A4 800F3404 24010005 */ li $at, 5 -/* B6A5A8 800F3408 3C0B8013 */ lui $t3, %hi(D_80130618) # $t3, 0x8013 -/* B6A5AC 800F340C 81CF0000 */ lb $t7, ($t6) -/* B6A5B0 800F3410 3C0D8013 */ lui $t5, %hi(D_80130610) # $t5, 0x8013 -/* B6A5B4 800F3414 01E2C021 */ addu $t8, $t7, $v0 -/* B6A5B8 800F3418 14810006 */ bne $a0, $at, .L800F3434 -/* B6A5BC 800F341C 03032821 */ addu $a1, $t8, $v1 -/* B6A5C0 800F3420 94F90028 */ lhu $t9, 0x28($a3) -/* B6A5C4 800F3424 332801FF */ andi $t0, $t9, 0x1ff -/* B6A5C8 800F3428 29010002 */ slti $at, $t0, 2 -/* B6A5CC 800F342C 54200008 */ bnezl $at, .L800F3450 -/* B6A5D0 800F3430 28A10080 */ slti $at, $a1, 0x80 -.L800F3434: -/* B6A5D4 800F3434 81290614 */ lb $t1, %lo(D_80130614)($t1) -/* B6A5D8 800F3438 816B0618 */ lb $t3, %lo(D_80130618)($t3) -/* B6A5DC 800F343C 81AD0610 */ lb $t5, %lo(D_80130610)($t5) -/* B6A5E0 800F3440 00A95021 */ addu $t2, $a1, $t1 -/* B6A5E4 800F3444 014B6021 */ addu $t4, $t2, $t3 -/* B6A5E8 800F3448 018D2821 */ addu $a1, $t4, $t5 -/* B6A5EC 800F344C 28A10080 */ slti $at, $a1, 0x80 -.L800F3450: -/* B6A5F0 800F3450 54200003 */ bnezl $at, .L800F3460 -/* B6A5F4 800F3454 00051600 */ sll $v0, $a1, 0x18 -/* B6A5F8 800F3458 2405007F */ li $a1, 127 -/* B6A5FC 800F345C 00051600 */ sll $v0, $a1, 0x18 -.L800F3460: -/* B6A600 800F3460 03E00008 */ jr $ra -/* B6A604 800F3464 00021603 */ sra $v0, $v0, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3468.s b/asm/non_matchings/code/code_800EC960/func_800F3468.s deleted file mode 100644 index 9e3d5a27d8..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3468.s +++ /dev/null @@ -1,118 +0,0 @@ -.late_rodata -glabel D_8014A57C - .float 3.3 - -glabel D_8014A580 - .float 5.0769234 - -.text -glabel func_800F3468 -/* B6A608 800F3468 44800000 */ mtc1 $zero, $f0 -/* B6A60C 800F346C 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* B6A610 800F3470 F7B40008 */ sdc1 $f20, 8($sp) -/* B6A614 800F3474 4600603C */ c.lt.s $f12, $f0 -/* B6A618 800F3478 44808000 */ mtc1 $zero, $f16 -/* B6A61C 800F347C 46006506 */ mov.s $f20, $f12 -/* B6A620 800F3480 AFA60018 */ sw $a2, 0x18($sp) -/* B6A624 800F3484 45000003 */ bc1f .L800F3494 -/* B6A628 800F3488 3C0145FA */ li $at, 0x45FA0000 # 0.000000 -/* B6A62C 800F348C 10000002 */ b .L800F3498 -/* B6A630 800F3490 46006307 */ neg.s $f12, $f12 -.L800F3494: -/* B6A634 800F3494 4600A306 */ mov.s $f12, $f20 -.L800F3498: -/* B6A638 800F3498 4600703C */ c.lt.s $f14, $f0 -/* B6A63C 800F349C 44810000 */ mtc1 $at, $f0 -/* B6A640 800F34A0 45020004 */ bc1fl .L800F34B4 -/* B6A644 800F34A4 46007086 */ mov.s $f2, $f14 -/* B6A648 800F34A8 10000002 */ b .L800F34B4 -/* B6A64C 800F34AC 46007087 */ neg.s $f2, $f14 -/* B6A650 800F34B0 46007086 */ mov.s $f2, $f14 -.L800F34B4: -/* B6A654 800F34B4 460C003C */ c.lt.s $f0, $f12 -/* B6A658 800F34B8 00000000 */ nop -/* B6A65C 800F34BC 45020003 */ bc1fl .L800F34CC -/* B6A660 800F34C0 4602003C */ c.lt.s $f0, $f2 -/* B6A664 800F34C4 46000306 */ mov.s $f12, $f0 -/* B6A668 800F34C8 4602003C */ c.lt.s $f0, $f2 -.L800F34CC: -/* B6A66C 800F34CC 00000000 */ nop -/* B6A670 800F34D0 45020003 */ bc1fl .L800F34E0 -/* B6A674 800F34D4 4610A032 */ c.eq.s $f20, $f16 -/* B6A678 800F34D8 46000086 */ mov.s $f2, $f0 -/* B6A67C 800F34DC 4610A032 */ c.eq.s $f20, $f16 -.L800F34E0: -/* B6A680 800F34E0 00000000 */ nop -/* B6A684 800F34E4 45020009 */ bc1fl .L800F350C -/* B6A688 800F34E8 460C103E */ c.le.s $f2, $f12 -/* B6A68C 800F34EC 46107032 */ c.eq.s $f14, $f16 -/* B6A690 800F34F0 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B6A694 800F34F4 45020005 */ bc1fl .L800F350C -/* B6A698 800F34F8 460C103E */ c.le.s $f2, $f12 -/* B6A69C 800F34FC 44817000 */ mtc1 $at, $f14 -/* B6A6A0 800F3500 1000001E */ b .L800F357C -/* B6A6A4 800F3504 46007006 */ mov.s $f0, $f14 -/* B6A6A8 800F3508 460C103E */ c.le.s $f2, $f12 -.L800F350C: -/* B6A6AC 800F350C 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B6A6B0 800F3510 45020015 */ bc1fl .L800F3568 -/* B6A6B4 800F3514 44817000 */ mtc1 $at, $f14 -/* B6A6B8 800F3518 3C01467A */ li $at, 0x467A0000 # 0.000000 -/* B6A6BC 800F351C 44819000 */ mtc1 $at, $f18 -/* B6A6C0 800F3520 3C018015 */ lui $at, %hi(D_8014A57C) -/* B6A6C4 800F3524 C424A57C */ lwc1 $f4, %lo(D_8014A57C)($at) -/* B6A6C8 800F3528 46029181 */ sub.s $f6, $f18, $f2 -/* B6A6CC 800F352C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6A6D0 800F3530 460C9281 */ sub.s $f10, $f18, $f12 -/* B6A6D4 800F3534 46062202 */ mul.s $f8, $f4, $f6 -/* B6A6D8 800F3538 4614803E */ c.le.s $f16, $f20 -/* B6A6DC 800F353C 46085383 */ div.s $f14, $f10, $f8 -/* B6A6E0 800F3540 45000004 */ bc1f .L800F3554 -/* B6A6E4 800F3544 46007006 */ mov.s $f0, $f14 -/* B6A6E8 800F3548 44812000 */ mtc1 $at, $f4 -/* B6A6EC 800F354C 00000000 */ nop -/* B6A6F0 800F3550 460E2001 */ sub.s $f0, $f4, $f14 -.L800F3554: -/* B6A6F4 800F3554 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B6A6F8 800F3558 44817000 */ mtc1 $at, $f14 -/* B6A6FC 800F355C 10000008 */ b .L800F3580 -/* B6A700 800F3560 3C014248 */ li $at, 0x42480000 # 0.000000 -/* B6A704 800F3564 44817000 */ mtc1 $at, $f14 -.L800F3568: -/* B6A708 800F3568 3C018015 */ lui $at, %hi(D_8014A580) -/* B6A70C 800F356C C426A580 */ lwc1 $f6, %lo(D_8014A580)($at) -/* B6A710 800F3570 46023282 */ mul.s $f10, $f6, $f2 -/* B6A714 800F3574 460AA203 */ div.s $f8, $f20, $f10 -/* B6A718 800F3578 460E4000 */ add.s $f0, $f8, $f14 -.L800F357C: -/* B6A71C 800F357C 3C014248 */ li $at, 0x42480000 # 0.000000 -.L800F3580: -/* B6A720 800F3580 44818000 */ mtc1 $at, $f16 -/* B6A724 800F3584 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B6A728 800F3588 44814000 */ mtc1 $at, $f8 -/* B6A72C 800F358C 4610103C */ c.lt.s $f2, $f16 -/* B6A730 800F3590 00000000 */ nop -/* B6A734 800F3594 4500000B */ bc1f .L800F35C4 -/* B6A738 800F3598 00000000 */ nop -/* B6A73C 800F359C 4610603C */ c.lt.s $f12, $f16 -/* B6A740 800F35A0 00000000 */ nop -/* B6A744 800F35A4 45000007 */ bc1f .L800F35C4 -/* B6A748 800F35A8 00000000 */ nop -/* B6A74C 800F35AC 46106083 */ div.s $f2, $f12, $f16 -/* B6A750 800F35B0 460E0101 */ sub.s $f4, $f0, $f14 -/* B6A754 800F35B4 46021182 */ mul.s $f6, $f2, $f2 -/* B6A758 800F35B8 00000000 */ nop -/* B6A75C 800F35BC 46062282 */ mul.s $f10, $f4, $f6 -/* B6A760 800F35C0 460E5000 */ add.s $f0, $f10, $f14 -.L800F35C4: -/* B6A764 800F35C4 46080102 */ mul.s $f4, $f0, $f8 -/* B6A768 800F35C8 D7B40008 */ ldc1 $f20, 8($sp) -/* B6A76C 800F35CC 27BD0010 */ addiu $sp, $sp, 0x10 -/* B6A770 800F35D0 460E2180 */ add.s $f6, $f4, $f14 -/* B6A774 800F35D4 4600328D */ trunc.w.s $f10, $f6 -/* B6A778 800F35D8 44025000 */ mfc1 $v0, $f10 -/* B6A77C 800F35DC 00000000 */ nop -/* B6A780 800F35E0 00021600 */ sll $v0, $v0, 0x18 -/* B6A784 800F35E4 03E00008 */ jr $ra -/* B6A788 800F35E8 00021603 */ sra $v0, $v0, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F35EC.s b/asm/non_matchings/code/code_800EC960/func_800F35EC.s deleted file mode 100644 index 63134b9b7c..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F35EC.s +++ /dev/null @@ -1,153 +0,0 @@ -.late_rodata -glabel jtbl_8014A584 - .word L800F3694 - .word L800F3694 - .word L800F36AC - .word L800F36AC - .word L800F36C0 - .word L800F36C0 - .word L800F3694 - -glabel D_8014A5A0 - .double 1.0293 - -glabel D_8014A5A8 - .float 10000 - -glabel D_8014A5AC - .float 0.2 - -glabel D_8014A5B0 - .float 0.2 - -.text -glabel func_800F35EC -/* B6A78C 800F35EC AFA40000 */ sw $a0, ($sp) -/* B6A790 800F35F0 308400FF */ andi $a0, $a0, 0xff -/* B6A794 800F35F4 AFA50004 */ sw $a1, 4($sp) -/* B6A798 800F35F8 00047080 */ sll $t6, $a0, 2 -/* B6A79C 800F35FC 3C0F8013 */ lui $t7, %hi(gSoundBanks) -/* B6A7A0 800F3600 30A500FF */ andi $a1, $a1, 0xff -/* B6A7A4 800F3604 01EE7821 */ addu $t7, $t7, $t6 -/* B6A7A8 800F3608 8DEF33A8 */ lw $t7, %lo(gSoundBanks)($t7) -/* B6A7AC 800F360C 0005C080 */ sll $t8, $a1, 2 -/* B6A7B0 800F3610 0305C023 */ subu $t8, $t8, $a1 -/* B6A7B4 800F3614 0018C100 */ sll $t8, $t8, 4 -/* B6A7B8 800F3618 01F81821 */ addu $v1, $t7, $t8 -/* B6A7BC 800F361C 94660026 */ lhu $a2, 0x26($v1) -/* B6A7C0 800F3620 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6A7C4 800F3624 44810000 */ mtc1 $at, $f0 -/* B6A7C8 800F3628 30D94000 */ andi $t9, $a2, 0x4000 -/* B6A7CC 800F362C 00001025 */ move $v0, $zero -/* B6A7D0 800F3630 13200010 */ beqz $t9, .L800F3674 -/* B6A7D4 800F3634 46000086 */ mov.s $f2, $f0 -/* B6A7D8 800F3638 3C088017 */ lui $t0, %hi(gAudioContext+0x297c) -/* B6A7DC 800F363C 8D081AFC */ lw $t0, %lo(gAudioContext+0x297c)($t0) -/* B6A7E0 800F3640 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B6A7E4 800F3644 3109000F */ andi $t1, $t0, 0xf -/* B6A7E8 800F3648 44892000 */ mtc1 $t1, $f4 -/* B6A7EC 800F364C 05210004 */ bgez $t1, .L800F3660 -/* B6A7F0 800F3650 468021A0 */ cvt.s.w $f6, $f4 -/* B6A7F4 800F3654 44814000 */ mtc1 $at, $f8 -/* B6A7F8 800F3658 00000000 */ nop -/* B6A7FC 800F365C 46083180 */ add.s $f6, $f6, $f8 -.L800F3660: -/* B6A800 800F3660 3C014340 */ li $at, 0x43400000 # 0.000000 -/* B6A804 800F3664 44815000 */ mtc1 $at, $f10 -/* B6A808 800F3668 00000000 */ nop -/* B6A80C 800F366C 460A3403 */ div.s $f16, $f6, $f10 -/* B6A810 800F3670 46100081 */ sub.s $f2, $f0, $f16 -.L800F3674: -/* B6A814 800F3674 2C810007 */ sltiu $at, $a0, 7 -/* B6A818 800F3678 10200011 */ beqz $at, .L800F36C0 -/* B6A81C 800F367C 00045080 */ sll $t2, $a0, 2 -/* B6A820 800F3680 3C018015 */ lui $at, %hi(jtbl_8014A584) -/* B6A824 800F3684 002A0821 */ addu $at, $at, $t2 -/* B6A828 800F3688 8C2AA584 */ lw $t2, %lo(jtbl_8014A584)($at) -/* B6A82C 800F368C 01400008 */ jr $t2 -/* B6A830 800F3690 00000000 */ nop -glabel L800F3694 -/* B6A834 800F3694 3C0B8013 */ lui $t3, %hi(D_80130644) # $t3, 0x8013 -/* B6A838 800F3698 916B0644 */ lbu $t3, %lo(D_80130644)($t3) -/* B6A83C 800F369C 51600009 */ beql $t3, $zero, .L800F36C4 -/* B6A840 800F36A0 24010001 */ li $at, 1 -/* B6A844 800F36A4 10000006 */ b .L800F36C0 -/* B6A848 800F36A8 24020001 */ li $v0, 1 -glabel L800F36AC -/* B6A84C 800F36AC 3C0C8013 */ lui $t4, %hi(D_80130648) # $t4, 0x8013 -/* B6A850 800F36B0 918C0648 */ lbu $t4, %lo(D_80130648)($t4) -/* B6A854 800F36B4 51800003 */ beql $t4, $zero, .L800F36C4 -/* B6A858 800F36B8 24010001 */ li $at, 1 -/* B6A85C 800F36BC 24020001 */ li $v0, 1 -.L800F36C0: -glabel L800F36C0 -/* B6A860 800F36C0 24010001 */ li $at, 1 -.L800F36C4: -/* B6A864 800F36C4 14410017 */ bne $v0, $at, .L800F3724 -/* B6A868 800F36C8 30D82000 */ andi $t8, $a2, 0x2000 -/* B6A86C 800F36CC 30CD0800 */ andi $t5, $a2, 0x800 -/* B6A870 800F36D0 15A00014 */ bnez $t5, .L800F3724 -/* B6A874 800F36D4 3C0E8017 */ lui $t6, %hi(gAudioContext+0x297c) -/* B6A878 800F36D8 8DCE1AFC */ lw $t6, %lo(gAudioContext+0x297c)($t6) -/* B6A87C 800F36DC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B6A880 800F36E0 31CF000F */ andi $t7, $t6, 0xf -/* B6A884 800F36E4 448F9000 */ mtc1 $t7, $f18 -/* B6A888 800F36E8 05E10004 */ bgez $t7, .L800F36FC -/* B6A88C 800F36EC 46809120 */ cvt.s.w $f4, $f18 -/* B6A890 800F36F0 44814000 */ mtc1 $at, $f8 -/* B6A894 800F36F4 00000000 */ nop -/* B6A898 800F36F8 46082100 */ add.s $f4, $f4, $f8 -.L800F36FC: -/* B6A89C 800F36FC 3C014310 */ li $at, 0x43100000 # 0.000000 -/* B6A8A0 800F3700 44813000 */ mtc1 $at, $f6 -/* B6A8A4 800F3704 3C018015 */ lui $at, %hi(D_8014A5A0) -/* B6A8A8 800F3708 D432A5A0 */ ldc1 $f18, %lo(D_8014A5A0)($at) -/* B6A8AC 800F370C 46062283 */ div.s $f10, $f4, $f6 -/* B6A8B0 800F3710 46001121 */ cvt.d.s $f4, $f2 -/* B6A8B4 800F3714 46005421 */ cvt.d.s $f16, $f10 -/* B6A8B8 800F3718 46309201 */ sub.d $f8, $f18, $f16 -/* B6A8BC 800F371C 46282182 */ mul.d $f6, $f4, $f8 -/* B6A8C0 800F3720 462030A0 */ cvt.s.d $f2, $f6 -.L800F3724: -/* B6A8C4 800F3724 17000012 */ bnez $t8, .L800F3770 -/* B6A8C8 800F3728 C460001C */ lwc1 $f0, 0x1c($v1) -/* B6A8CC 800F372C 30D98000 */ andi $t9, $a2, 0x8000 -/* B6A8D0 800F3730 1720000F */ bnez $t9, .L800F3770 -/* B6A8D4 800F3734 3C018015 */ lui $at, %hi(D_8014A5A8) -/* B6A8D8 800F3738 C42CA5A8 */ lwc1 $f12, %lo(D_8014A5A8)($at) -/* B6A8DC 800F373C 3C018015 */ lui $at, %hi(D_8014A5AC) -/* B6A8E0 800F3740 4600603E */ c.le.s $f12, $f0 -/* B6A8E4 800F3744 00000000 */ nop -/* B6A8E8 800F3748 45020005 */ bc1fl .L800F3760 -/* B6A8EC 800F374C 460C0403 */ div.s $f16, $f0, $f12 -/* B6A8F0 800F3750 C42AA5AC */ lwc1 $f10, %lo(D_8014A5AC)($at) -/* B6A8F4 800F3754 10000006 */ b .L800F3770 -/* B6A8F8 800F3758 460A1080 */ add.s $f2, $f2, $f10 -/* B6A8FC 800F375C 460C0403 */ div.s $f16, $f0, $f12 -.L800F3760: -/* B6A900 800F3760 3C018015 */ lui $at, %hi(D_8014A5B0) -/* B6A904 800F3764 C432A5B0 */ lwc1 $f18, %lo(D_8014A5B0)($at) -/* B6A908 800F3768 46109102 */ mul.s $f4, $f18, $f16 -/* B6A90C 800F376C 46041080 */ add.s $f2, $f2, $f4 -.L800F3770: -/* B6A910 800F3770 30C800C0 */ andi $t0, $a2, 0xc0 -/* B6A914 800F3774 1100000E */ beqz $t0, .L800F37B0 -/* B6A918 800F3778 00000000 */ nop -/* B6A91C 800F377C 9069002F */ lbu $t1, 0x2f($v1) -/* B6A920 800F3780 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B6A924 800F3784 44894000 */ mtc1 $t1, $f8 -/* B6A928 800F3788 05210004 */ bgez $t1, .L800F379C -/* B6A92C 800F378C 468041A0 */ cvt.s.w $f6, $f8 -/* B6A930 800F3790 44815000 */ mtc1 $at, $f10 -/* B6A934 800F3794 00000000 */ nop -/* B6A938 800F3798 460A3180 */ add.s $f6, $f6, $f10 -.L800F379C: -/* B6A93C 800F379C 3C014340 */ li $at, 0x43400000 # 0.000000 -/* B6A940 800F37A0 44819000 */ mtc1 $at, $f18 -/* B6A944 800F37A4 00000000 */ nop -/* B6A948 800F37A8 46123403 */ div.s $f16, $f6, $f18 -/* B6A94C 800F37AC 46101080 */ add.s $f2, $f2, $f16 -.L800F37B0: -/* B6A950 800F37B0 03E00008 */ jr $ra -/* B6A954 800F37B4 46001006 */ mov.s $f0, $f2 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F37B8.s b/asm/non_matchings/code/code_800EC960/func_800F37B8.s deleted file mode 100644 index 8ac488b5c0..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F37B8.s +++ /dev/null @@ -1,139 +0,0 @@ -.late_rodata -glabel D_8014A5B4 - .float 1923.077 - -.text -glabel func_800F37B8 -/* B6A958 800F37B8 AFA60008 */ sw $a2, 8($sp) -/* B6A95C 800F37BC 8CAE0008 */ lw $t6, 8($a1) -/* B6A960 800F37C0 00063600 */ sll $a2, $a2, 0x18 -/* B6A964 800F37C4 00063603 */ sra $a2, $a2, 0x18 -/* B6A968 800F37C8 C5C40000 */ lwc1 $f4, ($t6) -/* B6A96C 800F37CC 28C10041 */ slti $at, $a2, 0x41 -/* B6A970 800F37D0 00001825 */ move $v1, $zero -/* B6A974 800F37D4 460C203C */ c.lt.s $f4, $f12 -/* B6A978 800F37D8 00000000 */ nop -/* B6A97C 800F37DC 4500001D */ bc1f .L800F3854 -/* B6A980 800F37E0 00000000 */ nop -/* B6A984 800F37E4 10200004 */ beqz $at, .L800F37F8 -/* B6A988 800F37E8 240F007F */ li $t7, 127 -/* B6A98C 800F37EC 00061600 */ sll $v0, $a2, 0x18 -/* B6A990 800F37F0 10000004 */ b .L800F3804 -/* B6A994 800F37F4 00021603 */ sra $v0, $v0, 0x18 -.L800F37F8: -/* B6A998 800F37F8 01E61023 */ subu $v0, $t7, $a2 -/* B6A99C 800F37FC 00021600 */ sll $v0, $v0, 0x18 -/* B6A9A0 800F3800 00021603 */ sra $v0, $v0, 0x18 -.L800F3804: -/* B6A9A4 800F3804 2841001E */ slti $at, $v0, 0x1e -/* B6A9A8 800F3808 50200004 */ beql $at, $zero, .L800F381C -/* B6A9AC 800F380C 3041FFFF */ andi $at, $v0, 0xffff -/* B6A9B0 800F3810 10000010 */ b .L800F3854 -/* B6A9B4 800F3814 00001825 */ move $v1, $zero -/* B6A9B8 800F3818 3041FFFF */ andi $at, $v0, 0xffff -.L800F381C: -/* B6A9BC 800F381C 00012080 */ sll $a0, $at, 2 -/* B6A9C0 800F3820 00812021 */ addu $a0, $a0, $at -/* B6A9C4 800F3824 00042040 */ sll $a0, $a0, 1 -/* B6A9C8 800F3828 2484FED4 */ addiu $a0, $a0, -0x12c -/* B6A9CC 800F382C 24010022 */ li $at, 34 -/* B6A9D0 800F3830 0081001A */ div $zero, $a0, $at -/* B6A9D4 800F3834 00002012 */ mflo $a0 -/* B6A9D8 800F3838 308600FF */ andi $a2, $a0, 0xff -/* B6A9DC 800F383C 10C00005 */ beqz $a2, .L800F3854 -/* B6A9E0 800F3840 308300FF */ andi $v1, $a0, 0xff -/* B6A9E4 800F3844 24180010 */ li $t8, 16 -/* B6A9E8 800F3848 03061823 */ subu $v1, $t8, $a2 -/* B6A9EC 800F384C 10000001 */ b .L800F3854 -/* B6A9F0 800F3850 306300FF */ andi $v1, $v1, 0xff -.L800F3854: -/* B6A9F4 800F3854 14600006 */ bnez $v1, .L800F3870 -/* B6A9F8 800F3858 00602025 */ move $a0, $v1 -/* B6A9FC 800F385C 94B90026 */ lhu $t9, 0x26($a1) -/* B6AA00 800F3860 33280200 */ andi $t0, $t9, 0x200 -/* B6AA04 800F3864 51000003 */ beql $t0, $zero, .L800F3874 -/* B6AA08 800F3868 94A20026 */ lhu $v0, 0x26($a1) -/* B6AA0C 800F386C 2404000F */ li $a0, 15 -.L800F3870: -/* B6AA10 800F3870 94A20026 */ lhu $v0, 0x26($a1) -.L800F3874: -/* B6AA14 800F3874 24010001 */ li $at, 1 -/* B6AA18 800F3878 30420003 */ andi $v0, $v0, 3 -/* B6AA1C 800F387C 10410008 */ beq $v0, $at, .L800F38A0 -/* B6AA20 800F3880 24010002 */ li $at, 2 -/* B6AA24 800F3884 1041000A */ beq $v0, $at, .L800F38B0 -/* B6AA28 800F3888 24010003 */ li $at, 3 -/* B6AA2C 800F388C 1041000C */ beq $v0, $at, .L800F38C0 -/* B6AA30 800F3890 3C014170 */ li $at, 0x41700000 # 0.000000 -/* B6AA34 800F3894 44810000 */ mtc1 $at, $f0 -/* B6AA38 800F3898 1000000C */ b .L800F38CC -/* B6AA3C 800F389C 00000000 */ nop -.L800F38A0: -/* B6AA40 800F38A0 3C014140 */ li $at, 0x41400000 # 0.000000 -/* B6AA44 800F38A4 44810000 */ mtc1 $at, $f0 -/* B6AA48 800F38A8 10000008 */ b .L800F38CC -/* B6AA4C 800F38AC 00000000 */ nop -.L800F38B0: -/* B6AA50 800F38B0 3C014110 */ li $at, 0x41100000 # 0.000000 -/* B6AA54 800F38B4 44810000 */ mtc1 $at, $f0 -/* B6AA58 800F38B8 10000004 */ b .L800F38CC -/* B6AA5C 800F38BC 00000000 */ nop -.L800F38C0: -/* B6AA60 800F38C0 3C0140C0 */ li $at, 0x40C00000 # 0.000000 -/* B6AA64 800F38C4 44810000 */ mtc1 $at, $f0 -/* B6AA68 800F38C8 00000000 */ nop -.L800F38CC: -/* B6AA6C 800F38CC 3C018015 */ lui $at, %hi(D_8014A5B4) -/* B6AA70 800F38D0 C42EA5B4 */ lwc1 $f14, %lo(D_8014A5B4)($at) -/* B6AA74 800F38D4 C4A2001C */ lwc1 $f2, 0x1c($a1) -/* B6AA78 800F38D8 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B6AA7C 800F38DC 4602703C */ c.lt.s $f14, $f2 -/* B6AA80 800F38E0 00000000 */ nop -/* B6AA84 800F38E4 45020004 */ bc1fl .L800F38F8 -/* B6AA88 800F38E8 46001306 */ mov.s $f12, $f2 -/* B6AA8C 800F38EC 10000002 */ b .L800F38F8 -/* B6AA90 800F38F0 46007306 */ mov.s $f12, $f14 -/* B6AA94 800F38F4 46001306 */ mov.s $f12, $f2 -.L800F38F8: -/* B6AA98 800F38F8 460C0182 */ mul.s $f6, $f0, $f12 -/* B6AA9C 800F38FC 240B0001 */ li $t3, 1 -/* B6AAA0 800F3900 00044900 */ sll $t1, $a0, 4 -/* B6AAA4 800F3904 460E3203 */ div.s $f8, $f6, $f14 -/* B6AAA8 800F3908 444AF800 */ cfc1 $t2, $31 -/* B6AAAC 800F390C 44CBF800 */ ctc1 $t3, $31 -/* B6AAB0 800F3910 00000000 */ nop -/* B6AAB4 800F3914 460042A4 */ cvt.w.s $f10, $f8 -/* B6AAB8 800F3918 444BF800 */ cfc1 $t3, $31 -/* B6AABC 800F391C 00000000 */ nop -/* B6AAC0 800F3920 316B0078 */ andi $t3, $t3, 0x78 -/* B6AAC4 800F3924 51600013 */ beql $t3, $zero, .L800F3974 -/* B6AAC8 800F3928 440B5000 */ mfc1 $t3, $f10 -/* B6AACC 800F392C 44815000 */ mtc1 $at, $f10 -/* B6AAD0 800F3930 240B0001 */ li $t3, 1 -/* B6AAD4 800F3934 460A4281 */ sub.s $f10, $f8, $f10 -/* B6AAD8 800F3938 44CBF800 */ ctc1 $t3, $31 -/* B6AADC 800F393C 00000000 */ nop -/* B6AAE0 800F3940 460052A4 */ cvt.w.s $f10, $f10 -/* B6AAE4 800F3944 444BF800 */ cfc1 $t3, $31 -/* B6AAE8 800F3948 00000000 */ nop -/* B6AAEC 800F394C 316B0078 */ andi $t3, $t3, 0x78 -/* B6AAF0 800F3950 15600005 */ bnez $t3, .L800F3968 -/* B6AAF4 800F3954 00000000 */ nop -/* B6AAF8 800F3958 440B5000 */ mfc1 $t3, $f10 -/* B6AAFC 800F395C 3C018000 */ lui $at, 0x8000 -/* B6AB00 800F3960 10000007 */ b .L800F3980 -/* B6AB04 800F3964 01615825 */ or $t3, $t3, $at -.L800F3968: -/* B6AB08 800F3968 10000005 */ b .L800F3980 -/* B6AB0C 800F396C 240BFFFF */ li $t3, -1 -/* B6AB10 800F3970 440B5000 */ mfc1 $t3, $f10 -.L800F3974: -/* B6AB14 800F3974 00000000 */ nop -/* B6AB18 800F3978 0560FFFB */ bltz $t3, .L800F3968 -/* B6AB1C 800F397C 00000000 */ nop -.L800F3980: -/* B6AB20 800F3980 44CAF800 */ ctc1 $t2, $31 -/* B6AB24 800F3984 012B1021 */ addu $v0, $t1, $t3 -/* B6AB28 800F3988 03E00008 */ jr $ra -/* B6AB2C 800F398C 304200FF */ andi $v0, $v0, 0xff - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3990.s b/asm/non_matchings/code/code_800EC960/func_800F3990.s deleted file mode 100644 index 4e720b791f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3990.s +++ /dev/null @@ -1,39 +0,0 @@ -.late_rodata -glabel D_8014A5B8 - .float 625 - -.text -glabel func_800F3990 -/* B6AB30 800F3990 44802000 */ mtc1 $zero, $f4 -/* B6AB34 800F3994 AFA50004 */ sw $a1, 4($sp) -/* B6AB38 800F3998 00001825 */ move $v1, $zero -/* B6AB3C 800F399C 460C203E */ c.le.s $f4, $f12 -/* B6AB40 800F39A0 3C018015 */ lui $at, %hi(D_8014A5B8) -/* B6AB44 800F39A4 45020015 */ bc1fl .L800F39FC -/* B6AB48 800F39A8 34620001 */ ori $v0, $v1, 1 -/* B6AB4C 800F39AC C420A5B8 */ lwc1 $f0, %lo(D_8014A5B8)($at) -/* B6AB50 800F39B0 2403007F */ li $v1, 127 -/* B6AB54 800F39B4 34620001 */ ori $v0, $v1, 1 -/* B6AB58 800F39B8 460C003C */ c.lt.s $f0, $f12 -/* B6AB5C 800F39BC 00021600 */ sll $v0, $v0, 0x18 -/* B6AB60 800F39C0 45020004 */ bc1fl .L800F39D4 -/* B6AB64 800F39C4 46006183 */ div.s $f6, $f12, $f0 -/* B6AB68 800F39C8 03E00008 */ jr $ra -/* B6AB6C 800F39CC 00021603 */ sra $v0, $v0, 0x18 -/* B6AB70 800F39D0 46006183 */ div.s $f6, $f12, $f0 -.L800F39D4: -/* B6AB74 800F39D4 3C0142FC */ li $at, 0x42FC0000 # 0.000000 -/* B6AB78 800F39D8 44814000 */ mtc1 $at, $f8 -/* B6AB7C 800F39DC 00000000 */ nop -/* B6AB80 800F39E0 46083282 */ mul.s $f10, $f6, $f8 -/* B6AB84 800F39E4 4600540D */ trunc.w.s $f16, $f10 -/* B6AB88 800F39E8 44038000 */ mfc1 $v1, $f16 -/* B6AB8C 800F39EC 00000000 */ nop -/* B6AB90 800F39F0 00031E00 */ sll $v1, $v1, 0x18 -/* B6AB94 800F39F4 00031E03 */ sra $v1, $v1, 0x18 -/* B6AB98 800F39F8 34620001 */ ori $v0, $v1, 1 -.L800F39FC: -/* B6AB9C 800F39FC 00021600 */ sll $v0, $v0, 0x18 -/* B6ABA0 800F3A00 03E00008 */ jr $ra -/* B6ABA4 800F3A04 00021603 */ sra $v0, $v0, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3A08.s b/asm/non_matchings/code/code_800EC960/func_800F3A08.s deleted file mode 100644 index 541bd0808c..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3A08.s +++ /dev/null @@ -1,344 +0,0 @@ -.late_rodata -glabel jtbl_8014A5BC - .word L800F3A94 - .word L800F3A94 - .word L800F3A94 - .word L800F3A94 - .word L800F3C74 - .word L800F3AC4 - .word L800F3A94 - -.text -glabel func_800F3A08 -/* B6ABA8 800F3A08 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B6ABAC 800F3A0C AFA40048 */ sw $a0, 0x48($sp) -/* B6ABB0 800F3A10 93AF004B */ lbu $t7, 0x4b($sp) -/* B6ABB4 800F3A14 AFA5004C */ sw $a1, 0x4c($sp) -/* B6ABB8 800F3A18 93A8004F */ lbu $t0, 0x4f($sp) -/* B6ABBC 800F3A1C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6ABC0 800F3A20 44811000 */ mtc1 $at, $f2 -/* B6ABC4 800F3A24 3C198013 */ lui $t9, %hi(gSoundBanks) -/* B6ABC8 800F3A28 000FC080 */ sll $t8, $t7, 2 -/* B6ABCC 800F3A2C 0338C821 */ addu $t9, $t9, $t8 -/* B6ABD0 800F3A30 00084880 */ sll $t1, $t0, 2 -/* B6ABD4 800F3A34 8F3933A8 */ lw $t9, %lo(gSoundBanks)($t9) -/* B6ABD8 800F3A38 01284823 */ subu $t1, $t1, $t0 -/* B6ABDC 800F3A3C 240E0040 */ li $t6, 64 -/* B6ABE0 800F3A40 00094900 */ sll $t1, $t1, 4 -/* B6ABE4 800F3A44 2DE10007 */ sltiu $at, $t7, 7 -/* B6ABE8 800F3A48 AFBF0014 */ sw $ra, 0x14($sp) -/* B6ABEC 800F3A4C AFA60050 */ sw $a2, 0x50($sp) -/* B6ABF0 800F3A50 A3A00042 */ sb $zero, 0x42($sp) -/* B6ABF4 800F3A54 A3AE003B */ sb $t6, 0x3b($sp) -/* B6ABF8 800F3A58 A3A0003A */ sb $zero, 0x3a($sp) -/* B6ABFC 800F3A5C A3A00039 */ sb $zero, 0x39($sp) -/* B6AC00 800F3A60 A3A00038 */ sb $zero, 0x38($sp) -/* B6AC04 800F3A64 A3A00033 */ sb $zero, 0x33($sp) -/* B6AC08 800F3A68 AFAF0024 */ sw $t7, 0x24($sp) -/* B6AC0C 800F3A6C E7A2003C */ swc1 $f2, 0x3c($sp) -/* B6AC10 800F3A70 E7A20044 */ swc1 $f2, 0x44($sp) -/* B6AC14 800F3A74 1020007F */ beqz $at, .L800F3C74 -/* B6AC18 800F3A78 03293821 */ addu $a3, $t9, $t1 -/* B6AC1C 800F3A7C 000F5080 */ sll $t2, $t7, 2 -/* B6AC20 800F3A80 3C018015 */ lui $at, %hi(jtbl_8014A5BC) -/* B6AC24 800F3A84 002A0821 */ addu $at, $at, $t2 -/* B6AC28 800F3A88 8C2AA5BC */ lw $t2, %lo(jtbl_8014A5BC)($at) -/* B6AC2C 800F3A8C 01400008 */ jr $t2 -/* B6AC30 800F3A90 00000000 */ nop -glabel L800F3A94 -/* B6AC34 800F3A94 3C0B8013 */ lui $t3, %hi(D_80130604) # $t3, 0x8013 -/* B6AC38 800F3A98 816B0604 */ lb $t3, %lo(D_80130604)($t3) -/* B6AC3C 800F3A9C 24010002 */ li $at, 2 -/* B6AC40 800F3AA0 55610009 */ bnel $t3, $at, .L800F3AC8 -/* B6AC44 800F3AA4 C4E0001C */ lwc1 $f0, 0x1c($a3) -/* B6AC48 800F3AA8 8CEC0004 */ lw $t4, 4($a3) -/* B6AC4C 800F3AAC 94E50026 */ lhu $a1, 0x26($a3) -/* B6AC50 800F3AB0 C58C0000 */ lwc1 $f12, ($t4) -/* B6AC54 800F3AB4 0C03CE64 */ jal func_800F3990 -/* B6AC58 800F3AB8 AFA7002C */ sw $a3, 0x2c($sp) -/* B6AC5C 800F3ABC 8FA7002C */ lw $a3, 0x2c($sp) -/* B6AC60 800F3AC0 A3A20038 */ sb $v0, 0x38($sp) -glabel L800F3AC4 -/* B6AC64 800F3AC4 C4E0001C */ lwc1 $f0, 0x1c($a3) -.L800F3AC8: -/* B6AC68 800F3AC8 46000004 */ sqrt.s $f0, $f0 -/* B6AC6C 800F3ACC E4E0001C */ swc1 $f0, 0x1c($a3) -/* B6AC70 800F3AD0 AFA7002C */ sw $a3, 0x2c($sp) -/* B6AC74 800F3AD4 93A5004F */ lbu $a1, 0x4f($sp) -/* B6AC78 800F3AD8 0C03CC62 */ jal func_800F3188 -/* B6AC7C 800F3ADC 93A4004B */ lbu $a0, 0x4b($sp) -/* B6AC80 800F3AE0 8FA7002C */ lw $a3, 0x2c($sp) -/* B6AC84 800F3AE4 93A4004B */ lbu $a0, 0x4b($sp) -/* B6AC88 800F3AE8 93A5004F */ lbu $a1, 0x4f($sp) -/* B6AC8C 800F3AEC 8CED0014 */ lw $t5, 0x14($a3) -/* B6AC90 800F3AF0 93A60053 */ lbu $a2, 0x53($sp) -/* B6AC94 800F3AF4 C5A40000 */ lwc1 $f4, ($t5) -/* B6AC98 800F3AF8 46002182 */ mul.s $f6, $f4, $f0 -/* B6AC9C 800F3AFC 0C03CCBC */ jal func_800F32F0 -/* B6ACA0 800F3B00 E7A60044 */ swc1 $f6, 0x44($sp) -/* B6ACA4 800F3B04 8FA7002C */ lw $a3, 0x2c($sp) -/* B6ACA8 800F3B08 A3A20042 */ sb $v0, 0x42($sp) -/* B6ACAC 800F3B0C 8CF80008 */ lw $t8, 8($a3) -/* B6ACB0 800F3B10 8CEE0000 */ lw $t6, ($a3) -/* B6ACB4 800F3B14 90E6000C */ lbu $a2, 0xc($a3) -/* B6ACB8 800F3B18 C70E0000 */ lwc1 $f14, ($t8) -/* B6ACBC 800F3B1C 0C03CD1A */ jal func_800F3468 -/* B6ACC0 800F3B20 C5CC0000 */ lwc1 $f12, ($t6) -/* B6ACC4 800F3B24 A3A2003B */ sb $v0, 0x3b($sp) -/* B6ACC8 800F3B28 93A4004B */ lbu $a0, 0x4b($sp) -/* B6ACCC 800F3B2C 0C03CD7B */ jal func_800F35EC -/* B6ACD0 800F3B30 93A5004F */ lbu $a1, 0x4f($sp) -/* B6ACD4 800F3B34 8FA7002C */ lw $a3, 0x2c($sp) -/* B6ACD8 800F3B38 3C038013 */ lui $v1, %hi(D_80130604) # $v1, 0x8013 -/* B6ACDC 800F3B3C 80630604 */ lb $v1, %lo(D_80130604)($v1) -/* B6ACE0 800F3B40 8CE80010 */ lw $t0, 0x10($a3) -/* B6ACE4 800F3B44 24010002 */ li $at, 2 -/* B6ACE8 800F3B48 C5080000 */ lwc1 $f8, ($t0) -/* B6ACEC 800F3B4C 46004282 */ mul.s $f10, $f8, $f0 -/* B6ACF0 800F3B50 14610027 */ bne $v1, $at, .L800F3BF0 -/* B6ACF4 800F3B54 E7AA003C */ swc1 $f10, 0x3c($sp) -/* B6ACF8 800F3B58 94E20026 */ lhu $v0, 0x26($a3) -/* B6ACFC 800F3B5C 3C018013 */ lui $at, %hi(D_801305C4) -/* B6AD00 800F3B60 30590400 */ andi $t9, $v0, 0x400 -/* B6AD04 800F3B64 00194A83 */ sra $t1, $t9, 0xa -/* B6AD08 800F3B68 00097880 */ sll $t7, $t1, 2 -/* B6AD0C 800F3B6C 002F0821 */ addu $at, $at, $t7 -/* B6AD10 800F3B70 C43005C4 */ lwc1 $f16, %lo(D_801305C4)($at) -/* B6AD14 800F3B74 304A0800 */ andi $t2, $v0, 0x800 -/* B6AD18 800F3B78 1540001D */ bnez $t2, .L800F3BF0 -/* B6AD1C 800F3B7C E7B00034 */ swc1 $f16, 0x34($sp) -/* B6AD20 800F3B80 8CEB0008 */ lw $t3, 8($a3) -/* B6AD24 800F3B84 C7A40034 */ lwc1 $f4, 0x34($sp) -/* B6AD28 800F3B88 240C0010 */ li $t4, 16 -/* B6AD2C 800F3B8C C5720000 */ lwc1 $f18, ($t3) -/* B6AD30 800F3B90 4604903C */ c.lt.s $f18, $f4 -/* B6AD34 800F3B94 00000000 */ nop -/* B6AD38 800F3B98 45020003 */ bc1fl .L800F3BA8 -/* B6AD3C 800F3B9C 93AD0053 */ lbu $t5, 0x53($sp) -/* B6AD40 800F3BA0 A3AC003A */ sb $t4, 0x3a($sp) -/* B6AD44 800F3BA4 93AD0053 */ lbu $t5, 0x53($sp) -.L800F3BA8: -/* B6AD48 800F3BA8 3C028017 */ lui $v0, %hi(D_8016B8C2) -/* B6AD4C 800F3BAC 93B8003A */ lbu $t8, 0x3a($sp) -/* B6AD50 800F3BB0 000D7100 */ sll $t6, $t5, 4 -/* B6AD54 800F3BB4 004E1021 */ addu $v0, $v0, $t6 -/* B6AD58 800F3BB8 8042B8C2 */ lb $v0, %lo(D_8016B8C2)($v0) -/* B6AD5C 800F3BBC 83A9003B */ lb $t1, 0x3b($sp) -/* B6AD60 800F3BC0 00584026 */ xor $t0, $v0, $t8 -/* B6AD64 800F3BC4 31190010 */ andi $t9, $t0, 0x10 -/* B6AD68 800F3BC8 13200008 */ beqz $t9, .L800F3BEC -/* B6AD6C 800F3BCC 29210040 */ slti $at, $t1, 0x40 -/* B6AD70 800F3BD0 10200004 */ beqz $at, .L800F3BE4 -/* B6AD74 800F3BD4 384A0018 */ xori $t2, $v0, 0x18 -/* B6AD78 800F3BD8 384F0014 */ xori $t7, $v0, 0x14 -/* B6AD7C 800F3BDC 10000004 */ b .L800F3BF0 -/* B6AD80 800F3BE0 A3AF003A */ sb $t7, 0x3a($sp) -.L800F3BE4: -/* B6AD84 800F3BE4 10000002 */ b .L800F3BF0 -/* B6AD88 800F3BE8 A3AA003A */ sb $t2, 0x3a($sp) -.L800F3BEC: -/* B6AD8C 800F3BEC A3A2003A */ sb $v0, 0x3a($sp) -.L800F3BF0: -/* B6AD90 800F3BF0 3C028013 */ lui $v0, %hi(D_8013063C) # $v0, 0x8013 -/* B6AD94 800F3BF4 9042063C */ lbu $v0, %lo(D_8013063C)($v0) -/* B6AD98 800F3BF8 8FA40024 */ lw $a0, 0x24($sp) -/* B6AD9C 800F3BFC 24010001 */ li $at, 1 -/* B6ADA0 800F3C00 10400008 */ beqz $v0, .L800F3C24 -/* B6ADA4 800F3C04 3C0C8013 */ lui $t4, %hi(D_80130640) # $t4, 0x8013 -/* B6ADA8 800F3C08 50810006 */ beql $a0, $at, .L800F3C24 -/* B6ADAC 800F3C0C A3A20033 */ sb $v0, 0x33($sp) -/* B6ADB0 800F3C10 10800003 */ beqz $a0, .L800F3C20 -/* B6ADB4 800F3C14 24010006 */ li $at, 6 -/* B6ADB8 800F3C18 54810003 */ bnel $a0, $at, .L800F3C28 -/* B6ADBC 800F3C1C 93AB0033 */ lbu $t3, 0x33($sp) -.L800F3C20: -/* B6ADC0 800F3C20 A3A20033 */ sb $v0, 0x33($sp) -.L800F3C24: -/* B6ADC4 800F3C24 93AB0033 */ lbu $t3, 0x33($sp) -.L800F3C28: -/* B6ADC8 800F3C28 918C0640 */ lbu $t4, %lo(D_80130640)($t4) -/* B6ADCC 800F3C2C 24010002 */ li $at, 2 -/* B6ADD0 800F3C30 016C1025 */ or $v0, $t3, $t4 -/* B6ADD4 800F3C34 10400003 */ beqz $v0, .L800F3C44 -/* B6ADD8 800F3C38 00000000 */ nop -/* B6ADDC 800F3C3C 1000000C */ b .L800F3C70 -/* B6ADE0 800F3C40 A3A20039 */ sb $v0, 0x39($sp) -.L800F3C44: -/* B6ADE4 800F3C44 5461000B */ bnel $v1, $at, .L800F3C74 -/* B6ADE8 800F3C48 C7A20044 */ lwc1 $f2, 0x44($sp) -/* B6ADEC 800F3C4C 94ED0026 */ lhu $t5, 0x26($a3) -/* B6ADF0 800F3C50 C7AC0034 */ lwc1 $f12, 0x34($sp) -/* B6ADF4 800F3C54 00E02825 */ move $a1, $a3 -/* B6ADF8 800F3C58 31AE2000 */ andi $t6, $t5, 0x2000 -/* B6ADFC 800F3C5C 55C00005 */ bnezl $t6, .L800F3C74 -/* B6AE00 800F3C60 C7A20044 */ lwc1 $f2, 0x44($sp) -/* B6AE04 800F3C64 0C03CDEE */ jal func_800F37B8 -/* B6AE08 800F3C68 83A6003B */ lb $a2, 0x3b($sp) -/* B6AE0C 800F3C6C A3A20039 */ sb $v0, 0x39($sp) -.L800F3C70: -/* B6AE10 800F3C70 C7A20044 */ lwc1 $f2, 0x44($sp) -.L800F3C74: -glabel L800F3C74 -/* B6AE14 800F3C74 93B80053 */ lbu $t8, 0x53($sp) -/* B6AE18 800F3C78 3C198017 */ lui $t9, %hi(D_8016B8B8) # $t9, 0x8017 -/* B6AE1C 800F3C7C 2739B8B8 */ addiu $t9, %lo(D_8016B8B8) # addiu $t9, $t9, -0x4748 -/* B6AE20 800F3C80 00184100 */ sll $t0, $t8, 4 -/* B6AE24 800F3C84 01191021 */ addu $v0, $t0, $t9 -/* B6AE28 800F3C88 C4460000 */ lwc1 $f6, ($v0) -/* B6AE2C 800F3C8C 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B6AE30 800F3C90 2405FFFF */ li $a1, -1 -/* B6AE34 800F3C94 46061032 */ c.eq.s $f2, $f6 -/* B6AE38 800F3C98 00000000 */ nop -/* B6AE3C 800F3C9C 45010028 */ bc1t .L800F3D40 -/* B6AE40 800F3CA0 00000000 */ nop -/* B6AE44 800F3CA4 44814000 */ mtc1 $at, $f8 -/* B6AE48 800F3CA8 24050001 */ li $a1, 1 -/* B6AE4C 800F3CAC 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B6AE50 800F3CB0 46081282 */ mul.s $f10, $f2, $f8 -/* B6AE54 800F3CB4 4449F800 */ cfc1 $t1, $31 -/* B6AE58 800F3CB8 44C5F800 */ ctc1 $a1, $31 -/* B6AE5C 800F3CBC 00000000 */ nop -/* B6AE60 800F3CC0 46005424 */ cvt.w.s $f16, $f10 -/* B6AE64 800F3CC4 4445F800 */ cfc1 $a1, $31 -/* B6AE68 800F3CC8 00000000 */ nop -/* B6AE6C 800F3CCC 30A50078 */ andi $a1, $a1, 0x78 -/* B6AE70 800F3CD0 50A00013 */ beql $a1, $zero, .L800F3D20 -/* B6AE74 800F3CD4 44058000 */ mfc1 $a1, $f16 -/* B6AE78 800F3CD8 44818000 */ mtc1 $at, $f16 -/* B6AE7C 800F3CDC 24050001 */ li $a1, 1 -/* B6AE80 800F3CE0 46105401 */ sub.s $f16, $f10, $f16 -/* B6AE84 800F3CE4 44C5F800 */ ctc1 $a1, $31 -/* B6AE88 800F3CE8 00000000 */ nop -/* B6AE8C 800F3CEC 46008424 */ cvt.w.s $f16, $f16 -/* B6AE90 800F3CF0 4445F800 */ cfc1 $a1, $31 -/* B6AE94 800F3CF4 00000000 */ nop -/* B6AE98 800F3CF8 30A50078 */ andi $a1, $a1, 0x78 -/* B6AE9C 800F3CFC 14A00005 */ bnez $a1, .L800F3D14 -/* B6AEA0 800F3D00 00000000 */ nop -/* B6AEA4 800F3D04 44058000 */ mfc1 $a1, $f16 -/* B6AEA8 800F3D08 3C018000 */ lui $at, 0x8000 -/* B6AEAC 800F3D0C 10000007 */ b .L800F3D2C -/* B6AEB0 800F3D10 00A12825 */ or $a1, $a1, $at -.L800F3D14: -/* B6AEB4 800F3D14 10000005 */ b .L800F3D2C -/* B6AEB8 800F3D18 2405FFFF */ li $a1, -1 -/* B6AEBC 800F3D1C 44058000 */ mfc1 $a1, $f16 -.L800F3D20: -/* B6AEC0 800F3D20 00000000 */ nop -/* B6AEC4 800F3D24 04A0FFFB */ bltz $a1, .L800F3D14 -/* B6AEC8 800F3D28 00000000 */ nop -.L800F3D2C: -/* B6AECC 800F3D2C 44C9F800 */ ctc1 $t1, $31 -/* B6AED0 800F3D30 00052E00 */ sll $a1, $a1, 0x18 -/* B6AED4 800F3D34 00052E03 */ sra $a1, $a1, 0x18 -/* B6AED8 800F3D38 10000001 */ b .L800F3D40 -/* B6AEDC 800F3D3C E4420000 */ swc1 $f2, ($v0) -.L800F3D40: -/* B6AEE0 800F3D40 93A30053 */ lbu $v1, 0x53($sp) -/* B6AEE4 800F3D44 3C010602 */ lui $at, 0x602 -/* B6AEE8 800F3D48 AFA20024 */ sw $v0, 0x24($sp) -/* B6AEEC 800F3D4C 00031A00 */ sll $v1, $v1, 8 -/* B6AEF0 800F3D50 00613025 */ or $a2, $v1, $at -/* B6AEF4 800F3D54 34C40002 */ ori $a0, $a2, 2 -/* B6AEF8 800F3D58 AFA60018 */ sw $a2, 0x18($sp) -/* B6AEFC 800F3D5C 0C0396C8 */ jal func_800E5B20 -/* B6AF00 800F3D60 AFA3001C */ sw $v1, 0x1c($sp) -/* B6AF04 800F3D64 8FA20024 */ lw $v0, 0x24($sp) -/* B6AF08 800F3D68 83A50042 */ lb $a1, 0x42($sp) -/* B6AF0C 800F3D6C 8FA4001C */ lw $a0, 0x1c($sp) -/* B6AF10 800F3D70 804F0008 */ lb $t7, 8($v0) -/* B6AF14 800F3D74 3C010502 */ lui $at, 0x502 -/* B6AF18 800F3D78 00812025 */ or $a0, $a0, $at -/* B6AF1C 800F3D7C 50AF0007 */ beql $a1, $t7, .L800F3D9C -/* B6AF20 800F3D80 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* B6AF24 800F3D84 0C0396C8 */ jal func_800E5B20 -/* B6AF28 800F3D88 AFA20024 */ sw $v0, 0x24($sp) -/* B6AF2C 800F3D8C 8FA20024 */ lw $v0, 0x24($sp) -/* B6AF30 800F3D90 83AA0042 */ lb $t2, 0x42($sp) -/* B6AF34 800F3D94 A04A0008 */ sb $t2, 8($v0) -/* B6AF38 800F3D98 C7A0003C */ lwc1 $f0, 0x3c($sp) -.L800F3D9C: -/* B6AF3C 800F3D9C C4520004 */ lwc1 $f18, 4($v0) -/* B6AF40 800F3DA0 8FA4001C */ lw $a0, 0x1c($sp) -/* B6AF44 800F3DA4 3C010402 */ lui $at, 0x402 -/* B6AF48 800F3DA8 46120032 */ c.eq.s $f0, $f18 -/* B6AF4C 800F3DAC 00812025 */ or $a0, $a0, $at -/* B6AF50 800F3DB0 45030008 */ bc1tl .L800F3DD4 -/* B6AF54 800F3DB4 93A3003A */ lbu $v1, 0x3a($sp) -/* B6AF58 800F3DB8 44050000 */ mfc1 $a1, $f0 -/* B6AF5C 800F3DBC 0C0396B6 */ jal func_800E5AD8 -/* B6AF60 800F3DC0 AFA20024 */ sw $v0, 0x24($sp) -/* B6AF64 800F3DC4 8FA20024 */ lw $v0, 0x24($sp) -/* B6AF68 800F3DC8 C7A4003C */ lwc1 $f4, 0x3c($sp) -/* B6AF6C 800F3DCC E4440004 */ swc1 $f4, 4($v0) -/* B6AF70 800F3DD0 93A3003A */ lbu $v1, 0x3a($sp) -.L800F3DD4: -/* B6AF74 800F3DD4 804B000A */ lb $t3, 0xa($v0) -/* B6AF78 800F3DD8 8FA4001C */ lw $a0, 0x1c($sp) -/* B6AF7C 800F3DDC 3C010E02 */ lui $at, 0xe02 -/* B6AF80 800F3DE0 106B000A */ beq $v1, $t3, .L800F3E0C -/* B6AF84 800F3DE4 00812025 */ or $a0, $a0, $at -/* B6AF88 800F3DE8 34650010 */ ori $a1, $v1, 0x10 -/* B6AF8C 800F3DEC 00052E00 */ sll $a1, $a1, 0x18 -/* B6AF90 800F3DF0 00052E03 */ sra $a1, $a1, 0x18 -/* B6AF94 800F3DF4 AFA20024 */ sw $v0, 0x24($sp) -/* B6AF98 800F3DF8 0C0396C8 */ jal func_800E5B20 -/* B6AF9C 800F3DFC AFA30020 */ sw $v1, 0x20($sp) -/* B6AFA0 800F3E00 8FA20024 */ lw $v0, 0x24($sp) -/* B6AFA4 800F3E04 8FA30020 */ lw $v1, 0x20($sp) -/* B6AFA8 800F3E08 A043000A */ sb $v1, 0xa($v0) -.L800F3E0C: -/* B6AFAC 800F3E0C 93A30039 */ lbu $v1, 0x39($sp) -/* B6AFB0 800F3E10 904C000B */ lbu $t4, 0xb($v0) -/* B6AFB4 800F3E14 8FA40018 */ lw $a0, 0x18($sp) -/* B6AFB8 800F3E18 00032E00 */ sll $a1, $v1, 0x18 -/* B6AFBC 800F3E1C 106C0007 */ beq $v1, $t4, .L800F3E3C -/* B6AFC0 800F3E20 34840003 */ ori $a0, $a0, 3 -/* B6AFC4 800F3E24 00052E03 */ sra $a1, $a1, 0x18 -/* B6AFC8 800F3E28 0C0396C8 */ jal func_800E5B20 -/* B6AFCC 800F3E2C AFA20024 */ sw $v0, 0x24($sp) -/* B6AFD0 800F3E30 8FA20024 */ lw $v0, 0x24($sp) -/* B6AFD4 800F3E34 93AD0039 */ lbu $t5, 0x39($sp) -/* B6AFD8 800F3E38 A04D000B */ sb $t5, 0xb($v0) -.L800F3E3C: -/* B6AFDC 800F3E3C 83AE0038 */ lb $t6, 0x38($sp) -/* B6AFE0 800F3E40 9058000C */ lbu $t8, 0xc($v0) -/* B6AFE4 800F3E44 8FA4001C */ lw $a0, 0x1c($sp) -/* B6AFE8 800F3E48 3C010C02 */ lui $at, 0xc02 -/* B6AFEC 800F3E4C 11D80011 */ beq $t6, $t8, .L800F3E94 -/* B6AFF0 800F3E50 00812025 */ or $a0, $a0, $at -/* B6AFF4 800F3E54 24050010 */ li $a1, 16 -/* B6AFF8 800F3E58 0C0396C8 */ jal func_800E5B20 -/* B6AFFC 800F3E5C AFA20024 */ sw $v0, 0x24($sp) -/* B6B000 800F3E60 83A30038 */ lb $v1, 0x38($sp) -/* B6B004 800F3E64 8FA4001C */ lw $a0, 0x1c($sp) -/* B6B008 800F3E68 3C010D02 */ lui $at, 0xd02 -/* B6B00C 800F3E6C 00602825 */ move $a1, $v1 -/* B6B010 800F3E70 00052A00 */ sll $a1, $a1, 8 -/* B6B014 800F3E74 24A500FF */ addiu $a1, $a1, 0xff -/* B6B018 800F3E78 30A5FFFF */ andi $a1, $a1, 0xffff -/* B6B01C 800F3E7C AFA30020 */ sw $v1, 0x20($sp) -/* B6B020 800F3E80 0C0396D4 */ jal func_800E5B50 -/* B6B024 800F3E84 00812025 */ or $a0, $a0, $at -/* B6B028 800F3E88 8FA20024 */ lw $v0, 0x24($sp) -/* B6B02C 800F3E8C 8FA30020 */ lw $v1, 0x20($sp) -/* B6B030 800F3E90 A043000C */ sb $v1, 0xc($v0) -.L800F3E94: -/* B6B034 800F3E94 83A8003B */ lb $t0, 0x3b($sp) -/* B6B038 800F3E98 80590009 */ lb $t9, 9($v0) -/* B6B03C 800F3E9C 8FA4001C */ lw $a0, 0x1c($sp) -/* B6B040 800F3EA0 3C010302 */ lui $at, 0x302 -/* B6B044 800F3EA4 11190007 */ beq $t0, $t9, .L800F3EC4 -/* B6B048 800F3EA8 00812025 */ or $a0, $a0, $at -/* B6B04C 800F3EAC 01002825 */ move $a1, $t0 -/* B6B050 800F3EB0 0C0396C8 */ jal func_800E5B20 -/* B6B054 800F3EB4 AFA20024 */ sw $v0, 0x24($sp) -/* B6B058 800F3EB8 8FA20024 */ lw $v0, 0x24($sp) -/* B6B05C 800F3EBC 83A9003B */ lb $t1, 0x3b($sp) -/* B6B060 800F3EC0 A0490009 */ sb $t1, 9($v0) -.L800F3EC4: -/* B6B064 800F3EC4 8FBF0014 */ lw $ra, 0x14($sp) -/* B6B068 800F3EC8 27BD0048 */ addiu $sp, $sp, 0x48 -/* B6B06C 800F3ECC 03E00008 */ jr $ra -/* B6B070 800F3ED0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3ED4.s b/asm/non_matchings/code/code_800EC960/func_800F3ED4.s deleted file mode 100644 index e75a38ccca..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3ED4.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800F3ED4 -/* B6B074 800F3ED4 3C013F80 */ lui $at, 0x3f80 -/* B6B078 800F3ED8 3C048017 */ lui $a0, %hi(D_8016B8B8) -/* B6B07C 800F3EDC 44810000 */ mtc1 $at, $f0 -/* B6B080 800F3EE0 2484B8B8 */ addiu $a0, %lo(D_8016B8B8) -/* B6B084 800F3EE4 00001025 */ move $v0, $zero -/* B6B088 800F3EE8 240600FF */ li $a2, 255 -/* B6B08C 800F3EEC 24050040 */ li $a1, 64 -.L800F3EF0: -/* B6B090 800F3EF0 00027100 */ sll $t6, $v0, 4 -/* B6B094 800F3EF4 008E1821 */ addu $v1, $a0, $t6 -/* B6B098 800F3EF8 24420001 */ addiu $v0, $v0, 1 -/* B6B09C 800F3EFC 304200FF */ andi $v0, $v0, 0xff -/* B6B0A0 800F3F00 28410010 */ slti $at, $v0, 0x10 -/* B6B0A4 800F3F04 E4600000 */ swc1 $f0, ($v1) -/* B6B0A8 800F3F08 E4600004 */ swc1 $f0, 4($v1) -/* B6B0AC 800F3F0C A0600008 */ sb $zero, 8($v1) -/* B6B0B0 800F3F10 A0650009 */ sb $a1, 9($v1) -/* B6B0B4 800F3F14 A060000A */ sb $zero, 0xa($v1) -/* B6B0B8 800F3F18 A066000B */ sb $a2, 0xb($v1) -/* B6B0BC 800F3F1C 1420FFF4 */ bnez $at, .L800F3EF0 -/* B6B0C0 800F3F20 A066000C */ sb $a2, 0xc($v1) -/* B6B0C4 800F3F24 A08000DC */ sb $zero, 0xdc($a0) -/* B6B0C8 800F3F28 3C018013 */ lui $at, %hi(D_8013061C) # $at, 0x8013 -/* B6B0CC 800F3F2C A020061C */ sb $zero, %lo(D_8013061C)($at) -/* B6B0D0 800F3F30 3C018013 */ lui $at, %hi(D_80130618) -/* B6B0D4 800F3F34 03E00008 */ jr $ra -/* B6B0D8 800F3F38 A0200618 */ sb $zero, %lo(D_80130618)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3F3C.s b/asm/non_matchings/code/code_800EC960/func_800F3F3C.s deleted file mode 100644 index 5849e36952..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3F3C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800F3F3C -/* B6B0DC 800F3F3C 3C0E8017 */ lui $t6, %hi(D_8016E264) # $t6, 0x8017 -/* B6B0E0 800F3F40 91CEE264 */ lbu $t6, %lo(D_8016E264)($t6) -/* B6B0E4 800F3F44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6B0E8 800F3F48 24010001 */ li $at, 1 -/* B6B0EC 800F3F4C AFBF0014 */ sw $ra, 0x14($sp) -/* B6B0F0 800F3F50 11C10008 */ beq $t6, $at, .L800F3F74 -/* B6B0F4 800F3F54 AFA40018 */ sw $a0, 0x18($sp) -/* B6B0F8 800F3F58 3C040300 */ lui $a0, (0x0300006D >> 16) # lui $a0, 0x300 -/* B6B0FC 800F3F5C 0C03E803 */ jal Audio_SetBGM -/* B6B100 800F3F60 3484006D */ ori $a0, (0x0300006D & 0xFFFF) # ori $a0, $a0, 0x6d -/* B6B104 800F3F64 93A4001B */ lbu $a0, 0x1b($sp) -/* B6B108 800F3F68 3C018300 */ lui $at, 0x8300 -/* B6B10C 800F3F6C 0C03E803 */ jal Audio_SetBGM -/* B6B110 800F3F70 00812025 */ or $a0, $a0, $at -.L800F3F74: -/* B6B114 800F3F74 8FBF0014 */ lw $ra, 0x14($sp) -/* B6B118 800F3F78 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6B11C 800F3F7C 03E00008 */ jr $ra -/* B6B120 800F3F80 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F3F84.s b/asm/non_matchings/code/code_800EC960/func_800F3F84.s deleted file mode 100644 index 30ca27bc91..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F3F84.s +++ /dev/null @@ -1,55 +0,0 @@ -.late_rodata -glabel D_8014A5D8 - .float 1.1 - -glabel D_8014A5DC - .float 0.22500002 - -glabel D_8014A5E0 - .float 0.77499997 - -glabel D_8014A5E4 - .float 0.2 - -glabel D_8014A5E8 - .float 0.89999997 - -.text -glabel func_800F3F84 -/* B6B124 800F3F84 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6B128 800F3F88 44810000 */ mtc1 $at, $f0 -/* B6B12C 800F3F8C 3C0140C0 */ li $at, 0x40C00000 # 0.000000 -/* B6B130 800F3F90 44817000 */ mtc1 $at, $f14 -/* B6B134 800F3F94 3C018017 */ lui $at, %hi(D_8016B7A8) -/* B6B138 800F3F98 46000086 */ mov.s $f2, $f0 -/* B6B13C 800F3F9C 460C703C */ c.lt.s $f14, $f12 -/* B6B140 800F3FA0 00000000 */ nop -/* B6B144 800F3FA4 45020008 */ bc1fl .L800F3FC8 -/* B6B148 800F3FA8 460E6083 */ div.s $f2, $f12, $f14 -/* B6B14C 800F3FAC E420B7A8 */ swc1 $f0, %lo(D_8016B7A8)($at) -/* B6B150 800F3FB0 3C018015 */ lui $at, %hi(D_8014A5D8) -/* B6B154 800F3FB4 C424A5D8 */ lwc1 $f4, %lo(D_8014A5D8)($at) -/* B6B158 800F3FB8 3C018017 */ lui $at, %hi(D_8016B7B0) -/* B6B15C 800F3FBC 03E00008 */ jr $ra -/* B6B160 800F3FC0 E424B7B0 */ swc1 $f4, %lo(D_8016B7B0)($at) -/* B6B164 800F3FC4 460E6083 */ div.s $f2, $f12, $f14 -.L800F3FC8: -/* B6B168 800F3FC8 3C018015 */ lui $at, %hi(D_8014A5DC) -/* B6B16C 800F3FCC C426A5DC */ lwc1 $f6, %lo(D_8014A5DC)($at) -/* B6B170 800F3FD0 3C018015 */ lui $at, %hi(D_8014A5E0) -/* B6B174 800F3FD4 C42AA5E0 */ lwc1 $f10, %lo(D_8014A5E0)($at) -/* B6B178 800F3FD8 3C018017 */ lui $at, %hi(D_8016B7A8) -/* B6B17C 800F3FDC 46061202 */ mul.s $f8, $f2, $f6 -/* B6B180 800F3FE0 460A4400 */ add.s $f16, $f8, $f10 -/* B6B184 800F3FE4 E430B7A8 */ swc1 $f16, %lo(D_8016B7A8)($at) -/* B6B188 800F3FE8 3C018015 */ lui $at, %hi(D_8014A5E4) -/* B6B18C 800F3FEC C432A5E4 */ lwc1 $f18, %lo(D_8014A5E4)($at) -/* B6B190 800F3FF0 3C018015 */ lui $at, %hi(D_8014A5E8) -/* B6B194 800F3FF4 C426A5E8 */ lwc1 $f6, %lo(D_8014A5E8)($at) -/* B6B198 800F3FF8 46121102 */ mul.s $f4, $f2, $f18 -/* B6B19C 800F3FFC 3C018017 */ lui $at, %hi(D_8016B7B0) -/* B6B1A0 800F4000 46062200 */ add.s $f8, $f4, $f6 -/* B6B1A4 800F4004 E428B7B0 */ swc1 $f8, %lo(D_8016B7B0)($at) -/* B6B1A8 800F4008 03E00008 */ jr $ra -/* B6B1AC 800F400C 46001006 */ mov.s $f0, $f2 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4010.s b/asm/non_matchings/code/code_800EC960/func_800F4010.s deleted file mode 100644 index 51d4ccf252..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4010.s +++ /dev/null @@ -1,97 +0,0 @@ -.late_rodata -glabel D_8014A5EC - .float 0.3 - -glabel D_8014A5F0 - .float 1.1 - - .word 0 # forced padding -glabel D_8014A5F8 - .double 0.7 - -glabel D_8014A600 - .double 0.3 - -.text -glabel func_800F4010 -/* B6B1B0 800F4010 44866000 */ mtc1 $a2, $f12 -/* B6B1B4 800F4014 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6B1B8 800F4018 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B1BC 800F401C 3C018013 */ lui $at, %hi(D_80131C8C) -/* B6B1C0 800F4020 AFA40028 */ sw $a0, 0x28($sp) -/* B6B1C4 800F4024 AFA5002C */ sw $a1, 0x2c($sp) -/* B6B1C8 800F4028 E42C1C8C */ swc1 $f12, %lo(D_80131C8C)($at) -/* B6B1CC 800F402C 0C03CFE1 */ jal func_800F3F84 -/* B6B1D0 800F4030 E7AC0030 */ swc1 $f12, 0x30($sp) -/* B6B1D4 800F4034 3C0E8017 */ lui $t6, %hi(D_8016B7A8) # $t6, 0x8017 -/* B6B1D8 800F4038 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* B6B1DC 800F403C 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* B6B1E0 800F4040 25CEB7A8 */ addiu $t6, %lo(D_8016B7A8) # addiu $t6, $t6, -0x4858 -/* B6B1E4 800F4044 3C078017 */ lui $a3, %hi(D_8016B7B0) # $a3, 0x8017 -/* B6B1E8 800F4048 24E7B7B0 */ addiu $a3, %lo(D_8016B7B0) # addiu $a3, $a3, -0x4850 -/* B6B1EC 800F404C AFAE0010 */ sw $t6, 0x10($sp) -/* B6B1F0 800F4050 AFAF0014 */ sw $t7, 0x14($sp) -/* B6B1F4 800F4054 97A4002E */ lhu $a0, 0x2e($sp) -/* B6B1F8 800F4058 8FA50028 */ lw $a1, 0x28($sp) -/* B6B1FC 800F405C 24060004 */ li $a2, 4 -/* B6B200 800F4060 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B204 800F4064 E7A00024 */ swc1 $f0, 0x24($sp) -/* B6B208 800F4068 97A3002E */ lhu $v1, 0x2e($sp) -/* B6B20C 800F406C 240100B0 */ li $at, 176 -/* B6B210 800F4070 C7A20024 */ lwc1 $f2, 0x24($sp) -/* B6B214 800F4074 307800F0 */ andi $t8, $v1, 0xf0 -/* B6B218 800F4078 17010007 */ bne $t8, $at, .L800F4098 -/* B6B21C 800F407C C7A40030 */ lwc1 $f4, 0x30($sp) -/* B6B220 800F4080 3C018015 */ lui $at, %hi(D_8014A5EC) -/* B6B224 800F4084 C420A5EC */ lwc1 $f0, %lo(D_8014A5EC)($at) -/* B6B228 800F4088 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6B22C 800F408C 44811000 */ mtc1 $at, $f2 -/* B6B230 800F4090 10000007 */ b .L800F40B0 -/* B6B234 800F4094 24020001 */ li $v0, 1 -.L800F4098: -/* B6B238 800F4098 3C028017 */ lui $v0, %hi(gAudioContext+0x297c) # $v0, 0x8017 -/* B6B23C 800F409C 8C421AFC */ lw $v0, %lo(gAudioContext+0x297c)($v0) -/* B6B240 800F40A0 3C018015 */ lui $at, %hi(D_8014A5F0) -/* B6B244 800F40A4 C420A5F0 */ lwc1 $f0, %lo(D_8014A5F0)($at) -/* B6B248 800F40A8 30420001 */ andi $v0, $v0, 1 -/* B6B24C 800F40AC 304200FF */ andi $v0, $v0, 0xff -.L800F40B0: -/* B6B250 800F40B0 4604003C */ c.lt.s $f0, $f4 -/* B6B254 800F40B4 00000000 */ nop -/* B6B258 800F40B8 4502001C */ bc1fl .L800F412C -/* B6B25C 800F40BC 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B260 800F40C0 10400019 */ beqz $v0, .L800F4128 -/* B6B264 800F40C4 30790080 */ andi $t9, $v1, 0x80 -/* B6B268 800F40C8 13200003 */ beqz $t9, .L800F40D8 -/* B6B26C 800F40CC 3C018015 */ lui $at, %hi(D_8014A5F8) -/* B6B270 800F40D0 10000002 */ b .L800F40DC -/* B6B274 800F40D4 24040867 */ li $a0, 2151 -.L800F40D8: -/* B6B278 800F40D8 24040866 */ li $a0, 2150 -.L800F40DC: -/* B6B27C 800F40DC D428A5F8 */ ldc1 $f8, %lo(D_8014A5F8)($at) -/* B6B280 800F40E0 460011A1 */ cvt.d.s $f6, $f2 -/* B6B284 800F40E4 3C018015 */ lui $at, %hi(D_8014A600) -/* B6B288 800F40E8 46283282 */ mul.d $f10, $f6, $f8 -/* B6B28C 800F40EC D430A600 */ ldc1 $f16, %lo(D_8014A600)($at) -/* B6B290 800F40F0 3C028017 */ lui $v0, %hi(D_8016B7AC) # $v0, 0x8017 -/* B6B294 800F40F4 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* B6B298 800F40F8 2442B7AC */ addiu $v0, %lo(D_8016B7AC) # addiu $v0, $v0, -0x4854 -/* B6B29C 800F40FC 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* B6B2A0 800F4100 3C078017 */ lui $a3, %hi(D_8016B7B0) # $a3, 0x8017 -/* B6B2A4 800F4104 24E7B7B0 */ addiu $a3, %lo(D_8016B7B0) # addiu $a3, $a3, -0x4850 -/* B6B2A8 800F4108 46305480 */ add.d $f18, $f10, $f16 -/* B6B2AC 800F410C AFA80014 */ sw $t0, 0x14($sp) -/* B6B2B0 800F4110 AFA20010 */ sw $v0, 0x10($sp) -/* B6B2B4 800F4114 8FA50028 */ lw $a1, 0x28($sp) -/* B6B2B8 800F4118 46209120 */ cvt.s.d $f4, $f18 -/* B6B2BC 800F411C 24060004 */ li $a2, 4 -/* B6B2C0 800F4120 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B2C4 800F4124 E4440000 */ swc1 $f4, ($v0) -.L800F4128: -/* B6B2C8 800F4128 8FBF001C */ lw $ra, 0x1c($sp) -.L800F412C: -/* B6B2CC 800F412C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B6B2D0 800F4130 03E00008 */ jr $ra -/* B6B2D4 800F4134 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4138.s b/asm/non_matchings/code/code_800EC960/func_800F4138.s deleted file mode 100644 index 7c30222ce3..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4138.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800F4138 -/* B6B2D8 800F4138 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B2DC 800F413C AFBF001C */ sw $ra, 0x1c($sp) -/* B6B2E0 800F4140 44866000 */ mtc1 $a2, $f12 -/* B6B2E4 800F4144 AFA40020 */ sw $a0, 0x20($sp) -/* B6B2E8 800F4148 0C03CFE1 */ jal func_800F3F84 -/* B6B2EC 800F414C AFA50024 */ sw $a1, 0x24($sp) -/* B6B2F0 800F4150 3C0E8017 */ lui $t6, %hi(D_8016B7A8) # $t6, 0x8017 -/* B6B2F4 800F4154 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* B6B2F8 800F4158 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* B6B2FC 800F415C 25CEB7A8 */ addiu $t6, %lo(D_8016B7A8) # addiu $t6, $t6, -0x4858 -/* B6B300 800F4160 3C078017 */ lui $a3, %hi(D_8016B7B0) # $a3, 0x8017 -/* B6B304 800F4164 24E7B7B0 */ addiu $a3, %lo(D_8016B7B0) # addiu $a3, $a3, -0x4850 -/* B6B308 800F4168 AFAE0010 */ sw $t6, 0x10($sp) -/* B6B30C 800F416C AFAF0014 */ sw $t7, 0x14($sp) -/* B6B310 800F4170 97A40026 */ lhu $a0, 0x26($sp) -/* B6B314 800F4174 8FA50020 */ lw $a1, 0x20($sp) -/* B6B318 800F4178 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B31C 800F417C 24060004 */ li $a2, 4 -/* B6B320 800F4180 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B324 800F4184 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B328 800F4188 03E00008 */ jr $ra -/* B6B32C 800F418C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4190.s b/asm/non_matchings/code/code_800EC960/func_800F4190.s deleted file mode 100644 index 838039747f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4190.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800F4190 -/* B6B330 800F4190 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B334 800F4194 AFA50024 */ sw $a1, 0x24($sp) -/* B6B338 800F4198 3C0E8013 */ lui $t6, %hi(D_801333E0) # $t6, 0x8013 -/* B6B33C 800F419C 3C0F8013 */ lui $t7, %hi(D_801305B4) # $t7, 0x8013 -/* B6B340 800F41A0 00802825 */ move $a1, $a0 -/* B6B344 800F41A4 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B348 800F41A8 AFA40020 */ sw $a0, 0x20($sp) -/* B6B34C 800F41AC 25EF05B4 */ addiu $t7, %lo(D_801305B4) # addiu $t7, $t7, 0x5b4 -/* B6B350 800F41B0 25CE33E0 */ addiu $t6, %lo(D_801333E0) # addiu $t6, $t6, 0x33e0 -/* B6B354 800F41B4 3C078013 */ lui $a3, %hi(D_801305B0) # $a3, 0x8013 -/* B6B358 800F41B8 24E705B0 */ addiu $a3, %lo(D_801305B0) # addiu $a3, $a3, 0x5b0 -/* B6B35C 800F41BC AFAE0010 */ sw $t6, 0x10($sp) -/* B6B360 800F41C0 AFAF0014 */ sw $t7, 0x14($sp) -/* B6B364 800F41C4 97A40026 */ lhu $a0, 0x26($sp) -/* B6B368 800F41C8 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B36C 800F41CC 24060004 */ li $a2, 4 -/* B6B370 800F41D0 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B374 800F41D4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B378 800F41D8 03E00008 */ jr $ra -/* B6B37C 800F41DC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F41E0.s b/asm/non_matchings/code/code_800EC960/func_800F41E0.s deleted file mode 100644 index 4b34988a8b..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F41E0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800F41E0 -/* B6B380 800F41E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B384 800F41E4 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B388 800F41E8 AFA40020 */ sw $a0, 0x20($sp) -/* B6B38C 800F41EC AFA50024 */ sw $a1, 0x24($sp) -/* B6B390 800F41F0 0C0399F0 */ jal Audio_NextRandom -/* B6B394 800F41F4 AFA60028 */ sw $a2, 0x28($sp) -/* B6B398 800F41F8 93AF002B */ lbu $t7, 0x2b($sp) -/* B6B39C 800F41FC 97AE0026 */ lhu $t6, 0x26($sp) -/* B6B3A0 800F4200 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6B3A4 800F4204 004F001B */ divu $zero, $v0, $t7 -/* B6B3A8 800F4208 0000C010 */ mfhi $t8 -/* B6B3AC 800F420C 331900FF */ andi $t9, $t8, 0xff -/* B6B3B0 800F4210 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* B6B3B4 800F4214 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6B3B8 800F4218 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* B6B3BC 800F421C 15E00002 */ bnez $t7, .L800F4228 -/* B6B3C0 800F4220 00000000 */ nop -/* B6B3C4 800F4224 0007000D */ break 7 -.L800F4228: -/* B6B3C8 800F4228 01D92021 */ addu $a0, $t6, $t9 -/* B6B3CC 800F422C 3084FFFF */ andi $a0, $a0, 0xffff -/* B6B3D0 800F4230 AFA80014 */ sw $t0, 0x14($sp) -/* B6B3D4 800F4234 AFA70010 */ sw $a3, 0x10($sp) -/* B6B3D8 800F4238 8FA50020 */ lw $a1, 0x20($sp) -/* B6B3DC 800F423C 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B3E0 800F4240 24060004 */ li $a2, 4 -/* B6B3E4 800F4244 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B3E8 800F4248 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B3EC 800F424C 03E00008 */ jr $ra -/* B6B3F0 800F4250 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4254.s b/asm/non_matchings/code/code_800EC960/func_800F4254.s deleted file mode 100644 index 18642972de..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4254.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_800F4254 -/* B6B3F4 800F4254 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6B3F8 800F4258 AFB00020 */ sw $s0, 0x20($sp) -/* B6B3FC 800F425C 3C0E8013 */ lui $t6, %hi(D_801305E0) # $t6, 0x8013 -/* B6B400 800F4260 91CE05E0 */ lbu $t6, %lo(D_801305E0)($t6) -/* B6B404 800F4264 00A08025 */ move $s0, $a1 -/* B6B408 800F4268 32100003 */ andi $s0, $s0, 3 -/* B6B40C 800F426C 321000FF */ andi $s0, $s0, 0xff -/* B6B410 800F4270 AFBF0024 */ sw $ra, 0x24($sp) -/* B6B414 800F4274 AFA40030 */ sw $a0, 0x30($sp) -/* B6B418 800F4278 AFA50034 */ sw $a1, 0x34($sp) -/* B6B41C 800F427C 11D00029 */ beq $t6, $s0, .L800F4324 -/* B6B420 800F4280 02001025 */ move $v0, $s0 -/* B6B424 800F4284 00107880 */ sll $t7, $s0, 2 -/* B6B428 800F4288 3C018013 */ lui $at, %hi(D_801305E4) -/* B6B42C 800F428C 002F0821 */ addu $at, $at, $t7 -/* B6B430 800F4290 C42405E4 */ lwc1 $f4, %lo(D_801305E4)($at) -/* B6B434 800F4294 3C078013 */ lui $a3, %hi(D_801305F4) # $a3, 0x8013 -/* B6B438 800F4298 24E705F4 */ addiu $a3, %lo(D_801305F4) # addiu $a3, $a3, 0x5f4 -/* B6B43C 800F429C 24010001 */ li $at, 1 -/* B6B440 800F42A0 12010006 */ beq $s0, $at, .L800F42BC -/* B6B444 800F42A4 E4E40000 */ swc1 $f4, ($a3) -/* B6B448 800F42A8 24010002 */ li $at, 2 -/* B6B44C 800F42AC 10410010 */ beq $v0, $at, .L800F42F0 -/* B6B450 800F42B0 2404086D */ li $a0, 2157 -/* B6B454 800F42B4 10000019 */ b .L800F431C -/* B6B458 800F42B8 00000000 */ nop -.L800F42BC: -/* B6B45C 800F42BC 3C188013 */ lui $t8, %hi(D_801333E0) # $t8, 0x8013 -/* B6B460 800F42C0 3C198013 */ lui $t9, %hi(D_801333E8) # $t9, 0x8013 -/* B6B464 800F42C4 273933E8 */ addiu $t9, %lo(D_801333E8) # addiu $t9, $t9, 0x33e8 -/* B6B468 800F42C8 271833E0 */ addiu $t8, %lo(D_801333E0) # addiu $t8, $t8, 0x33e0 -/* B6B46C 800F42CC AFB80010 */ sw $t8, 0x10($sp) -/* B6B470 800F42D0 AFB90014 */ sw $t9, 0x14($sp) -/* B6B474 800F42D4 2404086D */ li $a0, 2157 -/* B6B478 800F42D8 8FA50030 */ lw $a1, 0x30($sp) -/* B6B47C 800F42DC 24060004 */ li $a2, 4 -/* B6B480 800F42E0 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B484 800F42E4 AFA20028 */ sw $v0, 0x28($sp) -/* B6B488 800F42E8 1000000C */ b .L800F431C -/* B6B48C 800F42EC 8FA20028 */ lw $v0, 0x28($sp) -.L800F42F0: -/* B6B490 800F42F0 3C088013 */ lui $t0, %hi(D_801333E0) # $t0, 0x8013 -/* B6B494 800F42F4 3C098013 */ lui $t1, %hi(D_801333E8) # $t1, 0x8013 -/* B6B498 800F42F8 252933E8 */ addiu $t1, %lo(D_801333E8) # addiu $t1, $t1, 0x33e8 -/* B6B49C 800F42FC 250833E0 */ addiu $t0, %lo(D_801333E0) # addiu $t0, $t0, 0x33e0 -/* B6B4A0 800F4300 AFA80010 */ sw $t0, 0x10($sp) -/* B6B4A4 800F4304 AFA90014 */ sw $t1, 0x14($sp) -/* B6B4A8 800F4308 8FA50030 */ lw $a1, 0x30($sp) -/* B6B4AC 800F430C 24060004 */ li $a2, 4 -/* B6B4B0 800F4310 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B4B4 800F4314 AFA20028 */ sw $v0, 0x28($sp) -/* B6B4B8 800F4318 8FA20028 */ lw $v0, 0x28($sp) -.L800F431C: -/* B6B4BC 800F431C 3C018013 */ lui $at, %hi(D_801305E0) # $at, 0x8013 -/* B6B4C0 800F4320 A03005E0 */ sb $s0, %lo(D_801305E0)($at) -.L800F4324: -/* B6B4C4 800F4324 3C078013 */ lui $a3, %hi(D_801305F4) # $a3, 0x8013 -/* B6B4C8 800F4328 1040000B */ beqz $v0, .L800F4358 -/* B6B4CC 800F432C 24E705F4 */ addiu $a3, %lo(D_801305F4) # addiu $a3, $a3, 0x5f4 -/* B6B4D0 800F4330 3C0A8013 */ lui $t2, %hi(D_801333E0) # $t2, 0x8013 -/* B6B4D4 800F4334 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 -/* B6B4D8 800F4338 256B33E8 */ addiu $t3, %lo(D_801333E8) # addiu $t3, $t3, 0x33e8 -/* B6B4DC 800F433C 254A33E0 */ addiu $t2, %lo(D_801333E0) # addiu $t2, $t2, 0x33e0 -/* B6B4E0 800F4340 AFAA0010 */ sw $t2, 0x10($sp) -/* B6B4E4 800F4344 AFAB0014 */ sw $t3, 0x14($sp) -/* B6B4E8 800F4348 24041022 */ li $a0, 4130 -/* B6B4EC 800F434C 8FA50030 */ lw $a1, 0x30($sp) -/* B6B4F0 800F4350 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B4F4 800F4354 24060004 */ li $a2, 4 -.L800F4358: -/* B6B4F8 800F4358 8FBF0024 */ lw $ra, 0x24($sp) -/* B6B4FC 800F435C 8FB00020 */ lw $s0, 0x20($sp) -/* B6B500 800F4360 27BD0030 */ addiu $sp, $sp, 0x30 -/* B6B504 800F4364 03E00008 */ jr $ra -/* B6B508 800F4368 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F436C.s b/asm/non_matchings/code/code_800EC960/func_800F436C.s deleted file mode 100644 index ba876f112f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F436C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_800F436C -/* B6B50C 800F436C 3C013F40 */ li $at, 0x3F400000 # 0.000000 -/* B6B510 800F4370 44810000 */ mtc1 $at, $f0 -/* B6B514 800F4374 44866000 */ mtc1 $a2, $f12 -/* B6B518 800F4378 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B51C 800F437C 3C078017 */ lui $a3, %hi(D_8016B7D8) # $a3, 0x8017 -/* B6B520 800F4380 4600603C */ c.lt.s $f12, $f0 -/* B6B524 800F4384 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B528 800F4388 AFA40020 */ sw $a0, 0x20($sp) -/* B6B52C 800F438C AFA50024 */ sw $a1, 0x24($sp) -/* B6B530 800F4390 4500000C */ bc1f .L800F43C4 -/* B6B534 800F4394 24E7B7D8 */ addiu $a3, %lo(D_8016B7D8) # addiu $a3, $a3, -0x4828 -/* B6B538 800F4398 46006103 */ div.s $f4, $f12, $f0 -/* B6B53C 800F439C 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* B6B540 800F43A0 44813000 */ mtc1 $at, $f6 -/* B6B544 800F43A4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B6B548 800F43A8 44815000 */ mtc1 $at, $f10 -/* B6B54C 800F43AC 3C078017 */ lui $a3, %hi(D_8016B7D8) # $a3, 0x8017 -/* B6B550 800F43B0 24E7B7D8 */ addiu $a3, %lo(D_8016B7D8) # addiu $a3, $a3, -0x4828 -/* B6B554 800F43B4 46062202 */ mul.s $f8, $f4, $f6 -/* B6B558 800F43B8 460A4400 */ add.s $f16, $f8, $f10 -/* B6B55C 800F43BC 10000002 */ b .L800F43C8 -/* B6B560 800F43C0 E4F00000 */ swc1 $f16, ($a3) -.L800F43C4: -/* B6B564 800F43C4 E4EC0000 */ swc1 $f12, ($a3) -.L800F43C8: -/* B6B568 800F43C8 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B6B56C 800F43CC 44819000 */ mtc1 $at, $f18 -/* B6B570 800F43D0 C4E40000 */ lwc1 $f4, ($a3) -/* B6B574 800F43D4 3C0E8013 */ lui $t6, %hi(D_801333E0) # $t6, 0x8013 -/* B6B578 800F43D8 25CE33E0 */ addiu $t6, %lo(D_801333E0) # addiu $t6, $t6, 0x33e0 -/* B6B57C 800F43DC 4604903C */ c.lt.s $f18, $f4 -/* B6B580 800F43E0 97A40026 */ lhu $a0, 0x26($sp) -/* B6B584 800F43E4 8FA50020 */ lw $a1, 0x20($sp) -/* B6B588 800F43E8 24060004 */ li $a2, 4 -/* B6B58C 800F43EC 45000005 */ bc1f .L800F4404 -/* B6B590 800F43F0 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* B6B594 800F43F4 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* B6B598 800F43F8 AFAF0014 */ sw $t7, 0x14($sp) -/* B6B59C 800F43FC 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B5A0 800F4400 AFAE0010 */ sw $t6, 0x10($sp) -.L800F4404: -/* B6B5A4 800F4404 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B5A8 800F4408 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B5AC 800F440C 03E00008 */ jr $ra -/* B6B5B0 800F4410 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4414.s b/asm/non_matchings/code/code_800EC960/func_800F4414.s deleted file mode 100644 index 68ff24a290..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4414.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_800F4414 -/* B6B5B4 800F4414 3C038013 */ lui $v1, %hi(D_801305B8) -/* B6B5B8 800F4418 246305B8 */ addiu $v1, %lo(D_801305B8) # addiu $v1, $v1, 0x5b8 -/* B6B5BC 800F441C 806E0000 */ lb $t6, ($v1) -/* B6B5C0 800F4420 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B5C4 800F4424 44866000 */ mtc1 $a2, $f12 -/* B6B5C8 800F4428 25CFFFFF */ addiu $t7, $t6, -1 -/* B6B5CC 800F442C A06F0000 */ sb $t7, ($v1) -/* B6B5D0 800F4430 80780000 */ lb $t8, ($v1) -/* B6B5D4 800F4434 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B5D8 800F4438 AFA40020 */ sw $a0, 0x20($sp) -/* B6B5DC 800F443C 17000027 */ bnez $t8, .L800F44DC -/* B6B5E0 800F4440 AFA50024 */ sw $a1, 0x24($sp) -/* B6B5E4 800F4444 3C198013 */ lui $t9, %hi(D_801333E0) # $t9, 0x8013 -/* B6B5E8 800F4448 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* B6B5EC 800F444C 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* B6B5F0 800F4450 273933E0 */ addiu $t9, %lo(D_801333E0) # addiu $t9, $t9, 0x33e0 -/* B6B5F4 800F4454 3C078017 */ lui $a3, %hi(D_8016B7D8) # $a3, 0x8017 -/* B6B5F8 800F4458 24E7B7D8 */ addiu $a3, %lo(D_8016B7D8) # addiu $a3, $a3, -0x4828 -/* B6B5FC 800F445C AFB90010 */ sw $t9, 0x10($sp) -/* B6B600 800F4460 AFA80014 */ sw $t0, 0x14($sp) -/* B6B604 800F4464 97A40026 */ lhu $a0, 0x26($sp) -/* B6B608 800F4468 8FA50020 */ lw $a1, 0x20($sp) -/* B6B60C 800F446C 24060004 */ li $a2, 4 -/* B6B610 800F4470 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B614 800F4474 E7AC0028 */ swc1 $f12, 0x28($sp) -/* B6B618 800F4478 3C014000 */ li $at, 0x40000000 # 0.000000 -/* B6B61C 800F447C 44810000 */ mtc1 $at, $f0 -/* B6B620 800F4480 C7AC0028 */ lwc1 $f12, 0x28($sp) -/* B6B624 800F4484 3C038013 */ lui $v1, %hi(D_801305B8) # $v1, 0x8013 -/* B6B628 800F4488 246305B8 */ addiu $v1, %lo(D_801305B8) # addiu $v1, $v1, 0x5b8 -/* B6B62C 800F448C 460C003C */ c.lt.s $f0, $f12 -/* B6B630 800F4490 3C028013 */ lui $v0, %hi(D_801305C0) # $v0, 0x8013 -/* B6B634 800F4494 3C098013 */ lui $t1, %hi(D_801305BC) # $t1, 0x8013 -/* B6B638 800F4498 45000002 */ bc1f .L800F44A4 -/* B6B63C 800F449C 00000000 */ nop -/* B6B640 800F44A0 46000306 */ mov.s $f12, $f0 -.L800F44A4: -/* B6B644 800F44A4 804205C0 */ lb $v0, %lo(D_801305C0)($v0) -/* B6B648 800F44A8 812905BC */ lb $t1, %lo(D_801305BC)($t1) -/* B6B64C 800F44AC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6B650 800F44B0 44814000 */ mtc1 $at, $f8 -/* B6B654 800F44B4 00495023 */ subu $t2, $v0, $t1 -/* B6B658 800F44B8 448A2000 */ mtc1 $t2, $f4 -/* B6B65C 800F44BC 460C4281 */ sub.s $f10, $f8, $f12 -/* B6B660 800F44C0 468021A0 */ cvt.s.w $f6, $f4 -/* B6B664 800F44C4 460A3402 */ mul.s $f16, $f6, $f10 -/* B6B668 800F44C8 4600848D */ trunc.w.s $f18, $f16 -/* B6B66C 800F44CC 440E9000 */ mfc1 $t6, $f18 -/* B6B670 800F44D0 00000000 */ nop -/* B6B674 800F44D4 01C27821 */ addu $t7, $t6, $v0 -/* B6B678 800F44D8 A06F0000 */ sb $t7, ($v1) -.L800F44DC: -/* B6B67C 800F44DC 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B680 800F44E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B684 800F44E4 03E00008 */ jr $ra -/* B6B688 800F44E8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F44EC.s b/asm/non_matchings/code/code_800EC960/func_800F44EC.s deleted file mode 100644 index a4eb5e375d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F44EC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800F44EC -/* B6B68C 800F44EC AFA50004 */ sw $a1, 4($sp) -/* B6B690 800F44F0 240E0001 */ li $t6, 1 -/* B6B694 800F44F4 3C018013 */ lui $at, %hi(D_801305B8) # $at, 0x8013 -/* B6B698 800F44F8 00052E00 */ sll $a1, $a1, 0x18 -/* B6B69C 800F44FC A02E05B8 */ sb $t6, %lo(D_801305B8)($at) -/* B6B6A0 800F4500 00052E03 */ sra $a1, $a1, 0x18 -/* B6B6A4 800F4504 AFA40000 */ sw $a0, ($sp) -/* B6B6A8 800F4508 3C018013 */ lui $at, %hi(D_801305BC) # $at, 0x8013 -/* B6B6AC 800F450C 00042600 */ sll $a0, $a0, 0x18 -/* B6B6B0 800F4510 A02505BC */ sb $a1, %lo(D_801305BC)($at) -/* B6B6B4 800F4514 00042603 */ sra $a0, $a0, 0x18 -/* B6B6B8 800F4518 3C018013 */ lui $at, %hi(D_801305C0) -/* B6B6BC 800F451C 03E00008 */ jr $ra -/* B6B6C0 800F4520 A02405C0 */ sb $a0, %lo(D_801305C0)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4524.s b/asm/non_matchings/code/code_800EC960/func_800F4524.s deleted file mode 100644 index 0f9f7d64dd..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4524.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800F4524 -/* B6B6C4 800F4524 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B6C8 800F4528 AFA60028 */ sw $a2, 0x28($sp) -/* B6B6CC 800F452C 83AE002B */ lb $t6, 0x2b($sp) -/* B6B6D0 800F4530 AFA50024 */ sw $a1, 0x24($sp) -/* B6B6D4 800F4534 3C028017 */ lui $v0, %hi(D_8016B7DC) # $v0, 0x8017 -/* B6B6D8 800F4538 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6B6DC 800F453C 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6B6E0 800F4540 2442B7DC */ addiu $v0, %lo(D_8016B7DC) # addiu $v0, $v0, -0x4824 -/* B6B6E4 800F4544 00802825 */ move $a1, $a0 -/* B6B6E8 800F4548 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B6EC 800F454C AFA40020 */ sw $a0, 0x20($sp) -/* B6B6F0 800F4550 97A40026 */ lhu $a0, 0x26($sp) -/* B6B6F4 800F4554 AFA20014 */ sw $v0, 0x14($sp) -/* B6B6F8 800F4558 AFA70010 */ sw $a3, 0x10($sp) -/* B6B6FC 800F455C 24060004 */ li $a2, 4 -/* B6B700 800F4560 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B704 800F4564 A04E0000 */ sb $t6, ($v0) -/* B6B708 800F4568 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B70C 800F456C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B710 800F4570 03E00008 */ jr $ra -/* B6B714 800F4574 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4578.s b/asm/non_matchings/code/code_800EC960/func_800F4578.s deleted file mode 100644 index 279aa4017c..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4578.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800F4578 -/* B6B718 800F4578 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B71C 800F457C 44866000 */ mtc1 $a2, $f12 -/* B6B720 800F4580 AFA50024 */ sw $a1, 0x24($sp) -/* B6B724 800F4584 3C028017 */ lui $v0, %hi(D_8016B7E0) # $v0, 0x8017 -/* B6B728 800F4588 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* B6B72C 800F458C 2442B7E0 */ addiu $v0, %lo(D_8016B7E0) # addiu $v0, $v0, -0x4820 -/* B6B730 800F4590 00802825 */ move $a1, $a0 -/* B6B734 800F4594 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B738 800F4598 AFA40020 */ sw $a0, 0x20($sp) -/* B6B73C 800F459C 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* B6B740 800F45A0 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6B744 800F45A4 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6B748 800F45A8 AFAE0014 */ sw $t6, 0x14($sp) -/* B6B74C 800F45AC 97A40026 */ lhu $a0, 0x26($sp) -/* B6B750 800F45B0 AFA20010 */ sw $v0, 0x10($sp) -/* B6B754 800F45B4 24060004 */ li $a2, 4 -/* B6B758 800F45B8 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B75C 800F45BC E44C0000 */ swc1 $f12, ($v0) -/* B6B760 800F45C0 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B764 800F45C4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B768 800F45C8 03E00008 */ jr $ra -/* B6B76C 800F45CC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F45D0.s b/asm/non_matchings/code/code_800EC960/func_800F45D0.s deleted file mode 100644 index 8592defb92..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F45D0.s +++ /dev/null @@ -1,35 +0,0 @@ -.late_rodata -glabel D_8014A608 - .float 0.15 - -glabel D_8014A60C - .float 1.39999997 - -.text -glabel func_800F45D0 -/* B6B770 800F45D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6B774 800F45D4 AFBF0014 */ sw $ra, 0x14($sp) -/* B6B778 800F45D8 E7AC0018 */ swc1 $f12, 0x18($sp) -/* B6B77C 800F45DC 3C048013 */ lui $a0, %hi(D_801333D4) # $a0, 0x8013 -/* B6B780 800F45E0 248433D4 */ addiu $a0, %lo(D_801333D4) # addiu $a0, $a0, 0x33d4 -/* B6B784 800F45E4 8FA60018 */ lw $a2, 0x18($sp) -/* B6B788 800F45E8 0C03D105 */ jal func_800F4414 -/* B6B78C 800F45EC 2405103D */ li $a1, 4157 -/* B6B790 800F45F0 3C018015 */ lui $at, %hi(D_8014A608) -/* B6B794 800F45F4 C424A608 */ lwc1 $f4, %lo(D_8014A608)($at) -/* B6B798 800F45F8 C7A60018 */ lwc1 $f6, 0x18($sp) -/* B6B79C 800F45FC 3C018015 */ lui $at, %hi(D_8014A60C) -/* B6B7A0 800F4600 C42AA60C */ lwc1 $f10, %lo(D_8014A60C)($at) -/* B6B7A4 800F4604 46062202 */ mul.s $f8, $f4, $f6 -/* B6B7A8 800F4608 3C048013 */ lui $a0, %hi(D_801333D4) # $a0, 0x8013 -/* B6B7AC 800F460C 248433D4 */ addiu $a0, %lo(D_801333D4) # addiu $a0, $a0, 0x33d4 -/* B6B7B0 800F4610 00002825 */ move $a1, $zero -/* B6B7B4 800F4614 460A4400 */ add.s $f16, $f8, $f10 -/* B6B7B8 800F4618 44068000 */ mfc1 $a2, $f16 -/* B6B7BC 800F461C 0C03D0DB */ jal func_800F436C -/* B6B7C0 800F4620 00000000 */ nop -/* B6B7C4 800F4624 8FBF0014 */ lw $ra, 0x14($sp) -/* B6B7C8 800F4628 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6B7CC 800F462C 03E00008 */ jr $ra -/* B6B7D0 800F4630 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4634.s b/asm/non_matchings/code/code_800EC960/func_800F4634.s deleted file mode 100644 index 60edacc89a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4634.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_800F4634 -/* B6B7D4 800F4634 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B7D8 800F4638 44856000 */ mtc1 $a1, $f12 -/* B6B7DC 800F463C AFBF001C */ sw $ra, 0x1c($sp) -/* B6B7E0 800F4640 AFA40020 */ sw $a0, 0x20($sp) -/* B6B7E4 800F4644 24042006 */ li $a0, 8198 -/* B6B7E8 800F4648 0C03E3FD */ jal func_800F8FF4 -/* B6B7EC 800F464C E7AC0024 */ swc1 $f12, 0x24($sp) -/* B6B7F0 800F4650 14400005 */ bnez $v0, .L800F4668 -/* B6B7F4 800F4654 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* B6B7F8 800F4658 3C078017 */ lui $a3, %hi(D_8016B7B8) # $a3, 0x8017 -/* B6B7FC 800F465C 24E7B7B8 */ addiu $a3, %lo(D_8016B7B8) # addiu $a3, $a3, -0x4848 -/* B6B800 800F4660 10000011 */ b .L800F46A8 -/* B6B804 800F4664 E4EC0000 */ swc1 $f12, ($a3) -.L800F4668: -/* B6B808 800F4668 3C078017 */ lui $a3, %hi(D_8016B7B8) # $a3, 0x8017 -/* B6B80C 800F466C 24E7B7B8 */ addiu $a3, %lo(D_8016B7B8) # addiu $a3, $a3, -0x4848 -/* B6B810 800F4670 C4E00000 */ lwc1 $f0, ($a3) -/* B6B814 800F4674 46006032 */ c.eq.s $f12, $f0 -/* B6B818 800F4678 00000000 */ nop -/* B6B81C 800F467C 4501000A */ bc1t .L800F46A8 -/* B6B820 800F4680 00000000 */ nop -/* B6B824 800F4684 E4EC0004 */ swc1 $f12, 4($a3) -/* B6B828 800F4688 C4E40004 */ lwc1 $f4, 4($a3) -/* B6B82C 800F468C 3C014220 */ li $at, 0x42200000 # 0.000000 -/* B6B830 800F4690 44814000 */ mtc1 $at, $f8 -/* B6B834 800F4694 46002181 */ sub.s $f6, $f4, $f0 -/* B6B838 800F4698 240E0028 */ li $t6, 40 -/* B6B83C 800F469C ACEE000C */ sw $t6, 0xc($a3) -/* B6B840 800F46A0 46083283 */ div.s $f10, $f6, $f8 -/* B6B844 800F46A4 E4EA0008 */ swc1 $f10, 8($a3) -.L800F46A8: -/* B6B848 800F46A8 3C0F8013 */ lui $t7, %hi(D_801333E0) # $t7, 0x8013 -/* B6B84C 800F46AC 3C188013 */ lui $t8, %hi(D_801333E8) # $t8, 0x8013 -/* B6B850 800F46B0 271833E8 */ addiu $t8, %lo(D_801333E8) # addiu $t8, $t8, 0x33e8 -/* B6B854 800F46B4 25EF33E0 */ addiu $t7, %lo(D_801333E0) # addiu $t7, $t7, 0x33e0 -/* B6B858 800F46B8 AFAF0010 */ sw $t7, 0x10($sp) -/* B6B85C 800F46BC AFB80014 */ sw $t8, 0x14($sp) -/* B6B860 800F46C0 24042006 */ li $a0, 8198 -/* B6B864 800F46C4 8FA50020 */ lw $a1, 0x20($sp) -/* B6B868 800F46C8 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B86C 800F46CC 24060004 */ li $a2, 4 -/* B6B870 800F46D0 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B874 800F46D4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B878 800F46D8 03E00008 */ jr $ra -/* B6B87C 800F46DC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F46E0.s b/asm/non_matchings/code/code_800EC960/func_800F46E0.s deleted file mode 100644 index f782b6d554..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F46E0.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_800F46E0 -/* B6B880 800F46E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6B884 800F46E4 44856000 */ mtc1 $a1, $f12 -/* B6B888 800F46E8 AFBF001C */ sw $ra, 0x1c($sp) -/* B6B88C 800F46EC AFA40020 */ sw $a0, 0x20($sp) -/* B6B890 800F46F0 24042007 */ li $a0, 8199 -/* B6B894 800F46F4 0C03E3FD */ jal func_800F8FF4 -/* B6B898 800F46F8 E7AC0024 */ swc1 $f12, 0x24($sp) -/* B6B89C 800F46FC 14400005 */ bnez $v0, .L800F4714 -/* B6B8A0 800F4700 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* B6B8A4 800F4704 3C078017 */ lui $a3, %hi(D_8016B7C8) # $a3, 0x8017 -/* B6B8A8 800F4708 24E7B7C8 */ addiu $a3, %lo(D_8016B7C8) # addiu $a3, $a3, -0x4838 -/* B6B8AC 800F470C 10000011 */ b .L800F4754 -/* B6B8B0 800F4710 E4EC0000 */ swc1 $f12, ($a3) -.L800F4714: -/* B6B8B4 800F4714 3C078017 */ lui $a3, %hi(D_8016B7C8) # $a3, 0x8017 -/* B6B8B8 800F4718 24E7B7C8 */ addiu $a3, %lo(D_8016B7C8) # addiu $a3, $a3, -0x4838 -/* B6B8BC 800F471C C4E00000 */ lwc1 $f0, ($a3) -/* B6B8C0 800F4720 46006032 */ c.eq.s $f12, $f0 -/* B6B8C4 800F4724 00000000 */ nop -/* B6B8C8 800F4728 4501000A */ bc1t .L800F4754 -/* B6B8CC 800F472C 00000000 */ nop -/* B6B8D0 800F4730 E4EC0004 */ swc1 $f12, 4($a3) -/* B6B8D4 800F4734 C4E40004 */ lwc1 $f4, 4($a3) -/* B6B8D8 800F4738 3C014220 */ li $at, 0x42200000 # 0.000000 -/* B6B8DC 800F473C 44814000 */ mtc1 $at, $f8 -/* B6B8E0 800F4740 46002181 */ sub.s $f6, $f4, $f0 -/* B6B8E4 800F4744 240E0028 */ li $t6, 40 -/* B6B8E8 800F4748 ACEE000C */ sw $t6, 0xc($a3) -/* B6B8EC 800F474C 46083283 */ div.s $f10, $f6, $f8 -/* B6B8F0 800F4750 E4EA0008 */ swc1 $f10, 8($a3) -.L800F4754: -/* B6B8F4 800F4754 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* B6B8F8 800F4758 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* B6B8FC 800F475C AFAF0014 */ sw $t7, 0x14($sp) -/* B6B900 800F4760 24042007 */ li $a0, 8199 -/* B6B904 800F4764 8FA50020 */ lw $a1, 0x20($sp) -/* B6B908 800F4768 24060004 */ li $a2, 4 -/* B6B90C 800F476C 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6B910 800F4770 AFA70010 */ sw $a3, 0x10($sp) -/* B6B914 800F4774 8FBF001C */ lw $ra, 0x1c($sp) -/* B6B918 800F4778 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6B91C 800F477C 03E00008 */ jr $ra -/* B6B920 800F4780 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4784.s b/asm/non_matchings/code/code_800EC960/func_800F4784.s deleted file mode 100644 index 03c38f0874..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4784.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800F4784 -/* B6B924 800F4784 8C82000C */ lw $v0, 0xc($a0) -/* B6B928 800F4788 1040000A */ beqz $v0, .L800F47B4 -/* B6B92C 800F478C 244EFFFF */ addiu $t6, $v0, -1 -/* B6B930 800F4790 11C00006 */ beqz $t6, .L800F47AC -/* B6B934 800F4794 AC8E000C */ sw $t6, 0xc($a0) -/* B6B938 800F4798 C4840000 */ lwc1 $f4, ($a0) -/* B6B93C 800F479C C4860008 */ lwc1 $f6, 8($a0) -/* B6B940 800F47A0 46062200 */ add.s $f8, $f4, $f6 -/* B6B944 800F47A4 03E00008 */ jr $ra -/* B6B948 800F47A8 E4880000 */ swc1 $f8, ($a0) -.L800F47AC: -/* B6B94C 800F47AC C48A0004 */ lwc1 $f10, 4($a0) -/* B6B950 800F47B0 E48A0000 */ swc1 $f10, ($a0) -.L800F47B4: -/* B6B954 800F47B4 03E00008 */ jr $ra -/* B6B958 800F47B8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F47BC.s b/asm/non_matchings/code/code_800EC960/func_800F47BC.s deleted file mode 100644 index 4d148e8da6..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F47BC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800F47BC -/* B6B95C 800F47BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6B960 800F47C0 AFBF0014 */ sw $ra, 0x14($sp) -/* B6B964 800F47C4 00002025 */ move $a0, $zero -/* B6B968 800F47C8 24050001 */ li $a1, 1 -/* B6B96C 800F47CC 00003025 */ move $a2, $zero -/* B6B970 800F47D0 0C03E890 */ jal func_800FA240 -/* B6B974 800F47D4 2407000A */ li $a3, 10 -/* B6B978 800F47D8 24040003 */ li $a0, 3 -/* B6B97C 800F47DC 24050001 */ li $a1, 1 -/* B6B980 800F47E0 00003025 */ move $a2, $zero -/* B6B984 800F47E4 0C03E890 */ jal func_800FA240 -/* B6B988 800F47E8 2407000A */ li $a3, 10 -/* B6B98C 800F47EC 8FBF0014 */ lw $ra, 0x14($sp) -/* B6B990 800F47F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6B994 800F47F4 03E00008 */ jr $ra -/* B6B998 800F47F8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F47FC.s b/asm/non_matchings/code/code_800EC960/func_800F47FC.s deleted file mode 100644 index 3dea9bc59a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F47FC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800F47FC -/* B6B99C 800F47FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6B9A0 800F4800 AFBF0014 */ sw $ra, 0x14($sp) -/* B6B9A4 800F4804 00002025 */ move $a0, $zero -/* B6B9A8 800F4808 24050001 */ li $a1, 1 -/* B6B9AC 800F480C 2406007F */ li $a2, 127 -/* B6B9B0 800F4810 0C03E890 */ jal func_800FA240 -/* B6B9B4 800F4814 24070003 */ li $a3, 3 -/* B6B9B8 800F4818 24040003 */ li $a0, 3 -/* B6B9BC 800F481C 24050001 */ li $a1, 1 -/* B6B9C0 800F4820 2406007F */ li $a2, 127 -/* B6B9C4 800F4824 0C03E890 */ jal func_800FA240 -/* B6B9C8 800F4828 24070003 */ li $a3, 3 -/* B6B9CC 800F482C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6B9D0 800F4830 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6B9D4 800F4834 03E00008 */ jr $ra -/* B6B9D8 800F4838 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F483C.s b/asm/non_matchings/code/code_800EC960/func_800F483C.s deleted file mode 100644 index 9f8148c729..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F483C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800F483C -/* B6B9DC 800F483C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6B9E0 800F4840 AFBF0014 */ sw $ra, 0x14($sp) -/* B6B9E4 800F4844 AFA40018 */ sw $a0, 0x18($sp) -/* B6B9E8 800F4848 AFA5001C */ sw $a1, 0x1c($sp) -/* B6B9EC 800F484C 308600FF */ andi $a2, $a0, 0xff -/* B6B9F0 800F4850 30A700FF */ andi $a3, $a1, 0xff -/* B6B9F4 800F4854 00002825 */ move $a1, $zero -/* B6B9F8 800F4858 0C03E890 */ jal func_800FA240 -/* B6B9FC 800F485C 00002025 */ move $a0, $zero -/* B6BA00 800F4860 8FBF0014 */ lw $ra, 0x14($sp) -/* B6BA04 800F4864 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6BA08 800F4868 03E00008 */ jr $ra -/* B6BA0C 800F486C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4870.s b/asm/non_matchings/code/code_800EC960/func_800F4870.s deleted file mode 100644 index fb0820e5bb..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4870.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800F4870 -/* B6BA10 800F4870 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6BA14 800F4874 AFB1001C */ sw $s1, 0x1c($sp) -/* B6BA18 800F4878 308200FF */ andi $v0, $a0, 0xff -/* B6BA1C 800F487C AFBF0024 */ sw $ra, 0x24($sp) -/* B6BA20 800F4880 AFB20020 */ sw $s2, 0x20($sp) -/* B6BA24 800F4884 AFB00018 */ sw $s0, 0x18($sp) -/* B6BA28 800F4888 AFA40030 */ sw $a0, 0x30($sp) -/* B6BA2C 800F488C 14400002 */ bnez $v0, .L800F4898 -/* B6BA30 800F4890 00008825 */ move $s1, $zero -/* B6BA34 800F4894 2411007F */ li $s1, 127 -.L800F4898: -/* B6BA38 800F4898 00008025 */ move $s0, $zero -/* B6BA3C 800F489C AFA20028 */ sw $v0, 0x28($sp) -/* B6BA40 800F48A0 3C120700 */ lui $s2, 0x700 -/* B6BA44 800F48A4 320E00FF */ andi $t6, $s0, 0xff -.L800F48A8: -/* B6BA48 800F48A8 000E7A00 */ sll $t7, $t6, 8 -/* B6BA4C 800F48AC 00112E00 */ sll $a1, $s1, 0x18 -/* B6BA50 800F48B0 00052E03 */ sra $a1, $a1, 0x18 -/* B6BA54 800F48B4 0C0396C8 */ jal func_800E5B20 -/* B6BA58 800F48B8 01F22025 */ or $a0, $t7, $s2 -/* B6BA5C 800F48BC 26100001 */ addiu $s0, $s0, 1 -/* B6BA60 800F48C0 321000FF */ andi $s0, $s0, 0xff -/* B6BA64 800F48C4 2A010010 */ slti $at, $s0, 0x10 -/* B6BA68 800F48C8 5420FFF7 */ bnezl $at, .L800F48A8 -/* B6BA6C 800F48CC 320E00FF */ andi $t6, $s0, 0xff -/* B6BA70 800F48D0 8FB80028 */ lw $t8, 0x28($sp) -/* B6BA74 800F48D4 8FA80028 */ lw $t0, 0x28($sp) -/* B6BA78 800F48D8 24010007 */ li $at, 7 -/* B6BA7C 800F48DC 17010005 */ bne $t8, $at, .L800F48F4 -/* B6BA80 800F48E0 31090007 */ andi $t1, $t0, 7 -/* B6BA84 800F48E4 24190002 */ li $t9, 2 -/* B6BA88 800F48E8 3C018013 */ lui $at, %hi(D_80130600) # $at, 0x8013 -/* B6BA8C 800F48EC 10000005 */ b .L800F4904 -/* B6BA90 800F48F0 A0390600 */ sb $t9, %lo(D_80130600)($at) -.L800F48F4: -/* B6BA94 800F48F4 3C048013 */ lui $a0, %hi(D_801305F8) -/* B6BA98 800F48F8 00892021 */ addu $a0, $a0, $t1 -/* B6BA9C 800F48FC 0C03D247 */ jal func_800F491C -/* B6BAA0 800F4900 908405F8 */ lbu $a0, %lo(D_801305F8)($a0) -.L800F4904: -/* B6BAA4 800F4904 8FBF0024 */ lw $ra, 0x24($sp) -/* B6BAA8 800F4908 8FB00018 */ lw $s0, 0x18($sp) -/* B6BAAC 800F490C 8FB1001C */ lw $s1, 0x1c($sp) -/* B6BAB0 800F4910 8FB20020 */ lw $s2, 0x20($sp) -/* B6BAB4 800F4914 03E00008 */ jr $ra -/* B6BAB8 800F4918 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F491C.s b/asm/non_matchings/code/code_800EC960/func_800F491C.s deleted file mode 100644 index cf1ced74cb..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F491C.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800F491C -/* B6BABC 800F491C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6BAC0 800F4920 3C0E8017 */ lui $t6, %hi(D_8016B8B4) # $t6, 0x8017 -/* B6BAC4 800F4924 91CEB8B4 */ lbu $t6, %lo(D_8016B8B4)($t6) -/* B6BAC8 800F4928 AFB50028 */ sw $s5, 0x28($sp) -/* B6BACC 800F492C 308600FF */ andi $a2, $a0, 0xff -/* B6BAD0 800F4930 AFBF002C */ sw $ra, 0x2c($sp) -/* B6BAD4 800F4934 AFB40024 */ sw $s4, 0x24($sp) -/* B6BAD8 800F4938 AFB30020 */ sw $s3, 0x20($sp) -/* B6BADC 800F493C AFB2001C */ sw $s2, 0x1c($sp) -/* B6BAE0 800F4940 AFB10018 */ sw $s1, 0x18($sp) -/* B6BAE4 800F4944 AFB00014 */ sw $s0, 0x14($sp) -/* B6BAE8 800F4948 AFA40030 */ sw $a0, 0x30($sp) -/* B6BAEC 800F494C 10CE0037 */ beq $a2, $t6, .L800F4A2C -/* B6BAF0 800F4950 00C0A825 */ move $s5, $a2 -/* B6BAF4 800F4954 00002025 */ move $a0, $zero -/* B6BAF8 800F4958 00002825 */ move $a1, $zero -/* B6BAFC 800F495C 24070002 */ li $a3, 2 -/* B6BB00 800F4960 0C03E890 */ jal func_800FA240 -/* B6BB04 800F4964 A3A60033 */ sb $a2, 0x33($sp) -/* B6BB08 800F4968 2AA10040 */ slti $at, $s5, 0x40 -/* B6BB0C 800F496C 10200003 */ beqz $at, .L800F497C -/* B6BB10 800F4970 26A2FFC0 */ addiu $v0, $s5, -0x40 -/* B6BB14 800F4974 10000005 */ b .L800F498C -/* B6BB18 800F4978 24020010 */ li $v0, 16 -.L800F497C: -/* B6BB1C 800F497C 00021083 */ sra $v0, $v0, 2 -/* B6BB20 800F4980 24420001 */ addiu $v0, $v0, 1 -/* B6BB24 800F4984 00021100 */ sll $v0, $v0, 4 -/* B6BB28 800F4988 304200FF */ andi $v0, $v0, 0xff -.L800F498C: -/* B6BB2C 800F498C 3C018004 */ lui $at, (0x80040F00 >> 16) # lui $at, 0x8004 -/* B6BB30 800F4990 34210F00 */ ori $at, (0x80040F00 & 0xFFFF) # ori $at, $at, 0xf00 -/* B6BB34 800F4994 0C03E803 */ jal Audio_SetBGM -/* B6BB38 800F4998 00412025 */ or $a0, $v0, $at -/* B6BB3C 800F499C 3C128017 */ lui $s2, %hi(gAudioContext) # $s2, 0x8017 -/* B6BB40 800F49A0 3C118017 */ lui $s1, %hi(gAudioContext+0x5AB0) # $s1, 0x8017 -/* B6BB44 800F49A4 26314C30 */ addiu $s1, %lo(gAudioContext+0x5AB0) # addiu $s1, $s1, 0x4c30 -/* B6BB48 800F49A8 2652F180 */ addiu $s2, %lo(gAudioContext) # addiu $s2, $s2, -0xe80 -/* B6BB4C 800F49AC 00008025 */ move $s0, $zero -/* B6BB50 800F49B0 3C140500 */ lui $s4, 0x500 -/* B6BB54 800F49B4 241300FF */ li $s3, 255 -/* B6BB58 800F49B8 00107880 */ sll $t7, $s0, 2 -.L800F49BC: -/* B6BB5C 800F49BC 024FC021 */ addu $t8, $s2, $t7 -/* B6BB60 800F49C0 8F023568 */ lw $v0, 0x3568($t8) -/* B6BB64 800F49C4 52220012 */ beql $s1, $v0, .L800F4A10 -/* B6BB68 800F49C8 26100001 */ addiu $s0, $s0, 1 -/* B6BB6C 800F49CC 804300C9 */ lb $v1, 0xc9($v0) -/* B6BB70 800F49D0 320900FF */ andi $t1, $s0, 0xff -/* B6BB74 800F49D4 00095200 */ sll $t2, $t1, 8 -/* B6BB78 800F49D8 307900FF */ andi $t9, $v1, 0xff -/* B6BB7C 800F49DC 1279000B */ beq $s3, $t9, .L800F4A0C -/* B6BB80 800F49E0 00751023 */ subu $v0, $v1, $s5 -/* B6BB84 800F49E4 2442007F */ addiu $v0, $v0, 0x7f -/* B6BB88 800F49E8 3042FFFF */ andi $v0, $v0, 0xffff -/* B6BB8C 800F49EC 28410080 */ slti $at, $v0, 0x80 -/* B6BB90 800F49F0 14200002 */ bnez $at, .L800F49FC -/* B6BB94 800F49F4 01542025 */ or $a0, $t2, $s4 -/* B6BB98 800F49F8 2402007F */ li $v0, 127 -.L800F49FC: -/* B6BB9C 800F49FC 00402825 */ move $a1, $v0 -/* B6BBA0 800F4A00 00052E00 */ sll $a1, $a1, 0x18 -/* B6BBA4 800F4A04 0C0396C8 */ jal func_800E5B20 -/* B6BBA8 800F4A08 00052E03 */ sra $a1, $a1, 0x18 -.L800F4A0C: -/* B6BBAC 800F4A0C 26100001 */ addiu $s0, $s0, 1 -.L800F4A10: -/* B6BBB0 800F4A10 321000FF */ andi $s0, $s0, 0xff -/* B6BBB4 800F4A14 2A010010 */ slti $at, $s0, 0x10 -/* B6BBB8 800F4A18 5420FFE8 */ bnezl $at, .L800F49BC -/* B6BBBC 800F4A1C 00107880 */ sll $t7, $s0, 2 -/* B6BBC0 800F4A20 93AB0033 */ lbu $t3, 0x33($sp) -/* B6BBC4 800F4A24 3C018017 */ lui $at, %hi(D_8016B8B4) # $at, 0x8017 -/* B6BBC8 800F4A28 A02BB8B4 */ sb $t3, %lo(D_8016B8B4)($at) -.L800F4A2C: -/* B6BBCC 800F4A2C 8FBF002C */ lw $ra, 0x2c($sp) -/* B6BBD0 800F4A30 8FB00014 */ lw $s0, 0x14($sp) -/* B6BBD4 800F4A34 8FB10018 */ lw $s1, 0x18($sp) -/* B6BBD8 800F4A38 8FB2001C */ lw $s2, 0x1c($sp) -/* B6BBDC 800F4A3C 8FB30020 */ lw $s3, 0x20($sp) -/* B6BBE0 800F4A40 8FB40024 */ lw $s4, 0x24($sp) -/* B6BBE4 800F4A44 8FB50028 */ lw $s5, 0x28($sp) -/* B6BBE8 800F4A48 27BD0030 */ addiu $sp, $sp, 0x30 -/* B6BBEC 800F4A4C 03E00008 */ jr $ra -/* B6BBF0 800F4A50 2402FFFF */ li $v0, -1 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4A54.s b/asm/non_matchings/code/code_800EC960/func_800F4A54.s deleted file mode 100644 index a0480eefe3..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4A54.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800F4A54 -/* B6BBF4 800F4A54 3C018017 */ lui $at, %hi(D_8016B8B0) # $at, 0x8017 -/* B6BBF8 800F4A58 A024B8B0 */ sb $a0, %lo(D_8016B8B0)($at) -/* B6BBFC 800F4A5C 3C018017 */ lui $at, %hi(D_8016B8B2) -/* B6BC00 800F4A60 240E0001 */ li $t6, 1 -/* B6BC04 800F4A64 AFA40000 */ sw $a0, ($sp) -/* B6BC08 800F4A68 03E00008 */ jr $ra -/* B6BC0C 800F4A6C A02EB8B2 */ sb $t6, %lo(D_8016B8B2)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4A70.s b/asm/non_matchings/code/code_800EC960/func_800F4A70.s deleted file mode 100644 index 2df141c978..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4A70.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_800F4A70 -/* B6BC10 800F4A70 3C0E8017 */ lui $t6, %hi(D_8016B8B2) # $t6, 0x8017 -/* B6BC14 800F4A74 91CEB8B2 */ lbu $t6, %lo(D_8016B8B2)($t6) -/* B6BC18 800F4A78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6BC1C 800F4A7C 24020001 */ li $v0, 1 -/* B6BC20 800F4A80 144E0015 */ bne $v0, $t6, .L800F4AD8 -/* B6BC24 800F4A84 AFBF0014 */ sw $ra, 0x14($sp) -/* B6BC28 800F4A88 3C068017 */ lui $a2, %hi(D_8016B8B0) # $a2, 0x8017 -/* B6BC2C 800F4A8C 3C0F8017 */ lui $t7, %hi(D_8016B8B1) # $t7, 0x8017 -/* B6BC30 800F4A90 91EFB8B1 */ lbu $t7, %lo(D_8016B8B1)($t7) -/* B6BC34 800F4A94 90C6B8B0 */ lbu $a2, %lo(D_8016B8B0)($a2) -/* B6BC38 800F4A98 00002025 */ move $a0, $zero -/* B6BC3C 800F4A9C 00002825 */ move $a1, $zero -/* B6BC40 800F4AA0 10CF000A */ beq $a2, $t7, .L800F4ACC -/* B6BC44 800F4AA4 00000000 */ nop -/* B6BC48 800F4AA8 0C03E890 */ jal func_800FA240 -/* B6BC4C 800F4AAC 2407000A */ li $a3, 10 -/* B6BC50 800F4AB0 3C188017 */ lui $t8, %hi(D_8016B8B0) # $t8, 0x8017 -/* B6BC54 800F4AB4 9318B8B0 */ lbu $t8, %lo(D_8016B8B0)($t8) -/* B6BC58 800F4AB8 3C018017 */ lui $at, %hi(D_8016B8B1) # $at, 0x8017 -/* B6BC5C 800F4ABC 24190001 */ li $t9, 1 -/* B6BC60 800F4AC0 A038B8B1 */ sb $t8, %lo(D_8016B8B1)($at) -/* B6BC64 800F4AC4 3C018017 */ lui $at, %hi(D_8016B8B3) # $at, 0x8017 -/* B6BC68 800F4AC8 A039B8B3 */ sb $t9, %lo(D_8016B8B3)($at) -.L800F4ACC: -/* B6BC6C 800F4ACC 3C018017 */ lui $at, %hi(D_8016B8B2) # $at, 0x8017 -/* B6BC70 800F4AD0 10000012 */ b .L800F4B1C -/* B6BC74 800F4AD4 A020B8B2 */ sb $zero, %lo(D_8016B8B2)($at) -.L800F4AD8: -/* B6BC78 800F4AD8 3C088017 */ lui $t0, %hi(D_8016B8B3) # $t0, 0x8017 -/* B6BC7C 800F4ADC 9108B8B3 */ lbu $t0, %lo(D_8016B8B3)($t0) -/* B6BC80 800F4AE0 3C098013 */ lui $t1, %hi(D_80130608) # $t1, 0x8013 -/* B6BC84 800F4AE4 1448000D */ bne $v0, $t0, .L800F4B1C -/* B6BC88 800F4AE8 00000000 */ nop -/* B6BC8C 800F4AEC 81290608 */ lb $t1, %lo(D_80130608)($t1) -/* B6BC90 800F4AF0 00002025 */ move $a0, $zero -/* B6BC94 800F4AF4 00002825 */ move $a1, $zero -/* B6BC98 800F4AF8 15200008 */ bnez $t1, .L800F4B1C -/* B6BC9C 800F4AFC 2406007F */ li $a2, 127 -/* B6BCA0 800F4B00 0C03E890 */ jal func_800FA240 -/* B6BCA4 800F4B04 2407000A */ li $a3, 10 -/* B6BCA8 800F4B08 240A007F */ li $t2, 127 -/* B6BCAC 800F4B0C 3C018017 */ lui $at, %hi(D_8016B8B1) # $at, 0x8017 -/* B6BCB0 800F4B10 A02AB8B1 */ sb $t2, %lo(D_8016B8B1)($at) -/* B6BCB4 800F4B14 3C018017 */ lui $at, %hi(D_8016B8B3) # $at, 0x8017 -/* B6BCB8 800F4B18 A020B8B3 */ sb $zero, %lo(D_8016B8B3)($at) -.L800F4B1C: -/* B6BCBC 800F4B1C 3C038013 */ lui $v1, %hi(D_80130600) # $v1, 0x8013 -/* B6BCC0 800F4B20 24630600 */ addiu $v1, %lo(D_80130600) # addiu $v1, $v1, 0x600 -/* B6BCC4 800F4B24 90620000 */ lbu $v0, ($v1) -/* B6BCC8 800F4B28 10400007 */ beqz $v0, .L800F4B48 -/* B6BCCC 800F4B2C 244BFFFF */ addiu $t3, $v0, -1 -/* B6BCD0 800F4B30 316C00FF */ andi $t4, $t3, 0xff -/* B6BCD4 800F4B34 15800004 */ bnez $t4, .L800F4B48 -/* B6BCD8 800F4B38 A06B0000 */ sb $t3, ($v1) -/* B6BCDC 800F4B3C 3C048013 */ lui $a0, %hi(D_801305FF) # $a0, 0x8013 -/* B6BCE0 800F4B40 0C03D247 */ jal func_800F491C -/* B6BCE4 800F4B44 908405FF */ lbu $a0, %lo(D_801305FF)($a0) -.L800F4B48: -/* B6BCE8 800F4B48 8FBF0014 */ lw $ra, 0x14($sp) -/* B6BCEC 800F4B4C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6BCF0 800F4B50 03E00008 */ jr $ra -/* B6BCF4 800F4B54 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4B58.s b/asm/non_matchings/code/code_800EC960/func_800F4B58.s deleted file mode 100644 index 2de9cf604a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4B58.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_800F4B58 -/* B6BCF8 800F4B58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6BCFC 800F4B5C AFA60028 */ sw $a2, 0x28($sp) -/* B6BD00 800F4B60 3C0E8013 */ lui $t6, %hi(D_801305CC) # $t6, 0x8013 -/* B6BD04 800F4B64 91CE05CC */ lbu $t6, %lo(D_801305CC)($t6) -/* B6BD08 800F4B68 8FAF0028 */ lw $t7, 0x28($sp) -/* B6BD0C 800F4B6C AFBF001C */ sw $ra, 0x1c($sp) -/* B6BD10 800F4B70 AFA40020 */ sw $a0, 0x20($sp) -/* B6BD14 800F4B74 AFA50024 */ sw $a1, 0x24($sp) -/* B6BD18 800F4B78 01CFC021 */ addu $t8, $t6, $t7 -/* B6BD1C 800F4B7C 93190000 */ lbu $t9, ($t8) -/* B6BD20 800F4B80 3C0A8013 */ lui $t2, %hi(gNoteFrequencies) # $t2, 0x8013 -/* B6BD24 800F4B84 3C0B8013 */ lui $t3, %hi(D_801333E0) # $t3, 0x8013 -/* B6BD28 800F4B88 3C0C8013 */ lui $t4, %hi(D_801333E8) # $t4, 0x8013 -/* B6BD2C 800F4B8C 00194080 */ sll $t0, $t9, 2 -/* B6BD30 800F4B90 00802825 */ move $a1, $a0 -/* B6BD34 800F4B94 2509009C */ addiu $t1, $t0, 0x9c -/* B6BD38 800F4B98 258C33E8 */ addiu $t4, %lo(D_801333E8) # addiu $t4, $t4, 0x33e8 -/* B6BD3C 800F4B9C 256B33E0 */ addiu $t3, %lo(D_801333E0) # addiu $t3, $t3, 0x33e0 -/* B6BD40 800F4BA0 254AF8B4 */ addiu $t2, %lo(gNoteFrequencies) # addiu $t2, $t2, -0x74c -/* B6BD44 800F4BA4 012A3821 */ addu $a3, $t1, $t2 -/* B6BD48 800F4BA8 AFAB0010 */ sw $t3, 0x10($sp) -/* B6BD4C 800F4BAC AFAC0014 */ sw $t4, 0x14($sp) -/* B6BD50 800F4BB0 97A40026 */ lhu $a0, 0x26($sp) -/* B6BD54 800F4BB4 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6BD58 800F4BB8 24060004 */ li $a2, 4 -/* B6BD5C 800F4BBC 3C038013 */ lui $v1, %hi(D_801305CC) # $v1, 0x8013 -/* B6BD60 800F4BC0 246305CC */ addiu $v1, %lo(D_801305CC) # addiu $v1, $v1, 0x5cc -/* B6BD64 800F4BC4 90620000 */ lbu $v0, ($v1) -/* B6BD68 800F4BC8 2841000F */ slti $at, $v0, 0xf -/* B6BD6C 800F4BCC 10200002 */ beqz $at, .L800F4BD8 -/* B6BD70 800F4BD0 244D0001 */ addiu $t5, $v0, 1 -/* B6BD74 800F4BD4 A06D0000 */ sb $t5, ($v1) -.L800F4BD8: -/* B6BD78 800F4BD8 8FBF001C */ lw $ra, 0x1c($sp) -/* B6BD7C 800F4BDC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6BD80 800F4BE0 03E00008 */ jr $ra -/* B6BD84 800F4BE4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4BE8.s b/asm/non_matchings/code/code_800EC960/func_800F4BE8.s deleted file mode 100644 index c6f0693f5f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4BE8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800F4BE8 -/* B6BD88 800F4BE8 3C018013 */ lui $at, %hi(D_801305CC) -/* B6BD8C 800F4BEC 03E00008 */ jr $ra -/* B6BD90 800F4BF0 A02005CC */ sb $zero, %lo(D_801305CC)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4BF4.s b/asm/non_matchings/code/code_800EC960/func_800F4BF4.s deleted file mode 100644 index 0732fa7d06..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4BF4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800F4BF4 -/* B6BD94 800F4BF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6BD98 800F4BF8 AFA60028 */ sw $a2, 0x28($sp) -/* B6BD9C 800F4BFC 83AE002B */ lb $t6, 0x2b($sp) -/* B6BDA0 800F4C00 AFA50024 */ sw $a1, 0x24($sp) -/* B6BDA4 800F4C04 3C198013 */ lui $t9, %hi(gNoteFrequencies) # $t9, 0x8013 -/* B6BDA8 800F4C08 3C088013 */ lui $t0, %hi(D_801333E0) # $t0, 0x8013 -/* B6BDAC 800F4C0C 3C098013 */ lui $t1, %hi(D_801333E8) # $t1, 0x8013 -/* B6BDB0 800F4C10 000E7880 */ sll $t7, $t6, 2 -/* B6BDB4 800F4C14 00802825 */ move $a1, $a0 -/* B6BDB8 800F4C18 AFBF001C */ sw $ra, 0x1c($sp) -/* B6BDBC 800F4C1C AFA40020 */ sw $a0, 0x20($sp) -/* B6BDC0 800F4C20 25F8009C */ addiu $t8, $t7, 0x9c -/* B6BDC4 800F4C24 252933E8 */ addiu $t1, %lo(D_801333E8) # addiu $t1, $t1, 0x33e8 -/* B6BDC8 800F4C28 250833E0 */ addiu $t0, %lo(D_801333E0) # addiu $t0, $t0, 0x33e0 -/* B6BDCC 800F4C2C 2739F8B4 */ addiu $t9, %lo(gNoteFrequencies) # addiu $t9, $t9, -0x74c -/* B6BDD0 800F4C30 03193821 */ addu $a3, $t8, $t9 -/* B6BDD4 800F4C34 AFA80010 */ sw $t0, 0x10($sp) -/* B6BDD8 800F4C38 AFA90014 */ sw $t1, 0x14($sp) -/* B6BDDC 800F4C3C 97A40026 */ lhu $a0, 0x26($sp) -/* B6BDE0 800F4C40 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6BDE4 800F4C44 24060004 */ li $a2, 4 -/* B6BDE8 800F4C48 8FBF001C */ lw $ra, 0x1c($sp) -/* B6BDEC 800F4C4C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6BDF0 800F4C50 03E00008 */ jr $ra -/* B6BDF4 800F4C54 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4C58.s b/asm/non_matchings/code/code_800EC960/func_800F4C58.s deleted file mode 100644 index 5f4c414f4e..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4C58.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_800F4C58 -/* B6BDF8 800F4C58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B6BDFC 800F4C5C AFA50054 */ sw $a1, 0x54($sp) -/* B6BE00 800F4C60 97A70056 */ lhu $a3, 0x56($sp) -/* B6BE04 800F4C64 AFB7003C */ sw $s7, 0x3c($sp) -/* B6BE08 800F4C68 AFBE0040 */ sw $fp, 0x40($sp) -/* B6BE0C 800F4C6C 00071303 */ sra $v0, $a3, 0xc -/* B6BE10 800F4C70 AFB10024 */ sw $s1, 0x24($sp) -/* B6BE14 800F4C74 AFB00020 */ sw $s0, 0x20($sp) -/* B6BE18 800F4C78 305700FF */ andi $s7, $v0, 0xff -/* B6BE1C 800F4C7C AFBF0044 */ sw $ra, 0x44($sp) -/* B6BE20 800F4C80 AFB60038 */ sw $s6, 0x38($sp) -/* B6BE24 800F4C84 AFB50034 */ sw $s5, 0x34($sp) -/* B6BE28 800F4C88 AFB40030 */ sw $s4, 0x30($sp) -/* B6BE2C 800F4C8C AFB3002C */ sw $s3, 0x2c($sp) -/* B6BE30 800F4C90 AFB20028 */ sw $s2, 0x28($sp) -/* B6BE34 800F4C94 AFA40050 */ sw $a0, 0x50($sp) -/* B6BE38 800F4C98 AFA60058 */ sw $a2, 0x58($sp) -/* B6BE3C 800F4C9C 00008825 */ move $s1, $zero -/* B6BE40 800F4CA0 305E00FF */ andi $fp, $v0, 0xff -/* B6BE44 800F4CA4 1AE00012 */ blez $s7, .L800F4CF0 -/* B6BE48 800F4CA8 00008025 */ move $s0, $zero -/* B6BE4C 800F4CAC 3C0E8013 */ lui $t6, %hi(D_801333CC) # $t6, 0x8013 -/* B6BE50 800F4CB0 91CE33CC */ lbu $t6, %lo(D_801333CC)($t6) -/* B6BE54 800F4CB4 3C188013 */ lui $t8, %hi(D_80130578) # $t8, 0x8013 -/* B6BE58 800F4CB8 27180578 */ addiu $t8, %lo(D_80130578) # addiu $t8, $t8, 0x578 -/* B6BE5C 800F4CBC 000E78C0 */ sll $t7, $t6, 3 -/* B6BE60 800F4CC0 01EE7823 */ subu $t7, $t7, $t6 -/* B6BE64 800F4CC4 01F81821 */ addu $v1, $t7, $t8 -/* B6BE68 800F4CC8 03C01025 */ move $v0, $fp -.L800F4CCC: -/* B6BE6C 800F4CCC 0070C821 */ addu $t9, $v1, $s0 -/* B6BE70 800F4CD0 93280000 */ lbu $t0, ($t9) -/* B6BE74 800F4CD4 26100001 */ addiu $s0, $s0, 1 -/* B6BE78 800F4CD8 321000FF */ andi $s0, $s0, 0xff -/* B6BE7C 800F4CDC 0202082A */ slt $at, $s0, $v0 -/* B6BE80 800F4CE0 02288821 */ addu $s1, $s1, $t0 -/* B6BE84 800F4CE4 1420FFF9 */ bnez $at, .L800F4CCC -/* B6BE88 800F4CE8 323100FF */ andi $s1, $s1, 0xff -/* B6BE8C 800F4CEC 00008025 */ move $s0, $zero -.L800F4CF0: -/* B6BE90 800F4CF0 3C098013 */ lui $t1, %hi(D_801333CC) # $t1, 0x8013 -/* B6BE94 800F4CF4 912933CC */ lbu $t1, %lo(D_801333CC)($t1) -/* B6BE98 800F4CF8 3C0B8013 */ lui $t3, %hi(D_80130578) # $t3, 0x8013 -/* B6BE9C 800F4CFC 256B0578 */ addiu $t3, %lo(D_80130578) # addiu $t3, $t3, 0x578 -/* B6BEA0 800F4D00 000950C0 */ sll $t2, $t1, 3 -/* B6BEA4 800F4D04 01495023 */ subu $t2, $t2, $t1 -/* B6BEA8 800F4D08 014B1821 */ addu $v1, $t2, $t3 -/* B6BEAC 800F4D0C 00776021 */ addu $t4, $v1, $s7 -/* B6BEB0 800F4D10 918D0000 */ lbu $t5, ($t4) -/* B6BEB4 800F4D14 00177080 */ sll $t6, $s7, 2 -/* B6BEB8 800F4D18 01D77023 */ subu $t6, $t6, $s7 -/* B6BEBC 800F4D1C 19A0002E */ blez $t5, .L800F4DD8 -/* B6BEC0 800F4D20 000E70C0 */ sll $t6, $t6, 3 -/* B6BEC4 800F4D24 3C0F8017 */ lui $t7, %hi(D_8016E1B8) # $t7, 0x8017 -/* B6BEC8 800F4D28 25EFE1B8 */ addiu $t7, %lo(D_8016E1B8) # addiu $t7, $t7, -0x1e48 -/* B6BECC 800F4D2C 3C138013 */ lui $s3, %hi(gSoundBanks) # $s3, 0x8013 -/* B6BED0 800F4D30 267333A8 */ addiu $s3, %lo(gSoundBanks) # addiu $s3, $s3, 0x33a8 -/* B6BED4 800F4D34 01CFB021 */ addu $s6, $t6, $t7 -/* B6BED8 800F4D38 3C150602 */ lui $s5, 0x602 -/* B6BEDC 800F4D3C 24140030 */ li $s4, 48 -/* B6BEE0 800F4D40 241200FF */ li $s2, 255 -.L800F4D44: -/* B6BEE4 800F4D44 0010C0C0 */ sll $t8, $s0, 3 -/* B6BEE8 800F4D48 02D8C821 */ addu $t9, $s6, $t8 -/* B6BEEC 800F4D4C 93220004 */ lbu $v0, 4($t9) -/* B6BEF0 800F4D50 5242001A */ beql $s2, $v0, .L800F4DBC -/* B6BEF4 800F4D54 007E4821 */ addu $t1, $v1, $fp -/* B6BEF8 800F4D58 00540019 */ multu $v0, $s4 -/* B6BEFC 800F4D5C 00174080 */ sll $t0, $s7, 2 -/* B6BF00 800F4D60 02684821 */ addu $t1, $s3, $t0 -/* B6BF04 800F4D64 8D2A0000 */ lw $t2, ($t1) -/* B6BF08 800F4D68 322E00FF */ andi $t6, $s1, 0xff -/* B6BF0C 800F4D6C 000E7A00 */ sll $t7, $t6, 8 -/* B6BF10 800F4D70 01F52025 */ or $a0, $t7, $s5 -/* B6BF14 800F4D74 34840006 */ ori $a0, $a0, 6 -/* B6BF18 800F4D78 83A5005B */ lb $a1, 0x5b($sp) -/* B6BF1C 800F4D7C 00005812 */ mflo $t3 -/* B6BF20 800F4D80 014B6021 */ addu $t4, $t2, $t3 -/* B6BF24 800F4D84 958D0028 */ lhu $t5, 0x28($t4) -/* B6BF28 800F4D88 54ED000C */ bnel $a3, $t5, .L800F4DBC -/* B6BF2C 800F4D8C 007E4821 */ addu $t1, $v1, $fp -/* B6BF30 800F4D90 0C0396C8 */ jal func_800E5B20 -/* B6BF34 800F4D94 AFA70048 */ sw $a3, 0x48($sp) -/* B6BF38 800F4D98 3C188013 */ lui $t8, %hi(D_801333CC) # $t8, 0x8013 -/* B6BF3C 800F4D9C 931833CC */ lbu $t8, %lo(D_801333CC)($t8) -/* B6BF40 800F4DA0 3C088013 */ lui $t0, %hi(D_80130578) # $t0, 0x8013 -/* B6BF44 800F4DA4 25080578 */ addiu $t0, %lo(D_80130578) # addiu $t0, $t0, 0x578 -/* B6BF48 800F4DA8 0018C8C0 */ sll $t9, $t8, 3 -/* B6BF4C 800F4DAC 0338C823 */ subu $t9, $t9, $t8 -/* B6BF50 800F4DB0 03281821 */ addu $v1, $t9, $t0 -/* B6BF54 800F4DB4 8FA70048 */ lw $a3, 0x48($sp) -/* B6BF58 800F4DB8 007E4821 */ addu $t1, $v1, $fp -.L800F4DBC: -/* B6BF5C 800F4DBC 912A0000 */ lbu $t2, ($t1) -/* B6BF60 800F4DC0 26100001 */ addiu $s0, $s0, 1 -/* B6BF64 800F4DC4 321000FF */ andi $s0, $s0, 0xff -/* B6BF68 800F4DC8 26310001 */ addiu $s1, $s1, 1 -/* B6BF6C 800F4DCC 020A082A */ slt $at, $s0, $t2 -/* B6BF70 800F4DD0 1420FFDC */ bnez $at, .L800F4D44 -/* B6BF74 800F4DD4 323100FF */ andi $s1, $s1, 0xff -.L800F4DD8: -/* B6BF78 800F4DD8 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6BF7C 800F4DDC 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 -/* B6BF80 800F4DE0 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6BF84 800F4DE4 256B33E8 */ addiu $t3, %lo(D_801333E8) # addiu $t3, $t3, 0x33e8 -/* B6BF88 800F4DE8 AFAB0014 */ sw $t3, 0x14($sp) -/* B6BF8C 800F4DEC AFA70010 */ sw $a3, 0x10($sp) -/* B6BF90 800F4DF0 97A40056 */ lhu $a0, 0x56($sp) -/* B6BF94 800F4DF4 8FA50050 */ lw $a1, 0x50($sp) -/* B6BF98 800F4DF8 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6BF9C 800F4DFC 24060004 */ li $a2, 4 -/* B6BFA0 800F4E00 8FBF0044 */ lw $ra, 0x44($sp) -/* B6BFA4 800F4E04 8FB00020 */ lw $s0, 0x20($sp) -/* B6BFA8 800F4E08 8FB10024 */ lw $s1, 0x24($sp) -/* B6BFAC 800F4E0C 8FB20028 */ lw $s2, 0x28($sp) -/* B6BFB0 800F4E10 8FB3002C */ lw $s3, 0x2c($sp) -/* B6BFB4 800F4E14 8FB40030 */ lw $s4, 0x30($sp) -/* B6BFB8 800F4E18 8FB50034 */ lw $s5, 0x34($sp) -/* B6BFBC 800F4E1C 8FB60038 */ lw $s6, 0x38($sp) -/* B6BFC0 800F4E20 8FB7003C */ lw $s7, 0x3c($sp) -/* B6BFC4 800F4E24 8FBE0040 */ lw $fp, 0x40($sp) -/* B6BFC8 800F4E28 03E00008 */ jr $ra -/* B6BFCC 800F4E2C 27BD0050 */ addiu $sp, $sp, 0x50 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F4E30.s b/asm/non_matchings/code/code_800EC960/func_800F4E30.s deleted file mode 100644 index d8bd53bb2a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F4E30.s +++ /dev/null @@ -1,196 +0,0 @@ -.late_rodata -glabel D_8014A610 - .float 0.1 - -glabel D_8014A614 - .float 0.89999997 - -glabel D_8014A618 - .float 0.1 - -.text -glabel func_800F4E30 -/* B6BFD0 800F4E30 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B6BFD4 800F4E34 3C038013 */ lui $v1, %hi(D_8013064C) -/* B6BFD8 800F4E38 2463064C */ addiu $v1, %lo(D_8013064C) # addiu $v1, $v1, 0x64c -/* B6BFDC 800F4E3C 8C620000 */ lw $v0, ($v1) -/* B6BFE0 800F4E40 44856000 */ mtc1 $a1, $f12 -/* B6BFE4 800F4E44 AFBF003C */ sw $ra, 0x3c($sp) -/* B6BFE8 800F4E48 AFB40038 */ sw $s4, 0x38($sp) -/* B6BFEC 800F4E4C AFB30034 */ sw $s3, 0x34($sp) -/* B6BFF0 800F4E50 AFB20030 */ sw $s2, 0x30($sp) -/* B6BFF4 800F4E54 AFB1002C */ sw $s1, 0x2c($sp) -/* B6BFF8 800F4E58 AFB00028 */ sw $s0, 0x28($sp) -/* B6BFFC 800F4E5C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B6C000 800F4E60 14400008 */ bnez $v0, .L800F4E84 -/* B6C004 800F4E64 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B6C008 800F4E68 3C058013 */ lui $a1, %hi(D_80130650) # $a1, 0x8013 -/* B6C00C 800F4E6C 24A50650 */ addiu $a1, %lo(D_80130650) # addiu $a1, $a1, 0x650 -/* B6C010 800F4E70 E4AC0000 */ swc1 $f12, ($a1) -/* B6C014 800F4E74 AC640000 */ sw $a0, ($v1) -/* B6C018 800F4E78 C4A00000 */ lwc1 $f0, ($a1) -/* B6C01C 800F4E7C 10000012 */ b .L800F4EC8 -/* B6C020 800F4E80 00801025 */ move $v0, $a0 -.L800F4E84: -/* B6C024 800F4E84 1082000C */ beq $a0, $v0, .L800F4EB8 -/* B6C028 800F4E88 3C058013 */ lui $a1, %hi(D_80130650) # $a1, 0x8013 -/* B6C02C 800F4E8C 24A50650 */ addiu $a1, %lo(D_80130650) # addiu $a1, $a1, 0x650 -/* B6C030 800F4E90 C4A00000 */ lwc1 $f0, ($a1) -/* B6C034 800F4E94 4600603C */ c.lt.s $f12, $f0 -/* B6C038 800F4E98 00000000 */ nop -/* B6C03C 800F4E9C 4502000B */ bc1fl .L800F4ECC -/* B6C040 800F4EA0 3C0142C8 */ lui $at, 0x42c8 -/* B6C044 800F4EA4 E4AC0000 */ swc1 $f12, ($a1) -/* B6C048 800F4EA8 AC640000 */ sw $a0, ($v1) -/* B6C04C 800F4EAC C4A00000 */ lwc1 $f0, ($a1) -/* B6C050 800F4EB0 10000005 */ b .L800F4EC8 -/* B6C054 800F4EB4 00801025 */ move $v0, $a0 -.L800F4EB8: -/* B6C058 800F4EB8 3C058013 */ lui $a1, %hi(D_80130650) # $a1, 0x8013 -/* B6C05C 800F4EBC 24A50650 */ addiu $a1, %lo(D_80130650) # addiu $a1, $a1, 0x650 -/* B6C060 800F4EC0 E4AC0000 */ swc1 $f12, ($a1) -/* B6C064 800F4EC4 C4A00000 */ lwc1 $f0, ($a1) -.L800F4EC8: -/* B6C068 800F4EC8 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -.L800F4ECC: -/* B6C06C 800F4ECC 44817000 */ mtc1 $at, $f14 -/* B6C070 800F4ED0 C4420000 */ lwc1 $f2, ($v0) -/* B6C074 800F4ED4 00001025 */ move $v0, $zero -/* B6C078 800F4ED8 00008025 */ move $s0, $zero -/* B6C07C 800F4EDC 4602703C */ c.lt.s $f14, $f2 -/* B6C080 800F4EE0 3C130300 */ lui $s3, 0x300 -/* B6C084 800F4EE4 3C126002 */ lui $s2, 0x6002 -/* B6C088 800F4EE8 45020004 */ bc1fl .L800F4EFC -/* B6C08C 800F4EEC 3C01C2C8 */ lui $at, 0xc2c8 -/* B6C090 800F4EF0 10000015 */ b .L800F4F48 -/* B6C094 800F4EF4 2414007F */ li $s4, 127 -/* B6C098 800F4EF8 3C01C2C8 */ li $at, 0xC2C80000 # 0.000000 -.L800F4EFC: -/* B6C09C 800F4EFC 44812000 */ mtc1 $at, $f4 -/* B6C0A0 800F4F00 00000000 */ nop -/* B6C0A4 800F4F04 4604103C */ c.lt.s $f2, $f4 -/* B6C0A8 800F4F08 00000000 */ nop -/* B6C0AC 800F4F0C 45020004 */ bc1fl .L800F4F20 -/* B6C0B0 800F4F10 460E1183 */ div.s $f6, $f2, $f14 -/* B6C0B4 800F4F14 1000000C */ b .L800F4F48 -/* B6C0B8 800F4F18 0000A025 */ move $s4, $zero -/* B6C0BC 800F4F1C 460E1183 */ div.s $f6, $f2, $f14 -.L800F4F20: -/* B6C0C0 800F4F20 3C014280 */ li $at, 0x42800000 # 0.000000 -/* B6C0C4 800F4F24 44816000 */ mtc1 $at, $f12 -/* B6C0C8 800F4F28 00000000 */ nop -/* B6C0CC 800F4F2C 460C3202 */ mul.s $f8, $f6, $f12 -/* B6C0D0 800F4F30 460C4280 */ add.s $f10, $f8, $f12 -/* B6C0D4 800F4F34 4600540D */ trunc.w.s $f16, $f10 -/* B6C0D8 800F4F38 44148000 */ mfc1 $s4, $f16 -/* B6C0DC 800F4F3C 00000000 */ nop -/* B6C0E0 800F4F40 0014A600 */ sll $s4, $s4, 0x18 -/* B6C0E4 800F4F44 0014A603 */ sra $s4, $s4, 0x18 -.L800F4F48: -/* B6C0E8 800F4F48 3C0143C8 */ li $at, 0x43C80000 # 0.000000 -/* B6C0EC 800F4F4C 44819000 */ mtc1 $at, $f18 -/* B6C0F0 800F4F50 00000000 */ nop -/* B6C0F4 800F4F54 4600903C */ c.lt.s $f18, $f0 -/* B6C0F8 800F4F58 00000000 */ nop -/* B6C0FC 800F4F5C 45000003 */ bc1f .L800F4F6C -/* B6C100 800F4F60 3C018015 */ lui $at, %hi(D_8014A610) -/* B6C104 800F4F64 10000018 */ b .L800F4FC8 -/* B6C108 800F4F68 C436A610 */ lwc1 $f22, %lo(D_8014A610)($at) -.L800F4F6C: -/* B6C10C 800F4F6C 3C0142F0 */ li $at, 0x42F00000 # 0.000000 -/* B6C110 800F4F70 44811000 */ mtc1 $at, $f2 -/* B6C114 800F4F74 3C01438C */ lui $at, 0x438c -/* B6C118 800F4F78 4602003C */ c.lt.s $f0, $f2 -/* B6C11C 800F4F7C 00000000 */ nop -/* B6C120 800F4F80 45020006 */ bc1fl .L800F4F9C -/* B6C124 800F4F84 46020101 */ sub.s $f4, $f0, $f2 -/* B6C128 800F4F88 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6C12C 800F4F8C 4481B000 */ mtc1 $at, $f22 -/* B6C130 800F4F90 1000000E */ b .L800F4FCC -/* B6C134 800F4F94 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B6C138 800F4F98 46020101 */ sub.s $f4, $f0, $f2 -.L800F4F9C: -/* B6C13C 800F4F9C 44813000 */ mtc1 $at, $f6 -/* B6C140 800F4FA0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6C144 800F4FA4 44815000 */ mtc1 $at, $f10 -/* B6C148 800F4FA8 46062203 */ div.s $f8, $f4, $f6 -/* B6C14C 800F4FAC 3C018015 */ lui $at, %hi(D_8014A614) -/* B6C150 800F4FB0 C432A614 */ lwc1 $f18, %lo(D_8014A614)($at) -/* B6C154 800F4FB4 3C018015 */ lui $at, %hi(D_8014A618) -/* B6C158 800F4FB8 C426A618 */ lwc1 $f6, %lo(D_8014A618)($at) -/* B6C15C 800F4FBC 46085401 */ sub.s $f16, $f10, $f8 -/* B6C160 800F4FC0 46128102 */ mul.s $f4, $f16, $f18 -/* B6C164 800F4FC4 46062580 */ add.s $f22, $f4, $f6 -.L800F4FC8: -/* B6C168 800F4FC8 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -.L800F4FCC: -/* B6C16C 800F4FCC 4481A000 */ mtc1 $at, $f20 -/* B6C170 800F4FD0 24110009 */ li $s1, 9 -.L800F4FD4: -/* B6C174 800F4FD4 5222002F */ beql $s1, $v0, .L800F5094 -/* B6C178 800F4FD8 26100001 */ addiu $s0, $s0, 1 -/* B6C17C 800F4FDC 4616A282 */ mul.s $f10, $f20, $f22 -/* B6C180 800F4FE0 24080001 */ li $t0, 1 -/* B6C184 800F4FE4 00027A00 */ sll $t7, $v0, 8 -/* B6C188 800F4FE8 01F2C025 */ or $t8, $t7, $s2 -/* B6C18C 800F4FEC 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B6C190 800F4FF0 4459F800 */ cfc1 $t9, $31 -/* B6C194 800F4FF4 44C8F800 */ ctc1 $t0, $31 -/* B6C198 800F4FF8 00000000 */ nop -/* B6C19C 800F4FFC 46005224 */ cvt.w.s $f8, $f10 -/* B6C1A0 800F5000 4448F800 */ cfc1 $t0, $31 -/* B6C1A4 800F5004 00000000 */ nop -/* B6C1A8 800F5008 31080078 */ andi $t0, $t0, 0x78 -/* B6C1AC 800F500C 51000013 */ beql $t0, $zero, .L800F505C -/* B6C1B0 800F5010 44084000 */ mfc1 $t0, $f8 -/* B6C1B4 800F5014 44814000 */ mtc1 $at, $f8 -/* B6C1B8 800F5018 24080001 */ li $t0, 1 -/* B6C1BC 800F501C 46085201 */ sub.s $f8, $f10, $f8 -/* B6C1C0 800F5020 44C8F800 */ ctc1 $t0, $31 -/* B6C1C4 800F5024 00000000 */ nop -/* B6C1C8 800F5028 46004224 */ cvt.w.s $f8, $f8 -/* B6C1CC 800F502C 4448F800 */ cfc1 $t0, $31 -/* B6C1D0 800F5030 00000000 */ nop -/* B6C1D4 800F5034 31080078 */ andi $t0, $t0, 0x78 -/* B6C1D8 800F5038 15000005 */ bnez $t0, .L800F5050 -/* B6C1DC 800F503C 00000000 */ nop -/* B6C1E0 800F5040 44084000 */ mfc1 $t0, $f8 -/* B6C1E4 800F5044 3C018000 */ lui $at, 0x8000 -/* B6C1E8 800F5048 10000007 */ b .L800F5068 -/* B6C1EC 800F504C 01014025 */ or $t0, $t0, $at -.L800F5050: -/* B6C1F0 800F5050 10000005 */ b .L800F5068 -/* B6C1F4 800F5054 2408FFFF */ li $t0, -1 -/* B6C1F8 800F5058 44084000 */ mfc1 $t0, $f8 -.L800F505C: -/* B6C1FC 800F505C 00000000 */ nop -/* B6C200 800F5060 0500FFFB */ bltz $t0, .L800F5050 -/* B6C204 800F5064 00000000 */ nop -.L800F5068: -/* B6C208 800F5068 44D9F800 */ ctc1 $t9, $31 -/* B6C20C 800F506C 310900FF */ andi $t1, $t0, 0xff -/* B6C210 800F5070 0C03E803 */ jal Audio_SetBGM -/* B6C214 800F5074 03092025 */ or $a0, $t8, $t1 -/* B6C218 800F5078 320A00FF */ andi $t2, $s0, 0xff -/* B6C21C 800F507C 000A5A00 */ sll $t3, $t2, 8 -/* B6C220 800F5080 00142E00 */ sll $a1, $s4, 0x18 -/* B6C224 800F5084 00052E03 */ sra $a1, $a1, 0x18 -/* B6C228 800F5088 0C0396C8 */ jal func_800E5B20 -/* B6C22C 800F508C 01732025 */ or $a0, $t3, $s3 -/* B6C230 800F5090 26100001 */ addiu $s0, $s0, 1 -.L800F5094: -/* B6C234 800F5094 321000FF */ andi $s0, $s0, 0xff -/* B6C238 800F5098 2A010010 */ slti $at, $s0, 0x10 -/* B6C23C 800F509C 1420FFCD */ bnez $at, .L800F4FD4 -/* B6C240 800F50A0 02001025 */ move $v0, $s0 -/* B6C244 800F50A4 8FBF003C */ lw $ra, 0x3c($sp) -/* B6C248 800F50A8 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B6C24C 800F50AC D7B60020 */ ldc1 $f22, 0x20($sp) -/* B6C250 800F50B0 8FB00028 */ lw $s0, 0x28($sp) -/* B6C254 800F50B4 8FB1002C */ lw $s1, 0x2c($sp) -/* B6C258 800F50B8 8FB20030 */ lw $s2, 0x30($sp) -/* B6C25C 800F50BC 8FB30034 */ lw $s3, 0x34($sp) -/* B6C260 800F50C0 8FB40038 */ lw $s4, 0x38($sp) -/* B6C264 800F50C4 03E00008 */ jr $ra -/* B6C268 800F50C8 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F50CC.s b/asm/non_matchings/code/code_800EC960/func_800F50CC.s deleted file mode 100644 index 2474c11827..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F50CC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800F50CC -/* B6C26C 800F50CC 3C028013 */ lui $v0, %hi(D_8013064C) # $v0, 0x8013 -/* B6C270 800F50D0 2442064C */ addiu $v0, %lo(D_8013064C) # addiu $v0, $v0, 0x64c -/* B6C274 800F50D4 8C4E0000 */ lw $t6, ($v0) -/* B6C278 800F50D8 11C00002 */ beqz $t6, .L800F50E4 -/* B6C27C 800F50DC 00000000 */ nop -/* B6C280 800F50E0 AC400000 */ sw $zero, ($v0) -.L800F50E4: -/* B6C284 800F50E4 03E00008 */ jr $ra -/* B6C288 800F50E8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F50EC.s b/asm/non_matchings/code/code_800EC960/func_800F50EC.s deleted file mode 100644 index 7b94b59a2f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F50EC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800F50EC -/* B6C28C 800F50EC 3C028013 */ lui $v0, %hi(D_8013064C) # $v0, 0x8013 -/* B6C290 800F50F0 2442064C */ addiu $v0, %lo(D_8013064C) # addiu $v0, $v0, 0x64c -/* B6C294 800F50F4 8C4E0000 */ lw $t6, ($v0) -/* B6C298 800F50F8 148E0002 */ bne $a0, $t6, .L800F5104 -/* B6C29C 800F50FC 00000000 */ nop -/* B6C2A0 800F5100 AC400000 */ sw $zero, ($v0) -.L800F5104: -/* B6C2A4 800F5104 03E00008 */ jr $ra -/* B6C2A8 800F5108 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F510C.s b/asm/non_matchings/code/code_800EC960/func_800F510C.s index d51b8c91b0..d27163452a 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F510C.s +++ b/asm/non_matchings/code/code_800EC960/func_800F510C.s @@ -94,7 +94,7 @@ glabel func_800F510C /* B6C3F8 800F5258 00024080 */ sll $t0, $v0, 2 /* B6C3FC 800F525C 00077600 */ sll $t6, $a3, 0x18 /* B6C400 800F5260 01D27825 */ or $t7, $t6, $s2 -/* B6C404 800F5264 0C03E803 */ jal Audio_SetBGM +/* B6C404 800F5264 0C03E803 */ jal Audio_QueueSeqCmd /* B6C408 800F5268 01E52025 */ or $a0, $t7, $a1 /* B6C40C 800F526C 26100001 */ addiu $s0, $s0, 1 /* B6C410 800F5270 321000FF */ andi $s0, $s0, 0xff diff --git a/asm/non_matchings/code/code_800EC960/func_800F52A0.s b/asm/non_matchings/code/code_800EC960/func_800F52A0.s deleted file mode 100644 index c9d2338f36..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F52A0.s +++ /dev/null @@ -1,167 +0,0 @@ -glabel func_800F52A0 -/* B6C440 800F52A0 3C038017 */ lui $v1, %hi(D_8016B9F3) # $v1, 0x8017 -/* B6C444 800F52A4 2463B9F3 */ addiu $v1, %lo(D_8016B9F3) # addiu $v1, $v1, -0x460d -/* B6C448 800F52A8 90620000 */ lbu $v0, ($v1) -/* B6C44C 800F52AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B6C450 800F52B0 AFBF001C */ sw $ra, 0x1c($sp) -/* B6C454 800F52B4 AFA40038 */ sw $a0, 0x38($sp) -/* B6C458 800F52B8 AFA5003C */ sw $a1, 0x3c($sp) -/* B6C45C 800F52BC 10400004 */ beqz $v0, .L800F52D0 -/* B6C460 800F52C0 AFA60040 */ sw $a2, 0x40($sp) -/* B6C464 800F52C4 244EFFFF */ addiu $t6, $v0, -1 -/* B6C468 800F52C8 1000008A */ b .L800F54F4 -/* B6C46C 800F52CC A06E0000 */ sb $t6, ($v1) -.L800F52D0: -/* B6C470 800F52D0 8FAF0038 */ lw $t7, 0x38($sp) -/* B6C474 800F52D4 3C038013 */ lui $v1, %hi(D_8013064C) -/* B6C478 800F52D8 2463064C */ addiu $v1, %lo(D_8013064C) # addiu $v1, $v1, 0x64c -/* B6C47C 800F52DC C5E20008 */ lwc1 $f2, 8($t7) -/* B6C480 800F52E0 C5EC0000 */ lwc1 $f12, ($t7) -/* B6C484 800F52E4 8C620000 */ lw $v0, ($v1) -/* B6C488 800F52E8 46021102 */ mul.s $f4, $f2, $f2 -/* B6C48C 800F52EC 00000000 */ nop -/* B6C490 800F52F0 460C6182 */ mul.s $f6, $f12, $f12 -/* B6C494 800F52F4 46062000 */ add.s $f0, $f4, $f6 -/* B6C498 800F52F8 1440000C */ bnez $v0, .L800F532C -/* B6C49C 800F52FC 46000384 */ sqrt.s $f14, $f0 -/* B6C4A0 800F5300 24180002 */ li $t8, 2 -/* B6C4A4 800F5304 AC6F0000 */ sw $t7, ($v1) -/* B6C4A8 800F5308 AFB80010 */ sw $t8, 0x10($sp) -/* B6C4AC 800F530C 24040003 */ li $a0, 3 -/* B6C4B0 800F5310 97A5003E */ lhu $a1, 0x3e($sp) -/* B6C4B4 800F5314 00003025 */ move $a2, $zero -/* B6C4B8 800F5318 24070007 */ li $a3, 7 -/* B6C4BC 800F531C 0C03D786 */ jal func_800F5E18 -/* B6C4C0 800F5320 E7AE0030 */ swc1 $f14, 0x30($sp) -/* B6C4C4 800F5324 10000010 */ b .L800F5368 -/* B6C4C8 800F5328 C7AE0030 */ lwc1 $f14, 0x30($sp) -.L800F532C: -/* B6C4CC 800F532C C4420008 */ lwc1 $f2, 8($v0) -/* B6C4D0 800F5330 C44C0000 */ lwc1 $f12, ($v0) -/* B6C4D4 800F5334 8FB90038 */ lw $t9, 0x38($sp) -/* B6C4D8 800F5338 46021202 */ mul.s $f8, $f2, $f2 -/* B6C4DC 800F533C 00000000 */ nop -/* B6C4E0 800F5340 460C6282 */ mul.s $f10, $f12, $f12 -/* B6C4E4 800F5344 460A4000 */ add.s $f0, $f8, $f10 -/* B6C4E8 800F5348 46000004 */ sqrt.s $f0, $f0 -/* B6C4EC 800F534C 4600703C */ c.lt.s $f14, $f0 -/* B6C4F0 800F5350 00000000 */ nop -/* B6C4F4 800F5354 45000003 */ bc1f .L800F5364 -/* B6C4F8 800F5358 00000000 */ nop -/* B6C4FC 800F535C 10000002 */ b .L800F5368 -/* B6C500 800F5360 AC790000 */ sw $t9, ($v1) -.L800F5364: -/* B6C504 800F5364 46000386 */ mov.s $f14, $f0 -.L800F5368: -/* B6C508 800F5368 8FA80038 */ lw $t0, 0x38($sp) -/* B6C50C 800F536C 44808000 */ mtc1 $zero, $f16 -/* B6C510 800F5370 97A90042 */ lhu $t1, 0x42($sp) -/* B6C514 800F5374 C5000004 */ lwc1 $f0, 4($t0) -/* B6C518 800F5378 97AB003E */ lhu $t3, 0x3e($sp) -/* B6C51C 800F537C 44899000 */ mtc1 $t1, $f18 -/* B6C520 800F5380 4610003C */ c.lt.s $f0, $f16 -/* B6C524 800F5384 00000000 */ nop -/* B6C528 800F5388 45020004 */ bc1fl .L800F539C -/* B6C52C 800F538C 46000086 */ mov.s $f2, $f0 -/* B6C530 800F5390 10000002 */ b .L800F539C -/* B6C534 800F5394 46000087 */ neg.s $f2, $f0 -/* B6C538 800F5398 46000086 */ mov.s $f2, $f0 -.L800F539C: -/* B6C53C 800F539C 05210005 */ bgez $t1, .L800F53B4 -/* B6C540 800F53A0 46809020 */ cvt.s.w $f0, $f18 -/* B6C544 800F53A4 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B6C548 800F53A8 44812000 */ mtc1 $at, $f4 -/* B6C54C 800F53AC 00000000 */ nop -/* B6C550 800F53B0 46040000 */ add.s $f0, $f0, $f4 -.L800F53B4: -/* B6C554 800F53B4 3C014170 */ li $at, 0x41700000 # 0.000000 -/* B6C558 800F53B8 44813000 */ mtc1 $at, $f6 -/* B6C55C 800F53BC 00000000 */ nop -/* B6C560 800F53C0 46060203 */ div.s $f8, $f0, $f6 -/* B6C564 800F53C4 4602403C */ c.lt.s $f8, $f2 -/* B6C568 800F53C8 00000000 */ nop -/* B6C56C 800F53CC 45020004 */ bc1fl .L800F53E0 -/* B6C570 800F53D0 4600703C */ c.lt.s $f14, $f0 -/* B6C574 800F53D4 10000033 */ b .L800F54A4 -/* B6C578 800F53D8 00003025 */ move $a2, $zero -/* B6C57C 800F53DC 4600703C */ c.lt.s $f14, $f0 -.L800F53E0: -/* B6C580 800F53E0 00003025 */ move $a2, $zero -/* B6C584 800F53E4 4500002F */ bc1f .L800F54A4 -/* B6C588 800F53E8 00000000 */ nop -/* B6C58C 800F53EC 46007403 */ div.s $f16, $f14, $f0 -/* B6C590 800F53F0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6C594 800F53F4 44815000 */ mtc1 $at, $f10 -/* B6C598 800F53F8 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B6C59C 800F53FC 44812000 */ mtc1 $at, $f4 -/* B6C5A0 800F5400 24060001 */ li $a2, 1 -/* B6C5A4 800F5404 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B6C5A8 800F5408 46105481 */ sub.s $f18, $f10, $f16 -/* B6C5AC 800F540C 46049182 */ mul.s $f6, $f18, $f4 -/* B6C5B0 800F5410 444AF800 */ cfc1 $t2, $31 -/* B6C5B4 800F5414 44C6F800 */ ctc1 $a2, $31 -/* B6C5B8 800F5418 00000000 */ nop -/* B6C5BC 800F541C 46003224 */ cvt.w.s $f8, $f6 -/* B6C5C0 800F5420 4446F800 */ cfc1 $a2, $31 -/* B6C5C4 800F5424 00000000 */ nop -/* B6C5C8 800F5428 30C60078 */ andi $a2, $a2, 0x78 -/* B6C5CC 800F542C 50C00017 */ beql $a2, $zero, .L800F548C -/* B6C5D0 800F5430 44064000 */ mfc1 $a2, $f8 -/* B6C5D4 800F5434 44814000 */ mtc1 $at, $f8 -/* B6C5D8 800F5438 24060001 */ li $a2, 1 -/* B6C5DC 800F543C 46083201 */ sub.s $f8, $f6, $f8 -/* B6C5E0 800F5440 44C6F800 */ ctc1 $a2, $31 -/* B6C5E4 800F5444 00000000 */ nop -/* B6C5E8 800F5448 46004224 */ cvt.w.s $f8, $f8 -/* B6C5EC 800F544C 4446F800 */ cfc1 $a2, $31 -/* B6C5F0 800F5450 00000000 */ nop -/* B6C5F4 800F5454 30C60078 */ andi $a2, $a2, 0x78 -/* B6C5F8 800F5458 54C00008 */ bnezl $a2, .L800F547C -/* B6C5FC 800F545C 2406FFFF */ li $a2, -1 -/* B6C600 800F5460 44064000 */ mfc1 $a2, $f8 -/* B6C604 800F5464 3C018000 */ lui $at, 0x8000 -/* B6C608 800F5468 44CAF800 */ ctc1 $t2, $31 -/* B6C60C 800F546C 00C13025 */ or $a2, $a2, $at -/* B6C610 800F5470 1000000C */ b .L800F54A4 -/* B6C614 800F5474 30C600FF */ andi $a2, $a2, 0xff -/* B6C618 800F5478 2406FFFF */ li $a2, -1 -.L800F547C: -/* B6C61C 800F547C 44CAF800 */ ctc1 $t2, $31 -/* B6C620 800F5480 10000008 */ b .L800F54A4 -/* B6C624 800F5484 30C600FF */ andi $a2, $a2, 0xff -/* B6C628 800F5488 44064000 */ mfc1 $a2, $f8 -.L800F548C: -/* B6C62C 800F548C 00000000 */ nop -/* B6C630 800F5490 04C2FFFA */ bltzl $a2, .L800F547C -/* B6C634 800F5494 2406FFFF */ li $a2, -1 -/* B6C638 800F5498 44CAF800 */ ctc1 $t2, $31 -/* B6C63C 800F549C 10000001 */ b .L800F54A4 -/* B6C640 800F54A0 30C600FF */ andi $a2, $a2, 0xff -.L800F54A4: -/* B6C644 800F54A4 24010028 */ li $at, 40 -/* B6C648 800F54A8 11610005 */ beq $t3, $at, .L800F54C0 -/* B6C64C 800F54AC 00062600 */ sll $a0, $a2, 0x18 -/* B6C650 800F54B0 00042603 */ sra $a0, $a0, 0x18 -/* B6C654 800F54B4 0C03D443 */ jal func_800F510C -/* B6C658 800F54B8 A3A6002F */ sb $a2, 0x2f($sp) -/* B6C65C 800F54BC 93A6002F */ lbu $a2, 0x2f($sp) -.L800F54C0: -/* B6C660 800F54C0 24040003 */ li $a0, 3 -/* B6C664 800F54C4 24050003 */ li $a1, 3 -/* B6C668 800F54C8 00003825 */ move $a3, $zero -/* B6C66C 800F54CC 0C03E890 */ jal func_800FA240 -/* B6C670 800F54D0 AFA60024 */ sw $a2, 0x24($sp) -/* B6C674 800F54D4 8FAC0024 */ lw $t4, 0x24($sp) -/* B6C678 800F54D8 240D007F */ li $t5, 127 -/* B6C67C 800F54DC 00002025 */ move $a0, $zero -/* B6C680 800F54E0 01AC3023 */ subu $a2, $t5, $t4 -/* B6C684 800F54E4 30C600FF */ andi $a2, $a2, 0xff -/* B6C688 800F54E8 24050003 */ li $a1, 3 -/* B6C68C 800F54EC 0C03E890 */ jal func_800FA240 -/* B6C690 800F54F0 00003825 */ move $a3, $zero -.L800F54F4: -/* B6C694 800F54F4 8FBF001C */ lw $ra, 0x1c($sp) -/* B6C698 800F54F8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B6C69C 800F54FC 03E00008 */ jr $ra -/* B6C6A0 800F5500 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5504.s b/asm/non_matchings/code/code_800EC960/func_800F5504.s deleted file mode 100644 index fed2814ce0..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5504.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800F5504 -/* B6C6A4 800F5504 3C018013 */ lui $at, %hi(D_8013064C) -/* B6C6A8 800F5508 03E00008 */ jr $ra -/* B6C6AC 800F550C AC20064C */ sw $zero, %lo(D_8013064C)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5510.s b/asm/non_matchings/code/code_800EC960/func_800F5510.s deleted file mode 100644 index 4a68f63d2a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5510.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800F5510 -/* B6C6B0 800F5510 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6C6B4 800F5514 AFBF001C */ sw $ra, 0x1c($sp) -/* B6C6B8 800F5518 AFA40020 */ sw $a0, 0x20($sp) -/* B6C6BC 800F551C 0C03D554 */ jal func_800F5550 -/* B6C6C0 800F5520 97A40022 */ lhu $a0, 0x22($sp) -/* B6C6C4 800F5524 240E0001 */ li $t6, 1 -/* B6C6C8 800F5528 AFAE0010 */ sw $t6, 0x10($sp) -/* B6C6CC 800F552C 00002025 */ move $a0, $zero -/* B6C6D0 800F5530 97A50022 */ lhu $a1, 0x22($sp) -/* B6C6D4 800F5534 00003025 */ move $a2, $zero -/* B6C6D8 800F5538 0C03D786 */ jal func_800F5E18 -/* B6C6DC 800F553C 00003825 */ move $a3, $zero -/* B6C6E0 800F5540 8FBF001C */ lw $ra, 0x1c($sp) -/* B6C6E4 800F5544 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6C6E8 800F5548 03E00008 */ jr $ra -/* B6C6EC 800F554C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5550.s b/asm/non_matchings/code/code_800EC960/func_800F5550.s deleted file mode 100644 index 6af3b9eb1e..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5550.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_800F5550 -/* B6C6F0 800F5550 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6C6F4 800F5554 AFBF001C */ sw $ra, 0x1c($sp) -/* B6C6F8 800F5558 AFA40028 */ sw $a0, 0x28($sp) -/* B6C6FC 800F555C A3A00027 */ sb $zero, 0x27($sp) -/* B6C700 800F5560 0C03E82D */ jal func_800FA0B4 -/* B6C704 800F5564 00002025 */ move $a0, $zero -/* B6C708 800F5568 2401004C */ li $at, 76 -/* B6C70C 800F556C 5041004B */ beql $v0, $at, .L800F569C -/* B6C710 800F5570 8FBF001C */ lw $ra, 0x1c($sp) -/* B6C714 800F5574 0C03E82D */ jal func_800FA0B4 -/* B6C718 800F5578 24040003 */ li $a0, 3 -/* B6C71C 800F557C 2401002F */ li $at, 47 -/* B6C720 800F5580 14410006 */ bne $v0, $at, .L800F559C -/* B6C724 800F5584 24040003 */ li $a0, 3 -/* B6C728 800F5588 0C03E51D */ jal func_800F9474 -/* B6C72C 800F558C 00002825 */ move $a1, $zero -/* B6C730 800F5590 3C04F800 */ lui $a0, 0xf800 -/* B6C734 800F5594 0C0396BF */ jal func_800E5AFC -/* B6C738 800F5598 00002825 */ move $a1, $zero -.L800F559C: -/* B6C73C 800F559C 3C0E8013 */ lui $t6, %hi(D_80130630) # $t6, 0x8013 -/* B6C740 800F55A0 91CE0630 */ lbu $t6, %lo(D_80130630)($t6) -/* B6C744 800F55A4 3C088013 */ lui $t0, %hi(D_80130658) # $t0, 0x8013 -/* B6C748 800F55A8 25080658 */ addiu $t0, %lo(D_80130658) # addiu $t0, $t0, 0x658 -/* B6C74C 800F55AC 010E7821 */ addu $t7, $t0, $t6 -/* B6C750 800F55B0 91F80000 */ lbu $t8, ($t7) -/* B6C754 800F55B4 97A5002A */ lhu $a1, 0x2a($sp) -/* B6C758 800F55B8 00002025 */ move $a0, $zero -/* B6C75C 800F55BC 33190020 */ andi $t9, $t8, 0x20 -/* B6C760 800F55C0 13200018 */ beqz $t9, .L800F5624 -/* B6C764 800F55C4 30A300FF */ andi $v1, $a1, 0xff -/* B6C768 800F55C8 306900FF */ andi $t1, $v1, 0xff -/* B6C76C 800F55CC 01095021 */ addu $t2, $t0, $t1 -/* B6C770 800F55D0 914B0000 */ lbu $t3, ($t2) -/* B6C774 800F55D4 3C028013 */ lui $v0, %hi(D_8013062C) # $v0, 0x8013 -/* B6C778 800F55D8 24070007 */ li $a3, 7 -/* B6C77C 800F55DC 316C0010 */ andi $t4, $t3, 0x10 -/* B6C780 800F55E0 51800011 */ beql $t4, $zero, .L800F5628 -/* B6C784 800F55E4 97A5002A */ lhu $a1, 0x2a($sp) -/* B6C788 800F55E8 9042062C */ lbu $v0, %lo(D_8013062C)($v0) -/* B6C78C 800F55EC 240E001E */ li $t6, 30 -/* B6C790 800F55F0 00002025 */ move $a0, $zero -/* B6C794 800F55F4 304D003F */ andi $t5, $v0, 0x3f -/* B6C798 800F55F8 51A00003 */ beql $t5, $zero, .L800F5608 -/* B6C79C 800F55FC 93A60027 */ lbu $a2, 0x27($sp) -/* B6C7A0 800F5600 A3AE0027 */ sb $t6, 0x27($sp) -/* B6C7A4 800F5604 93A60027 */ lbu $a2, 0x27($sp) -.L800F5608: -/* B6C7A8 800F5608 AFA20010 */ sw $v0, 0x10($sp) -/* B6C7AC 800F560C 0C03D786 */ jal func_800F5E18 -/* B6C7B0 800F5610 AFA30020 */ sw $v1, 0x20($sp) -/* B6C7B4 800F5614 3C018013 */ lui $at, %hi(D_8013062C) # $at, 0x8013 -/* B6C7B8 800F5618 8FA30020 */ lw $v1, 0x20($sp) -/* B6C7BC 800F561C 1000001C */ b .L800F5690 -/* B6C7C0 800F5620 A020062C */ sb $zero, %lo(D_8013062C)($at) -.L800F5624: -/* B6C7C4 800F5624 97A5002A */ lhu $a1, 0x2a($sp) -.L800F5628: -/* B6C7C8 800F5628 240200FF */ li $v0, 255 -/* B6C7CC 800F562C 00003025 */ move $a2, $zero -/* B6C7D0 800F5630 30A300FF */ andi $v1, $a1, 0xff -/* B6C7D4 800F5634 306F00FF */ andi $t7, $v1, 0xff -/* B6C7D8 800F5638 010FC021 */ addu $t8, $t0, $t7 -/* B6C7DC 800F563C 93190000 */ lbu $t9, ($t8) -/* B6C7E0 800F5640 24070007 */ li $a3, 7 -/* B6C7E4 800F5644 33290040 */ andi $t1, $t9, 0x40 -/* B6C7E8 800F5648 11200003 */ beqz $t1, .L800F5658 -/* B6C7EC 800F564C 00000000 */ nop -/* B6C7F0 800F5650 10000001 */ b .L800F5658 -/* B6C7F4 800F5654 24020001 */ li $v0, 1 -.L800F5658: -/* B6C7F8 800F5658 AFA20010 */ sw $v0, 0x10($sp) -/* B6C7FC 800F565C 0C03D786 */ jal func_800F5E18 -/* B6C800 800F5660 AFA30020 */ sw $v1, 0x20($sp) -/* B6C804 800F5664 97AA002A */ lhu $t2, 0x2a($sp) -/* B6C808 800F5668 3C088013 */ lui $t0, %hi(D_80130658) # $t0, 0x8013 -/* B6C80C 800F566C 25080658 */ addiu $t0, %lo(D_80130658) # addiu $t0, $t0, 0x658 -/* B6C810 800F5670 010A5821 */ addu $t3, $t0, $t2 -/* B6C814 800F5674 916C0000 */ lbu $t4, ($t3) -/* B6C818 800F5678 8FA30020 */ lw $v1, 0x20($sp) -/* B6C81C 800F567C 240E00C0 */ li $t6, 192 -/* B6C820 800F5680 318D0020 */ andi $t5, $t4, 0x20 -/* B6C824 800F5684 15A00002 */ bnez $t5, .L800F5690 -/* B6C828 800F5688 3C018013 */ lui $at, %hi(D_8013062C) # $at, 0x8013 -/* B6C82C 800F568C A02E062C */ sb $t6, %lo(D_8013062C)($at) -.L800F5690: -/* B6C830 800F5690 3C018013 */ lui $at, %hi(D_80130630) # $at, 0x8013 -/* B6C834 800F5694 A0230630 */ sb $v1, %lo(D_80130630)($at) -/* B6C838 800F5698 8FBF001C */ lw $ra, 0x1c($sp) -.L800F569C: -/* B6C83C 800F569C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B6C840 800F56A0 03E00008 */ jr $ra -/* B6C844 800F56A4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F56A8.s b/asm/non_matchings/code/code_800EC960/func_800F56A8.s deleted file mode 100644 index cf1b383556..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F56A8.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800F56A8 -/* B6C848 800F56A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6C84C 800F56AC AFBF0014 */ sw $ra, 0x14($sp) -/* B6C850 800F56B0 0C03E82D */ jal func_800FA0B4 -/* B6C854 800F56B4 00002025 */ move $a0, $zero -/* B6C858 800F56B8 3401FFFF */ li $at, 65535 -/* B6C85C 800F56BC 10410012 */ beq $v0, $at, .L800F5708 -/* B6C860 800F56C0 304F00FF */ andi $t7, $v0, 0xff -/* B6C864 800F56C4 3C188013 */ lui $t8, %hi(D_80130658) -/* B6C868 800F56C8 030FC021 */ addu $t8, $t8, $t7 -/* B6C86C 800F56CC 93180658 */ lbu $t8, %lo(D_80130658)($t8) -/* B6C870 800F56D0 3C028013 */ lui $v0, %hi(D_8013062C) # $v0, 0x8013 -/* B6C874 800F56D4 2442062C */ addiu $v0, %lo(D_8013062C) # addiu $v0, $v0, 0x62c -/* B6C878 800F56D8 33190010 */ andi $t9, $t8, 0x10 -/* B6C87C 800F56DC 5320000B */ beql $t9, $zero, .L800F570C -/* B6C880 800F56E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B6C884 800F56E4 90480000 */ lbu $t0, ($v0) -/* B6C888 800F56E8 240100C0 */ li $at, 192 -/* B6C88C 800F56EC 3C098017 */ lui $t1, %hi(gAudioContext+0x368b) # $t1, 0x8017 -/* B6C890 800F56F0 51010005 */ beql $t0, $at, .L800F5708 -/* B6C894 800F56F4 A0400000 */ sb $zero, ($v0) -/* B6C898 800F56F8 8129280B */ lb $t1, %lo(gAudioContext+0x368b)($t1) -/* B6C89C 800F56FC 10000002 */ b .L800F5708 -/* B6C8A0 800F5700 A0490000 */ sb $t1, ($v0) -/* B6C8A4 800F5704 A0400000 */ sb $zero, ($v0) -.L800F5708: -/* B6C8A8 800F5708 8FBF0014 */ lw $ra, 0x14($sp) -.L800F570C: -/* B6C8AC 800F570C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6C8B0 800F5710 03E00008 */ jr $ra -/* B6C8B4 800F5714 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5718.s b/asm/non_matchings/code/code_800EC960/func_800F5718.s deleted file mode 100644 index 7381f40840..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5718.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800F5718 -/* B6C8B8 800F5718 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6C8BC 800F571C AFBF0014 */ sw $ra, 0x14($sp) -/* B6C8C0 800F5720 0C03E82D */ jal func_800FA0B4 -/* B6C8C4 800F5724 00002025 */ move $a0, $zero -/* B6C8C8 800F5728 2401004C */ li $at, 76 -/* B6C8CC 800F572C 50410004 */ beql $v0, $at, .L800F5740 -/* B6C8D0 800F5730 8FBF0014 */ lw $ra, 0x14($sp) -/* B6C8D4 800F5734 0C03E803 */ jal Audio_SetBGM -/* B6C8D8 800F5738 2404004C */ li $a0, 76 -/* B6C8DC 800F573C 8FBF0014 */ lw $ra, 0x14($sp) -.L800F5740: -/* B6C8E0 800F5740 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6C8E4 800F5744 03E00008 */ jr $ra -/* B6C8E8 800F5748 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F574C.s b/asm/non_matchings/code/code_800EC960/func_800F574C.s deleted file mode 100644 index 134e89d8f4..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F574C.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_800F574C -/* B6C8EC 800F574C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6C8F0 800F5750 44812000 */ mtc1 $at, $f4 -/* B6C8F4 800F5754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6C8F8 800F5758 AFA5002C */ sw $a1, 0x2c($sp) -/* B6C8FC 800F575C 46046032 */ c.eq.s $f12, $f4 -/* B6C900 800F5760 30A600FF */ andi $a2, $a1, 0xff -/* B6C904 800F5764 AFBF0014 */ sw $ra, 0x14($sp) -/* B6C908 800F5768 00C02825 */ move $a1, $a2 -/* B6C90C 800F576C 45000035 */ bc1f .L800F5844 -/* B6C910 800F5770 3C0142C8 */ lui $at, 0x42c8 -/* B6C914 800F5774 3C01B000 */ lui $at, (0xB0004000 >> 16) # lui $at, 0xb000 -/* B6C918 800F5778 34214000 */ ori $at, (0xB0004000 & 0xFFFF) # ori $at, $at, 0x4000 -/* B6C91C 800F577C 00062400 */ sll $a0, $a2, 0x10 -/* B6C920 800F5780 00812025 */ or $a0, $a0, $at -/* B6C924 800F5784 AFA60024 */ sw $a2, 0x24($sp) -/* B6C928 800F5788 0C03E803 */ jal Audio_SetBGM -/* B6C92C 800F578C E7AC0028 */ swc1 $f12, 0x28($sp) -/* B6C930 800F5790 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -/* B6C934 800F5794 44813000 */ mtc1 $at, $f6 -/* B6C938 800F5798 C7AC0028 */ lwc1 $f12, 0x28($sp) -/* B6C93C 800F579C 24030001 */ li $v1, 1 -/* B6C940 800F57A0 8FA50024 */ lw $a1, 0x24($sp) -/* B6C944 800F57A4 46066202 */ mul.s $f8, $f12, $f6 -/* B6C948 800F57A8 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B6C94C 800F57AC 00051200 */ sll $v0, $a1, 8 -/* B6C950 800F57B0 444EF800 */ cfc1 $t6, $31 -/* B6C954 800F57B4 44C3F800 */ ctc1 $v1, $31 -/* B6C958 800F57B8 00000000 */ nop -/* B6C95C 800F57BC 460042A4 */ cvt.w.s $f10, $f8 -/* B6C960 800F57C0 4443F800 */ cfc1 $v1, $31 -/* B6C964 800F57C4 00000000 */ nop -/* B6C968 800F57C8 30630078 */ andi $v1, $v1, 0x78 -/* B6C96C 800F57CC 50600017 */ beql $v1, $zero, .L800F582C -/* B6C970 800F57D0 44035000 */ mfc1 $v1, $f10 -/* B6C974 800F57D4 44815000 */ mtc1 $at, $f10 -/* B6C978 800F57D8 24030001 */ li $v1, 1 -/* B6C97C 800F57DC 460A4281 */ sub.s $f10, $f8, $f10 -/* B6C980 800F57E0 44C3F800 */ ctc1 $v1, $31 -/* B6C984 800F57E4 00000000 */ nop -/* B6C988 800F57E8 460052A4 */ cvt.w.s $f10, $f10 -/* B6C98C 800F57EC 4443F800 */ cfc1 $v1, $31 -/* B6C990 800F57F0 00000000 */ nop -/* B6C994 800F57F4 30630078 */ andi $v1, $v1, 0x78 -/* B6C998 800F57F8 54600008 */ bnezl $v1, .L800F581C -/* B6C99C 800F57FC 2403FFFF */ li $v1, -1 -/* B6C9A0 800F5800 44035000 */ mfc1 $v1, $f10 -/* B6C9A4 800F5804 3C018000 */ li $at, 0x80000000 # 0.000000 -/* B6C9A8 800F5808 44CEF800 */ ctc1 $t6, $31 -/* B6C9AC 800F580C 00611825 */ or $v1, $v1, $at -/* B6C9B0 800F5810 10000039 */ b .L800F58F8 -/* B6C9B4 800F5814 306300FF */ andi $v1, $v1, 0xff -/* B6C9B8 800F5818 2403FFFF */ li $v1, -1 -.L800F581C: -/* B6C9BC 800F581C 44CEF800 */ ctc1 $t6, $31 -/* B6C9C0 800F5820 10000035 */ b .L800F58F8 -/* B6C9C4 800F5824 306300FF */ andi $v1, $v1, 0xff -/* B6C9C8 800F5828 44035000 */ mfc1 $v1, $f10 -.L800F582C: -/* B6C9CC 800F582C 00000000 */ nop -/* B6C9D0 800F5830 0462FFFA */ bltzl $v1, .L800F581C -/* B6C9D4 800F5834 2403FFFF */ li $v1, -1 -/* B6C9D8 800F5838 44CEF800 */ ctc1 $t6, $31 -/* B6C9DC 800F583C 1000002E */ b .L800F58F8 -/* B6C9E0 800F5840 306300FF */ andi $v1, $v1, 0xff -.L800F5844: -/* B6C9E4 800F5844 44818000 */ mtc1 $at, $f16 -/* B6C9E8 800F5848 24030001 */ li $v1, 1 -/* B6C9EC 800F584C 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B6C9F0 800F5850 46106482 */ mul.s $f18, $f12, $f16 -/* B6C9F4 800F5854 00061200 */ sll $v0, $a2, 8 -/* B6C9F8 800F5858 444FF800 */ cfc1 $t7, $31 -/* B6C9FC 800F585C 44C3F800 */ ctc1 $v1, $31 -/* B6CA00 800F5860 00000000 */ nop -/* B6CA04 800F5864 46009124 */ cvt.w.s $f4, $f18 -/* B6CA08 800F5868 4443F800 */ cfc1 $v1, $31 -/* B6CA0C 800F586C 00000000 */ nop -/* B6CA10 800F5870 30630078 */ andi $v1, $v1, 0x78 -/* B6CA14 800F5874 50600013 */ beql $v1, $zero, .L800F58C4 -/* B6CA18 800F5878 44032000 */ mfc1 $v1, $f4 -/* B6CA1C 800F587C 44812000 */ mtc1 $at, $f4 -/* B6CA20 800F5880 24030001 */ li $v1, 1 -/* B6CA24 800F5884 46049101 */ sub.s $f4, $f18, $f4 -/* B6CA28 800F5888 44C3F800 */ ctc1 $v1, $31 -/* B6CA2C 800F588C 00000000 */ nop -/* B6CA30 800F5890 46002124 */ cvt.w.s $f4, $f4 -/* B6CA34 800F5894 4443F800 */ cfc1 $v1, $31 -/* B6CA38 800F5898 00000000 */ nop -/* B6CA3C 800F589C 30630078 */ andi $v1, $v1, 0x78 -/* B6CA40 800F58A0 14600005 */ bnez $v1, .L800F58B8 -/* B6CA44 800F58A4 00000000 */ nop -/* B6CA48 800F58A8 44032000 */ mfc1 $v1, $f4 -/* B6CA4C 800F58AC 3C018000 */ lui $at, 0x8000 -/* B6CA50 800F58B0 10000007 */ b .L800F58D0 -/* B6CA54 800F58B4 00611825 */ or $v1, $v1, $at -.L800F58B8: -/* B6CA58 800F58B8 10000005 */ b .L800F58D0 -/* B6CA5C 800F58BC 2403FFFF */ li $v1, -1 -/* B6CA60 800F58C0 44032000 */ mfc1 $v1, $f4 -.L800F58C4: -/* B6CA64 800F58C4 00000000 */ nop -/* B6CA68 800F58C8 0460FFFB */ bltz $v1, .L800F58B8 -/* B6CA6C 800F58CC 00000000 */ nop -.L800F58D0: -/* B6CA70 800F58D0 3C01C130 */ lui $at, 0xc130 -/* B6CA74 800F58D4 0041C025 */ or $t8, $v0, $at -/* B6CA78 800F58D8 44CFF800 */ ctc1 $t7, $31 -/* B6CA7C 800F58DC 306300FF */ andi $v1, $v1, 0xff -/* B6CA80 800F58E0 03032025 */ or $a0, $t8, $v1 -/* B6CA84 800F58E4 AFA3001C */ sw $v1, 0x1c($sp) -/* B6CA88 800F58E8 0C03E803 */ jal Audio_SetBGM -/* B6CA8C 800F58EC AFA20020 */ sw $v0, 0x20($sp) -/* B6CA90 800F58F0 8FA20020 */ lw $v0, 0x20($sp) -/* B6CA94 800F58F4 8FA3001C */ lw $v1, 0x1c($sp) -.L800F58F8: -/* B6CA98 800F58F8 3C01C1A0 */ lui $at, 0xc1a0 -/* B6CA9C 800F58FC 0041C825 */ or $t9, $v0, $at -/* B6CAA0 800F5900 0C03E803 */ jal Audio_SetBGM -/* B6CAA4 800F5904 03232025 */ or $a0, $t9, $v1 -/* B6CAA8 800F5908 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CAAC 800F590C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B6CAB0 800F5910 03E00008 */ jr $ra -/* B6CAB4 800F5914 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5918.s b/asm/non_matchings/code/code_800EC960/func_800F5918.s deleted file mode 100644 index 14c77cac22..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5918.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_800F5918 -/* B6CAB8 800F5918 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6CABC 800F591C AFBF0014 */ sw $ra, 0x14($sp) -/* B6CAC0 800F5920 0C03E82D */ jal func_800FA0B4 -/* B6CAC4 800F5924 00002025 */ move $a0, $zero -/* B6CAC8 800F5928 2401006C */ li $at, 108 -/* B6CACC 800F592C 14410007 */ bne $v0, $at, .L800F594C -/* B6CAD0 800F5930 00002025 */ move $a0, $zero -/* B6CAD4 800F5934 0C03E847 */ jal func_800FA11C -/* B6CAD8 800F5938 3C05F000 */ lui $a1, 0xf000 -/* B6CADC 800F593C 10400003 */ beqz $v0, .L800F594C -/* B6CAE0 800F5940 3C04B005 */ lui $a0, (0xB00500D2 >> 16) # lui $a0, 0xb005 -/* B6CAE4 800F5944 0C03E803 */ jal Audio_SetBGM -/* B6CAE8 800F5948 348400D2 */ ori $a0, (0xB00500D2 & 0xFFFF) # ori $a0, $a0, 0xd2 -.L800F594C: -/* B6CAEC 800F594C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CAF0 800F5950 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6CAF4 800F5954 03E00008 */ jr $ra -/* B6CAF8 800F5958 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F595C.s b/asm/non_matchings/code/code_800EC960/func_800F595C.s deleted file mode 100644 index 77d8c47093..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F595C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800F595C -/* B6CAFC 800F595C 3085FFFF */ andi $a1, $a0, 0xffff -/* B6CB00 800F5960 30AF00FF */ andi $t7, $a1, 0xff -/* B6CB04 800F5964 3C038013 */ lui $v1, %hi(D_80130658) -/* B6CB08 800F5968 006F1821 */ addu $v1, $v1, $t7 -/* B6CB0C 800F596C 90630658 */ lbu $v1, %lo(D_80130658)($v1) -/* B6CB10 800F5970 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6CB14 800F5974 AFBF001C */ sw $ra, 0x1c($sp) -/* B6CB18 800F5978 30780002 */ andi $t8, $v1, 2 -/* B6CB1C 800F597C AFA40020 */ sw $a0, 0x20($sp) -/* B6CB20 800F5980 13000005 */ beqz $t8, .L800F5998 -/* B6CB24 800F5984 00A01025 */ move $v0, $a1 -/* B6CB28 800F5988 0C03D719 */ jal func_800F5C64 -/* B6CB2C 800F598C 30A4FFFF */ andi $a0, $a1, 0xffff -/* B6CB30 800F5990 10000012 */ b .L800F59DC -/* B6CB34 800F5994 8FBF001C */ lw $ra, 0x1c($sp) -.L800F5998: -/* B6CB38 800F5998 30790004 */ andi $t9, $v1, 4 -/* B6CB3C 800F599C 13200006 */ beqz $t9, .L800F59B8 -/* B6CB40 800F59A0 00002025 */ move $a0, $zero -/* B6CB44 800F59A4 3C010100 */ lui $at, 0x100 -/* B6CB48 800F59A8 0C03E803 */ jal Audio_SetBGM -/* B6CB4C 800F59AC 00412025 */ or $a0, $v0, $at -/* B6CB50 800F59B0 1000000A */ b .L800F59DC -/* B6CB54 800F59B4 8FBF001C */ lw $ra, 0x1c($sp) -.L800F59B8: -/* B6CB58 800F59B8 2408FFFF */ li $t0, -1 -/* B6CB5C 800F59BC AFA80010 */ sw $t0, 0x10($sp) -/* B6CB60 800F59C0 00003025 */ move $a2, $zero -/* B6CB64 800F59C4 0C03D786 */ jal func_800F5E18 -/* B6CB68 800F59C8 24070007 */ li $a3, 7 -/* B6CB6C 800F59CC 3C041100 */ lui $a0, (0x110000FF >> 16) # lui $a0, 0x1100 -/* B6CB70 800F59D0 0C03E803 */ jal Audio_SetBGM -/* B6CB74 800F59D4 348400FF */ ori $a0, (0x110000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6CB78 800F59D8 8FBF001C */ lw $ra, 0x1c($sp) -.L800F59DC: -/* B6CB7C 800F59DC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6CB80 800F59E0 03E00008 */ jr $ra -/* B6CB84 800F59E4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F59E8.s b/asm/non_matchings/code/code_800EC960/func_800F59E8.s deleted file mode 100644 index f79dbe78d8..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F59E8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800F59E8 -/* B6CB88 800F59E8 308F00FF */ andi $t7, $a0, 0xff -/* B6CB8C 800F59EC 3C028013 */ lui $v0, %hi(D_80130658) -/* B6CB90 800F59F0 004F1021 */ addu $v0, $v0, $t7 -/* B6CB94 800F59F4 90420658 */ lbu $v0, %lo(D_80130658)($v0) -/* B6CB98 800F59F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6CB9C 800F59FC AFBF0014 */ sw $ra, 0x14($sp) -/* B6CBA0 800F5A00 30580002 */ andi $t8, $v0, 2 -/* B6CBA4 800F5A04 13000006 */ beqz $t8, .L800F5A20 -/* B6CBA8 800F5A08 AFA40018 */ sw $a0, 0x18($sp) -/* B6CBAC 800F5A0C 3C041100 */ lui $a0, (0x110000FF >> 16) # lui $a0, 0x1100 -/* B6CBB0 800F5A10 0C03E803 */ jal Audio_SetBGM -/* B6CBB4 800F5A14 348400FF */ ori $a0, (0x110000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6CBB8 800F5A18 1000000C */ b .L800F5A4C -/* B6CBBC 800F5A1C 8FBF0014 */ lw $ra, 0x14($sp) -.L800F5A20: -/* B6CBC0 800F5A20 30590004 */ andi $t9, $v0, 4 -/* B6CBC4 800F5A24 13200006 */ beqz $t9, .L800F5A40 -/* B6CBC8 800F5A28 3C041000 */ lui $a0, 0x1000 -/* B6CBCC 800F5A2C 3C041100 */ lui $a0, (0x110000FF >> 16) # lui $a0, 0x1100 -/* B6CBD0 800F5A30 0C03E803 */ jal Audio_SetBGM -/* B6CBD4 800F5A34 348400FF */ ori $a0, (0x110000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6CBD8 800F5A38 10000004 */ b .L800F5A4C -/* B6CBDC 800F5A3C 8FBF0014 */ lw $ra, 0x14($sp) -.L800F5A40: -/* B6CBE0 800F5A40 0C03E803 */ jal Audio_SetBGM -/* B6CBE4 800F5A44 348400FF */ ori $a0, (0x110000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6CBE8 800F5A48 8FBF0014 */ lw $ra, 0x14($sp) -.L800F5A4C: -/* B6CBEC 800F5A4C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6CBF0 800F5A50 03E00008 */ jr $ra -/* B6CBF4 800F5A54 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5A58.s b/asm/non_matchings/code/code_800EC960/func_800F5A58.s deleted file mode 100644 index ac82cbbaf4..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5A58.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_800F5A58 -/* B6CBF8 800F5A58 308300FF */ andi $v1, $a0, 0xff -/* B6CBFC 800F5A5C 306E00FF */ andi $t6, $v1, 0xff -/* B6CC00 800F5A60 3C028013 */ lui $v0, %hi(D_80130658) -/* B6CC04 800F5A64 004E1021 */ addu $v0, $v0, $t6 -/* B6CC08 800F5A68 90420658 */ lbu $v0, %lo(D_80130658)($v0) -/* B6CC0C 800F5A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6CC10 800F5A70 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CC14 800F5A74 304F0002 */ andi $t7, $v0, 2 -/* B6CC18 800F5A78 AFA40020 */ sw $a0, 0x20($sp) -/* B6CC1C 800F5A7C 11E00003 */ beqz $t7, .L800F5A8C -/* B6CC20 800F5A80 00002825 */ move $a1, $zero -/* B6CC24 800F5A84 10000005 */ b .L800F5A9C -/* B6CC28 800F5A88 24050001 */ li $a1, 1 -.L800F5A8C: -/* B6CC2C 800F5A8C 30580004 */ andi $t8, $v0, 4 -/* B6CC30 800F5A90 53000003 */ beql $t8, $zero, .L800F5AA0 -/* B6CC34 800F5A94 30A400FF */ andi $a0, $a1, 0xff -/* B6CC38 800F5A98 24050001 */ li $a1, 1 -.L800F5A9C: -/* B6CC3C 800F5A9C 30A400FF */ andi $a0, $a1, 0xff -.L800F5AA0: -/* B6CC40 800F5AA0 0C03E82D */ jal func_800FA0B4 -/* B6CC44 800F5AA4 AFA30018 */ sw $v1, 0x18($sp) -/* B6CC48 800F5AA8 8FA30018 */ lw $v1, 0x18($sp) -/* B6CC4C 800F5AAC 305900FF */ andi $t9, $v0, 0xff -/* B6CC50 800F5AB0 00001025 */ move $v0, $zero -/* B6CC54 800F5AB4 14790003 */ bne $v1, $t9, .L800F5AC4 -/* B6CC58 800F5AB8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CC5C 800F5ABC 10000001 */ b .L800F5AC4 -/* B6CC60 800F5AC0 24020001 */ li $v0, 1 -.L800F5AC4: -/* B6CC64 800F5AC4 03E00008 */ jr $ra -/* B6CC68 800F5AC8 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5ACC.s b/asm/non_matchings/code/code_800EC960/func_800F5ACC.s deleted file mode 100644 index cad4b69af7..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5ACC.s +++ /dev/null @@ -1,46 +0,0 @@ -.rdata -glabel D_8014A460 - .asciz "Middle Boss BGM Start not stack \n" - .balign 4 - -.text -glabel func_800F5ACC -/* B6CC6C 800F5ACC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6CC70 800F5AD0 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CC74 800F5AD4 AFA40028 */ sw $a0, 0x28($sp) -/* B6CC78 800F5AD8 0C03E82D */ jal func_800FA0B4 -/* B6CC7C 800F5ADC 00002025 */ move $a0, $zero -/* B6CC80 800F5AE0 304400FF */ andi $a0, $v0, 0xff -/* B6CC84 800F5AE4 2401002E */ li $at, 46 -/* B6CC88 800F5AE8 10810017 */ beq $a0, $at, .L800F5B48 -/* B6CC8C 800F5AEC 3045FFFF */ andi $a1, $v0, 0xffff -/* B6CC90 800F5AF0 24010062 */ li $at, 98 -/* B6CC94 800F5AF4 10810014 */ beq $a0, $at, .L800F5B48 -/* B6CC98 800F5AF8 97A6002A */ lhu $a2, 0x2a($sp) -/* B6CC9C 800F5AFC 10C20012 */ beq $a2, $v0, .L800F5B48 -/* B6CCA0 800F5B00 24040003 */ li $a0, 3 -/* B6CCA4 800F5B04 A7A50026 */ sh $a1, 0x26($sp) -/* B6CCA8 800F5B08 0C03D7A4 */ jal func_800F5E90 -/* B6CCAC 800F5B0C AFA6001C */ sw $a2, 0x1c($sp) -/* B6CCB0 800F5B10 97A50026 */ lhu $a1, 0x26($sp) -/* B6CCB4 800F5B14 3401FFFF */ li $at, 65535 -/* B6CCB8 800F5B18 8FA6001C */ lw $a2, 0x1c($sp) -/* B6CCBC 800F5B1C 10A10004 */ beq $a1, $at, .L800F5B30 -/* B6CCC0 800F5B20 3C048015 */ lui $a0, %hi(D_8014A460) # $a0, 0x8015 -/* B6CCC4 800F5B24 3C018013 */ lui $at, %hi(D_80130628) # $at, 0x8013 -/* B6CCC8 800F5B28 10000005 */ b .L800F5B40 -/* B6CCCC 800F5B2C A4250628 */ sh $a1, %lo(D_80130628)($at) -.L800F5B30: -/* B6CCD0 800F5B30 2484A460 */ addiu $a0, %lo(D_8014A460) # addiu $a0, $a0, -0x5ba0 -/* B6CCD4 800F5B34 0C00084C */ jal osSyncPrintf -/* B6CCD8 800F5B38 AFA6001C */ sw $a2, 0x1c($sp) -/* B6CCDC 800F5B3C 8FA6001C */ lw $a2, 0x1c($sp) -.L800F5B40: -/* B6CCE0 800F5B40 0C03E803 */ jal Audio_SetBGM -/* B6CCE4 800F5B44 00C02025 */ move $a0, $a2 -.L800F5B48: -/* B6CCE8 800F5B48 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CCEC 800F5B4C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B6CCF0 800F5B50 03E00008 */ jr $ra -/* B6CCF4 800F5B54 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5B58.s b/asm/non_matchings/code/code_800EC960/func_800F5B58.s deleted file mode 100644 index 31572c4781..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5B58.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800F5B58 -/* B6CCF8 800F5B58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6CCFC 800F5B5C AFBF0014 */ sw $ra, 0x14($sp) -/* B6CD00 800F5B60 0C03E82D */ jal func_800FA0B4 -/* B6CD04 800F5B64 00002025 */ move $a0, $zero -/* B6CD08 800F5B68 3403FFFF */ li $v1, 65535 -/* B6CD0C 800F5B6C 1062001C */ beq $v1, $v0, .L800F5BE0 -/* B6CD10 800F5B70 3C0E8013 */ lui $t6, %hi(D_80130628) # $t6, 0x8013 -/* B6CD14 800F5B74 95CE0628 */ lhu $t6, %lo(D_80130628)($t6) -/* B6CD18 800F5B78 506E001A */ beql $v1, $t6, .L800F5BE4 -/* B6CD1C 800F5B7C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CD20 800F5B80 0C03E82D */ jal func_800FA0B4 -/* B6CD24 800F5B84 00002025 */ move $a0, $zero -/* B6CD28 800F5B88 304F00FF */ andi $t7, $v0, 0xff -/* B6CD2C 800F5B8C 3C188013 */ lui $t8, %hi(D_80130658) -/* B6CD30 800F5B90 030FC021 */ addu $t8, $t8, $t7 -/* B6CD34 800F5B94 93180658 */ lbu $t8, %lo(D_80130658)($t8) -/* B6CD38 800F5B98 3403FFFF */ li $v1, 65535 -/* B6CD3C 800F5B9C 3C028013 */ lui $v0, %hi(D_80130628) # $v0, 0x8013 -/* B6CD40 800F5BA0 33190008 */ andi $t9, $t8, 8 -/* B6CD44 800F5BA4 5320000F */ beql $t9, $zero, .L800F5BE4 -/* B6CD48 800F5BA8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CD4C 800F5BAC 94420628 */ lhu $v0, %lo(D_80130628)($v0) -/* B6CD50 800F5BB0 3C041000 */ lui $a0, (0x100000FF >> 16) # lui $a0, 0x1000 -/* B6CD54 800F5BB4 14620005 */ bne $v1, $v0, .L800F5BCC -/* B6CD58 800F5BB8 00000000 */ nop -/* B6CD5C 800F5BBC 0C03E803 */ jal Audio_SetBGM -/* B6CD60 800F5BC0 348400FF */ ori $a0, (0x100000FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6CD64 800F5BC4 10000004 */ b .L800F5BD8 -/* B6CD68 800F5BC8 3408FFFF */ li $t0, 65535 -.L800F5BCC: -/* B6CD6C 800F5BCC 0C03E803 */ jal Audio_SetBGM -/* B6CD70 800F5BD0 00402025 */ move $a0, $v0 -/* B6CD74 800F5BD4 3408FFFF */ li $t0, 65535 -.L800F5BD8: -/* B6CD78 800F5BD8 3C018013 */ lui $at, %hi(D_80130628) # $at, 0x8013 -/* B6CD7C 800F5BDC A4280628 */ sh $t0, %lo(D_80130628)($at) -.L800F5BE0: -/* B6CD80 800F5BE0 8FBF0014 */ lw $ra, 0x14($sp) -.L800F5BE4: -/* B6CD84 800F5BE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6CD88 800F5BE8 03E00008 */ jr $ra -/* B6CD8C 800F5BEC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5BF0.s b/asm/non_matchings/code/code_800EC960/func_800F5BF0.s deleted file mode 100644 index 39de6465e7..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5BF0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800F5BF0 -/* B6CD90 800F5BF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6CD94 800F5BF4 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CD98 800F5BF8 AFA40018 */ sw $a0, 0x18($sp) -/* B6CD9C 800F5BFC 0C03E82D */ jal func_800FA0B4 -/* B6CDA0 800F5C00 00002025 */ move $a0, $zero -/* B6CDA4 800F5C04 24010001 */ li $at, 1 -/* B6CDA8 800F5C08 10410002 */ beq $v0, $at, .L800F5C14 -/* B6CDAC 800F5C0C 3C018013 */ lui $at, %hi(D_80130628) # $at, 0x8013 -/* B6CDB0 800F5C10 A4220628 */ sh $v0, %lo(D_80130628)($at) -.L800F5C14: -/* B6CDB4 800F5C14 0C03DBED */ jal func_800F6FB4 -/* B6CDB8 800F5C18 93A4001B */ lbu $a0, 0x1b($sp) -/* B6CDBC 800F5C1C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CDC0 800F5C20 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6CDC4 800F5C24 03E00008 */ jr $ra -/* B6CDC8 800F5C28 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5C2C.s b/asm/non_matchings/code/code_800EC960/func_800F5C2C.s deleted file mode 100644 index cdd850443d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5C2C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800F5C2C -/* B6CDCC 800F5C2C 3C028013 */ lui $v0, %hi(D_80130628) # $v0, 0x8013 -/* B6CDD0 800F5C30 94420628 */ lhu $v0, %lo(D_80130628)($v0) -/* B6CDD4 800F5C34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6CDD8 800F5C38 3401FFFF */ li $at, 65535 -/* B6CDDC 800F5C3C 10410003 */ beq $v0, $at, .L800F5C4C -/* B6CDE0 800F5C40 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CDE4 800F5C44 0C03E803 */ jal Audio_SetBGM -/* B6CDE8 800F5C48 00402025 */ move $a0, $v0 -.L800F5C4C: -/* B6CDEC 800F5C4C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CDF0 800F5C50 340EFFFF */ li $t6, 65535 -/* B6CDF4 800F5C54 3C018013 */ lui $at, %hi(D_80130628) # $at, 0x8013 -/* B6CDF8 800F5C58 A42E0628 */ sh $t6, %lo(D_80130628)($at) -/* B6CDFC 800F5C5C 03E00008 */ jr $ra -/* B6CE00 800F5C60 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5C64.s b/asm/non_matchings/code/code_800EC960/func_800F5C64.s deleted file mode 100644 index a941798db4..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5C64.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_800F5C64 -/* B6CE04 800F5C64 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6CE08 800F5C68 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CE0C 800F5C6C AFA40028 */ sw $a0, 0x28($sp) -/* B6CE10 800F5C70 0C03E82D */ jal func_800FA0B4 -/* B6CE14 800F5C74 24040001 */ li $a0, 1 -/* B6CE18 800F5C78 A7A20026 */ sh $v0, 0x26($sp) -/* B6CE1C 800F5C7C 304400FF */ andi $a0, $v0, 0xff -/* B6CE20 800F5C80 0C0397A1 */ jal func_800E5E84 -/* B6CE24 800F5C84 27A50020 */ addiu $a1, $sp, 0x20 -/* B6CE28 800F5C88 97A4002A */ lhu $a0, 0x2a($sp) -/* B6CE2C 800F5C8C AFA2001C */ sw $v0, 0x1c($sp) -/* B6CE30 800F5C90 27A50020 */ addiu $a1, $sp, 0x20 -/* B6CE34 800F5C94 0C0397A1 */ jal func_800E5E84 -/* B6CE38 800F5C98 308400FF */ andi $a0, $a0, 0xff -/* B6CE3C 800F5C9C 97AE0026 */ lhu $t6, 0x26($sp) -/* B6CE40 800F5CA0 3401FFFF */ li $at, 65535 -/* B6CE44 800F5CA4 8FAF001C */ lw $t7, 0x1c($sp) -/* B6CE48 800F5CA8 11C10007 */ beq $t6, $at, .L800F5CC8 -/* B6CE4C 800F5CAC 24080001 */ li $t0, 1 -/* B6CE50 800F5CB0 91F80000 */ lbu $t8, ($t7) -/* B6CE54 800F5CB4 90590000 */ lbu $t9, ($v0) -/* B6CE58 800F5CB8 24090005 */ li $t1, 5 -/* B6CE5C 800F5CBC 3C018017 */ lui $at, %hi(D_8016B9F4) -/* B6CE60 800F5CC0 17190004 */ bne $t8, $t9, .L800F5CD4 -/* B6CE64 800F5CC4 3C041100 */ lui $a0, (0x110000FF >> 16) # lui $a0, 0x1100 -.L800F5CC8: -/* B6CE68 800F5CC8 3C018017 */ lui $at, %hi(D_8016B9F4) # $at, 0x8017 -/* B6CE6C 800F5CCC 10000004 */ b .L800F5CE0 -/* B6CE70 800F5CD0 A028B9F4 */ sb $t0, %lo(D_8016B9F4)($at) -.L800F5CD4: -/* B6CE74 800F5CD4 A029B9F4 */ sb $t1, %lo(D_8016B9F4)($at) -/* B6CE78 800F5CD8 0C03E803 */ jal Audio_SetBGM -/* B6CE7C 800F5CDC 348400FF */ ori $a0, (0x110000FF & 0xFFFF) # ori $a0, $a0, 0xff -.L800F5CE0: -/* B6CE80 800F5CE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CE84 800F5CE4 97AA002A */ lhu $t2, 0x2a($sp) -/* B6CE88 800F5CE8 3C018017 */ lui $at, %hi(D_8016B9F6) -/* B6CE8C 800F5CEC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B6CE90 800F5CF0 03E00008 */ jr $ra -/* B6CE94 800F5CF4 A42AB9F6 */ sh $t2, %lo(D_8016B9F6)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5CF8.s b/asm/non_matchings/code/code_800EC960/func_800F5CF8.s deleted file mode 100644 index f24adce511..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5CF8.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_800F5CF8 -/* B6CE98 800F5CF8 3C038017 */ lui $v1, %hi(D_8016B9F4) # $v1, 0x8017 -/* B6CE9C 800F5CFC 2463B9F4 */ addiu $v1, %lo(D_8016B9F4) # addiu $v1, $v1, -0x460c -/* B6CEA0 800F5D00 90620000 */ lbu $v0, ($v1) -/* B6CEA4 800F5D04 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6CEA8 800F5D08 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CEAC 800F5D0C 1040003E */ beqz $v0, .L800F5E08 -/* B6CEB0 800F5D10 244EFFFF */ addiu $t6, $v0, -1 -/* B6CEB4 800F5D14 31CF00FF */ andi $t7, $t6, 0xff -/* B6CEB8 800F5D18 15E0003B */ bnez $t7, .L800F5E08 -/* B6CEBC 800F5D1C A06E0000 */ sb $t6, ($v1) -/* B6CEC0 800F5D20 3C04E300 */ lui $a0, 0xe300 -/* B6CEC4 800F5D24 0C0396BF */ jal func_800E5AFC -/* B6CEC8 800F5D28 00002825 */ move $a1, $zero -/* B6CECC 800F5D2C 3C04E300 */ lui $a0, 0xe300 -/* B6CED0 800F5D30 0C0396BF */ jal func_800E5AFC -/* B6CED4 800F5D34 24050001 */ li $a1, 1 -/* B6CED8 800F5D38 0C03E82D */ jal func_800FA0B4 -/* B6CEDC 800F5D3C 00002025 */ move $a0, $zero -/* B6CEE0 800F5D40 0C03E82D */ jal func_800FA0B4 -/* B6CEE4 800F5D44 24040001 */ li $a0, 1 -/* B6CEE8 800F5D48 A7A20026 */ sh $v0, 0x26($sp) -/* B6CEEC 800F5D4C 0C03E82D */ jal func_800FA0B4 -/* B6CEF0 800F5D50 24040003 */ li $a0, 3 -/* B6CEF4 800F5D54 97B80026 */ lhu $t8, 0x26($sp) -/* B6CEF8 800F5D58 3401FFFF */ li $at, 65535 -/* B6CEFC 800F5D5C A7A20022 */ sh $v0, 0x22($sp) -/* B6CF00 800F5D60 17010018 */ bne $t8, $at, .L800F5DC4 -/* B6CF04 800F5D64 00002025 */ move $a0, $zero -/* B6CF08 800F5D68 24050001 */ li $a1, 1 -/* B6CF0C 800F5D6C 00003025 */ move $a2, $zero -/* B6CF10 800F5D70 0C03E890 */ jal func_800FA240 -/* B6CF14 800F5D74 24070005 */ li $a3, 5 -/* B6CF18 800F5D78 24040003 */ li $a0, 3 -/* B6CF1C 800F5D7C 24050001 */ li $a1, 1 -/* B6CF20 800F5D80 00003025 */ move $a2, $zero -/* B6CF24 800F5D84 0C03E890 */ jal func_800FA240 -/* B6CF28 800F5D88 24070005 */ li $a3, 5 -/* B6CF2C 800F5D8C 3C04C180 */ lui $a0, (0xC180010A >> 16) # lui $a0, 0xc180 -/* B6CF30 800F5D90 0C03E803 */ jal Audio_SetBGM -/* B6CF34 800F5D94 3484010A */ ori $a0, (0xC180010A & 0xFFFF) # ori $a0, $a0, 0x10a -/* B6CF38 800F5D98 3C04C183 */ lui $a0, (0xC183010A >> 16) # lui $a0, 0xc183 -/* B6CF3C 800F5D9C 0C03E803 */ jal Audio_SetBGM -/* B6CF40 800F5DA0 3484010A */ ori $a0, (0xC183010A & 0xFFFF) # ori $a0, $a0, 0x10a -/* B6CF44 800F5DA4 0C03E803 */ jal Audio_SetBGM -/* B6CF48 800F5DA8 3C04C190 */ lui $a0, 0xc190 -/* B6CF4C 800F5DAC 97B90022 */ lhu $t9, 0x22($sp) -/* B6CF50 800F5DB0 2401002F */ li $at, 47 -/* B6CF54 800F5DB4 13210003 */ beq $t9, $at, .L800F5DC4 -/* B6CF58 800F5DB8 00000000 */ nop -/* B6CF5C 800F5DBC 0C03E803 */ jal Audio_SetBGM -/* B6CF60 800F5DC0 3C04C193 */ lui $a0, 0xc193 -.L800F5DC4: -/* B6CF64 800F5DC4 3C048017 */ lui $a0, %hi(D_8016B9F6) # $a0, 0x8017 -/* B6CF68 800F5DC8 9484B9F6 */ lhu $a0, %lo(D_8016B9F6)($a0) -/* B6CF6C 800F5DCC 97A80022 */ lhu $t0, 0x22($sp) -/* B6CF70 800F5DD0 3C010101 */ lui $at, 0x101 -/* B6CF74 800F5DD4 00812025 */ or $a0, $a0, $at -/* B6CF78 800F5DD8 0C03E803 */ jal Audio_SetBGM -/* B6CF7C 800F5DDC AFA8001C */ sw $t0, 0x1c($sp) -/* B6CF80 800F5DE0 3C04A000 */ lui $a0, (0xA000FFFF >> 16) # lui $a0, 0xa000 -/* B6CF84 800F5DE4 0C03E803 */ jal Audio_SetBGM -/* B6CF88 800F5DE8 3484FFFF */ ori $a0, (0xA000FFFF & 0xFFFF) # ori $a0, $a0, 0xffff -/* B6CF8C 800F5DEC 8FA9001C */ lw $t1, 0x1c($sp) -/* B6CF90 800F5DF0 2401002F */ li $at, 47 -/* B6CF94 800F5DF4 3C04A300 */ lui $a0, (0xA300FFFF >> 16) # lui $a0, 0xa300 -/* B6CF98 800F5DF8 51210004 */ beql $t1, $at, .L800F5E0C -/* B6CF9C 800F5DFC 8FBF0014 */ lw $ra, 0x14($sp) -/* B6CFA0 800F5E00 0C03E803 */ jal Audio_SetBGM -/* B6CFA4 800F5E04 3484FFFF */ ori $a0, (0xA300FFFF & 0xFFFF) # ori $a0, $a0, 0xffff -.L800F5E08: -/* B6CFA8 800F5E08 8FBF0014 */ lw $ra, 0x14($sp) -.L800F5E0C: -/* B6CFAC 800F5E0C 27BD0028 */ addiu $sp, $sp, 0x28 -/* B6CFB0 800F5E10 03E00008 */ jr $ra -/* B6CFB4 800F5E14 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5E18.s b/asm/non_matchings/code/code_800EC960/func_800F5E18.s deleted file mode 100644 index 3bafb62fda..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5E18.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800F5E18 -/* B6CFB8 800F5E18 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6CFBC 800F5E1C AFA40020 */ sw $a0, 0x20($sp) -/* B6CFC0 800F5E20 93A20023 */ lbu $v0, 0x23($sp) -/* B6CFC4 800F5E24 AFA7002C */ sw $a3, 0x2c($sp) -/* B6CFC8 800F5E28 00073E00 */ sll $a3, $a3, 0x18 -/* B6CFCC 800F5E2C 00073E03 */ sra $a3, $a3, 0x18 -/* B6CFD0 800F5E30 30EF00FF */ andi $t7, $a3, 0xff -/* B6CFD4 800F5E34 3C017000 */ lui $at, 0x7000 -/* B6CFD8 800F5E38 00021600 */ sll $v0, $v0, 0x18 -/* B6CFDC 800F5E3C 93A80033 */ lbu $t0, 0x33($sp) -/* B6CFE0 800F5E40 00417025 */ or $t6, $v0, $at -/* B6CFE4 800F5E44 000FC400 */ sll $t8, $t7, 0x10 -/* B6CFE8 800F5E48 AFBF0014 */ sw $ra, 0x14($sp) -/* B6CFEC 800F5E4C 01D8C825 */ or $t9, $t6, $t8 -/* B6CFF0 800F5E50 AFA50024 */ sw $a1, 0x24($sp) -/* B6CFF4 800F5E54 AFA60028 */ sw $a2, 0x28($sp) -/* B6CFF8 800F5E58 AFA2001C */ sw $v0, 0x1c($sp) -/* B6CFFC 800F5E5C 0C03E803 */ jal Audio_SetBGM -/* B6D000 800F5E60 03282025 */ or $a0, $t9, $t0 -/* B6D004 800F5E64 93A9002B */ lbu $t1, 0x2b($sp) -/* B6D008 800F5E68 8FA2001C */ lw $v0, 0x1c($sp) -/* B6D00C 800F5E6C 97AC0026 */ lhu $t4, 0x26($sp) -/* B6D010 800F5E70 00095400 */ sll $t2, $t1, 0x10 -/* B6D014 800F5E74 004A5825 */ or $t3, $v0, $t2 -/* B6D018 800F5E78 0C03E803 */ jal Audio_SetBGM -/* B6D01C 800F5E7C 016C2025 */ or $a0, $t3, $t4 -/* B6D020 800F5E80 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D024 800F5E84 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6D028 800F5E88 03E00008 */ jr $ra -/* B6D02C 800F5E8C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F5E90.s b/asm/non_matchings/code/code_800EC960/func_800F5E90.s deleted file mode 100644 index 7a97975c43..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F5E90.s +++ /dev/null @@ -1,180 +0,0 @@ -glabel func_800F5E90 -/* B6D030 800F5E90 3C0E8013 */ lui $t6, %hi(D_80130628) # $t6, 0x8013 -/* B6D034 800F5E94 95CE0628 */ lhu $t6, %lo(D_80130628)($t6) -/* B6D038 800F5E98 308500FF */ andi $a1, $a0, 0xff -/* B6D03C 800F5E9C 3C018013 */ lui $at, %hi(D_80130654) # $at, 0x8013 -/* B6D040 800F5EA0 A0250654 */ sb $a1, %lo(D_80130654)($at) -/* B6D044 800F5EA4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6D048 800F5EA8 3401FFFF */ li $at, 65535 -/* B6D04C 800F5EAC AFBF0014 */ sw $ra, 0x14($sp) -/* B6D050 800F5EB0 15C10094 */ bne $t6, $at, .L800F6104 -/* B6D054 800F5EB4 AFA40030 */ sw $a0, 0x30($sp) -/* B6D058 800F5EB8 3C0F8013 */ lui $t7, %hi(D_8013060C) # $t7, 0x8013 -/* B6D05C 800F5EBC 81EF060C */ lb $t7, %lo(D_8013060C)($t7) -/* B6D060 800F5EC0 3C028017 */ lui $v0, %hi(D_8016E9A4) # $v0, 0x8017 -/* B6D064 800F5EC4 24040003 */ li $a0, 3 -/* B6D068 800F5EC8 11E00002 */ beqz $t7, .L800F5ED4 -/* B6D06C 800F5ECC 00000000 */ nop -/* B6D070 800F5ED0 24050003 */ li $a1, 3 -.L800F5ED4: -/* B6D074 800F5ED4 9442E9A4 */ lhu $v0, %lo(D_8016E9A4)($v0) -/* B6D078 800F5ED8 24030002 */ li $v1, 2 -/* B6D07C 800F5EDC 1462000A */ bne $v1, $v0, .L800F5F08 -/* B6D080 800F5EE0 00405025 */ move $t2, $v0 -/* B6D084 800F5EE4 A3A50033 */ sb $a1, 0x33($sp) -/* B6D088 800F5EE8 0C03E82D */ jal func_800FA0B4 -/* B6D08C 800F5EEC AFA20024 */ sw $v0, 0x24($sp) -/* B6D090 800F5EF0 2401081A */ li $at, 2074 -/* B6D094 800F5EF4 24030002 */ li $v1, 2 -/* B6D098 800F5EF8 93A50033 */ lbu $a1, 0x33($sp) -/* B6D09C 800F5EFC 14410002 */ bne $v0, $at, .L800F5F08 -/* B6D0A0 800F5F00 8FAA0024 */ lw $t2, 0x24($sp) -/* B6D0A4 800F5F04 24050003 */ li $a1, 3 -.L800F5F08: -/* B6D0A8 800F5F08 3401FFFF */ li $at, 65535 -/* B6D0AC 800F5F0C 1141000E */ beq $t2, $at, .L800F5F48 -/* B6D0B0 800F5F10 315900FF */ andi $t9, $t2, 0xff -/* B6D0B4 800F5F14 3C0D8013 */ lui $t5, %hi(D_80130658) -/* B6D0B8 800F5F18 01B96821 */ addu $t5, $t5, $t9 -/* B6D0BC 800F5F1C 91AD0658 */ lbu $t5, %lo(D_80130658)($t5) -/* B6D0C0 800F5F20 3C0C8013 */ lui $t4, %hi(D_8013061C) # $t4, 0x8013 -/* B6D0C4 800F5F24 258C061C */ addiu $t4, %lo(D_8013061C) # addiu $t4, $t4, 0x61c -/* B6D0C8 800F5F28 31AE0001 */ andi $t6, $t5, 1 -/* B6D0CC 800F5F2C 15C00006 */ bnez $t6, .L800F5F48 -/* B6D0D0 800F5F30 00000000 */ nop -/* B6D0D4 800F5F34 91820000 */ lbu $v0, ($t4) -/* B6D0D8 800F5F38 240B0001 */ li $t3, 1 -/* B6D0DC 800F5F3C 304F007F */ andi $t7, $v0, 0x7f -/* B6D0E0 800F5F40 156F004A */ bne $t3, $t7, .L800F606C -/* B6D0E4 800F5F44 00000000 */ nop -.L800F5F48: -/* B6D0E8 800F5F48 3C0C8013 */ lui $t4, %hi(D_8013061C) # $t4, 0x8013 -/* B6D0EC 800F5F4C 258C061C */ addiu $t4, %lo(D_8013061C) # addiu $t4, $t4, 0x61c -/* B6D0F0 800F5F50 91820000 */ lbu $v0, ($t4) -/* B6D0F4 800F5F54 240B0001 */ li $t3, 1 -/* B6D0F8 800F5F58 00A04825 */ move $t1, $a1 -/* B6D0FC 800F5F5C 3042007F */ andi $v0, $v0, 0x7f -/* B6D100 800F5F60 50450069 */ beql $v0, $a1, .L800F6108 -/* B6D104 800F5F64 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D108 800F5F68 15650028 */ bne $t3, $a1, .L800F600C -/* B6D10C 800F5F6C 3C038013 */ lui $v1, %hi(D_80130624) # $v1, 0x8013 -/* B6D110 800F5F70 3C188017 */ lui $t8, %hi(D_8016EE8B) # $t8, 0x8017 -/* B6D114 800F5F74 9318EE8B */ lbu $t8, %lo(D_8016EE8B)($t8) -/* B6D118 800F5F78 80630624 */ lb $v1, %lo(D_80130624)($v1) -/* B6D11C 800F5F7C 24040003 */ li $a0, 3 -/* B6D120 800F5F80 24050003 */ li $a1, 3 -/* B6D124 800F5F84 03031023 */ subu $v0, $t8, $v1 -/* B6D128 800F5F88 04410003 */ bgez $v0, .L800F5F98 -/* B6D12C 800F5F8C 306600FF */ andi $a2, $v1, 0xff -/* B6D130 800F5F90 10000002 */ b .L800F5F9C -/* B6D134 800F5F94 00024023 */ negu $t0, $v0 -.L800F5F98: -/* B6D138 800F5F98 00404025 */ move $t0, $v0 -.L800F5F9C: -/* B6D13C 800F5F9C 310700FF */ andi $a3, $t0, 0xff -/* B6D140 800F5FA0 AFA9001C */ sw $t1, 0x1c($sp) -/* B6D144 800F5FA4 0C03E890 */ jal func_800FA240 -/* B6D148 800F5FA8 AFAA0024 */ sw $t2, 0x24($sp) -/* B6D14C 800F5FAC 3C04030A */ lui $a0, (0x030A081A >> 16) # lui $a0, 0x30a -/* B6D150 800F5FB0 0C03E803 */ jal Audio_SetBGM -/* B6D154 800F5FB4 3484081A */ ori $a0, (0x030A081A & 0xFFFF) # ori $a0, $a0, 0x81a -/* B6D158 800F5FB8 8FAA0024 */ lw $t2, 0x24($sp) -/* B6D15C 800F5FBC 24010001 */ li $at, 1 -/* B6D160 800F5FC0 8FA9001C */ lw $t1, 0x1c($sp) -/* B6D164 800F5FC4 1141000E */ beq $t2, $at, .L800F6000 -/* B6D168 800F5FC8 00002025 */ move $a0, $zero -/* B6D16C 800F5FCC 3C198013 */ lui $t9, %hi(D_80130624) # $t9, 0x8013 -/* B6D170 800F5FD0 83390624 */ lb $t9, %lo(D_80130624)($t9) -/* B6D174 800F5FD4 240D007F */ li $t5, 127 -/* B6D178 800F5FD8 24050003 */ li $a1, 3 -/* B6D17C 800F5FDC 01B93023 */ subu $a2, $t5, $t9 -/* B6D180 800F5FE0 30C600FF */ andi $a2, $a2, 0xff -/* B6D184 800F5FE4 2407000A */ li $a3, 10 -/* B6D188 800F5FE8 0C03E890 */ jal func_800FA240 -/* B6D18C 800F5FEC AFA9001C */ sw $t1, 0x1c($sp) -/* B6D190 800F5FF0 3C048013 */ lui $a0, %hi(D_80130624) # $a0, 0x8013 -/* B6D194 800F5FF4 0C03D443 */ jal func_800F510C -/* B6D198 800F5FF8 80840624 */ lb $a0, %lo(D_80130624)($a0) -/* B6D19C 800F5FFC 8FA9001C */ lw $t1, 0x1c($sp) -.L800F6000: -/* B6D1A0 800F6000 3C0C8013 */ lui $t4, %hi(D_8013061C) # $t4, 0x8013 -/* B6D1A4 800F6004 10000016 */ b .L800F6060 -/* B6D1A8 800F6008 258C061C */ addiu $t4, %lo(D_8013061C) # addiu $t4, $t4, 0x61c -.L800F600C: -/* B6D1AC 800F600C 15620014 */ bne $t3, $v0, .L800F6060 -/* B6D1B0 800F6010 3C04130A */ lui $a0, (0x130A00FF >> 16) # lui $a0, 0x130a -/* B6D1B4 800F6014 348400FF */ ori $a0, (0x130A00FF & 0xFFFF) # ori $a0, $a0, 0xff -/* B6D1B8 800F6018 0C03E803 */ jal Audio_SetBGM -/* B6D1BC 800F601C AFA9001C */ sw $t1, 0x1c($sp) -/* B6D1C0 800F6020 8FA9001C */ lw $t1, 0x1c($sp) -/* B6D1C4 800F6024 24010003 */ li $at, 3 -/* B6D1C8 800F6028 00002025 */ move $a0, $zero -/* B6D1CC 800F602C 15210003 */ bne $t1, $at, .L800F603C -/* B6D1D0 800F6030 24050003 */ li $a1, 3 -/* B6D1D4 800F6034 10000002 */ b .L800F6040 -/* B6D1D8 800F6038 00003825 */ move $a3, $zero -.L800F603C: -/* B6D1DC 800F603C 2407000A */ li $a3, 10 -.L800F6040: -/* B6D1E0 800F6040 2406007F */ li $a2, 127 -/* B6D1E4 800F6044 0C03E890 */ jal func_800FA240 -/* B6D1E8 800F6048 AFA9001C */ sw $t1, 0x1c($sp) -/* B6D1EC 800F604C 0C03D443 */ jal func_800F510C -/* B6D1F0 800F6050 00002025 */ move $a0, $zero -/* B6D1F4 800F6054 3C0C8013 */ lui $t4, %hi(D_8013061C) # $t4, 0x8013 -/* B6D1F8 800F6058 258C061C */ addiu $t4, %lo(D_8013061C) # addiu $t4, $t4, 0x61c -/* B6D1FC 800F605C 8FA9001C */ lw $t1, 0x1c($sp) -.L800F6060: -/* B6D200 800F6060 252E0080 */ addiu $t6, $t1, 0x80 -/* B6D204 800F6064 10000027 */ b .L800F6104 -/* B6D208 800F6068 A18E0000 */ sb $t6, ($t4) -.L800F606C: -/* B6D20C 800F606C 14A0000E */ bnez $a1, .L800F60A8 -/* B6D210 800F6070 00A04825 */ move $t1, $a1 -/* B6D214 800F6074 14620003 */ bne $v1, $v0, .L800F6084 -/* B6D218 800F6078 3C048013 */ lui $a0, %hi(D_80130638) # $a0, 0x8013 -/* B6D21C 800F607C 24840638 */ addiu $a0, %lo(D_80130638) # addiu $a0, $a0, 0x638 -/* B6D220 800F6080 AC800000 */ sw $zero, ($a0) -.L800F6084: -/* B6D224 800F6084 3C048013 */ lui $a0, %hi(D_80130638) # $a0, 0x8013 -/* B6D228 800F6088 24840638 */ addiu $a0, %lo(D_80130638) # addiu $a0, $a0, 0x638 -/* B6D22C 800F608C 8C8F0000 */ lw $t7, ($a0) -/* B6D230 800F6090 3C028013 */ lui $v0, %hi(D_80130634) # $v0, 0x8013 -/* B6D234 800F6094 24420634 */ addiu $v0, %lo(D_80130634) # addiu $v0, $v0, 0x634 -/* B6D238 800F6098 25F80001 */ addiu $t8, $t7, 1 -/* B6D23C 800F609C AC400000 */ sw $zero, ($v0) -/* B6D240 800F60A0 10000008 */ b .L800F60C4 -/* B6D244 800F60A4 AC980000 */ sw $t8, ($a0) -.L800F60A8: -/* B6D248 800F60A8 3C028013 */ lui $v0, %hi(D_80130634) # $v0, 0x8013 -/* B6D24C 800F60AC 24420634 */ addiu $v0, %lo(D_80130634) # addiu $v0, $v0, 0x634 -/* B6D250 800F60B0 8C4D0000 */ lw $t5, ($v0) -/* B6D254 800F60B4 3C048013 */ lui $a0, %hi(D_80130638) # $a0, 0x8013 -/* B6D258 800F60B8 24840638 */ addiu $a0, %lo(D_80130638) # addiu $a0, $a0, 0x638 -/* B6D25C 800F60BC 25B90001 */ addiu $t9, $t5, 1 -/* B6D260 800F60C0 AC590000 */ sw $t9, ($v0) -.L800F60C4: -/* B6D264 800F60C4 5469000C */ bnel $v1, $t1, .L800F60F8 -/* B6D268 800F60C8 3C017002 */ lui $at, 0x7002 -/* B6D26C 800F60CC 8C4E0000 */ lw $t6, ($v0) -/* B6D270 800F60D0 2DC1001E */ sltiu $at, $t6, 0x1e -/* B6D274 800F60D4 50200008 */ beql $at, $zero, .L800F60F8 -/* B6D278 800F60D8 3C017002 */ lui $at, 0x7002 -/* B6D27C 800F60DC 8C8F0000 */ lw $t7, ($a0) -/* B6D280 800F60E0 2DE10015 */ sltiu $at, $t7, 0x15 -/* B6D284 800F60E4 54200004 */ bnezl $at, .L800F60F8 -/* B6D288 800F60E8 3C017002 */ lui $at, 0x7002 -/* B6D28C 800F60EC 00002825 */ move $a1, $zero -/* B6D290 800F60F0 00004825 */ move $t1, $zero -/* B6D294 800F60F4 3C017002 */ lui $at, 0x7002 -.L800F60F8: -/* B6D298 800F60F8 A1850000 */ sb $a1, ($t4) -/* B6D29C 800F60FC 0C03E803 */ jal Audio_SetBGM -/* B6D2A0 800F6100 01212025 */ or $a0, $t1, $at -.L800F6104: -/* B6D2A4 800F6104 8FBF0014 */ lw $ra, 0x14($sp) -.L800F6108: -/* B6D2A8 800F6108 27BD0030 */ addiu $sp, $sp, 0x30 -/* B6D2AC 800F610C 03E00008 */ jr $ra -/* B6D2B0 800F6110 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6114.s b/asm/non_matchings/code/code_800EC960/func_800F6114.s deleted file mode 100644 index 407c3ea758..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6114.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_800F6114 -/* B6D2B4 800F6114 3C0E8013 */ lui $t6, %hi(D_8013061C) -/* B6D2B8 800F6118 91CE061C */ lbu $t6, %lo(D_8013061C)($t6) -/* B6D2BC 800F611C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6D2C0 800F6120 24010081 */ li $at, 129 -/* B6D2C4 800F6124 15C1004B */ bne $t6, $at, .L800F6254 -/* B6D2C8 800F6128 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D2CC 800F612C 3C018013 */ lui $at, %hi(D_80130620) -/* B6D2D0 800F6130 C4240620 */ lwc1 $f4, %lo(D_80130620)($at) -/* B6D2D4 800F6134 3C014316 */ li $at, 0x43160000 # 0.000000 -/* B6D2D8 800F6138 46046032 */ c.eq.s $f12, $f4 -/* B6D2DC 800F613C 00000000 */ nop -/* B6D2E0 800F6140 4501003A */ bc1t .L800F622C -/* B6D2E4 800F6144 00000000 */ nop -/* B6D2E8 800F6148 44811000 */ mtc1 $at, $f2 -/* B6D2EC 800F614C 3C0143FA */ li $at, 0x43FA0000 # 0.000000 -/* B6D2F0 800F6150 4602603C */ c.lt.s $f12, $f2 -/* B6D2F4 800F6154 00000000 */ nop -/* B6D2F8 800F6158 45020007 */ bc1fl .L800F6178 -/* B6D2FC 800F615C 44813000 */ mtc1 $at, $f6 -/* B6D300 800F6160 3C0143AF */ li $at, 0x43AF0000 # 0.000000 -/* B6D304 800F6164 44811000 */ mtc1 $at, $f2 -/* B6D308 800F6168 44800000 */ mtc1 $zero, $f0 -/* B6D30C 800F616C 1000000F */ b .L800F61AC -/* B6D310 800F6170 46001201 */ sub.s $f8, $f2, $f0 -/* B6D314 800F6174 44813000 */ mtc1 $at, $f6 -.L800F6178: -/* B6D318 800F6178 3C0143AF */ li $at, 0x43AF0000 # 0.000000 -/* B6D31C 800F617C 460C303C */ c.lt.s $f6, $f12 -/* B6D320 800F6180 00000000 */ nop -/* B6D324 800F6184 45020006 */ bc1fl .L800F61A0 -/* B6D328 800F6188 46026001 */ sub.s $f0, $f12, $f2 -/* B6D32C 800F618C 3C0143AF */ li $at, 0x43AF0000 # 0.000000 -/* B6D330 800F6190 44811000 */ mtc1 $at, $f2 -/* B6D334 800F6194 10000004 */ b .L800F61A8 -/* B6D338 800F6198 46001006 */ mov.s $f0, $f2 -/* B6D33C 800F619C 46026001 */ sub.s $f0, $f12, $f2 -.L800F61A0: -/* B6D340 800F61A0 44811000 */ mtc1 $at, $f2 -/* B6D344 800F61A4 00000000 */ nop -.L800F61A8: -/* B6D348 800F61A8 46001201 */ sub.s $f8, $f2, $f0 -.L800F61AC: -/* B6D34C 800F61AC 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B6D350 800F61B0 44815000 */ mtc1 $at, $f10 -/* B6D354 800F61B4 3C028013 */ lui $v0, %hi(D_80130624) # $v0, 0x8013 -/* B6D358 800F61B8 24420624 */ addiu $v0, %lo(D_80130624) # addiu $v0, $v0, 0x624 -/* B6D35C 800F61BC 460A4402 */ mul.s $f16, $f8, $f10 -/* B6D360 800F61C0 24040003 */ li $a0, 3 -/* B6D364 800F61C4 24050003 */ li $a1, 3 -/* B6D368 800F61C8 2407000A */ li $a3, 10 -/* B6D36C 800F61CC E7AC0018 */ swc1 $f12, 0x18($sp) -/* B6D370 800F61D0 46028483 */ div.s $f18, $f16, $f2 -/* B6D374 800F61D4 4600910D */ trunc.w.s $f4, $f18 -/* B6D378 800F61D8 44182000 */ mfc1 $t8, $f4 -/* B6D37C 800F61DC 00000000 */ nop -/* B6D380 800F61E0 A0580000 */ sb $t8, ($v0) -/* B6D384 800F61E4 0C03E890 */ jal func_800FA240 -/* B6D388 800F61E8 330600FF */ andi $a2, $t8, 0xff -/* B6D38C 800F61EC 3C198017 */ lui $t9, %hi(D_8016E9A4) # $t9, 0x8017 -/* B6D390 800F61F0 9739E9A4 */ lhu $t9, %lo(D_8016E9A4)($t9) -/* B6D394 800F61F4 24010001 */ li $at, 1 -/* B6D398 800F61F8 C7AC0018 */ lwc1 $f12, 0x18($sp) -/* B6D39C 800F61FC 1321000B */ beq $t9, $at, .L800F622C -/* B6D3A0 800F6200 00002025 */ move $a0, $zero -/* B6D3A4 800F6204 3C088013 */ lui $t0, %hi(D_80130624) # $t0, 0x8013 -/* B6D3A8 800F6208 81080624 */ lb $t0, %lo(D_80130624)($t0) -/* B6D3AC 800F620C 2409007F */ li $t1, 127 -/* B6D3B0 800F6210 24050003 */ li $a1, 3 -/* B6D3B4 800F6214 01283023 */ subu $a2, $t1, $t0 -/* B6D3B8 800F6218 30C600FF */ andi $a2, $a2, 0xff -/* B6D3BC 800F621C 2407000A */ li $a3, 10 -/* B6D3C0 800F6220 0C03E890 */ jal func_800FA240 -/* B6D3C4 800F6224 E7AC0018 */ swc1 $f12, 0x18($sp) -/* B6D3C8 800F6228 C7AC0018 */ lwc1 $f12, 0x18($sp) -.L800F622C: -/* B6D3CC 800F622C 3C0A8017 */ lui $t2, %hi(D_8016E9A4) # $t2, 0x8017 -/* B6D3D0 800F6230 954AE9A4 */ lhu $t2, %lo(D_8016E9A4)($t2) -/* B6D3D4 800F6234 24010001 */ li $at, 1 -/* B6D3D8 800F6238 3C048013 */ lui $a0, %hi(D_80130624) # $a0, 0x8013 -/* B6D3DC 800F623C 51410006 */ beql $t2, $at, .L800F6258 -/* B6D3E0 800F6240 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D3E4 800F6244 80840624 */ lb $a0, %lo(D_80130624)($a0) -/* B6D3E8 800F6248 0C03D443 */ jal func_800F510C -/* B6D3EC 800F624C E7AC0018 */ swc1 $f12, 0x18($sp) -/* B6D3F0 800F6250 C7AC0018 */ lwc1 $f12, 0x18($sp) -.L800F6254: -/* B6D3F4 800F6254 8FBF0014 */ lw $ra, 0x14($sp) -.L800F6258: -/* B6D3F8 800F6258 3C018013 */ lui $at, %hi(D_80130620) -/* B6D3FC 800F625C E42C0620 */ swc1 $f12, %lo(D_80130620)($at) -/* B6D400 800F6260 03E00008 */ jr $ra -/* B6D404 800F6264 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6268.s b/asm/non_matchings/code/code_800EC960/func_800F6268.s index 726914b262..651d510a11 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F6268.s +++ b/asm/non_matchings/code/code_800EC960/func_800F6268.s @@ -58,18 +58,18 @@ glabel func_800F6268 /* B6D4DC 800F633C 3C016003 */ lui $at, 0x6003 /* B6D4E0 800F6340 00412025 */ or $a0, $v0, $at /* B6D4E4 800F6344 AFA20028 */ sw $v0, 0x28($sp) -/* B6D4E8 800F6348 0C03E803 */ jal Audio_SetBGM +/* B6D4E8 800F6348 0C03E803 */ jal Audio_QueueSeqCmd /* B6D4EC 800F634C A3A3002E */ sb $v1, 0x2e($sp) /* B6D4F0 800F6350 8FA20028 */ lw $v0, 0x28($sp) /* B6D4F4 800F6354 3C016003 */ lui $at, (0x60030100 >> 16) # lui $at, 0x6003 /* B6D4F8 800F6358 34210100 */ ori $at, (0x60030100 & 0xFFFF) # ori $at, $at, 0x100 -/* B6D4FC 800F635C 0C03E803 */ jal Audio_SetBGM +/* B6D4FC 800F635C 0C03E803 */ jal Audio_QueueSeqCmd /* B6D500 800F6360 00412025 */ or $a0, $v0, $at /* B6D504 800F6364 83A3002E */ lb $v1, 0x2e($sp) /* B6D508 800F6368 3C016003 */ lui $at, (0x60030D00 >> 16) # lui $at, 0x6003 /* B6D50C 800F636C 34210D00 */ ori $at, (0x60030D00 & 0xFFFF) # ori $at, $at, 0xd00 /* B6D510 800F6370 306400FF */ andi $a0, $v1, 0xff -/* B6D514 800F6374 0C03E803 */ jal Audio_SetBGM +/* B6D514 800F6374 0C03E803 */ jal Audio_QueueSeqCmd /* B6D518 800F6378 00812025 */ or $a0, $a0, $at /* B6D51C 800F637C 3C038017 */ lui $v1, %hi(D_8016B9D8) # $v1, 0x8017 /* B6D520 800F6380 2463B9D8 */ addiu $v1, %lo(D_8016B9D8) # addiu $v1, $v1, -0x4628 @@ -106,7 +106,7 @@ glabel func_800F6268 /* B6D594 800F63F4 0C03D786 */ jal func_800F5E18 /* B6D598 800F63F8 E7AC0030 */ swc1 $f12, 0x30($sp) /* B6D59C 800F63FC 3C04A300 */ lui $a0, (0xA300FFFC >> 16) # lui $a0, 0xa300 -/* B6D5A0 800F6400 0C03E803 */ jal Audio_SetBGM +/* B6D5A0 800F6400 0C03E803 */ jal Audio_QueueSeqCmd /* B6D5A4 800F6404 3484FFFC */ ori $a0, (0xA300FFFC & 0xFFFF) # ori $a0, $a0, 0xfffc /* B6D5A8 800F6408 240D000A */ li $t5, 10 /* B6D5AC 800F640C 3C018017 */ lui $at, %hi(D_8016B9D8) @@ -148,12 +148,12 @@ glabel func_800F6268 /* B6D62C 800F648C 01E31023 */ subu $v0, $t7, $v1 /* B6D630 800F6490 3C016303 */ lui $at, 0x6303 /* B6D634 800F6494 00412025 */ or $a0, $v0, $at -/* B6D638 800F6498 0C03E803 */ jal Audio_SetBGM +/* B6D638 800F6498 0C03E803 */ jal Audio_QueueSeqCmd /* B6D63C 800F649C AFA20028 */ sw $v0, 0x28($sp) /* B6D640 800F64A0 8FA20028 */ lw $v0, 0x28($sp) /* B6D644 800F64A4 3C016303 */ lui $at, (0x63030100 >> 16) # lui $at, 0x6303 /* B6D648 800F64A8 34210100 */ ori $at, (0x63030100 & 0xFFFF) # ori $at, $at, 0x100 -/* B6D64C 800F64AC 0C03E803 */ jal Audio_SetBGM +/* B6D64C 800F64AC 0C03E803 */ jal Audio_QueueSeqCmd /* B6D650 800F64B0 00412025 */ or $a0, $v0, $at .L800F64B4: /* B6D654 800F64B4 3C038017 */ lui $v1, %hi(D_8016B9D8) # $v1, 0x8017 diff --git a/asm/non_matchings/code/code_800EC960/func_800F64E0.s b/asm/non_matchings/code/code_800EC960/func_800F64E0.s deleted file mode 100644 index d30c4610cb..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F64E0.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_800F64E0 -/* B6D680 800F64E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6D684 800F64E4 AFA40020 */ sw $a0, 0x20($sp) -/* B6D688 800F64E8 308400FF */ andi $a0, $a0, 0xff -/* B6D68C 800F64EC 3C018013 */ lui $at, %hi(D_80130608) # $at, 0x8013 -/* B6D690 800F64F0 AFBF001C */ sw $ra, 0x1c($sp) -/* B6D694 800F64F4 10800011 */ beqz $a0, .L800F653C -/* B6D698 800F64F8 A0240608 */ sb $a0, %lo(D_80130608)($at) -/* B6D69C 800F64FC 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6D6A0 800F6500 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* B6D6A4 800F6504 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6D6A8 800F6508 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* B6D6AC 800F650C 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B6D6B0 800F6510 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B6D6B4 800F6514 AFAE0014 */ sw $t6, 0x14($sp) -/* B6D6B8 800F6518 AFA70010 */ sw $a3, 0x10($sp) -/* B6D6BC 800F651C 24044800 */ li $a0, 18432 -/* B6D6C0 800F6520 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6D6C4 800F6524 24060004 */ li $a2, 4 -/* B6D6C8 800F6528 3C04F100 */ lui $a0, 0xf100 -/* B6D6CC 800F652C 0C0396BF */ jal func_800E5AFC -/* B6D6D0 800F6530 00002825 */ move $a1, $zero -/* B6D6D4 800F6534 10000010 */ b .L800F6578 -/* B6D6D8 800F6538 8FBF001C */ lw $ra, 0x1c($sp) -.L800F653C: -/* B6D6DC 800F653C 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6D6E0 800F6540 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* B6D6E4 800F6544 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6D6E8 800F6548 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* B6D6EC 800F654C 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B6D6F0 800F6550 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B6D6F4 800F6554 AFAF0014 */ sw $t7, 0x14($sp) -/* B6D6F8 800F6558 AFA70010 */ sw $a3, 0x10($sp) -/* B6D6FC 800F655C 24044801 */ li $a0, 18433 -/* B6D700 800F6560 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6D704 800F6564 24060004 */ li $a2, 4 -/* B6D708 800F6568 3C04F200 */ lui $a0, 0xf200 -/* B6D70C 800F656C 0C0396BF */ jal func_800E5AFC -/* B6D710 800F6570 00002825 */ move $a1, $zero -/* B6D714 800F6574 8FBF001C */ lw $ra, 0x1c($sp) -.L800F6578: -/* B6D718 800F6578 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6D71C 800F657C 03E00008 */ jr $ra -/* B6D720 800F6580 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6584.s b/asm/non_matchings/code/code_800EC960/func_800F6584.s deleted file mode 100644 index 24ed3d1483..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6584.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800F6584 -/* B6D724 800F6584 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B6D728 800F6588 AFB0001C */ sw $s0, 0x1c($sp) -/* B6D72C 800F658C 309000FF */ andi $s0, $a0, 0xff -/* B6D730 800F6590 AFBF0024 */ sw $ra, 0x24($sp) -/* B6D734 800F6594 AFA40038 */ sw $a0, 0x38($sp) -/* B6D738 800F6598 3C018017 */ lui $at, %hi(D_8016B9F2) # $at, 0x8017 -/* B6D73C 800F659C AFB10020 */ sw $s1, 0x20($sp) -/* B6D740 800F65A0 A030B9F2 */ sb $s0, %lo(D_8016B9F2)($at) -/* B6D744 800F65A4 0C03E82D */ jal func_800FA0B4 -/* B6D748 800F65A8 00002025 */ move $a0, $zero -/* B6D74C 800F65AC 2411002F */ li $s1, 47 -/* B6D750 800F65B0 304E00FF */ andi $t6, $v0, 0xff -/* B6D754 800F65B4 162E0003 */ bne $s1, $t6, .L800F65C4 -/* B6D758 800F65B8 00001825 */ move $v1, $zero -/* B6D75C 800F65BC 10000008 */ b .L800F65E0 -/* B6D760 800F65C0 A7A00034 */ sh $zero, 0x34($sp) -.L800F65C4: -/* B6D764 800F65C4 0C03E82D */ jal func_800FA0B4 -/* B6D768 800F65C8 24040003 */ li $a0, 3 -/* B6D76C 800F65CC 304F00FF */ andi $t7, $v0, 0xff -/* B6D770 800F65D0 162F0036 */ bne $s1, $t7, .L800F66AC -/* B6D774 800F65D4 24030003 */ li $v1, 3 -/* B6D778 800F65D8 3418FFFC */ li $t8, 65532 -/* B6D77C 800F65DC A7B80034 */ sh $t8, 0x34($sp) -.L800F65E0: -/* B6D780 800F65E0 12000018 */ beqz $s0, .L800F6644 -/* B6D784 800F65E4 24010003 */ li $at, 3 -/* B6D788 800F65E8 00038E00 */ sll $s1, $v1, 0x18 -/* B6D78C 800F65EC 3C016000 */ lui $at, 0x6000 -/* B6D790 800F65F0 02211025 */ or $v0, $s1, $at -/* B6D794 800F65F4 3C010001 */ lui $at, 1 -/* B6D798 800F65F8 00411025 */ or $v0, $v0, $at -/* B6D79C 800F65FC 00402025 */ move $a0, $v0 -/* B6D7A0 800F6600 AFA20028 */ sw $v0, 0x28($sp) -/* B6D7A4 800F6604 0C03E803 */ jal Audio_SetBGM -/* B6D7A8 800F6608 00608025 */ move $s0, $v1 -/* B6D7AC 800F660C 8FA20028 */ lw $v0, 0x28($sp) -/* B6D7B0 800F6610 0C03E803 */ jal Audio_SetBGM -/* B6D7B4 800F6614 34440100 */ ori $a0, $v0, 0x100 -/* B6D7B8 800F6618 24010003 */ li $at, 3 -/* B6D7BC 800F661C 16010023 */ bne $s0, $at, .L800F66AC -/* B6D7C0 800F6620 97A80034 */ lhu $t0, 0x34($sp) -/* B6D7C4 800F6624 3C01A000 */ lui $at, 0xa000 -/* B6D7C8 800F6628 35090003 */ ori $t1, $t0, 3 -/* B6D7CC 800F662C 312AFFFF */ andi $t2, $t1, 0xffff -/* B6D7D0 800F6630 0221C825 */ or $t9, $s1, $at -/* B6D7D4 800F6634 0C03E803 */ jal Audio_SetBGM -/* B6D7D8 800F6638 032A2025 */ or $a0, $t9, $t2 -/* B6D7DC 800F663C 1000001C */ b .L800F66B0 -/* B6D7E0 800F6640 8FBF0024 */ lw $ra, 0x24($sp) -.L800F6644: -/* B6D7E4 800F6644 14610007 */ bne $v1, $at, .L800F6664 -/* B6D7E8 800F6648 00608025 */ move $s0, $v1 -/* B6D7EC 800F664C 24040003 */ li $a0, 3 -/* B6D7F0 800F6650 2405002F */ li $a1, 47 -/* B6D7F4 800F6654 00003025 */ move $a2, $zero -/* B6D7F8 800F6658 00003825 */ move $a3, $zero -/* B6D7FC 800F665C 0C03D786 */ jal func_800F5E18 -/* B6D800 800F6660 AFA00010 */ sw $zero, 0x10($sp) -.L800F6664: -/* B6D804 800F6664 00108E00 */ sll $s1, $s0, 0x18 -/* B6D808 800F6668 3C016000 */ lui $at, 0x6000 -/* B6D80C 800F666C 02211025 */ or $v0, $s1, $at -/* B6D810 800F6670 3C010001 */ lui $at, 1 -/* B6D814 800F6674 00411025 */ or $v0, $v0, $at -/* B6D818 800F6678 3444007F */ ori $a0, $v0, 0x7f -/* B6D81C 800F667C 0C03E803 */ jal Audio_SetBGM -/* B6D820 800F6680 AFA20028 */ sw $v0, 0x28($sp) -/* B6D824 800F6684 8FA40028 */ lw $a0, 0x28($sp) -/* B6D828 800F6688 0C03E803 */ jal Audio_SetBGM -/* B6D82C 800F668C 3484017F */ ori $a0, $a0, 0x17f -/* B6D830 800F6690 24010003 */ li $at, 3 -/* B6D834 800F6694 16010005 */ bne $s0, $at, .L800F66AC -/* B6D838 800F6698 97AC0034 */ lhu $t4, 0x34($sp) -/* B6D83C 800F669C 3C01A000 */ lui $at, 0xa000 -/* B6D840 800F66A0 02215825 */ or $t3, $s1, $at -/* B6D844 800F66A4 0C03E803 */ jal Audio_SetBGM -/* B6D848 800F66A8 016C2025 */ or $a0, $t3, $t4 -.L800F66AC: -/* B6D84C 800F66AC 8FBF0024 */ lw $ra, 0x24($sp) -.L800F66B0: -/* B6D850 800F66B0 8FB0001C */ lw $s0, 0x1c($sp) -/* B6D854 800F66B4 8FB10020 */ lw $s1, 0x20($sp) -/* B6D858 800F66B8 03E00008 */ jr $ra -/* B6D85C 800F66BC 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F66C0.s b/asm/non_matchings/code/code_800EC960/func_800F66C0.s deleted file mode 100644 index a556dd8d24..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F66C0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800F66C0 -/* B6D860 800F66C0 AFA40000 */ sw $a0, ($sp) -/* B6D864 800F66C4 00042600 */ sll $a0, $a0, 0x18 -/* B6D868 800F66C8 00042603 */ sra $a0, $a0, 0x18 -/* B6D86C 800F66CC 308E007F */ andi $t6, $a0, 0x7f -/* B6D870 800F66D0 3C018013 */ lui $at, %hi(D_80130614) -/* B6D874 800F66D4 03E00008 */ jr $ra -/* B6D878 800F66D8 A02E0614 */ sb $t6, %lo(D_80130614)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F66DC.s b/asm/non_matchings/code/code_800EC960/func_800F66DC.s deleted file mode 100644 index 36339b8f6d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F66DC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800F66DC -/* B6D87C 800F66DC AFA40000 */ sw $a0, ($sp) -/* B6D880 800F66E0 00042600 */ sll $a0, $a0, 0x18 -/* B6D884 800F66E4 00042603 */ sra $a0, $a0, 0x18 -/* B6D888 800F66E8 10800003 */ beqz $a0, .L800F66F8 -/* B6D88C 800F66EC 308E007F */ andi $t6, $a0, 0x7f -/* B6D890 800F66F0 3C018013 */ lui $at, %hi(D_80130618) # $at, 0x8013 -/* B6D894 800F66F4 A02E0618 */ sb $t6, %lo(D_80130618)($at) -.L800F66F8: -/* B6D898 800F66F8 03E00008 */ jr $ra -/* B6D89C 800F66FC 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6700.s b/asm/non_matchings/code/code_800EC960/func_800F6700.s deleted file mode 100644 index 1f7059d5f9..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6700.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_800F6700 -/* B6D8A0 800F6700 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6D8A4 800F6704 AFA40020 */ sw $a0, 0x20($sp) -/* B6D8A8 800F6708 00042600 */ sll $a0, $a0, 0x18 -/* B6D8AC 800F670C 00042603 */ sra $a0, $a0, 0x18 -/* B6D8B0 800F6710 1080000C */ beqz $a0, .L800F6744 -/* B6D8B4 800F6714 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D8B8 800F6718 24020001 */ li $v0, 1 -/* B6D8BC 800F671C 1082000D */ beq $a0, $v0, .L800F6754 -/* B6D8C0 800F6720 240E0003 */ li $t6, 3 -/* B6D8C4 800F6724 24030002 */ li $v1, 2 -/* B6D8C8 800F6728 1083000F */ beq $a0, $v1, .L800F6768 -/* B6D8CC 800F672C 3C018013 */ lui $at, %hi(D_80130604) -/* B6D8D0 800F6730 24010003 */ li $at, 3 -/* B6D8D4 800F6734 1081000F */ beq $a0, $at, .L800F6774 -/* B6D8D8 800F6738 00000000 */ nop -/* B6D8DC 800F673C 10000011 */ b .L800F6784 -/* B6D8E0 800F6740 93A4001F */ lbu $a0, 0x1f($sp) -.L800F6744: -/* B6D8E4 800F6744 3C018013 */ lui $at, %hi(D_80130604) # $at, 0x8013 -/* B6D8E8 800F6748 A3A0001F */ sb $zero, 0x1f($sp) -/* B6D8EC 800F674C 1000000C */ b .L800F6780 -/* B6D8F0 800F6750 A0200604 */ sb $zero, %lo(D_80130604)($at) -.L800F6754: -/* B6D8F4 800F6754 240F0003 */ li $t7, 3 -/* B6D8F8 800F6758 3C018013 */ lui $at, %hi(D_80130604) # $at, 0x8013 -/* B6D8FC 800F675C A3AE001F */ sb $t6, 0x1f($sp) -/* B6D900 800F6760 10000007 */ b .L800F6780 -/* B6D904 800F6764 A02F0604 */ sb $t7, %lo(D_80130604)($at) -.L800F6768: -/* B6D908 800F6768 A3A2001F */ sb $v0, 0x1f($sp) -/* B6D90C 800F676C 10000004 */ b .L800F6780 -/* B6D910 800F6770 A0220604 */ sb $v0, %lo(D_80130604)($at) -.L800F6774: -/* B6D914 800F6774 3C018013 */ lui $at, %hi(D_80130604) # $at, 0x8013 -/* B6D918 800F6778 A3A0001F */ sb $zero, 0x1f($sp) -/* B6D91C 800F677C A0230604 */ sb $v1, %lo(D_80130604)($at) -.L800F6780: -/* B6D920 800F6780 93A4001F */ lbu $a0, 0x1f($sp) -.L800F6784: -/* B6D924 800F6784 3C01E000 */ lui $at, 0xe000 -/* B6D928 800F6788 0C03E803 */ jal Audio_SetBGM -/* B6D92C 800F678C 00812025 */ or $a0, $a0, $at -/* B6D930 800F6790 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D934 800F6794 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6D938 800F6798 03E00008 */ jr $ra -/* B6D93C 800F679C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F67A0.s b/asm/non_matchings/code/code_800EC960/func_800F67A0.s deleted file mode 100644 index 3aab9beb9b..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F67A0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_800F67A0 -/* B6D940 800F67A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6D944 800F67A4 AFA40020 */ sw $a0, 0x20($sp) -/* B6D948 800F67A8 3C038013 */ lui $v1, %hi(D_8013063C) # $v1, 0x8013 -/* B6D94C 800F67AC 9063063C */ lbu $v1, %lo(D_8013063C)($v1) -/* B6D950 800F67B0 93A20023 */ lbu $v0, 0x23($sp) -/* B6D954 800F67B4 AFBF001C */ sw $ra, 0x1c($sp) -/* B6D958 800F67B8 50430014 */ beql $v0, $v1, .L800F680C -/* B6D95C 800F67BC 93AF0023 */ lbu $t7, 0x23($sp) -/* B6D960 800F67C0 14400005 */ bnez $v0, .L800F67D8 -/* B6D964 800F67C4 00000000 */ nop -/* B6D968 800F67C8 0C03E341 */ jal func_800F8D04 -/* B6D96C 800F67CC 2404086B */ li $a0, 2155 -/* B6D970 800F67D0 1000000E */ b .L800F680C -/* B6D974 800F67D4 93AF0023 */ lbu $t7, 0x23($sp) -.L800F67D8: -/* B6D978 800F67D8 1460000B */ bnez $v1, .L800F6808 -/* B6D97C 800F67DC 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6D980 800F67E0 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* B6D984 800F67E4 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6D988 800F67E8 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* B6D98C 800F67EC 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B6D990 800F67F0 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B6D994 800F67F4 AFAE0014 */ sw $t6, 0x14($sp) -/* B6D998 800F67F8 AFA70010 */ sw $a3, 0x10($sp) -/* B6D99C 800F67FC 2404086B */ li $a0, 2155 -/* B6D9A0 800F6800 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6D9A4 800F6804 24060004 */ li $a2, 4 -.L800F6808: -/* B6D9A8 800F6808 93AF0023 */ lbu $t7, 0x23($sp) -.L800F680C: -/* B6D9AC 800F680C 8FBF001C */ lw $ra, 0x1c($sp) -/* B6D9B0 800F6810 3C018013 */ lui $at, %hi(D_8013063C) # $at, 0x8013 -/* B6D9B4 800F6814 A02F063C */ sb $t7, %lo(D_8013063C)($at) -/* B6D9B8 800F6818 3C018013 */ lui $at, %hi(D_80130644) -/* B6D9BC 800F681C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6D9C0 800F6820 03E00008 */ jr $ra -/* B6D9C4 800F6824 A02F0644 */ sb $t7, %lo(D_80130644)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6828.s b/asm/non_matchings/code/code_800EC960/func_800F6828.s deleted file mode 100644 index 7fa40c0861..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6828.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800F6828 -/* B6D9C8 800F6828 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6D9CC 800F682C AFA40028 */ sw $a0, 0x28($sp) -/* B6D9D0 800F6830 308400FF */ andi $a0, $a0, 0xff -/* B6D9D4 800F6834 3C018013 */ lui $at, %hi(D_80130648) # $at, 0x8013 -/* B6D9D8 800F6838 A0240648 */ sb $a0, %lo(D_80130648)($at) -/* B6D9DC 800F683C 3C0E8017 */ lui $t6, %hi(D_8016E9A4) # $t6, 0x8017 -/* B6D9E0 800F6840 95CEE9A4 */ lhu $t6, %lo(D_8016E9A4)($t6) -/* B6D9E4 800F6844 3C018013 */ lui $at, %hi(D_80130640) # $at, 0x8013 -/* B6D9E8 800F6848 A0240640 */ sb $a0, %lo(D_80130640)($at) -/* B6D9EC 800F684C 24010001 */ li $at, 1 -/* B6D9F0 800F6850 AFBF0024 */ sw $ra, 0x24($sp) -/* B6D9F4 800F6854 AFB20020 */ sw $s2, 0x20($sp) -/* B6D9F8 800F6858 AFB1001C */ sw $s1, 0x1c($sp) -/* B6D9FC 800F685C 15C10011 */ bne $t6, $at, .L800F68A4 -/* B6DA00 800F6860 AFB00018 */ sw $s0, 0x18($sp) -/* B6DA04 800F6864 00048E00 */ sll $s1, $a0, 0x18 -/* B6DA08 800F6868 00118E03 */ sra $s1, $s1, 0x18 -/* B6DA0C 800F686C 00008025 */ move $s0, $zero -/* B6DA10 800F6870 3C120600 */ lui $s2, 0x600 -/* B6DA14 800F6874 320F00FF */ andi $t7, $s0, 0xff -.L800F6878: -/* B6DA18 800F6878 000FC200 */ sll $t8, $t7, 8 -/* B6DA1C 800F687C 03122025 */ or $a0, $t8, $s2 -/* B6DA20 800F6880 00112E00 */ sll $a1, $s1, 0x18 -/* B6DA24 800F6884 00052E03 */ sra $a1, $a1, 0x18 -/* B6DA28 800F6888 0C0396C8 */ jal func_800E5B20 -/* B6DA2C 800F688C 34840006 */ ori $a0, $a0, 6 -/* B6DA30 800F6890 26100001 */ addiu $s0, $s0, 1 -/* B6DA34 800F6894 321000FF */ andi $s0, $s0, 0xff -/* B6DA38 800F6898 2A010010 */ slti $at, $s0, 0x10 -/* B6DA3C 800F689C 5420FFF6 */ bnezl $at, .L800F6878 -/* B6DA40 800F68A0 320F00FF */ andi $t7, $s0, 0xff -.L800F68A4: -/* B6DA44 800F68A4 8FBF0024 */ lw $ra, 0x24($sp) -/* B6DA48 800F68A8 8FB00018 */ lw $s0, 0x18($sp) -/* B6DA4C 800F68AC 8FB1001C */ lw $s1, 0x1c($sp) -/* B6DA50 800F68B0 8FB20020 */ lw $s2, 0x20($sp) -/* B6DA54 800F68B4 03E00008 */ jr $ra -/* B6DA58 800F68B8 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F68BC.s b/asm/non_matchings/code/code_800EC960/func_800F68BC.s deleted file mode 100644 index 8b525bfc2d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F68BC.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800F68BC -/* B6DA5C 800F68BC AFA40000 */ sw $a0, ($sp) -/* B6DA60 800F68C0 00042600 */ sll $a0, $a0, 0x18 -/* B6DA64 800F68C4 00042603 */ sra $a0, $a0, 0x18 -/* B6DA68 800F68C8 3C018013 */ lui $at, %hi(D_8013060C) -/* B6DA6C 800F68CC 03E00008 */ jr $ra -/* B6DA70 800F68D0 A024060C */ sb $a0, %lo(D_8013060C)($at) - diff --git a/asm/non_matchings/code/code_800EC960/func_800F68D4.s b/asm/non_matchings/code/code_800EC960/func_800F68D4.s deleted file mode 100644 index d6f108578b..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F68D4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800F68D4 -/* B6DA74 800F68D4 3C0E8013 */ lui $t6, %hi(D_8013060C) # $t6, 0x8013 -/* B6DA78 800F68D8 81CE060C */ lb $t6, %lo(D_8013060C)($t6) -/* B6DA7C 800F68DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6DA80 800F68E0 AFA40020 */ sw $a0, 0x20($sp) -/* B6DA84 800F68E4 AFA60028 */ sw $a2, 0x28($sp) -/* B6DA88 800F68E8 30C600FF */ andi $a2, $a2, 0xff -/* B6DA8C 800F68EC 3084FFFF */ andi $a0, $a0, 0xffff -/* B6DA90 800F68F0 15C00006 */ bnez $t6, .L800F690C -/* B6DA94 800F68F4 AFBF001C */ sw $ra, 0x1c($sp) -/* B6DA98 800F68F8 8FAF0030 */ lw $t7, 0x30($sp) -/* B6DA9C 800F68FC 8FB80034 */ lw $t8, 0x34($sp) -/* B6DAA0 800F6900 AFAF0010 */ sw $t7, 0x10($sp) -/* B6DAA4 800F6904 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* B6DAA8 800F6908 AFB80014 */ sw $t8, 0x14($sp) -.L800F690C: -/* B6DAAC 800F690C 8FBF001C */ lw $ra, 0x1c($sp) -/* B6DAB0 800F6910 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6DAB4 800F6914 03E00008 */ jr $ra -/* B6DAB8 800F6918 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F691C.s b/asm/non_matchings/code/code_800EC960/func_800F691C.s deleted file mode 100644 index d99b703fd1..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F691C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_800F691C -/* B6DABC 800F691C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6DAC0 800F6920 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* B6DAC4 800F6924 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* B6DAC8 800F6928 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* B6DACC 800F692C AFBF001C */ sw $ra, 0x1c($sp) -/* B6DAD0 800F6930 AFA40020 */ sw $a0, 0x20($sp) -/* B6DAD4 800F6934 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* B6DAD8 800F6938 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* B6DADC 800F693C 3084FFFF */ andi $a0, $a0, 0xffff -/* B6DAE0 800F6940 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* B6DAE4 800F6944 AFAE0014 */ sw $t6, 0x14($sp) -/* B6DAE8 800F6948 AFA70010 */ sw $a3, 0x10($sp) -/* B6DAEC 800F694C 0C03DA35 */ jal func_800F68D4 -/* B6DAF0 800F6950 24060004 */ li $a2, 4 -/* B6DAF4 800F6954 8FBF001C */ lw $ra, 0x1c($sp) -/* B6DAF8 800F6958 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6DAFC 800F695C 03E00008 */ jr $ra -/* B6DB00 800F6960 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6964.s b/asm/non_matchings/code/code_800EC960/func_800F6964.s deleted file mode 100644 index bcd4101278..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6964.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_800F6964 -/* B6DB04 800F6964 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B6DB08 800F6968 3085FFFF */ andi $a1, $a0, 0xffff -/* B6DB0C 800F696C 00051080 */ sll $v0, $a1, 2 -/* B6DB10 800F6970 00451023 */ subu $v0, $v0, $a1 -/* B6DB14 800F6974 AFBF0034 */ sw $ra, 0x34($sp) -/* B6DB18 800F6978 AFB70030 */ sw $s7, 0x30($sp) -/* B6DB1C 800F697C AFA40050 */ sw $a0, 0x50($sp) -/* B6DB20 800F6980 AFB6002C */ sw $s6, 0x2c($sp) -/* B6DB24 800F6984 AFB50028 */ sw $s5, 0x28($sp) -/* B6DB28 800F6988 AFB40024 */ sw $s4, 0x24($sp) -/* B6DB2C 800F698C AFB30020 */ sw $s3, 0x20($sp) -/* B6DB30 800F6990 AFB2001C */ sw $s2, 0x1c($sp) -/* B6DB34 800F6994 AFB10018 */ sw $s1, 0x18($sp) -/* B6DB38 800F6998 AFB00014 */ sw $s0, 0x14($sp) -/* B6DB3C 800F699C 00A0B825 */ move $s7, $a1 -/* B6DB40 800F69A0 04410002 */ bgez $v0, .L800F69AC -/* B6DB44 800F69A4 00400821 */ addu $at, $v0, $zero -/* B6DB48 800F69A8 24410001 */ addiu $at, $v0, 1 -.L800F69AC: -/* B6DB4C 800F69AC 00011043 */ sra $v0, $at, 1 -/* B6DB50 800F69B0 3C011000 */ lui $at, (0x100000FF >> 16) # lui $at, 0x1000 -/* B6DB54 800F69B4 304200FF */ andi $v0, $v0, 0xff -/* B6DB58 800F69B8 00021400 */ sll $v0, $v0, 0x10 -/* B6DB5C 800F69BC 342100FF */ ori $at, (0x100000FF & 0xFFFF) # ori $at, $at, 0xff -/* B6DB60 800F69C0 00412025 */ or $a0, $v0, $at -/* B6DB64 800F69C4 0C03E803 */ jal Audio_SetBGM -/* B6DB68 800F69C8 AFA2003C */ sw $v0, 0x3c($sp) -/* B6DB6C 800F69CC 8FA4003C */ lw $a0, 0x3c($sp) -/* B6DB70 800F69D0 3C011100 */ lui $at, (0x110000FF >> 16) # lui $at, 0x1100 -/* B6DB74 800F69D4 342100FF */ ori $at, (0x110000FF & 0xFFFF) # ori $at, $at, 0xff -/* B6DB78 800F69D8 0C03E803 */ jal Audio_SetBGM -/* B6DB7C 800F69DC 00812025 */ or $a0, $a0, $at -/* B6DB80 800F69E0 3C168013 */ lui $s6, %hi(D_80133414) # $s6, 0x8013 -/* B6DB84 800F69E4 26D63414 */ addiu $s6, %lo(D_80133414) # addiu $s6, $s6, 0x3414 -/* B6DB88 800F69E8 00008025 */ move $s0, $zero -/* B6DB8C 800F69EC 00001025 */ move $v0, $zero -/* B6DB90 800F69F0 2415000A */ li $s5, 10 -/* B6DB94 800F69F4 3C146200 */ lui $s4, 0x6200 -/* B6DB98 800F69F8 2413000D */ li $s3, 13 -/* B6DB9C 800F69FC 2412000C */ li $s2, 12 -/* B6DBA0 800F6A00 2411000B */ li $s1, 11 -.L800F6A04: -/* B6DBA4 800F6A04 12220007 */ beq $s1, $v0, .L800F6A24 -/* B6DBA8 800F6A08 00001825 */ move $v1, $zero -/* B6DBAC 800F6A0C 50520006 */ beql $v0, $s2, .L800F6A28 -/* B6DBB0 800F6A10 92CE0000 */ lbu $t6, ($s6) -/* B6DBB4 800F6A14 50530009 */ beql $v0, $s3, .L800F6A3C -/* B6DBB8 800F6A18 24030001 */ li $v1, 1 -/* B6DBBC 800F6A1C 10000007 */ b .L800F6A3C -/* B6DBC0 800F6A20 00000000 */ nop -.L800F6A24: -/* B6DBC4 800F6A24 92CE0000 */ lbu $t6, ($s6) -.L800F6A28: -/* B6DBC8 800F6A28 16AE0004 */ bne $s5, $t6, .L800F6A3C -/* B6DBCC 800F6A2C 00000000 */ nop -/* B6DBD0 800F6A30 10000002 */ b .L800F6A3C -/* B6DBD4 800F6A34 24030001 */ li $v1, 1 -/* B6DBD8 800F6A38 24030001 */ li $v1, 1 -.L800F6A3C: -/* B6DBDC 800F6A3C 14600007 */ bnez $v1, .L800F6A5C -/* B6DBE0 800F6A40 00177843 */ sra $t7, $s7, 1 -/* B6DBE4 800F6A44 31F800FF */ andi $t8, $t7, 0xff -/* B6DBE8 800F6A48 0018CC00 */ sll $t9, $t8, 0x10 -/* B6DBEC 800F6A4C 03344025 */ or $t0, $t9, $s4 -/* B6DBF0 800F6A50 00024A00 */ sll $t1, $v0, 8 -/* B6DBF4 800F6A54 0C03E803 */ jal Audio_SetBGM -/* B6DBF8 800F6A58 01092025 */ or $a0, $t0, $t1 -.L800F6A5C: -/* B6DBFC 800F6A5C 26100001 */ addiu $s0, $s0, 1 -/* B6DC00 800F6A60 321000FF */ andi $s0, $s0, 0xff -/* B6DC04 800F6A64 2A010010 */ slti $at, $s0, 0x10 -/* B6DC08 800F6A68 1420FFE6 */ bnez $at, .L800F6A04 -/* B6DC0C 800F6A6C 02001025 */ move $v0, $s0 -/* B6DC10 800F6A70 8FA4003C */ lw $a0, 0x3c($sp) -/* B6DC14 800F6A74 3C011300 */ lui $at, (0x130000FF >> 16) # lui $at, 0x1300 -/* B6DC18 800F6A78 342100FF */ ori $at, (0x130000FF & 0xFFFF) # ori $at, $at, 0xff -/* B6DC1C 800F6A7C 0C03E803 */ jal Audio_SetBGM -/* B6DC20 800F6A80 00812025 */ or $a0, $a0, $at -/* B6DC24 800F6A84 8FBF0034 */ lw $ra, 0x34($sp) -/* B6DC28 800F6A88 8FB00014 */ lw $s0, 0x14($sp) -/* B6DC2C 800F6A8C 8FB10018 */ lw $s1, 0x18($sp) -/* B6DC30 800F6A90 8FB2001C */ lw $s2, 0x1c($sp) -/* B6DC34 800F6A94 8FB30020 */ lw $s3, 0x20($sp) -/* B6DC38 800F6A98 8FB40024 */ lw $s4, 0x24($sp) -/* B6DC3C 800F6A9C 8FB50028 */ lw $s5, 0x28($sp) -/* B6DC40 800F6AA0 8FB6002C */ lw $s6, 0x2c($sp) -/* B6DC44 800F6AA4 8FB70030 */ lw $s7, 0x30($sp) -/* B6DC48 800F6AA8 03E00008 */ jr $ra -/* B6DC4C 800F6AAC 27BD0050 */ addiu $sp, $sp, 0x50 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6AB0.s b/asm/non_matchings/code/code_800EC960/func_800F6AB0.s deleted file mode 100644 index 0ed4591ba4..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6AB0.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800F6AB0 -/* B6DC50 800F6AB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B6DC54 800F6AB4 00802825 */ move $a1, $a0 -/* B6DC58 800F6AB8 30A200FF */ andi $v0, $a1, 0xff -/* B6DC5C 800F6ABC 3C011000 */ lui $at, (0x100000FF >> 16) # lui $at, 0x1000 -/* B6DC60 800F6AC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B6DC64 800F6AC4 AFA40020 */ sw $a0, 0x20($sp) -/* B6DC68 800F6AC8 342100FF */ ori $at, (0x100000FF & 0xFFFF) # ori $at, $at, 0xff -/* B6DC6C 800F6ACC 00021400 */ sll $v0, $v0, 0x10 -/* B6DC70 800F6AD0 00412025 */ or $a0, $v0, $at -/* B6DC74 800F6AD4 0C03E803 */ jal Audio_SetBGM -/* B6DC78 800F6AD8 AFA2001C */ sw $v0, 0x1c($sp) -/* B6DC7C 800F6ADC 8FA4001C */ lw $a0, 0x1c($sp) -/* B6DC80 800F6AE0 3C011100 */ lui $at, (0x110000FF >> 16) # lui $at, 0x1100 -/* B6DC84 800F6AE4 342100FF */ ori $at, (0x110000FF & 0xFFFF) # ori $at, $at, 0xff -/* B6DC88 800F6AE8 0C03E803 */ jal Audio_SetBGM -/* B6DC8C 800F6AEC 00812025 */ or $a0, $a0, $at -/* B6DC90 800F6AF0 8FA4001C */ lw $a0, 0x1c($sp) -/* B6DC94 800F6AF4 3C011300 */ lui $at, (0x130000FF >> 16) # lui $at, 0x1300 -/* B6DC98 800F6AF8 342100FF */ ori $at, (0x130000FF & 0xFFFF) # ori $at, $at, 0xff -/* B6DC9C 800F6AFC 0C03E803 */ jal Audio_SetBGM -/* B6DCA0 800F6B00 00812025 */ or $a0, $a0, $at -/* B6DCA4 800F6B04 00002025 */ move $a0, $zero -/* B6DCA8 800F6B08 24050003 */ li $a1, 3 -/* B6DCAC 800F6B0C 2406007F */ li $a2, 127 -/* B6DCB0 800F6B10 0C03E890 */ jal func_800FA240 -/* B6DCB4 800F6B14 00003825 */ move $a3, $zero -/* B6DCB8 800F6B18 00002025 */ move $a0, $zero -/* B6DCBC 800F6B1C 24050001 */ li $a1, 1 -/* B6DCC0 800F6B20 2406007F */ li $a2, 127 -/* B6DCC4 800F6B24 0C03E890 */ jal func_800FA240 -/* B6DCC8 800F6B28 00003825 */ move $a3, $zero -/* B6DCCC 800F6B2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DCD0 800F6B30 27BD0020 */ addiu $sp, $sp, 0x20 -/* B6DCD4 800F6B34 03E00008 */ jr $ra -/* B6DCD8 800F6B38 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6B3C.s b/asm/non_matchings/code/code_800EC960/func_800F6B3C.s deleted file mode 100644 index 9b5cff454a..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6B3C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800F6B3C -/* B6DCDC 800F6B3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6DCE0 800F6B40 AFBF0014 */ sw $ra, 0x14($sp) -/* B6DCE4 800F6B44 24040002 */ li $a0, 2 -/* B6DCE8 800F6B48 00002825 */ move $a1, $zero -/* B6DCEC 800F6B4C 240600FF */ li $a2, 255 -/* B6DCF0 800F6B50 0C03E4A0 */ jal func_800F9280 -/* B6DCF4 800F6B54 24070005 */ li $a3, 5 -/* B6DCF8 800F6B58 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DCFC 800F6B5C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6DD00 800F6B60 03E00008 */ jr $ra -/* B6DD04 800F6B64 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6B68.s b/asm/non_matchings/code/code_800EC960/func_800F6B68.s deleted file mode 100644 index 7fd4e90620..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6B68.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800F6B68 -/* B6DD08 800F6B68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6DD0C 800F6B6C AFBF0014 */ sw $ra, 0x14($sp) -/* B6DD10 800F6B70 3C048300 */ lui $a0, 0x8300 -/* B6DD14 800F6B74 0C0396BF */ jal func_800E5AFC -/* B6DD18 800F6B78 00002825 */ move $a1, $zero -/* B6DD1C 800F6B7C 3C048301 */ lui $a0, 0x8301 -/* B6DD20 800F6B80 0C0396BF */ jal func_800E5AFC -/* B6DD24 800F6B84 00002825 */ move $a1, $zero -/* B6DD28 800F6B88 3C048302 */ lui $a0, 0x8302 -/* B6DD2C 800F6B8C 0C0396BF */ jal func_800E5AFC -/* B6DD30 800F6B90 00002825 */ move $a1, $zero -/* B6DD34 800F6B94 3C048303 */ lui $a0, 0x8303 -/* B6DD38 800F6B98 0C0396BF */ jal func_800E5AFC -/* B6DD3C 800F6B9C 00002825 */ move $a1, $zero -/* B6DD40 800F6BA0 0C0396E0 */ jal func_800E5B80 -/* B6DD44 800F6BA4 00000000 */ nop -/* B6DD48 800F6BA8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DD4C 800F6BAC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6DD50 800F6BB0 03E00008 */ jr $ra -/* B6DD54 800F6BB4 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6BB8.s b/asm/non_matchings/code/code_800EC960/func_800F6BB8.s deleted file mode 100644 index f355bbe86e..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6BB8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800F6BB8 -/* B6DD58 800F6BB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6DD5C 800F6BBC AFBF0014 */ sw $ra, 0x14($sp) -/* B6DD60 800F6BC0 0C0399A0 */ jal func_800E6680 -/* B6DD64 800F6BC4 00000000 */ nop -/* B6DD68 800F6BC8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DD6C 800F6BCC 00021600 */ sll $v0, $v0, 0x18 -/* B6DD70 800F6BD0 00021603 */ sra $v0, $v0, 0x18 -/* B6DD74 800F6BD4 03E00008 */ jr $ra -/* B6DD78 800F6BD8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6BDC.s b/asm/non_matchings/code/code_800EC960/func_800F6BDC.s deleted file mode 100644 index 397e3de80d..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6BDC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800F6BDC -/* B6DD7C 800F6BDC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6DD80 800F6BE0 AFBF0014 */ sw $ra, 0x14($sp) -/* B6DD84 800F6BE4 0C03DADA */ jal func_800F6B68 -/* B6DD88 800F6BE8 00000000 */ nop -/* B6DD8C 800F6BEC 0C0396E0 */ jal func_800E5B80 -/* B6DD90 800F6BF0 00000000 */ nop -.L800F6BF4: -/* B6DD94 800F6BF4 0C03DAEE */ jal func_800F6BB8 -/* B6DD98 800F6BF8 00000000 */ nop -/* B6DD9C 800F6BFC 1440FFFD */ bnez $v0, .L800F6BF4 -/* B6DDA0 800F6C00 00000000 */ nop -/* B6DDA4 800F6C04 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DDA8 800F6C08 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6DDAC 800F6C0C 03E00008 */ jr $ra -/* B6DDB0 800F6C10 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6C14.s b/asm/non_matchings/code/code_800EC960/func_800F6C14.s deleted file mode 100644 index e5840bc678..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6C14.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800F6C14 -/* B6DDB4 800F6C14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6DDB8 800F6C18 AFBF0014 */ sw $ra, 0x14($sp) -/* B6DDBC 800F6C1C 0C039809 */ jal func_800E6024 -/* B6DDC0 800F6C20 00000000 */ nop -/* B6DDC4 800F6C24 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DDC8 800F6C28 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6DDCC 800F6C2C 03E00008 */ jr $ra -/* B6DDD0 800F6C30 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6C34.s b/asm/non_matchings/code/code_800EC960/func_800F6C34.s deleted file mode 100644 index 745130b07f..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6C34.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_800F6C34 -/* B6DDD4 800F6C34 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6DDD8 800F6C38 44810000 */ mtc1 $at, $f0 -/* B6DDDC 800F6C3C 3C018013 */ lui $at, %hi(D_8013061C) # $at, 0x8013 -/* B6DDE0 800F6C40 A020061C */ sb $zero, %lo(D_8013061C)($at) -/* B6DDE4 800F6C44 3C018017 */ lui $at, %hi(D_8016B7A8) -/* B6DDE8 800F6C48 E420B7A8 */ swc1 $f0, %lo(D_8016B7A8)($at) -/* B6DDEC 800F6C4C 3C018017 */ lui $at, %hi(D_8016B7B0) -/* B6DDF0 800F6C50 E420B7B0 */ swc1 $f0, %lo(D_8016B7B0)($at) -/* B6DDF4 800F6C54 3C018013 */ lui $at, %hi(D_8013063C) # $at, 0x8013 -/* B6DDF8 800F6C58 A020063C */ sb $zero, %lo(D_8013063C)($at) -/* B6DDFC 800F6C5C 3C018013 */ lui $at, %hi(D_80130640) # $at, 0x8013 -/* B6DE00 800F6C60 A0200640 */ sb $zero, %lo(D_80130640)($at) -/* B6DE04 800F6C64 3C018013 */ lui $at, %hi(D_80130644) # $at, 0x8013 -/* B6DE08 800F6C68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6DE0C 800F6C6C A0200644 */ sb $zero, %lo(D_80130644)($at) -/* B6DE10 800F6C70 AFBF0014 */ sw $ra, 0x14($sp) -/* B6DE14 800F6C74 3C018013 */ lui $at, %hi(D_80130648) # $at, 0x8013 -/* B6DE18 800F6C78 A0200648 */ sb $zero, %lo(D_80130648)($at) -/* B6DE1C 800F6C7C 0C03B616 */ jal func_800ED858 -/* B6DE20 800F6C80 00002025 */ move $a0, $zero -/* B6DE24 800F6C84 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6DE28 800F6C88 44810000 */ mtc1 $at, $f0 -/* B6DE2C 800F6C8C 3C028017 */ lui $v0, %hi(D_8016B7B8) # $v0, 0x8017 -/* B6DE30 800F6C90 3C038017 */ lui $v1, %hi(D_8016B7C8) # $v1, 0x8017 -/* B6DE34 800F6C94 2463B7C8 */ addiu $v1, %lo(D_8016B7C8) # addiu $v1, $v1, -0x4838 -/* B6DE38 800F6C98 2442B7B8 */ addiu $v0, %lo(D_8016B7B8) # addiu $v0, $v0, -0x4848 -/* B6DE3C 800F6C9C AC40000C */ sw $zero, 0xc($v0) -/* B6DE40 800F6CA0 AC60000C */ sw $zero, 0xc($v1) -/* B6DE44 800F6CA4 3C018017 */ lui $at, %hi(D_8016B7D8) -/* B6DE48 800F6CA8 E4400000 */ swc1 $f0, ($v0) -/* B6DE4C 800F6CAC E4600000 */ swc1 $f0, ($v1) -/* B6DE50 800F6CB0 E420B7D8 */ swc1 $f0, %lo(D_8016B7D8)($at) -/* B6DE54 800F6CB4 2406007F */ li $a2, 127 -/* B6DE58 800F6CB8 3C018017 */ lui $at, %hi(D_8016B8B0) # $at, 0x8017 -/* B6DE5C 800F6CBC A026B8B0 */ sb $a2, %lo(D_8016B8B0)($at) -/* B6DE60 800F6CC0 3C018017 */ lui $at, %hi(D_8016B8B1) # $at, 0x8017 -/* B6DE64 800F6CC4 A026B8B1 */ sb $a2, %lo(D_8016B8B1)($at) -/* B6DE68 800F6CC8 3C018017 */ lui $at, %hi(D_8016B8B2) # $at, 0x8017 -/* B6DE6C 800F6CCC A020B8B2 */ sb $zero, %lo(D_8016B8B2)($at) -/* B6DE70 800F6CD0 3C0F8013 */ lui $t7, %hi(D_80133414) # $t7, 0x8013 -/* B6DE74 800F6CD4 91EF3414 */ lbu $t7, %lo(D_80133414)($t7) -/* B6DE78 800F6CD8 3C018017 */ lui $at, %hi(D_8016B8B3) # $at, 0x8017 -/* B6DE7C 800F6CDC A020B8B3 */ sb $zero, %lo(D_8016B8B3)($at) -/* B6DE80 800F6CE0 3C018017 */ lui $at, %hi(D_8016B8B4) # $at, 0x8017 -/* B6DE84 800F6CE4 240E00FF */ li $t6, 255 -/* B6DE88 800F6CE8 3C188013 */ lui $t8, %hi(D_801306C8) -/* B6DE8C 800F6CEC A02EB8B4 */ sb $t6, %lo(D_8016B8B4)($at) -/* B6DE90 800F6CF0 030FC021 */ addu $t8, $t8, $t7 -/* B6DE94 800F6CF4 831806C8 */ lb $t8, %lo(D_801306C8)($t8) -/* B6DE98 800F6CF8 3C018017 */ lui $at, %hi(D_8016B9D8) # $at, 0x8017 -/* B6DE9C 800F6CFC A020B9D8 */ sb $zero, %lo(D_8016B9D8)($at) -/* B6DEA0 800F6D00 3C018013 */ lui $at, %hi(D_80130610) # $at, 0x8013 -/* B6DEA4 800F6D04 A0380610 */ sb $t8, %lo(D_80130610)($at) -/* B6DEA8 800F6D08 3C018013 */ lui $at, %hi(D_80130608) # $at, 0x8013 -/* B6DEAC 800F6D0C A0200608 */ sb $zero, %lo(D_80130608)($at) -/* B6DEB0 800F6D10 3C018013 */ lui $at, %hi(D_80130628) # $at, 0x8013 -/* B6DEB4 800F6D14 3419FFFF */ li $t9, 65535 -/* B6DEB8 800F6D18 A4390628 */ sh $t9, %lo(D_80130628)($at) -/* B6DEBC 800F6D1C 3C044600 */ lui $a0, 0x4600 -/* B6DEC0 800F6D20 0C0396C8 */ jal func_800E5B20 -/* B6DEC4 800F6D24 2405FFFF */ li $a1, -1 -/* B6DEC8 800F6D28 3C018013 */ lui $at, %hi(D_8013064C) # $at, 0x8013 -/* B6DECC 800F6D2C AC20064C */ sw $zero, %lo(D_8013064C)($at) -/* B6DED0 800F6D30 3C018017 */ lui $at, %hi(D_8016B9F4) # $at, 0x8017 -/* B6DED4 800F6D34 A020B9F4 */ sb $zero, %lo(D_8016B9F4)($at) -/* B6DED8 800F6D38 8FBF0014 */ lw $ra, 0x14($sp) -/* B6DEDC 800F6D3C 3C018017 */ lui $at, %hi(D_8016B9F3) # $at, 0x8017 -/* B6DEE0 800F6D40 24080001 */ li $t0, 1 -/* B6DEE4 800F6D44 A028B9F3 */ sb $t0, %lo(D_8016B9F3)($at) -/* B6DEE8 800F6D48 3C018017 */ lui $at, %hi(D_8016B9F2) # $at, 0x8017 -/* B6DEEC 800F6D4C A020B9F2 */ sb $zero, %lo(D_8016B9F2)($at) -/* B6DEF0 800F6D50 03E00008 */ jr $ra -/* B6DEF4 800F6D54 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6D58.s b/asm/non_matchings/code/code_800EC960/func_800F6D58.s deleted file mode 100644 index d0a1129d39..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6D58.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_800F6D58 -/* B6DEF8 800F6D58 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B6DEFC 800F6D5C 3C0E8017 */ lui $t6, %hi(D_8016E9A4) # $t6, 0x8017 -/* B6DF00 800F6D60 95CEE9A4 */ lhu $t6, %lo(D_8016E9A4)($t6) -/* B6DF04 800F6D64 AFB20020 */ sw $s2, 0x20($sp) -/* B6DF08 800F6D68 AFB1001C */ sw $s1, 0x1c($sp) -/* B6DF0C 800F6D6C 24010001 */ li $at, 1 -/* B6DF10 800F6D70 309100FF */ andi $s1, $a0, 0xff -/* B6DF14 800F6D74 30B200FF */ andi $s2, $a1, 0xff -/* B6DF18 800F6D78 AFBF002C */ sw $ra, 0x2c($sp) -/* B6DF1C 800F6D7C AFB40028 */ sw $s4, 0x28($sp) -/* B6DF20 800F6D80 AFB30024 */ sw $s3, 0x24($sp) -/* B6DF24 800F6D84 AFB00018 */ sw $s0, 0x18($sp) -/* B6DF28 800F6D88 AFA40040 */ sw $a0, 0x40($sp) -/* B6DF2C 800F6D8C AFA50044 */ sw $a1, 0x44($sp) -/* B6DF30 800F6D90 11C1000A */ beq $t6, $at, .L800F6DBC -/* B6DF34 800F6D94 AFA60048 */ sw $a2, 0x48($sp) -/* B6DF38 800F6D98 3C05F000 */ lui $a1, (0xF00000FF >> 16) # lui $a1, 0xf000 -/* B6DF3C 800F6D9C 34A500FF */ ori $a1, (0xF00000FF & 0xFFFF) # ori $a1, $a1, 0xff -/* B6DF40 800F6DA0 0C03E847 */ jal func_800FA11C -/* B6DF44 800F6DA4 24040001 */ li $a0, 1 -/* B6DF48 800F6DA8 10400004 */ beqz $v0, .L800F6DBC -/* B6DF4C 800F6DAC 240F0001 */ li $t7, 1 -/* B6DF50 800F6DB0 3C018013 */ lui $at, %hi(D_80131F64) # $at, 0x8013 -/* B6DF54 800F6DB4 10000029 */ b .L800F6E5C -/* B6DF58 800F6DB8 A02F1F64 */ sb $t7, %lo(D_80131F64)($at) -.L800F6DBC: -/* B6DF5C 800F6DBC 0011C200 */ sll $t8, $s1, 8 -/* B6DF60 800F6DC0 0312C821 */ addu $t9, $t8, $s2 -/* B6DF64 800F6DC4 24010101 */ li $at, 257 -/* B6DF68 800F6DC8 02208025 */ move $s0, $s1 -/* B6DF6C 800F6DCC 17210009 */ bne $t9, $at, .L800F6DF4 -/* B6DF70 800F6DD0 02402825 */ move $a1, $s2 -/* B6DF74 800F6DD4 24040003 */ li $a0, 3 -/* B6DF78 800F6DD8 0C03E82D */ jal func_800FA0B4 -/* B6DF7C 800F6DDC AFB20034 */ sw $s2, 0x34($sp) -/* B6DF80 800F6DE0 2401002F */ li $at, 47 -/* B6DF84 800F6DE4 10410003 */ beq $v0, $at, .L800F6DF4 -/* B6DF88 800F6DE8 8FA50034 */ lw $a1, 0x34($sp) -/* B6DF8C 800F6DEC 3C018017 */ lui $at, %hi(D_8016B9D8) # $at, 0x8017 -/* B6DF90 800F6DF0 A020B9D8 */ sb $zero, %lo(D_8016B9D8)($at) -.L800F6DF4: -/* B6DF94 800F6DF4 00101103 */ sra $v0, $s0, 4 -/* B6DF98 800F6DF8 3204000F */ andi $a0, $s0, 0xf -/* B6DF9C 800F6DFC 304800FF */ andi $t0, $v0, 0xff -/* B6DFA0 800F6E00 304300FF */ andi $v1, $v0, 0xff -/* B6DFA4 800F6E04 15000002 */ bnez $t0, .L800F6E10 -/* B6DFA8 800F6E08 308600FF */ andi $a2, $a0, 0xff -/* B6DFAC 800F6E0C 308300FF */ andi $v1, $a0, 0xff -.L800F6E10: -/* B6DFB0 800F6E10 308900FF */ andi $t1, $a0, 0xff -/* B6DFB4 800F6E14 0123082A */ slt $at, $t1, $v1 -/* B6DFB8 800F6E18 14200010 */ bnez $at, .L800F6E5C -/* B6DFBC 800F6E1C 307000FF */ andi $s0, $v1, 0xff -/* B6DFC0 800F6E20 00059C00 */ sll $s3, $a1, 0x10 -/* B6DFC4 800F6E24 3C018000 */ lui $at, 0x8000 -/* B6DFC8 800F6E28 02619825 */ or $s3, $s3, $at -/* B6DFCC 800F6E2C 00C09025 */ move $s2, $a2 -/* B6DFD0 800F6E30 02008825 */ move $s1, $s0 -/* B6DFD4 800F6E34 93B4004B */ lbu $s4, 0x4b($sp) -.L800F6E38: -/* B6DFD8 800F6E38 00115200 */ sll $t2, $s1, 8 -/* B6DFDC 800F6E3C 026A5825 */ or $t3, $s3, $t2 -/* B6DFE0 800F6E40 0C03E803 */ jal Audio_SetBGM -/* B6DFE4 800F6E44 01742025 */ or $a0, $t3, $s4 -/* B6DFE8 800F6E48 26100001 */ addiu $s0, $s0, 1 -/* B6DFEC 800F6E4C 321000FF */ andi $s0, $s0, 0xff -/* B6DFF0 800F6E50 0250082A */ slt $at, $s2, $s0 -/* B6DFF4 800F6E54 1020FFF8 */ beqz $at, .L800F6E38 -/* B6DFF8 800F6E58 02008825 */ move $s1, $s0 -.L800F6E5C: -/* B6DFFC 800F6E5C 8FBF002C */ lw $ra, 0x2c($sp) -/* B6E000 800F6E60 8FB00018 */ lw $s0, 0x18($sp) -/* B6E004 800F6E64 8FB1001C */ lw $s1, 0x1c($sp) -/* B6E008 800F6E68 8FB20020 */ lw $s2, 0x20($sp) -/* B6E00C 800F6E6C 8FB30024 */ lw $s3, 0x24($sp) -/* B6E010 800F6E70 8FB40028 */ lw $s4, 0x28($sp) -/* B6E014 800F6E74 03E00008 */ jr $ra -/* B6E018 800F6E78 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6E7C.s b/asm/non_matchings/code/code_800EC960/func_800F6E7C.s deleted file mode 100644 index d09a785ec0..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6E7C.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_800F6E7C -/* B6E01C 800F6E7C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6E020 800F6E80 AFB00014 */ sw $s0, 0x14($sp) -/* B6E024 800F6E84 3090FFFF */ andi $s0, $a0, 0xffff -/* B6E028 800F6E88 AFBF0024 */ sw $ra, 0x24($sp) -/* B6E02C 800F6E8C AFB10018 */ sw $s1, 0x18($sp) -/* B6E030 800F6E90 AFA40028 */ sw $a0, 0x28($sp) -/* B6E034 800F6E94 30B1FFFF */ andi $s1, $a1, 0xffff -/* B6E038 800F6E98 AFB30020 */ sw $s3, 0x20($sp) -/* B6E03C 800F6E9C AFB2001C */ sw $s2, 0x1c($sp) -/* B6E040 800F6EA0 AFA5002C */ sw $a1, 0x2c($sp) -/* B6E044 800F6EA4 0C03E82D */ jal func_800FA0B4 -/* B6E048 800F6EA8 00002025 */ move $a0, $zero -/* B6E04C 800F6EAC 2401004C */ li $at, 76 -/* B6E050 800F6EB0 14410005 */ bne $v0, $at, .L800F6EC8 -/* B6E054 800F6EB4 3C047000 */ lui $a0, (0x70000001 >> 16) # lui $a0, 0x7000 -/* B6E058 800F6EB8 0C03CFCF */ jal func_800F3F3C -/* B6E05C 800F6EBC 2404000F */ li $a0, 15 -/* B6E060 800F6EC0 10000036 */ b .L800F6F9C -/* B6E064 800F6EC4 8FBF0024 */ lw $ra, 0x24($sp) -.L800F6EC8: -/* B6E068 800F6EC8 0C03E803 */ jal Audio_SetBGM -/* B6E06C 800F6ECC 34840001 */ ori $a0, (0x70000001 & 0xFFFF) # ori $a0, $a0, 1 -/* B6E070 800F6ED0 00102203 */ sra $a0, $s0, 8 -/* B6E074 800F6ED4 308400FF */ andi $a0, $a0, 0xff -/* B6E078 800F6ED8 3C017004 */ lui $at, 0x7004 -/* B6E07C 800F6EDC 00812025 */ or $a0, $a0, $at -/* B6E080 800F6EE0 0C03E803 */ jal Audio_SetBGM -/* B6E084 800F6EE4 02009825 */ move $s3, $s0 -/* B6E088 800F6EE8 02602025 */ move $a0, $s3 -/* B6E08C 800F6EEC 308400FF */ andi $a0, $a0, 0xff -/* B6E090 800F6EF0 3C017005 */ lui $at, 0x7005 -/* B6E094 800F6EF4 0C03E803 */ jal Audio_SetBGM -/* B6E098 800F6EF8 00812025 */ or $a0, $a0, $at -/* B6E09C 800F6EFC 00002025 */ move $a0, $zero -/* B6E0A0 800F6F00 00002825 */ move $a1, $zero -/* B6E0A4 800F6F04 2406007F */ li $a2, 127 -/* B6E0A8 800F6F08 0C03E890 */ jal func_800FA240 -/* B6E0AC 800F6F0C 24070001 */ li $a3, 1 -/* B6E0B0 800F6F10 3C0E8013 */ lui $t6, %hi(D_80133408) # $t6, 0x8013 -/* B6E0B4 800F6F14 91CE3408 */ lbu $t6, %lo(D_80133408)($t6) -/* B6E0B8 800F6F18 3C04E000 */ lui $a0, (0xE0000100 >> 16) # lui $a0, 0xe000 -/* B6E0BC 800F6F1C 00008025 */ move $s0, $zero -/* B6E0C0 800F6F20 11C00003 */ beqz $t6, .L800F6F30 -/* B6E0C4 800F6F24 34840100 */ ori $a0, (0xE0000100 & 0xFFFF) # ori $a0, $a0, 0x100 -/* B6E0C8 800F6F28 0C03E803 */ jal Audio_SetBGM -/* B6E0CC 800F6F2C 24100001 */ li $s0, 1 -.L800F6F30: -/* B6E0D0 800F6F30 0C03E803 */ jal Audio_SetBGM -/* B6E0D4 800F6F34 24040001 */ li $a0, 1 -/* B6E0D8 800F6F38 0010102B */ sltu $v0, $zero, $s0 -/* B6E0DC 800F6F3C 10400004 */ beqz $v0, .L800F6F50 -/* B6E0E0 800F6F40 00008025 */ move $s0, $zero -/* B6E0E4 800F6F44 3C04E000 */ lui $a0, (0xE0000001 >> 16) # lui $a0, 0xe000 -/* B6E0E8 800F6F48 0C03E803 */ jal Audio_SetBGM -/* B6E0EC 800F6F4C 34840101 */ ori $a0, (0xE0000101 & 0xFFFF) # ori $a0, $a0, 0x101 -.L800F6F50: -/* B6E0F0 800F6F50 02209025 */ move $s2, $s1 -/* B6E0F4 800F6F54 3C118001 */ lui $s1, 0x8001 -/* B6E0F8 800F6F58 00001025 */ move $v0, $zero -.L800F6F5C: -/* B6E0FC 800F6F5C 240F0001 */ li $t7, 1 -/* B6E100 800F6F60 004F1804 */ sllv $v1, $t7, $v0 -/* B6E104 800F6F64 0243C024 */ and $t8, $s2, $v1 -/* B6E108 800F6F68 17000006 */ bnez $t8, .L800F6F84 -/* B6E10C 800F6F6C 0263C824 */ and $t9, $s3, $v1 -/* B6E110 800F6F70 13200004 */ beqz $t9, .L800F6F84 -/* B6E114 800F6F74 00024200 */ sll $t0, $v0, 8 -/* B6E118 800F6F78 01112025 */ or $a0, $t0, $s1 -/* B6E11C 800F6F7C 0C03E803 */ jal Audio_SetBGM -/* B6E120 800F6F80 34840001 */ ori $a0, (0xE0000001 & 0xFFFF) # ori $a0, $a0, 1 -.L800F6F84: -/* B6E124 800F6F84 26100001 */ addiu $s0, $s0, 1 -/* B6E128 800F6F88 321000FF */ andi $s0, $s0, 0xff -/* B6E12C 800F6F8C 2A010010 */ slti $at, $s0, 0x10 -/* B6E130 800F6F90 1420FFF2 */ bnez $at, .L800F6F5C -/* B6E134 800F6F94 02001025 */ move $v0, $s0 -/* B6E138 800F6F98 8FBF0024 */ lw $ra, 0x24($sp) -.L800F6F9C: -/* B6E13C 800F6F9C 8FB00014 */ lw $s0, 0x14($sp) -/* B6E140 800F6FA0 8FB10018 */ lw $s1, 0x18($sp) -/* B6E144 800F6FA4 8FB2001C */ lw $s2, 0x1c($sp) -/* B6E148 800F6FA8 8FB30020 */ lw $s3, 0x20($sp) -/* B6E14C 800F6FAC 03E00008 */ jr $ra -/* B6E150 800F6FB0 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F6FB4.s b/asm/non_matchings/code/code_800EC960/func_800F6FB4.s deleted file mode 100644 index 7c13e4e004..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F6FB4.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_800F6FB4 -/* B6E154 800F6FB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6E158 800F6FB8 3C028017 */ lui $v0, %hi(D_8016E9A4) # $v0, 0x8017 -/* B6E15C 800F6FBC 9442E9A4 */ lhu $v0, %lo(D_8016E9A4)($v0) -/* B6E160 800F6FC0 AFB1001C */ sw $s1, 0x1c($sp) -/* B6E164 800F6FC4 AFB00018 */ sw $s0, 0x18($sp) -/* B6E168 800F6FC8 3401FFFF */ li $at, 65535 -/* B6E16C 800F6FCC 309100FF */ andi $s1, $a0, 0xff -/* B6E170 800F6FD0 AFBF002C */ sw $ra, 0x2c($sp) -/* B6E174 800F6FD4 AFB40028 */ sw $s4, 0x28($sp) -/* B6E178 800F6FD8 AFB30024 */ sw $s3, 0x24($sp) -/* B6E17C 800F6FDC AFB20020 */ sw $s2, 0x20($sp) -/* B6E180 800F6FE0 AFA40030 */ sw $a0, 0x30($sp) -/* B6E184 800F6FE4 10410007 */ beq $v0, $at, .L800F7004 -/* B6E188 800F6FE8 00008025 */ move $s0, $zero -/* B6E18C 800F6FEC 304F00FF */ andi $t7, $v0, 0xff -/* B6E190 800F6FF0 3C188013 */ lui $t8, %hi(D_80130658) -/* B6E194 800F6FF4 030FC021 */ addu $t8, $t8, $t7 -/* B6E198 800F6FF8 93180658 */ lbu $t8, %lo(D_80130658)($t8) -/* B6E19C 800F6FFC 33190080 */ andi $t9, $t8, 0x80 -/* B6E1A0 800F7000 17200035 */ bnez $t9, .L800F70D8 -.L800F7004: -/* B6E1A4 800F7004 00114080 */ sll $t0, $s1, 2 -/* B6E1A8 800F7008 01114023 */ subu $t0, $t0, $s1 -/* B6E1AC 800F700C 00084080 */ sll $t0, $t0, 2 -/* B6E1B0 800F7010 3C138013 */ lui $s3, %hi(D_801306DC) # $s3, 0x8013 -/* B6E1B4 800F7014 01114021 */ addu $t0, $t0, $s1 -/* B6E1B8 800F7018 267306DC */ addiu $s3, %lo(D_801306DC) # addiu $s3, $s3, 0x6dc -/* B6E1BC 800F701C 000840C0 */ sll $t0, $t0, 3 -/* B6E1C0 800F7020 02681021 */ addu $v0, $s3, $t0 -/* B6E1C4 800F7024 94440000 */ lhu $a0, ($v0) -/* B6E1C8 800F7028 0C03DB9F */ jal func_800F6E7C -/* B6E1CC 800F702C 94450002 */ lhu $a1, 2($v0) -/* B6E1D0 800F7030 00114880 */ sll $t1, $s1, 2 -/* B6E1D4 800F7034 01314823 */ subu $t1, $t1, $s1 -/* B6E1D8 800F7038 00094880 */ sll $t1, $t1, 2 -/* B6E1DC 800F703C 01314821 */ addu $t1, $t1, $s1 -/* B6E1E0 800F7040 000948C0 */ sll $t1, $t1, 3 -/* B6E1E4 800F7044 02699021 */ addu $s2, $s3, $t1 -/* B6E1E8 800F7048 924A0004 */ lbu $t2, 4($s2) -/* B6E1EC 800F704C 241400FF */ li $s4, 255 -/* B6E1F0 800F7050 02505821 */ addu $t3, $s2, $s0 -/* B6E1F4 800F7054 128A001A */ beq $s4, $t2, .L800F70C0 -/* B6E1F8 800F7058 3C138000 */ lui $s3, 0x8000 -/* B6E1FC 800F705C 91710004 */ lbu $s1, 4($t3) -/* B6E200 800F7060 26100001 */ addiu $s0, $s0, 1 -.L800F7064: -/* B6E204 800F7064 321000FF */ andi $s0, $s0, 0xff -/* B6E208 800F7068 02506021 */ addu $t4, $s2, $s0 -/* B6E20C 800F706C 91830004 */ lbu $v1, 4($t4) -/* B6E210 800F7070 26100001 */ addiu $s0, $s0, 1 -/* B6E214 800F7074 321000FF */ andi $s0, $s0, 0xff -/* B6E218 800F7078 322200FF */ andi $v0, $s1, 0xff -/* B6E21C 800F707C 02506821 */ addu $t5, $s2, $s0 -/* B6E220 800F7080 00037400 */ sll $t6, $v1, 0x10 -/* B6E224 800F7084 91A50004 */ lbu $a1, 4($t5) -/* B6E228 800F7088 01D37825 */ or $t7, $t6, $s3 -/* B6E22C 800F708C 0002C200 */ sll $t8, $v0, 8 -/* B6E230 800F7090 26100001 */ addiu $s0, $s0, 1 -/* B6E234 800F7094 01F8C825 */ or $t9, $t7, $t8 -/* B6E238 800F7098 321000FF */ andi $s0, $s0, 0xff -/* B6E23C 800F709C 0C03E803 */ jal Audio_SetBGM -/* B6E240 800F70A0 03252025 */ or $a0, $t9, $a1 -/* B6E244 800F70A4 02504021 */ addu $t0, $s2, $s0 -/* B6E248 800F70A8 91110004 */ lbu $s1, 4($t0) -/* B6E24C 800F70AC 2A010064 */ slti $at, $s0, 0x64 -/* B6E250 800F70B0 12910003 */ beq $s4, $s1, .L800F70C0 -/* B6E254 800F70B4 00000000 */ nop -/* B6E258 800F70B8 5420FFEA */ bnezl $at, .L800F7064 -/* B6E25C 800F70BC 26100001 */ addiu $s0, $s0, 1 -.L800F70C0: -/* B6E260 800F70C0 3C048013 */ lui $a0, %hi(D_80130604) # $a0, 0x8013 -/* B6E264 800F70C4 90840604 */ lbu $a0, %lo(D_80130604)($a0) -/* B6E268 800F70C8 3C018007 */ lui $at, (0x80070D00 >> 16) # lui $at, 0x8007 -/* B6E26C 800F70CC 34210D00 */ ori $at, (0x80070D00 & 0xFFFF) # ori $at, $at, 0xd00 -/* B6E270 800F70D0 0C03E803 */ jal Audio_SetBGM -/* B6E274 800F70D4 00812025 */ or $a0, $a0, $at -.L800F70D8: -/* B6E278 800F70D8 8FBF002C */ lw $ra, 0x2c($sp) -/* B6E27C 800F70DC 8FB00018 */ lw $s0, 0x18($sp) -/* B6E280 800F70E0 8FB1001C */ lw $s1, 0x1c($sp) -/* B6E284 800F70E4 8FB20020 */ lw $s2, 0x20($sp) -/* B6E288 800F70E8 8FB30024 */ lw $s3, 0x24($sp) -/* B6E28C 800F70EC 8FB40028 */ lw $s4, 0x28($sp) -/* B6E290 800F70F0 03E00008 */ jr $ra -/* B6E294 800F70F4 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/code_800EC960/func_800F70F8.s b/asm/non_matchings/code/code_800EC960/func_800F70F8.s deleted file mode 100644 index 0d74b80414..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F70F8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800F70F8 -/* B6E298 800F70F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E29C 800F70FC AFBF0014 */ sw $ra, 0x14($sp) -/* B6E2A0 800F7100 00002025 */ move $a0, $zero -/* B6E2A4 800F7104 0C038C25 */ jal func_800E3094 -/* B6E2A8 800F7108 00002825 */ move $a1, $zero -/* B6E2AC 800F710C 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E2B0 800F7110 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E2B4 800F7114 03E00008 */ jr $ra -/* B6E2B8 800F7118 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F711C.s b/asm/non_matchings/code/code_800EC960/func_800F711C.s deleted file mode 100644 index 626a576da5..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F711C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800F711C -/* B6E2BC 800F711C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E2C0 800F7120 AFBF0014 */ sw $ra, 0x14($sp) -/* B6E2C4 800F7124 0C03DB0D */ jal func_800F6C34 -/* B6E2C8 800F7128 00000000 */ nop -/* B6E2CC 800F712C 0C03BA4C */ jal func_800EE930 -/* B6E2D0 800F7130 00000000 */ nop -/* B6E2D4 800F7134 0C03CFB5 */ jal func_800F3ED4 -/* B6E2D8 800F7138 00000000 */ nop -/* B6E2DC 800F713C 0C03EBAD */ jal func_800FAEB4 -/* B6E2E0 800F7140 00000000 */ nop -/* B6E2E4 800F7144 0C03E417 */ jal func_800F905C -/* B6E2E8 800F7148 00000000 */ nop -/* B6E2EC 800F714C 24040002 */ li $a0, 2 -/* B6E2F0 800F7150 00002825 */ move $a1, $zero -/* B6E2F4 800F7154 24060070 */ li $a2, 112 -/* B6E2F8 800F7158 0C03E4A0 */ jal func_800F9280 -/* B6E2FC 800F715C 2407000A */ li $a3, 10 -/* B6E300 800F7160 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E304 800F7164 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E308 800F7168 03E00008 */ jr $ra -/* B6E30C 800F716C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F7170.s b/asm/non_matchings/code/code_800EC960/func_800F7170.s deleted file mode 100644 index b14ef44b70..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F7170.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800F7170 -/* B6E310 800F7170 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E314 800F7174 AFBF0014 */ sw $ra, 0x14($sp) -/* B6E318 800F7178 24040002 */ li $a0, 2 -/* B6E31C 800F717C 00002825 */ move $a1, $zero -/* B6E320 800F7180 24060070 */ li $a2, 112 -/* B6E324 800F7184 0C03E4A0 */ jal func_800F9280 -/* B6E328 800F7188 24070001 */ li $a3, 1 -/* B6E32C 800F718C 3C04F200 */ lui $a0, 0xf200 -/* B6E330 800F7190 0C0396BF */ jal func_800E5AFC -/* B6E334 800F7194 24050001 */ li $a1, 1 -/* B6E338 800F7198 0C0396E0 */ jal func_800E5B80 -/* B6E33C 800F719C 00000000 */ nop -/* B6E340 800F71A0 3C04F800 */ lui $a0, 0xf800 -/* B6E344 800F71A4 0C0396BF */ jal func_800E5AFC -/* B6E348 800F71A8 00002825 */ move $a1, $zero -/* B6E34C 800F71AC 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E350 800F71B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E354 800F71B4 03E00008 */ jr $ra -/* B6E358 800F71B8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F71BC.s b/asm/non_matchings/code/code_800EC960/func_800F71BC.s deleted file mode 100644 index 9aea76087c..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F71BC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800F71BC -/* B6E35C 800F71BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E360 800F71C0 AFBF0014 */ sw $ra, 0x14($sp) -/* B6E364 800F71C4 240E0001 */ li $t6, 1 -/* B6E368 800F71C8 3C018013 */ lui $at, %hi(D_80133418) # $at, 0x8013 -/* B6E36C 800F71CC AFA40018 */ sw $a0, 0x18($sp) -/* B6E370 800F71D0 0C03DB0D */ jal func_800F6C34 -/* B6E374 800F71D4 A02E3418 */ sb $t6, %lo(D_80133418)($at) -/* B6E378 800F71D8 0C03BA4C */ jal func_800EE930 -/* B6E37C 800F71DC 00000000 */ nop -/* B6E380 800F71E0 0C03CFB5 */ jal func_800F3ED4 -/* B6E384 800F71E4 00000000 */ nop -/* B6E388 800F71E8 0C03EB7E */ jal func_800FADF8 -/* B6E38C 800F71EC 00000000 */ nop -/* B6E390 800F71F0 0C03E417 */ jal func_800F905C -/* B6E394 800F71F4 00000000 */ nop -/* B6E398 800F71F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E39C 800F71FC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E3A0 800F7200 03E00008 */ jr $ra -/* B6E3A4 800F7204 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800EC960/func_800F7208.s b/asm/non_matchings/code/code_800EC960/func_800F7208.s deleted file mode 100644 index 0ceeeb8a35..0000000000 --- a/asm/non_matchings/code/code_800EC960/func_800F7208.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800F7208 -/* B6E3A8 800F7208 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6E3AC 800F720C AFBF0014 */ sw $ra, 0x14($sp) -/* B6E3B0 800F7210 0C03EB7E */ jal func_800FADF8 -/* B6E3B4 800F7214 00000000 */ nop -/* B6E3B8 800F7218 3C04F200 */ lui $a0, 0xf200 -/* B6E3BC 800F721C 0C0396BF */ jal func_800E5AFC -/* B6E3C0 800F7220 24050001 */ li $a1, 1 -/* B6E3C4 800F7224 0C03DB0D */ jal func_800F6C34 -/* B6E3C8 800F7228 00000000 */ nop -/* B6E3CC 800F722C 0C03CFB5 */ jal func_800F3ED4 -/* B6E3D0 800F7230 00000000 */ nop -/* B6E3D4 800F7234 24040002 */ li $a0, 2 -/* B6E3D8 800F7238 00002825 */ move $a1, $zero -/* B6E3DC 800F723C 24060070 */ li $a2, 112 -/* B6E3E0 800F7240 0C03E4A0 */ jal func_800F9280 -/* B6E3E4 800F7244 24070001 */ li $a3, 1 -/* B6E3E8 800F7248 8FBF0014 */ lw $ra, 0x14($sp) -/* B6E3EC 800F724C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6E3F0 800F7250 03E00008 */ jr $ra -/* B6E3F4 800F7254 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/code_800F7260/func_800F7680.s b/asm/non_matchings/code/code_800F7260/func_800F7680.s index a4b6b6c1b1..4241703d71 100644 --- a/asm/non_matchings/code/code_800F7260/func_800F7680.s +++ b/asm/non_matchings/code/code_800F7260/func_800F7680.s @@ -162,7 +162,7 @@ glabel func_800F7680 /* B6EA7C 800F78DC AFAA0050 */ sw $t2, 0x50($sp) /* B6EA80 800F78E0 AFA8003C */ sw $t0, 0x3c($sp) /* B6EA84 800F78E4 AFA30048 */ sw $v1, 0x48($sp) -/* B6EA88 800F78E8 0C03DCC7 */ jal func_800F731C +/* B6EA88 800F78E8 0C03DCC7 */ jal Audio_ClearBGMMute /* B6EA8C 800F78EC AFA20030 */ sw $v0, 0x30($sp) /* B6EA90 800F78F0 8FA8003C */ lw $t0, 0x3c($sp) /* B6EA94 800F78F4 8FA20030 */ lw $v0, 0x30($sp) diff --git a/asm/non_matchings/code/code_800F9280/func_800F94FC.s b/asm/non_matchings/code/code_800F9280/Audio_ProcessSeqCmd.s similarity index 97% rename from asm/non_matchings/code/code_800F9280/func_800F94FC.s rename to asm/non_matchings/code/code_800F9280/Audio_ProcessSeqCmd.s index 283ce2281b..c3dc6b453d 100644 --- a/asm/non_matchings/code/code_800F9280/func_800F94FC.s +++ b/asm/non_matchings/code/code_800F9280/Audio_ProcessSeqCmd.s @@ -1,4 +1,25 @@ -glabel func_800F94FC + +.late_rodata +glabel jtbl_8014A640 + .word L800F9588 + .word L800F95F4 + .word L800F9614 + .word L800F97E4 + .word L800F9940 + .word L800F9A00 + .word L800F9BD8 + .word L800F9CE4 + .word L800F9D20 + .word L800F9DB4 + .word L800F9DE8 + .word L800F9E84 + .word L800F9EB8 + .word L800F9B00 + .word L800F9F68 + .word L800F9FB8 + +.text +glabel Audio_ProcessSeqCmd /* B7069C 800F94FC 3C0E8013 */ lui $t6, %hi(D_8013340C) # $t6, 0x8013 /* B706A0 800F9500 91CE340C */ lbu $t6, %lo(D_8013340C)($t6) /* B706A4 800F9504 27BDFF98 */ addiu $sp, $sp, -0x68 @@ -554,7 +575,7 @@ glabel L800F9CE4 /* B70EA4 800F9D04 00052E00 */ sll $a1, $a1, 0x18 /* B70EA8 800F9D08 330F00FF */ andi $t7, $t8, 0xff /* B70EAC 800F9D0C 01AF2025 */ or $a0, $t5, $t7 -/* B70EB0 800F9D10 0C0396C8 */ jal func_800E5B20 +/* B70EB0 800F9D10 0C0396C8 */ jal Audio_QueueCmdS8 /* B70EB4 800F9D14 00052E03 */ sra $a1, $a1, 0x18 /* B70EB8 800F9D18 100000B8 */ b .L800F9FFC /* B70EBC 800F9D1C 8FBF001C */ lw $ra, 0x1c($sp) @@ -592,7 +613,7 @@ glabel L800F9D20 /* B70F38 800F9D98 00052E00 */ sll $a1, $a1, 0x18 /* B70F3C 800F9D9C 330E00FF */ andi $t6, $t8, 0xff /* B70F40 800F9DA0 032E2025 */ or $a0, $t9, $t6 -/* B70F44 800F9DA4 0C0396C8 */ jal func_800E5B20 +/* B70F44 800F9DA4 0C0396C8 */ jal Audio_QueueCmdS8 /* B70F48 800F9DA8 00052E03 */ sra $a1, $a1, 0x18 /* B70F4C 800F9DAC 10000093 */ b .L800F9FFC /* B70F50 800F9DB0 8FBF001C */ lw $ra, 0x1c($sp) @@ -623,13 +644,13 @@ glabel L800F9DE8 /* B70FAC 800F9E0C AFA20030 */ sw $v0, 0x30($sp) /* B70FB0 800F9E10 30C5FFFF */ andi $a1, $a2, 0xffff /* B70FB4 800F9E14 AFA60034 */ sw $a2, 0x34($sp) -/* B70FB8 800F9E18 0C0396D4 */ jal func_800E5B50 +/* B70FB8 800F9E18 0C0396D4 */ jal Audio_QueueCmdU16 /* B70FBC 800F9E1C AFA70038 */ sw $a3, 0x38($sp) /* B70FC0 800F9E20 8FA20030 */ lw $v0, 0x30($sp) /* B70FC4 800F9E24 3C010800 */ lui $at, 0x800 /* B70FC8 800F9E28 24050001 */ li $a1, 1 /* B70FCC 800F9E2C 00412025 */ or $a0, $v0, $at -/* B70FD0 800F9E30 0C0396C8 */ jal func_800E5B20 +/* B70FD0 800F9E30 0C0396C8 */ jal Audio_QueueCmdS8 /* B70FD4 800F9E34 3484FF00 */ ori $a0, $a0, 0xff00 /* B70FD8 800F9E38 8FA30034 */ lw $v1, 0x34($sp) /* B70FDC 800F9E3C 8FA70038 */ lw $a3, 0x38($sp) @@ -644,10 +665,10 @@ glabel L800F9DE8 /* B70FFC 800F9E5C 3C010800 */ lui $at, 0x800 /* B71000 800F9E60 00418025 */ or $s0, $v0, $at /* B71004 800F9E64 3610FF00 */ ori $s0, $s0, 0xff00 -/* B71008 800F9E68 0C0396D4 */ jal func_800E5B50 +/* B71008 800F9E68 0C0396D4 */ jal Audio_QueueCmdU16 /* B7100C 800F9E6C 30C5FFFF */ andi $a1, $a2, 0xffff /* B71010 800F9E70 02002025 */ move $a0, $s0 -/* B71014 800F9E74 0C0396C8 */ jal func_800E5B20 +/* B71014 800F9E74 0C0396C8 */ jal Audio_QueueCmdS8 /* B71018 800F9E78 00002825 */ move $a1, $zero /* B7101C 800F9E7C 1000005F */ b .L800F9FFC /* B71020 800F9E80 8FBF001C */ lw $ra, 0x1c($sp) @@ -726,7 +747,7 @@ glabel L800F9F68 /* B71130 800F9F90 320F00FF */ andi $t7, $s0, 0xff /* B71134 800F9F94 3C058013 */ lui $a1, %hi(D_80133410) /* B71138 800F9F98 00AF2821 */ addu $a1, $a1, $t7 -/* B7113C 800F9F9C 0C0396BF */ jal func_800E5AFC +/* B7113C 800F9F9C 0C0396BF */ jal Audio_QueueCmdS32 /* B71140 800F9FA0 90A53410 */ lbu $a1, %lo(D_80133410)($a1) /* B71144 800F9FA4 10000015 */ b .L800F9FFC /* B71148 800F9FA8 8FBF001C */ lw $ra, 0x1c($sp) @@ -749,7 +770,7 @@ glabel L800F9FB8 /* B71184 800F9FE4 0C03DC6F */ jal func_800F71BC /* B71188 800F9FE8 93A40059 */ lbu $a0, 0x59($sp) /* B7118C 800F9FEC 3C04F800 */ lui $a0, 0xf800 -/* B71190 800F9FF0 0C0396BF */ jal func_800E5AFC +/* B71190 800F9FF0 0C0396BF */ jal Audio_QueueCmdS32 /* B71194 800F9FF4 00002825 */ move $a1, $zero .L800F9FF8: /* B71198 800F9FF8 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/code_800F9280/Audio_SetBGM.s b/asm/non_matchings/code/code_800F9280/Audio_SetBGM.s deleted file mode 100644 index 8f713c84fb..0000000000 --- a/asm/non_matchings/code/code_800F9280/Audio_SetBGM.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel Audio_SetBGM -/* B711AC 800FA00C 3C038013 */ lui $v1, %hi(D_80133400) # $v1, 0x8013 -/* B711B0 800FA010 24633400 */ addiu $v1, %lo(D_80133400) # addiu $v1, $v1, 0x3400 -/* B711B4 800FA014 90620000 */ lbu $v0, ($v1) -/* B711B8 800FA018 3C018017 */ lui $at, %hi(D_8016E350) -/* B711BC 800FA01C 00027080 */ sll $t6, $v0, 2 -/* B711C0 800FA020 002E0821 */ addu $at, $at, $t6 -/* B711C4 800FA024 AC24E350 */ sw $a0, %lo(D_8016E350)($at) -/* B711C8 800FA028 244F0001 */ addiu $t7, $v0, 1 -/* B711CC 800FA02C 03E00008 */ jr $ra -/* B711D0 800FA030 A06F0000 */ sb $t7, ($v1) - diff --git a/asm/non_matchings/code/code_800F9280/func_800F9280.s b/asm/non_matchings/code/code_800F9280/func_800F9280.s index 6968a30567..fcf7007805 100644 --- a/asm/non_matchings/code/code_800F9280/func_800F9280.s +++ b/asm/non_matchings/code/code_800F9280/func_800F9280.s @@ -38,7 +38,7 @@ glabel func_800F9280 /* B704AC 800F930C AFA6002C */ sw $a2, 0x2c($sp) /* B704B0 800F9310 00001012 */ mflo $v0 /* B704B4 800F9314 3045FFFF */ andi $a1, $v0, 0xffff -/* B704B8 800F9318 0C0396BF */ jal func_800E5AFC +/* B704B8 800F9318 0C0396BF */ jal Audio_QueueCmdS32 /* B704BC 800F931C 00000000 */ nop /* B704C0 800F9320 8FA30028 */ lw $v1, 0x28($sp) /* B704C4 800F9324 10000018 */ b .L800F9388 @@ -64,7 +64,7 @@ glabel func_800F9280 /* B70510 800F9370 24A10003 */ addiu $at, $a1, 3 .L800F9374: /* B70514 800F9374 00012883 */ sra $a1, $at, 2 -/* B70518 800F9378 0C0396BF */ jal func_800E5AFC +/* B70518 800F9378 0C0396BF */ jal Audio_QueueCmdS32 /* B7051C 800F937C 00000000 */ nop /* B70520 800F9380 8FA30028 */ lw $v1, 0x28($sp) /* B70524 800F9384 8FA7002C */ lw $a3, 0x2c($sp) @@ -92,7 +92,7 @@ glabel func_800F9280 /* B70578 800F93D8 3C014100 */ lui $at, 0x4100 /* B7057C 800F93DC 44051000 */ mfc1 $a1, $f2 /* B70580 800F93E0 00612025 */ or $a0, $v1, $at -/* B70584 800F93E4 0C0396B6 */ jal func_800E5AD8 +/* B70584 800F93E4 0C0396B6 */ jal Audio_QueueCmdF32 /* B70588 800F93E8 AFA60024 */ sw $a2, 0x24($sp) /* B7058C 800F93EC 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B70590 800F93F0 44810000 */ mtc1 $at, $f0 diff --git a/asm/non_matchings/code/code_800F9280/func_800F9474.s b/asm/non_matchings/code/code_800F9280/func_800F9474.s deleted file mode 100644 index 6edbb77c23..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800F9474.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800F9474 -/* B70614 800F9474 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2854) # $t6, 0x8017 -/* B70618 800F9478 95CE19D4 */ lhu $t6, %lo(gAudioContext+0x2854)($t6) -/* B7061C 800F947C 30A6FFFF */ andi $a2, $a1, 0xffff -/* B70620 800F9480 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B70624 800F9484 00CE0019 */ multu $a2, $t6 -/* B70628 800F9488 AFA40018 */ sw $a0, 0x18($sp) -/* B7062C 800F948C 93A4001B */ lbu $a0, 0x1b($sp) -/* B70630 800F9490 AFA5001C */ sw $a1, 0x1c($sp) -/* B70634 800F9494 3C018300 */ lui $at, 0x8300 -/* B70638 800F9498 00042400 */ sll $a0, $a0, 0x10 -/* B7063C 800F949C 00812025 */ or $a0, $a0, $at -/* B70640 800F94A0 AFBF0014 */ sw $ra, 0x14($sp) -/* B70644 800F94A4 00002812 */ mflo $a1 -/* B70648 800F94A8 04A10002 */ bgez $a1, .L800F94B4 -/* B7064C 800F94AC 00A00821 */ addu $at, $a1, $zero -/* B70650 800F94B0 24A10003 */ addiu $at, $a1, 3 -.L800F94B4: -/* B70654 800F94B4 00012883 */ sra $a1, $at, 2 -/* B70658 800F94B8 0C0396BF */ jal func_800E5AFC -/* B7065C 800F94BC 00000000 */ nop -/* B70660 800F94C0 93B8001B */ lbu $t8, 0x1b($sp) -/* B70664 800F94C4 8FBF0014 */ lw $ra, 0x14($sp) -/* B70668 800F94C8 3C018017 */ lui $at, %hi(D_8016E9A4) -/* B7066C 800F94CC 0018C880 */ sll $t9, $t8, 2 -/* B70670 800F94D0 0338C821 */ addu $t9, $t9, $t8 -/* B70674 800F94D4 0019C880 */ sll $t9, $t9, 2 -/* B70678 800F94D8 0338C823 */ subu $t9, $t9, $t8 -/* B7067C 800F94DC 0019C8C0 */ sll $t9, $t9, 3 -/* B70680 800F94E0 0338C821 */ addu $t9, $t9, $t8 -/* B70684 800F94E4 0019C880 */ sll $t9, $t9, 2 -/* B70688 800F94E8 00390821 */ addu $at, $at, $t9 -/* B7068C 800F94EC 340FFFFF */ li $t7, 65535 -/* B70690 800F94F0 A42FE9A4 */ sh $t7, %lo(D_8016E9A4)($at) -/* B70694 800F94F4 03E00008 */ jr $ra -/* B70698 800F94F8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA034.s b/asm/non_matchings/code/code_800F9280/func_800FA034.s deleted file mode 100644 index 47351419ce..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FA034.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_800FA034 -/* B711D4 800FA034 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B711D8 800FA038 AFB2001C */ sw $s2, 0x1c($sp) -/* B711DC 800FA03C AFB10018 */ sw $s1, 0x18($sp) -/* B711E0 800FA040 3C118013 */ lui $s1, %hi(D_80133404) # $s1, 0x8013 -/* B711E4 800FA044 3C128013 */ lui $s2, %hi(D_80133400) # $s2, 0x8013 -/* B711E8 800FA048 26523400 */ addiu $s2, %lo(D_80133400) # addiu $s2, $s2, 0x3400 -/* B711EC 800FA04C 26313404 */ addiu $s1, %lo(D_80133404) # addiu $s1, $s1, 0x3404 -/* B711F0 800FA050 AFB00014 */ sw $s0, 0x14($sp) -/* B711F4 800FA054 92300000 */ lbu $s0, ($s1) -/* B711F8 800FA058 924E0000 */ lbu $t6, ($s2) -/* B711FC 800FA05C AFB30020 */ sw $s3, 0x20($sp) -/* B71200 800FA060 AFBF0024 */ sw $ra, 0x24($sp) -/* B71204 800FA064 120E000C */ beq $s0, $t6, .L800FA098 -/* B71208 800FA068 3C138017 */ lui $s3, %hi(D_8016E350) # $s3, 0x8017 -/* B7120C 800FA06C 2673E350 */ addiu $s3, %lo(D_8016E350) # addiu $s3, $s3, -0x1cb0 -/* B71210 800FA070 00107880 */ sll $t7, $s0, 2 -.L800FA074: -/* B71214 800FA074 026FC021 */ addu $t8, $s3, $t7 -/* B71218 800FA078 8F040000 */ lw $a0, ($t8) -/* B7121C 800FA07C 26190001 */ addiu $t9, $s0, 1 -/* B71220 800FA080 0C03E53F */ jal func_800F94FC -/* B71224 800FA084 A2390000 */ sb $t9, ($s1) -/* B71228 800FA088 92300000 */ lbu $s0, ($s1) -/* B7122C 800FA08C 92480000 */ lbu $t0, ($s2) -/* B71230 800FA090 5608FFF8 */ bnel $s0, $t0, .L800FA074 -/* B71234 800FA094 00107880 */ sll $t7, $s0, 2 -.L800FA098: -/* B71238 800FA098 8FBF0024 */ lw $ra, 0x24($sp) -/* B7123C 800FA09C 8FB00014 */ lw $s0, 0x14($sp) -/* B71240 800FA0A0 8FB10018 */ lw $s1, 0x18($sp) -/* B71244 800FA0A4 8FB2001C */ lw $s2, 0x1c($sp) -/* B71248 800FA0A8 8FB30020 */ lw $s3, 0x20($sp) -/* B7124C 800FA0AC 03E00008 */ jr $ra -/* B71250 800FA0B0 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA0B4.s b/asm/non_matchings/code/code_800F9280/func_800FA0B4.s deleted file mode 100644 index 292e89d484..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FA0B4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800FA0B4 -/* B71254 800FA0B4 AFA40000 */ sw $a0, ($sp) -/* B71258 800FA0B8 308400FF */ andi $a0, $a0, 0xff -/* B7125C 800FA0BC 00047080 */ sll $t6, $a0, 2 -/* B71260 800FA0C0 01C47023 */ subu $t6, $t6, $a0 -/* B71264 800FA0C4 000E7080 */ sll $t6, $t6, 2 -/* B71268 800FA0C8 01C47023 */ subu $t6, $t6, $a0 -/* B7126C 800FA0CC 000E7140 */ sll $t6, $t6, 5 -/* B71270 800FA0D0 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3530) -/* B71274 800FA0D4 01EE7821 */ addu $t7, $t7, $t6 -/* B71278 800FA0D8 8DEF26B0 */ lw $t7, %lo(gAudioContext+0x3530)($t7) -/* B7127C 800FA0DC 0004C880 */ sll $t9, $a0, 2 -/* B71280 800FA0E0 0324C821 */ addu $t9, $t9, $a0 -/* B71284 800FA0E4 000FC7C2 */ srl $t8, $t7, 0x1f -/* B71288 800FA0E8 17000003 */ bnez $t8, .L800FA0F8 -/* B7128C 800FA0EC 0019C880 */ sll $t9, $t9, 2 -/* B71290 800FA0F0 03E00008 */ jr $ra -/* B71294 800FA0F4 3402FFFF */ li $v0, 65535 - -.L800FA0F8: -/* B71298 800FA0F8 0324C823 */ subu $t9, $t9, $a0 -/* B7129C 800FA0FC 0019C8C0 */ sll $t9, $t9, 3 -/* B712A0 800FA100 0324C821 */ addu $t9, $t9, $a0 -/* B712A4 800FA104 0019C880 */ sll $t9, $t9, 2 -/* B712A8 800FA108 3C028017 */ lui $v0, %hi(D_8016E9A4) -/* B712AC 800FA10C 00591021 */ addu $v0, $v0, $t9 -/* B712B0 800FA110 9442E9A4 */ lhu $v0, %lo(D_8016E9A4)($v0) -/* B712B4 800FA114 03E00008 */ jr $ra -/* B712B8 800FA118 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA11C.s b/asm/non_matchings/code/code_800F9280/func_800FA11C.s deleted file mode 100644 index 0c19ca8c68..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FA11C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800FA11C -/* B712BC 800FA11C 3C028013 */ lui $v0, %hi(D_80133404) # $v0, 0x8013 -/* B712C0 800FA120 3C038013 */ lui $v1, %hi(D_80133400) # $v1, 0x8013 -/* B712C4 800FA124 90633400 */ lbu $v1, %lo(D_80133400)($v1) -/* B712C8 800FA128 90423404 */ lbu $v0, %lo(D_80133404)($v0) -/* B712CC 800FA12C 3C068017 */ lui $a2, %hi(D_8016E350) # $a2, 0x8017 -/* B712D0 800FA130 24C6E350 */ addiu $a2, %lo(D_8016E350) # addiu $a2, $a2, -0x1cb0 -/* B712D4 800FA134 1062000C */ beq $v1, $v0, .L800FA168 -/* B712D8 800FA138 00027080 */ sll $t6, $v0, 2 -.L800FA13C: -/* B712DC 800FA13C 00CE7821 */ addu $t7, $a2, $t6 -/* B712E0 800FA140 8DF80000 */ lw $t8, ($t7) -/* B712E4 800FA144 24420001 */ addiu $v0, $v0, 1 -/* B712E8 800FA148 304200FF */ andi $v0, $v0, 0xff -/* B712EC 800FA14C 0305C824 */ and $t9, $t8, $a1 -/* B712F0 800FA150 14990003 */ bne $a0, $t9, .L800FA160 -/* B712F4 800FA154 00000000 */ nop -/* B712F8 800FA158 03E00008 */ jr $ra -/* B712FC 800FA15C 00001025 */ move $v0, $zero - -.L800FA160: -/* B71300 800FA160 5462FFF6 */ bnel $v1, $v0, .L800FA13C -/* B71304 800FA164 00027080 */ sll $t6, $v0, 2 -.L800FA168: -/* B71308 800FA168 24020001 */ li $v0, 1 -/* B7130C 800FA16C 03E00008 */ jr $ra -/* B71310 800FA170 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA174.s b/asm/non_matchings/code/code_800F9280/func_800FA174.s deleted file mode 100644 index 2907e74915..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FA174.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800FA174 -/* B71314 800FA174 AFA40000 */ sw $a0, ($sp) -/* B71318 800FA178 308400FF */ andi $a0, $a0, 0xff -/* B7131C 800FA17C 3C018017 */ lui $at, %hi(D_8016E348) -/* B71320 800FA180 00240821 */ addu $at, $at, $a0 -/* B71324 800FA184 03E00008 */ jr $ra -/* B71328 800FA188 A020E348 */ sb $zero, %lo(D_8016E348)($at) - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA18C.s b/asm/non_matchings/code/code_800F9280/func_800FA18C.s deleted file mode 100644 index d577e3767c..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FA18C.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_800FA18C -/* B7132C 800FA18C AFA40000 */ sw $a0, ($sp) -/* B71330 800FA190 308400FF */ andi $a0, $a0, 0xff -/* B71334 800FA194 00047080 */ sll $t6, $a0, 2 -/* B71338 800FA198 01C47021 */ addu $t6, $t6, $a0 -/* B7133C 800FA19C 000E7080 */ sll $t6, $t6, 2 -/* B71340 800FA1A0 01C47023 */ subu $t6, $t6, $a0 -/* B71344 800FA1A4 000E70C0 */ sll $t6, $t6, 3 -/* B71348 800FA1A8 01C47021 */ addu $t6, $t6, $a0 -/* B7134C 800FA1AC 3C0F8017 */ lui $t7, %hi(D_8016E750) # $t7, 0x8017 -/* B71350 800FA1B0 25EFE750 */ addiu $t7, %lo(D_8016E750) # addiu $t7, $t7, -0x18b0 -/* B71354 800FA1B4 000E7080 */ sll $t6, $t6, 2 -/* B71358 800FA1B8 01CF1821 */ addu $v1, $t6, $t7 -/* B7135C 800FA1BC 9066004D */ lbu $a2, 0x4d($v1) -/* B71360 800FA1C0 AFA50004 */ sw $a1, 4($sp) -/* B71364 800FA1C4 30A700FF */ andi $a3, $a1, 0xff -/* B71368 800FA1C8 18C0001B */ blez $a2, .L800FA238 -/* B7136C 800FA1CC 00001025 */ move $v0, $zero -/* B71370 800FA1D0 0004C080 */ sll $t8, $a0, 2 -/* B71374 800FA1D4 0304C021 */ addu $t8, $t8, $a0 -/* B71378 800FA1D8 0018C080 */ sll $t8, $t8, 2 -/* B7137C 800FA1DC 0304C023 */ subu $t8, $t8, $a0 -/* B71380 800FA1E0 0018C0C0 */ sll $t8, $t8, 3 -/* B71384 800FA1E4 0304C021 */ addu $t8, $t8, $a0 -/* B71388 800FA1E8 0018C080 */ sll $t8, $t8, 2 -/* B7138C 800FA1EC 030F2821 */ addu $a1, $t8, $t7 -/* B71390 800FA1F0 00E04025 */ move $t0, $a3 -/* B71394 800FA1F4 3C0AFF00 */ lui $t2, 0xff00 -/* B71398 800FA1F8 3C0900F0 */ lui $t1, 0xf0 -/* B7139C 800FA1FC 0002C880 */ sll $t9, $v0, 2 -.L800FA200: -/* B713A0 800FA200 00B93821 */ addu $a3, $a1, $t9 -/* B713A4 800FA204 8CEB002C */ lw $t3, 0x2c($a3) -/* B713A8 800FA208 24420001 */ addiu $v0, $v0, 1 -/* B713AC 800FA20C 304200FF */ andi $v0, $v0, 0xff -/* B713B0 800FA210 01692024 */ and $a0, $t3, $t1 -/* B713B4 800FA214 00042502 */ srl $a0, $a0, 0x14 -/* B713B8 800FA218 308400FF */ andi $a0, $a0, 0xff -/* B713BC 800FA21C 55040004 */ bnel $t0, $a0, .L800FA230 -/* B713C0 800FA220 0046082A */ slt $at, $v0, $a2 -/* B713C4 800FA224 ACEA002C */ sw $t2, 0x2c($a3) -/* B713C8 800FA228 9066004D */ lbu $a2, 0x4d($v1) -/* B713CC 800FA22C 0046082A */ slt $at, $v0, $a2 -.L800FA230: -/* B713D0 800FA230 5420FFF3 */ bnezl $at, .L800FA200 -/* B713D4 800FA234 0002C880 */ sll $t9, $v0, 2 -.L800FA238: -/* B713D8 800FA238 03E00008 */ jr $ra -/* B713DC 800FA23C 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA240.s b/asm/non_matchings/code/code_800F9280/func_800FA240.s deleted file mode 100644 index ad432ce709..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FA240.s +++ /dev/null @@ -1,112 +0,0 @@ -glabel func_800FA240 -/* B713E0 800FA240 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B713E4 800FA244 AFA40018 */ sw $a0, 0x18($sp) -/* B713E8 800FA248 93AE001B */ lbu $t6, 0x1b($sp) -/* B713EC 800FA24C 3C098017 */ lui $t1, %hi(D_8016E750) -/* B713F0 800FA250 2529E750 */ addiu $t1, %lo(D_8016E750) # addiu $t1, $t1, -0x18b0 -/* B713F4 800FA254 000E7880 */ sll $t7, $t6, 2 -/* B713F8 800FA258 01EE7821 */ addu $t7, $t7, $t6 -/* B713FC 800FA25C 000F7880 */ sll $t7, $t7, 2 -/* B71400 800FA260 01EE7823 */ subu $t7, $t7, $t6 -/* B71404 800FA264 000F78C0 */ sll $t7, $t7, 3 -/* B71408 800FA268 01EE7821 */ addu $t7, $t7, $t6 -/* B7140C 800FA26C AFA5001C */ sw $a1, 0x1c($sp) -/* B71410 800FA270 000F7880 */ sll $t7, $t7, 2 -/* B71414 800FA274 30A500FF */ andi $a1, $a1, 0xff -/* B71418 800FA278 AFA70024 */ sw $a3, 0x24($sp) -/* B7141C 800FA27C 012F1821 */ addu $v1, $t1, $t7 -/* B71420 800FA280 30E700FF */ andi $a3, $a3, 0xff -/* B71424 800FA284 0065C821 */ addu $t9, $v1, $a1 -/* B71428 800FA288 30D8007F */ andi $t8, $a2, 0x7f -/* B7142C 800FA28C AFBF0014 */ sw $ra, 0x14($sp) -/* B71430 800FA290 AFA60020 */ sw $a2, 0x20($sp) -/* B71434 800FA294 A338000E */ sb $t8, 0xe($t9) -/* B71438 800FA298 10E0000E */ beqz $a3, .L800FA2D4 -/* B7143C 800FA29C 00E04025 */ move $t0, $a3 -/* B71440 800FA2A0 93AA001B */ lbu $t2, 0x1b($sp) -/* B71444 800FA2A4 240C0001 */ li $t4, 1 -/* B71448 800FA2A8 000A5880 */ sll $t3, $t2, 2 -/* B7144C 800FA2AC 016A5821 */ addu $t3, $t3, $t2 -/* B71450 800FA2B0 000B5880 */ sll $t3, $t3, 2 -/* B71454 800FA2B4 016A5823 */ subu $t3, $t3, $t2 -/* B71458 800FA2B8 000B58C0 */ sll $t3, $t3, 3 -/* B7145C 800FA2BC 016A5821 */ addu $t3, $t3, $t2 -/* B71460 800FA2C0 000B5880 */ sll $t3, $t3, 2 -/* B71464 800FA2C4 012B1021 */ addu $v0, $t1, $t3 -/* B71468 800FA2C8 A04C0013 */ sb $t4, 0x13($v0) -/* B7146C 800FA2CC 1000003F */ b .L800FA3CC -/* B71470 800FA2D0 A0470012 */ sb $a3, 0x12($v0) -.L800FA2D4: -/* B71474 800FA2D4 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B71478 800FA2D8 44810000 */ mtc1 $at, $f0 -/* B7147C 800FA2DC 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B71480 800FA2E0 44811000 */ mtc1 $at, $f2 -/* B71484 800FA2E4 00001025 */ move $v0, $zero -/* B71488 800FA2E8 00626821 */ addu $t5, $v1, $v0 -.L800FA2EC: -/* B7148C 800FA2EC 91AE000E */ lbu $t6, 0xe($t5) -/* B71490 800FA2F0 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B71494 800FA2F4 448E2000 */ mtc1 $t6, $f4 -/* B71498 800FA2F8 05C10004 */ bgez $t6, .L800FA30C -/* B7149C 800FA2FC 468021A0 */ cvt.s.w $f6, $f4 -/* B714A0 800FA300 44814000 */ mtc1 $at, $f8 -/* B714A4 800FA304 00000000 */ nop -/* B714A8 800FA308 46083180 */ add.s $f6, $f6, $f8 -.L800FA30C: -/* B714AC 800FA30C 46023283 */ div.s $f10, $f6, $f2 -/* B714B0 800FA310 24420001 */ addiu $v0, $v0, 1 -/* B714B4 800FA314 304200FF */ andi $v0, $v0, 0xff -/* B714B8 800FA318 28410004 */ slti $at, $v0, 4 -/* B714BC 800FA31C 460A0002 */ mul.s $f0, $f0, $f10 -/* B714C0 800FA320 5420FFF2 */ bnezl $at, .L800FA2EC -/* B714C4 800FA324 00626821 */ addu $t5, $v1, $v0 -/* B714C8 800FA328 46020402 */ mul.s $f16, $f0, $f2 -/* B714CC 800FA32C 240D0001 */ li $t5, 1 -/* B714D0 800FA330 93AF001B */ lbu $t7, 0x1b($sp) -/* B714D4 800FA334 3C014000 */ lui $at, 0x4000 -/* B714D8 800FA338 00085400 */ sll $t2, $t0, 0x10 -/* B714DC 800FA33C 000FC600 */ sll $t8, $t7, 0x18 -/* B714E0 800FA340 0301C825 */ or $t9, $t8, $at -/* B714E4 800FA344 444CF800 */ cfc1 $t4, $31 -/* B714E8 800FA348 44CDF800 */ ctc1 $t5, $31 -/* B714EC 800FA34C 032A5825 */ or $t3, $t9, $t2 -/* B714F0 800FA350 460084A4 */ cvt.w.s $f18, $f16 -/* B714F4 800FA354 444DF800 */ cfc1 $t5, $31 -/* B714F8 800FA358 00000000 */ nop -/* B714FC 800FA35C 31AD0078 */ andi $t5, $t5, 0x78 -/* B71500 800FA360 11A00012 */ beqz $t5, .L800FA3AC -/* B71504 800FA364 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* B71508 800FA368 44819000 */ mtc1 $at, $f18 -/* B7150C 800FA36C 240D0001 */ li $t5, 1 -/* B71510 800FA370 46128481 */ sub.s $f18, $f16, $f18 -/* B71514 800FA374 44CDF800 */ ctc1 $t5, $31 -/* B71518 800FA378 00000000 */ nop -/* B7151C 800FA37C 460094A4 */ cvt.w.s $f18, $f18 -/* B71520 800FA380 444DF800 */ cfc1 $t5, $31 -/* B71524 800FA384 00000000 */ nop -/* B71528 800FA388 31AD0078 */ andi $t5, $t5, 0x78 -/* B7152C 800FA38C 15A00005 */ bnez $t5, .L800FA3A4 -/* B71530 800FA390 00000000 */ nop -/* B71534 800FA394 440D9000 */ mfc1 $t5, $f18 -/* B71538 800FA398 3C018000 */ lui $at, 0x8000 -/* B7153C 800FA39C 10000007 */ b .L800FA3BC -/* B71540 800FA3A0 01A16825 */ or $t5, $t5, $at -.L800FA3A4: -/* B71544 800FA3A4 10000005 */ b .L800FA3BC -/* B71548 800FA3A8 240DFFFF */ li $t5, -1 -.L800FA3AC: -/* B7154C 800FA3AC 440D9000 */ mfc1 $t5, $f18 -/* B71550 800FA3B0 00000000 */ nop -/* B71554 800FA3B4 05A0FFFB */ bltz $t5, .L800FA3A4 -/* B71558 800FA3B8 00000000 */ nop -.L800FA3BC: -/* B7155C 800FA3BC 44CCF800 */ ctc1 $t4, $31 -/* B71560 800FA3C0 31AE00FF */ andi $t6, $t5, 0xff -/* B71564 800FA3C4 0C03E53F */ jal func_800F94FC -/* B71568 800FA3C8 016E2025 */ or $a0, $t3, $t6 -.L800FA3CC: -/* B7156C 800FA3CC 8FBF0014 */ lw $ra, 0x14($sp) -/* B71570 800FA3D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B71574 800FA3D4 03E00008 */ jr $ra -/* B71578 800FA3D8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F9280/func_800FA3DC.s b/asm/non_matchings/code/code_800F9280/func_800FA3DC.s index fc3a5904ed..d9615230e4 100644 --- a/asm/non_matchings/code/code_800F9280/func_800FA3DC.s +++ b/asm/non_matchings/code/code_800F9280/func_800FA3DC.s @@ -1,3 +1,22 @@ +.late_rodata +glabel jtbl_8014A680 + .word L800FAAE4 + .word L800FAB28 + .word L800FAB48 + .word L800FAB84 + .word L800FABAC + .word L800FABD0 + .word L800FAC18 + .word L800FAAFC + .word L800FAC24 + .word L800FAC84 + .word L800FACA4 + .word L800FACD4 + .word L800FACD4 + .word L800FACD4 + .word L800FAC3C + +.text glabel func_800FA3DC /* B7157C 800FA3DC 27BDFF70 */ addiu $sp, $sp, -0x90 /* B71580 800FA3E0 AFB7003C */ sw $s7, 0x3c($sp) @@ -38,7 +57,7 @@ glabel func_800FA3DC /* B71608 800FA468 92580013 */ lbu $t8, 0x13($s2) .L800FA46C: /* B7160C 800FA46C A2400260 */ sb $zero, 0x260($s2) -/* B71610 800FA470 0C03E53F */ jal func_800F94FC +/* B71610 800FA470 0C03E53F */ jal Audio_ProcessSeqCmd /* B71614 800FA474 8E44025C */ lw $a0, 0x25c($s2) /* B71618 800FA478 92580013 */ lbu $t8, 0x13($s2) .L800FA47C: @@ -116,7 +135,7 @@ glabel func_800FA3DC .L800FA588: /* B71728 800FA588 44D9F800 */ ctc1 $t9, $31 /* B7172C 800FA58C 314B00FF */ andi $t3, $t2, 0xff -/* B71730 800FA590 0C03E803 */ jal Audio_SetBGM +/* B71730 800FA590 0C03E803 */ jal Audio_QueueSeqCmd /* B71734 800FA594 030B2025 */ or $a0, $t8, $t3 /* B71738 800FA598 A2400013 */ sb $zero, 0x13($s2) .L800FA59C: @@ -139,7 +158,7 @@ glabel func_800FA3DC /* B71774 800FA5D4 00042400 */ sll $a0, $a0, 0x10 /* B71778 800FA5D8 3C014100 */ lui $at, 0x4100 /* B7177C 800FA5DC 00812025 */ or $a0, $a0, $at -/* B71780 800FA5E0 0C0396B6 */ jal func_800E5AD8 +/* B71780 800FA5E0 0C0396B6 */ jal Audio_QueueCmdF32 /* B71784 800FA5E4 8E450000 */ lw $a1, ($s2) .L800FA5E8: /* B71788 800FA5E8 8E450014 */ lw $a1, 0x14($s2) @@ -327,7 +346,7 @@ glabel func_800FA3DC /* B71A10 800FA870 00612025 */ or $a0, $v1, $at /* B71A14 800FA874 4600410D */ trunc.w.s $f4, $f8 /* B71A18 800FA878 44052000 */ mfc1 $a1, $f4 -/* B71A1C 800FA87C 0C0396BF */ jal func_800E5AFC +/* B71A1C 800FA87C 0C0396BF */ jal Audio_QueueCmdS32 /* B71A20 800FA880 00000000 */ nop .L800FA884: /* B71A24 800FA884 96590252 */ lhu $t9, 0x252($s2) @@ -372,7 +391,7 @@ glabel func_800FA3DC /* B71AB4 800FA914 321900FF */ andi $t9, $s0, 0xff /* B71AB8 800FA918 00195200 */ sll $t2, $t9, 8 /* B71ABC 800FA91C 00CA2025 */ or $a0, $a2, $t2 -/* B71AC0 800FA920 0C0396B6 */ jal func_800E5AD8 +/* B71AC0 800FA920 0C0396B6 */ jal Audio_QueueCmdF32 /* B71AC4 800FA924 8C450050 */ lw $a1, 0x50($v0) .L800FA928: /* B71AC8 800FA928 26100001 */ addiu $s0, $s0, 1 @@ -423,7 +442,7 @@ glabel func_800FA3DC /* B71B6C 800FA9CC 321800FF */ andi $t8, $s0, 0xff /* B71B70 800FA9D0 00185A00 */ sll $t3, $t8, 8 /* B71B74 800FA9D4 00CB2025 */ or $a0, $a2, $t3 -/* B71B78 800FA9D8 0C0396B6 */ jal func_800E5AD8 +/* B71B78 800FA9D8 0C0396B6 */ jal Audio_QueueCmdF32 /* B71B7C 800FA9DC 8C450060 */ lw $a1, 0x60($v0) .L800FA9E0: /* B71B80 800FA9E0 26100001 */ addiu $s0, $s0, 1 @@ -498,7 +517,7 @@ glabel func_800FA3DC glabel L800FAAE4 /* B71C84 800FAAE4 322400FF */ andi $a0, $s1, 0xff /* B71C88 800FAAE8 24050001 */ li $a1, 1 -/* B71C8C 800FAAEC 0C03E890 */ jal func_800FA240 +/* B71C8C 800FAAEC 0C03E890 */ jal Audio_SetVolScale /* B71C90 800FAAF0 2406007F */ li $a2, 127 /* B71C94 800FAAF4 10000077 */ b .L800FACD4 /* B71C98 800FAAF8 9243004D */ lbu $v1, 0x4d($s2) @@ -510,7 +529,7 @@ glabel L800FAAFC /* B71CAC 800FAB0C 24050001 */ li $a1, 1 /* B71CB0 800FAB10 14EC0070 */ bne $a3, $t4, .L800FACD4 /* B71CB4 800FAB14 2406007F */ li $a2, 127 -/* B71CB8 800FAB18 0C03E890 */ jal func_800FA240 +/* B71CB8 800FAB18 0C03E890 */ jal Audio_SetVolScale /* B71CBC 800FAB1C 320700FF */ andi $a3, $s0, 0xff /* B71CC0 800FAB20 1000006C */ b .L800FACD4 /* B71CC4 800FAB24 9243004D */ lbu $v1, 0x4d($s2) @@ -519,7 +538,7 @@ glabel L800FAB28 /* B71CCC 800FAB2C 3C013000 */ lui $at, 0x3000 /* B71CD0 800FAB30 0015CE00 */ sll $t9, $s5, 0x18 /* B71CD4 800FAB34 01E17025 */ or $t6, $t7, $at -/* B71CD8 800FAB38 0C03E803 */ jal Audio_SetBGM +/* B71CD8 800FAB38 0C03E803 */ jal Audio_QueueSeqCmd /* B71CDC 800FAB3C 01D92025 */ or $a0, $t6, $t9 /* B71CE0 800FAB40 10000064 */ b .L800FACD4 /* B71CE4 800FAB44 9243004D */ lbu $v1, 0x4d($s2) @@ -531,7 +550,7 @@ glabel L800FAB48 /* B71CF8 800FAB58 02EA8021 */ addu $s0, $s7, $t2 /* B71CFC 800FAB5C 96180254 */ lhu $t8, 0x254($s0) /* B71D00 800FAB60 030B2025 */ or $a0, $t8, $t3 -/* B71D04 800FAB64 0C03E803 */ jal Audio_SetBGM +/* B71D04 800FAB64 0C03E803 */ jal Audio_QueueSeqCmd /* B71D08 800FAB68 00812025 */ or $a0, $a0, $at /* B71D0C 800FAB6C 240D0001 */ li $t5, 1 /* B71D10 800FAB70 240C007F */ li $t4, 127 @@ -546,7 +565,7 @@ glabel L800FAB84 /* B71D30 800FAB90 01E17025 */ or $t6, $t7, $at /* B71D34 800FAB94 0010CC00 */ sll $t9, $s0, 0x10 /* B71D38 800FAB98 01D95025 */ or $t2, $t6, $t9 -/* B71D3C 800FAB9C 0C03E803 */ jal Audio_SetBGM +/* B71D3C 800FAB9C 0C03E803 */ jal Audio_QueueSeqCmd /* B71D40 800FABA0 01472025 */ or $a0, $t2, $a3 /* B71D44 800FABA4 1000004B */ b .L800FACD4 /* B71D48 800FABA8 9243004D */ lbu $v1, 0x4d($s2) @@ -556,7 +575,7 @@ glabel L800FABAC /* B71D54 800FABB4 0011C600 */ sll $t8, $s1, 0x18 /* B71D58 800FABB8 03015825 */ or $t3, $t8, $at /* B71D5C 800FABBC 00076C00 */ sll $t5, $a3, 0x10 -/* B71D60 800FABC0 0C03E803 */ jal Audio_SetBGM +/* B71D60 800FABC0 0C03E803 */ jal Audio_QueueSeqCmd /* B71D64 800FABC4 016D2025 */ or $a0, $t3, $t5 /* B71D68 800FABC8 10000042 */ b .L800FACD4 /* B71D6C 800FABCC 9243004D */ lbu $v1, 0x4d($s2) @@ -569,12 +588,12 @@ glabel L800FABD0 /* B71D84 800FABE4 920F004E */ lbu $t7, 0x4e($s0) /* B71D88 800FABE8 000F7400 */ sll $t6, $t7, 0x10 /* B71D8C 800FABEC 01D95025 */ or $t2, $t6, $t9 -/* B71D90 800FABF0 0C03E803 */ jal Audio_SetBGM +/* B71D90 800FABF0 0C03E803 */ jal Audio_QueueSeqCmd /* B71D94 800FABF4 01432025 */ or $a0, $t2, $v1 /* B71D98 800FABF8 322400FF */ andi $a0, $s1, 0xff /* B71D9C 800FABFC 24050001 */ li $a1, 1 /* B71DA0 800FAC00 2406007F */ li $a2, 127 -/* B71DA4 800FAC04 0C03E890 */ jal func_800FA240 +/* B71DA4 800FAC04 0C03E890 */ jal Audio_SetVolScale /* B71DA8 800FAC08 00003825 */ move $a3, $zero /* B71DAC 800FAC0C A200004E */ sb $zero, 0x4e($s0) /* B71DB0 800FAC10 10000030 */ b .L800FACD4 @@ -586,7 +605,7 @@ glabel L800FAC18 glabel L800FAC24 /* B71DC4 800FAC24 322400FF */ andi $a0, $s1, 0xff /* B71DC8 800FAC28 320500FF */ andi $a1, $s0, 0xff -/* B71DCC 800FAC2C 0C03E890 */ jal func_800FA240 +/* B71DCC 800FAC2C 0C03E890 */ jal Audio_SetVolScale /* B71DD0 800FAC30 2406007F */ li $a2, 127 /* B71DD4 800FAC34 10000027 */ b .L800FACD4 /* B71DD8 800FAC38 9243004D */ lbu $v1, 0x4d($s2) @@ -595,19 +614,19 @@ glabel L800FAC3C /* B71DE0 800FAC40 13000004 */ beqz $t8, .L800FAC54 /* B71DE4 800FAC44 00E08025 */ move $s0, $a3 /* B71DE8 800FAC48 02C02025 */ move $a0, $s6 -/* B71DEC 800FAC4C 0C0396BF */ jal func_800E5AFC +/* B71DEC 800FAC4C 0C0396BF */ jal Audio_QueueCmdS32 /* B71DF0 800FAC50 00002825 */ move $a1, $zero .L800FAC54: /* B71DF4 800FAC54 320B0002 */ andi $t3, $s0, 2 /* B71DF8 800FAC58 11600003 */ beqz $t3, .L800FAC68 /* B71DFC 800FAC5C 02C02025 */ move $a0, $s6 -/* B71E00 800FAC60 0C0396BF */ jal func_800E5AFC +/* B71E00 800FAC60 0C0396BF */ jal Audio_QueueCmdS32 /* B71E04 800FAC64 24050001 */ li $a1, 1 .L800FAC68: /* B71E08 800FAC68 320D0004 */ andi $t5, $s0, 4 /* B71E0C 800FAC6C 11A00003 */ beqz $t5, .L800FAC7C /* B71E10 800FAC70 02C02025 */ move $a0, $s6 -/* B71E14 800FAC74 0C0396BF */ jal func_800E5AFC +/* B71E14 800FAC74 0C0396BF */ jal Audio_QueueCmdS32 /* B71E18 800FAC78 24050002 */ li $a1, 2 .L800FAC7C: /* B71E1C 800FAC7C 10000015 */ b .L800FACD4 @@ -617,7 +636,7 @@ glabel L800FAC84 /* B71E28 800FAC88 3C01A000 */ lui $at, 0xa000 /* B71E2C 800FAC8C 3043FFFF */ andi $v1, $v0, 0xffff /* B71E30 800FAC90 01817825 */ or $t7, $t4, $at -/* B71E34 800FAC94 0C03E803 */ jal Audio_SetBGM +/* B71E34 800FAC94 0C03E803 */ jal Audio_QueueSeqCmd /* B71E38 800FAC98 01E32025 */ or $a0, $t7, $v1 /* B71E3C 800FAC9C 1000000D */ b .L800FACD4 /* B71E40 800FACA0 9243004D */ lbu $v1, 0x4d($s2) @@ -631,7 +650,7 @@ glabel L800FACA4 /* B71E5C 800FACBC 00105400 */ sll $t2, $s0, 0x10 /* B71E60 800FACC0 032AC025 */ or $t8, $t9, $t2 /* B71E64 800FACC4 316DFFFF */ andi $t5, $t3, 0xffff -/* B71E68 800FACC8 0C03E803 */ jal Audio_SetBGM +/* B71E68 800FACC8 0C03E803 */ jal Audio_QueueSeqCmd /* B71E6C 800FACCC 030D2025 */ or $a0, $t8, $t5 /* B71E70 800FACD0 9243004D */ lbu $v1, 0x4d($s2) .L800FACD4: diff --git a/asm/non_matchings/code/code_800F9280/func_800FAD34.s b/asm/non_matchings/code/code_800F9280/func_800FAD34.s deleted file mode 100644 index 60c3128340..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FAD34.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_800FAD34 -/* B71ED4 800FAD34 3C038013 */ lui $v1, %hi(D_80133418) # $v1, 0x8013 -/* B71ED8 800FAD38 90633418 */ lbu $v1, %lo(D_80133418)($v1) -/* B71EDC 800FAD3C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B71EE0 800FAD40 AFBF001C */ sw $ra, 0x1c($sp) -/* B71EE4 800FAD44 AFB00018 */ sw $s0, 0x18($sp) -/* B71EE8 800FAD48 10600026 */ beqz $v1, .L800FADE4 -/* B71EEC 800FAD4C 00601025 */ move $v0, $v1 -/* B71EF0 800FAD50 24100001 */ li $s0, 1 -/* B71EF4 800FAD54 1602000F */ bne $s0, $v0, .L800FAD94 -/* B71EF8 800FAD58 24010002 */ li $at, 2 -/* B71EFC 800FAD5C 0C0397B7 */ jal func_800E5EDC -/* B71F00 800FAD60 00000000 */ nop -/* B71F04 800FAD64 14500008 */ bne $v0, $s0, .L800FAD88 -/* B71F08 800FAD68 3C018013 */ lui $at, %hi(D_80133418) # $at, 0x8013 -/* B71F0C 800FAD6C 3C058013 */ lui $a1, %hi(D_801333CC) # $a1, 0x8013 -/* B71F10 800FAD70 A0203418 */ sb $zero, %lo(D_80133418)($at) -/* B71F14 800FAD74 80A533CC */ lb $a1, %lo(D_801333CC)($a1) -/* B71F18 800FAD78 0C0396C8 */ jal func_800E5B20 -/* B71F1C 800FAD7C 3C044602 */ lui $a0, 0x4602 -/* B71F20 800FAD80 0C03DC5C */ jal func_800F7170 -/* B71F24 800FAD84 00000000 */ nop -.L800FAD88: -/* B71F28 800FAD88 3C038013 */ lui $v1, %hi(D_80133418) # $v1, 0x8013 -/* B71F2C 800FAD8C 10000015 */ b .L800FADE4 -/* B71F30 800FAD90 90633418 */ lbu $v1, %lo(D_80133418)($v1) -.L800FAD94: -/* B71F34 800FAD94 54410014 */ bnel $v0, $at, .L800FADE8 -/* B71F38 800FAD98 8FBF001C */ lw $ra, 0x1c($sp) -/* B71F3C 800FAD9C 0C0397B7 */ jal func_800E5EDC -/* B71F40 800FADA0 00000000 */ nop -/* B71F44 800FADA4 10500005 */ beq $v0, $s0, .L800FADBC -/* B71F48 800FADA8 00000000 */ nop -.L800FADAC: -/* B71F4C 800FADAC 0C0397B7 */ jal func_800E5EDC -/* B71F50 800FADB0 00000000 */ nop -/* B71F54 800FADB4 1450FFFD */ bne $v0, $s0, .L800FADAC -/* B71F58 800FADB8 00000000 */ nop -.L800FADBC: -/* B71F5C 800FADBC 3C018013 */ lui $at, %hi(D_80133418) # $at, 0x8013 -/* B71F60 800FADC0 3C058013 */ lui $a1, %hi(D_801333CC) # $a1, 0x8013 -/* B71F64 800FADC4 A0203418 */ sb $zero, %lo(D_80133418)($at) -/* B71F68 800FADC8 80A533CC */ lb $a1, %lo(D_801333CC)($a1) -/* B71F6C 800FADCC 0C0396C8 */ jal func_800E5B20 -/* B71F70 800FADD0 3C044602 */ lui $a0, 0x4602 -/* B71F74 800FADD4 0C03DC5C */ jal func_800F7170 -/* B71F78 800FADD8 00000000 */ nop -/* B71F7C 800FADDC 3C038013 */ lui $v1, %hi(D_80133418) # $v1, 0x8013 -/* B71F80 800FADE0 90633418 */ lbu $v1, %lo(D_80133418)($v1) -.L800FADE4: -/* B71F84 800FADE4 8FBF001C */ lw $ra, 0x1c($sp) -.L800FADE8: -/* B71F88 800FADE8 8FB00018 */ lw $s0, 0x18($sp) -/* B71F8C 800FADEC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B71F90 800FADF0 03E00008 */ jr $ra -/* B71F94 800FADF4 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/code_800F9280/func_800FADF8.s b/asm/non_matchings/code/code_800F9280/func_800FADF8.s deleted file mode 100644 index 752e8b5a25..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FADF8.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800FADF8 -/* B71F98 800FADF8 3C078017 */ lui $a3, %hi(D_8016E750) # $a3, 0x8017 -/* B71F9C 800FADFC 3C068017 */ lui $a2, %hi(D_8016E348) # $a2, 0x8017 -/* B71FA0 800FAE00 24C6E348 */ addiu $a2, %lo(D_8016E348) # addiu $a2, $a2, -0x1cb8 -/* B71FA4 800FAE04 24E7E750 */ addiu $a3, %lo(D_8016E750) # addiu $a3, $a3, -0x18b0 -/* B71FA8 800FAE08 00001025 */ move $v0, $zero -/* B71FAC 800FAE0C 240B0001 */ li $t3, 1 -/* B71FB0 800FAE10 240A007F */ li $t2, 127 -/* B71FB4 800FAE14 3409FFFF */ li $t1, 65535 -/* B71FB8 800FAE18 24080264 */ li $t0, 612 -.L800FAE1C: -/* B71FBC 800FAE1C 00480019 */ multu $v0, $t0 -/* B71FC0 800FAE20 00C27021 */ addu $t6, $a2, $v0 -/* B71FC4 800FAE24 A1C00000 */ sb $zero, ($t6) -/* B71FC8 800FAE28 0002C080 */ sll $t8, $v0, 2 -/* B71FCC 800FAE2C 0302C021 */ addu $t8, $t8, $v0 -/* B71FD0 800FAE30 0018C080 */ sll $t8, $t8, 2 -/* B71FD4 800FAE34 0302C023 */ subu $t8, $t8, $v0 -/* B71FD8 800FAE38 0018C0C0 */ sll $t8, $t8, 3 -/* B71FDC 800FAE3C 0302C021 */ addu $t8, $t8, $v0 -/* B71FE0 800FAE40 0018C080 */ sll $t8, $t8, 2 -/* B71FE4 800FAE44 00007812 */ mflo $t7 -/* B71FE8 800FAE48 00EF1821 */ addu $v1, $a3, $t7 -/* B71FEC 800FAE4C A4690254 */ sh $t1, 0x254($v1) -/* B71FF0 800FAE50 A4690256 */ sh $t1, 0x256($v1) -/* B71FF4 800FAE54 A4600028 */ sh $zero, 0x28($v1) -/* B71FF8 800FAE58 A4600018 */ sh $zero, 0x18($v1) -/* B71FFC 800FAE5C AC600014 */ sw $zero, 0x14($v1) -/* B72000 800FAE60 A4600258 */ sh $zero, 0x258($v1) -/* B72004 800FAE64 A060004D */ sb $zero, 0x4d($v1) -/* B72008 800FAE68 A060004E */ sb $zero, 0x4e($v1) -/* B7200C 800FAE6C A4600250 */ sh $zero, 0x250($v1) -/* B72010 800FAE70 A4600252 */ sh $zero, 0x252($v1) -/* B72014 800FAE74 00F82821 */ addu $a1, $a3, $t8 -/* B72018 800FAE78 00002025 */ move $a0, $zero -.L800FAE7C: -/* B7201C 800FAE7C 00A4C821 */ addu $t9, $a1, $a0 -/* B72020 800FAE80 24840001 */ addiu $a0, $a0, 1 -/* B72024 800FAE84 308400FF */ andi $a0, $a0, 0xff -/* B72028 800FAE88 28810004 */ slti $at, $a0, 4 -/* B7202C 800FAE8C 1420FFFB */ bnez $at, .L800FAE7C -/* B72030 800FAE90 A32A000E */ sb $t2, 0xe($t9) -/* B72034 800FAE94 24420001 */ addiu $v0, $v0, 1 -/* B72038 800FAE98 304200FF */ andi $v0, $v0, 0xff -/* B7203C 800FAE9C 28410004 */ slti $at, $v0, 4 -/* B72040 800FAEA0 A06B0012 */ sb $t3, 0x12($v1) -/* B72044 800FAEA4 1420FFDD */ bnez $at, .L800FAE1C -/* B72048 800FAEA8 A06B0013 */ sb $t3, 0x13($v1) -/* B7204C 800FAEAC 03E00008 */ jr $ra -/* B72050 800FAEB0 00000000 */ nop - diff --git a/asm/non_matchings/code/code_800F9280/func_800FAEB4.s b/asm/non_matchings/code/code_800F9280/func_800FAEB4.s deleted file mode 100644 index 8cae17a309..0000000000 --- a/asm/non_matchings/code/code_800F9280/func_800FAEB4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800FAEB4 -/* B72054 800FAEB4 3C013F80 */ lui $at, 0x3f80 -/* B72058 800FAEB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B7205C 800FAEBC 3C078017 */ lui $a3, %hi(D_8016E750) -/* B72060 800FAEC0 44810000 */ mtc1 $at, $f0 -/* B72064 800FAEC4 AFBF0014 */ sw $ra, 0x14($sp) -/* B72068 800FAEC8 24E7E750 */ addiu $a3, %lo(D_8016E750) -/* B7206C 800FAECC 00003025 */ move $a2, $zero -/* B72070 800FAED0 24080264 */ li $t0, 612 -/* B72074 800FAED4 2404007F */ li $a0, 127 -.L800FAED8: -/* B72078 800FAED8 00C80019 */ multu $a2, $t0 -/* B7207C 800FAEDC 00067880 */ sll $t7, $a2, 2 -/* B72080 800FAEE0 01E67821 */ addu $t7, $t7, $a2 -/* B72084 800FAEE4 000F7880 */ sll $t7, $t7, 2 -/* B72088 800FAEE8 01E67823 */ subu $t7, $t7, $a2 -/* B7208C 800FAEEC 000F78C0 */ sll $t7, $t7, 3 -/* B72090 800FAEF0 01E67821 */ addu $t7, $t7, $a2 -/* B72094 800FAEF4 000F7880 */ sll $t7, $t7, 2 -/* B72098 800FAEF8 00EF1821 */ addu $v1, $a3, $t7 -/* B7209C 800FAEFC 00001025 */ move $v0, $zero -/* B720A0 800FAF00 00007012 */ mflo $t6 -/* B720A4 800FAF04 00EE2821 */ addu $a1, $a3, $t6 -/* B720A8 800FAF08 E4A00000 */ swc1 $f0, ($a1) -/* B720AC 800FAF0C A4A0000C */ sh $zero, 0xc($a1) -/* B720B0 800FAF10 A0A00013 */ sb $zero, 0x13($a1) -.L800FAF14: -/* B720B4 800FAF14 0062C021 */ addu $t8, $v1, $v0 -/* B720B8 800FAF18 24420001 */ addiu $v0, $v0, 1 -/* B720BC 800FAF1C 304200FF */ andi $v0, $v0, 0xff -/* B720C0 800FAF20 28410004 */ slti $at, $v0, 4 -/* B720C4 800FAF24 1420FFFB */ bnez $at, .L800FAF14 -/* B720C8 800FAF28 A304000E */ sb $a0, 0xe($t8) -/* B720CC 800FAF2C 24C60001 */ addiu $a2, $a2, 1 -/* B720D0 800FAF30 30C600FF */ andi $a2, $a2, 0xff -/* B720D4 800FAF34 28C10004 */ slti $at, $a2, 4 -/* B720D8 800FAF38 1420FFE7 */ bnez $at, .L800FAED8 -/* B720DC 800FAF3C 00000000 */ nop -/* B720E0 800FAF40 0C03EB7E */ jal func_800FADF8 -/* B720E4 800FAF44 00000000 */ nop -/* B720E8 800FAF48 8FBF0014 */ lw $ra, 0x14($sp) -/* B720EC 800FAF4C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B720F0 800FAF50 03E00008 */ jr $ra -/* B720F4 800FAF54 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/z_kankyo/func_800758AC.s b/asm/non_matchings/code/z_kankyo/func_800758AC.s index 6fba91f987..4368e54b6e 100644 --- a/asm/non_matchings/code/z_kankyo/func_800758AC.s +++ b/asm/non_matchings/code/z_kankyo/func_800758AC.s @@ -59,7 +59,7 @@ glabel func_800758AC /* AECAB0 80075910 00000000 */ nop /* AECAB4 80075914 14400003 */ bnez $v0, .L80075924 /* AECAB8 80075918 3C028016 */ lui $v0, %hi(gSaveContext+0x140e) # $v0, 0x8016 -/* AECABC 8007591C 0C03E803 */ jal Audio_SetBGM +/* AECABC 8007591C 0C03E803 */ jal Audio_QueueSeqCmd /* AECAC0 80075920 9444FA6E */ lhu $a0, %lo(gSaveContext+0x140e)($v0) .L80075924: /* AECAC4 80075924 3C018016 */ lui $at, %hi(gSaveContext+0x140e) # $at, 0x8016 diff --git a/asm/non_matchings/code/z_kankyo/func_80075B44.s b/asm/non_matchings/code/z_kankyo/func_80075B44.s index 34ded79086..61ae2c47bc 100644 --- a/asm/non_matchings/code/z_kankyo/func_80075B44.s +++ b/asm/non_matchings/code/z_kankyo/func_80075B44.s @@ -71,7 +71,7 @@ glabel L80075BD8 /* AECDA4 80075C04 3C0410F0 */ lui $a0, (0x10F000FF >> 16) # lui $a0, 0x10f0 /* AECDA8 80075C08 55600005 */ bnezl $t3, .L80075C20 /* AECDAC 80075C0C 3C010001 */ lui $at, 1 -/* AECDB0 80075C10 0C03E803 */ jal Audio_SetBGM +/* AECDB0 80075C10 0C03E803 */ jal Audio_QueueSeqCmd /* AECDB4 80075C14 348400FF */ ori $a0, (0x10F000FF & 0xFFFF) # ori $a0, $a0, 0xff /* AECDB8 80075C18 92020B04 */ lbu $v0, 0xb04($s0) /* AECDBC 80075C1C 3C010001 */ lui $at, 1 diff --git a/asm/non_matchings/code/z_message_PAL/func_80106AA8.s b/asm/non_matchings/code/z_message_PAL/func_80106AA8.s index 945d31e42a..f2b95d0f84 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80106AA8.s +++ b/asm/non_matchings/code/z_message_PAL/func_80106AA8.s @@ -48,7 +48,7 @@ glabel func_80106AA8 /* B7DCFC 80106B5C 00000000 */ nop /* B7DD00 80106B60 0C03B616 */ jal func_800ED858 /* B7DD04 80106B64 AFA30024 */ sw $v1, 0x24($sp) -/* B7DD08 80106B68 0C03B8FE */ jal func_800EE3F8 +/* B7DD08 80106B68 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B7DD0C 80106B6C 00000000 */ nop /* B7DD10 80106B70 8FA30024 */ lw $v1, 0x24($sp) /* B7DD14 80106B74 3C068015 */ lui $a2, %hi(D_8014B2F8) # $a2, 0x8015 diff --git a/asm/non_matchings/code/z_message_PAL/func_801083F8.s b/asm/non_matchings/code/z_message_PAL/func_801083F8.s index aea6870de0..de0e0508b1 100644 --- a/asm/non_matchings/code/z_message_PAL/func_801083F8.s +++ b/asm/non_matchings/code/z_message_PAL/func_801083F8.s @@ -89,7 +89,7 @@ glabel func_801083F8 /* B7F61C 8010847C 24040001 */ li $a0, 1 /* B7F620 80108480 0C03B616 */ jal func_800ED858 /* B7F624 80108484 24040001 */ li $a0, 1 -/* B7F628 80108488 0C03B8FE */ jal func_800EE3F8 +/* B7F628 80108488 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B7F62C 8010848C 00000000 */ nop /* B7F630 80108490 3C038015 */ lui $v1, %hi(D_8014B2FC) # $v1, 0x8015 /* B7F634 80108494 26017FFF */ addiu $at, $s0, 0x7fff @@ -136,7 +136,7 @@ glabel func_801083F8 /* B7F6D0 80108530 24040001 */ li $a0, 1 /* B7F6D4 80108534 0C03B616 */ jal func_800ED858 /* B7F6D8 80108538 24040001 */ li $a0, 1 -/* B7F6DC 8010853C 0C03B8FE */ jal func_800EE3F8 +/* B7F6DC 8010853C 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B7F6E0 80108540 00000000 */ nop /* B7F6E4 80108544 3C038015 */ lui $v1, %hi(D_8014B2FC) # $v1, 0x8015 /* B7F6E8 80108548 26017FFF */ addiu $at, $s0, 0x7fff diff --git a/asm/non_matchings/code/z_message_PAL/func_8010B820.s b/asm/non_matchings/code/z_message_PAL/func_8010B820.s index 3c4f03dd7d..7b6109d270 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010B820.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010B820.s @@ -351,7 +351,7 @@ glabel func_8010B820 /* B82E20 8010BC80 24040001 */ li $a0, 1 /* B82E24 8010BC84 0C03B616 */ jal func_800ED858 /* B82E28 8010BC88 24040001 */ li $a0, 1 -/* B82E2C 8010BC8C 0C03B8FE */ jal func_800EE3F8 +/* B82E2C 8010BC8C 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B82E30 8010BC90 00000000 */ nop /* B82E34 8010BC94 3C048015 */ lui $a0, %hi(D_8014B2FC) # $a0, 0x8015 /* B82E38 8010BC98 26417FFF */ addiu $at, $s2, 0x7fff diff --git a/asm/non_matchings/code/z_message_PAL/func_8010C39C.s b/asm/non_matchings/code/z_message_PAL/func_8010C39C.s index e5fe58d06b..e64e2db895 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010C39C.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010C39C.s @@ -2020,7 +2020,7 @@ glabel L8010D9D8 /* B84DA8 8010DC08 10000419 */ b .L8010EC70 /* B84DAC 8010DC0C 92026304 */ lbu $v0, 0x6304($s0) glabel L8010DC10 -/* B84DB0 8010DC10 0C03B8FE */ jal func_800EE3F8 +/* B84DB0 8010DC10 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B84DB4 8010DC14 00000000 */ nop /* B84DB8 8010DC18 26217FFF */ addiu $at, $s1, 0x7fff /* B84DBC 8010DC1C AC2262B9 */ sw $v0, 0x62b9($at) @@ -2415,7 +2415,7 @@ glabel L8010DF4C /* B85370 8010E1D0 100002A7 */ b .L8010EC70 /* B85374 8010E1D4 92026304 */ lbu $v0, 0x6304($s0) glabel L8010E1D8 -/* B85378 8010E1D8 0C03B8FE */ jal func_800EE3F8 +/* B85378 8010E1D8 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B8537C 8010E1DC 00000000 */ nop /* B85380 8010E1E0 26217FFF */ addiu $at, $s1, 0x7fff /* B85384 8010E1E4 AC2262B9 */ sw $v0, 0x62b9($at) @@ -2672,7 +2672,7 @@ glabel L8010E580 /* B85730 8010E590 3C048016 */ lui $a0, %hi(gSaveContext+0x3f) # $a0, 0x8016 /* B85734 8010E594 0C03B95F */ jal func_800EE57C /* B85738 8010E598 9084E69F */ lbu $a0, %lo(gSaveContext+0x3f)($a0) -/* B8573C 8010E59C 0C03B8FE */ jal func_800EE3F8 +/* B8573C 8010E59C 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B85740 8010E5A0 00000000 */ nop /* B85744 8010E5A4 3C088015 */ lui $t0, %hi(D_8014B2F8) # $t0, 0x8015 /* B85748 8010E5A8 26217FFF */ addiu $at, $s1, 0x7fff @@ -2705,7 +2705,7 @@ glabel L8010E5F0 /* B857B0 8010E610 24044038 */ li $a0, 16440 /* B857B4 8010E614 0C03DCE3 */ jal Audio_PlaySoundGeneral /* B857B8 8010E618 24060004 */ li $a2, 4 -/* B857BC 8010E61C 0C03B8FE */ jal func_800EE3F8 +/* B857BC 8010E61C 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B857C0 8010E620 00000000 */ nop /* B857C4 8010E624 26217FFF */ addiu $at, $s1, 0x7fff /* B857C8 8010E628 AC2262B9 */ sw $v0, 0x62b9($at) @@ -2781,7 +2781,7 @@ glabel L8010E5F0 /* B858C8 8010E728 10000151 */ b .L8010EC70 /* B858CC 8010E72C 92026304 */ lbu $v0, 0x6304($s0) glabel L8010E730 -/* B858D0 8010E730 0C03B8FE */ jal func_800EE3F8 +/* B858D0 8010E730 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B858D4 8010E734 00000000 */ nop /* B858D8 8010E738 26217FFF */ addiu $at, $s1, 0x7fff /* B858DC 8010E73C AC2262B9 */ sw $v0, 0x62b9($at) @@ -2986,7 +2986,7 @@ glabel L8010EA20 /* B85BC4 8010EA24 24044836 */ li $a0, 18486 /* B85BC8 8010EA28 1440000F */ bnez $v0, .L8010EA68 /* B85BCC 8010EA2C 00000000 */ nop -/* B85BD0 8010EA30 0C03B8FE */ jal func_800EE3F8 +/* B85BD0 8010EA30 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* B85BD4 8010EA34 00000000 */ nop /* B85BD8 8010EA38 3C088015 */ lui $t0, %hi(D_8014B2F8) # $t0, 0x8015 /* B85BDC 8010EA3C 26217FFF */ addiu $at, $s1, 0x7fff @@ -3176,8 +3176,8 @@ glabel L8010EC60 /* B85E74 8010ECD4 14410093 */ bne $v0, $at, .L8010EF24 /* B85E78 8010ECD8 2529FA90 */ addiu $t1, %lo(gGameInfo) # addiu $t1, $t1, -0x570 /* B85E7C 8010ECDC 960463F0 */ lhu $a0, 0x63f0($s0) -/* B85E80 8010ECE0 3C188013 */ lui $t8, %hi(D_80131C00) # $t8, 0x8013 -/* B85E84 8010ECE4 27181C00 */ addiu $t8, %lo(D_80131C00) # addiu $t8, $t8, 0x1c00 +/* B85E80 8010ECE0 3C188013 */ lui $t8, %hi(gOcarinaSongNotes) # $t8, 0x8013 +/* B85E84 8010ECE4 27181C00 */ addiu $t8, %lo(gOcarinaSongNotes) # addiu $t8, $t8, 0x1c00 /* B85E88 8010ECE8 2484FFF1 */ addiu $a0, $a0, -0xf /* B85E8C 8010ECEC 00042400 */ sll $a0, $a0, 0x10 /* B85E90 8010ECF0 00042403 */ sra $a0, $a0, 0x10 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index dbf688e717..3578ec6c54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -180,7 +180,7 @@ glabel L808D79E8 /* 01290 808D7B00 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 01294 808D7B04 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 01298 808D7B08 A42CFA84 */ sh $t4, %lo(gSaveContext+0x1424)($at) -/* 0129C 808D7B0C 0C03E803 */ jal Audio_SetBGM +/* 0129C 808D7B0C 0C03E803 */ jal Audio_QueueSeqCmd /* 012A0 808D7B10 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF /* 012A4 808D7B14 8FA40074 */ lw $a0, 0x0074($sp) @@ -688,7 +688,7 @@ glabel L808D8220 /* 019CC 808D823C 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 /* 019D0 808D8240 54610010 */ bnel $v1, $at, .L808D8284 /* 019D4 808D8244 2C61001F */ sltiu $at, $v1, 0x001F -/* 019D8 808D8248 0C03E803 */ jal Audio_SetBGM +/* 019D8 808D8248 0C03E803 */ jal Audio_QueueSeqCmd /* 019DC 808D824C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 019E0 808D8250 3C040600 */ lui $a0, %hi(D_06004F64) ## $a0 = 06000000 @@ -1340,7 +1340,7 @@ glabel L808D8A98 /* 0232C 808D8B9C E5EA16C4 */ swc1 $f10, 0x16C4($t7) ## 809016C4 /* 02330 808D8BA0 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 -/* 02334 808D8BA4 0C03E803 */ jal Audio_SetBGM +/* 02334 808D8BA4 0C03E803 */ jal Audio_QueueSeqCmd /* 02338 808D8BA8 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 0233C 808D8BAC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s index 6651b8c379..e33b2177d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD20C.s @@ -178,7 +178,7 @@ glabel func_808DD20C /* 06C18 808DD488 0C01E245 */ jal func_80078914 /* 06C1C 808DD48C 2405388B */ addiu $a1, $zero, 0x388B ## $a1 = 0000388B /* 06C20 808DD490 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 06C24 808DD494 0C03E803 */ jal Audio_SetBGM +/* 06C24 808DD494 0C03E803 */ jal Audio_QueueSeqCmd /* 06C28 808DD498 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 06C2C 808DD49C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 3f82cb70c0..a2261eb6bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -490,7 +490,7 @@ glabel L808FDB64 /* 00C80 808FDBC0 0C01E245 */ jal func_80078914 /* 00C84 808FDBC4 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D /* 00C88 808FDBC8 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 -/* 00C8C 808FDBCC 0C03E803 */ jal Audio_SetBGM +/* 00C8C 808FDBCC 0C03E803 */ jal Audio_QueueSeqCmd /* 00C90 808FDBD0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF /* 00C94 808FDBD4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 @@ -965,7 +965,7 @@ glabel L808FE1C0 /* 01388 808FE2C8 24040023 */ addiu $a0, $zero, 0x0023 ## $a0 = 00000023 /* 0138C 808FE2CC E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 01390 808FE2D0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 01394 808FE2D4 0C03E803 */ jal Audio_SetBGM +/* 01394 808FE2D4 0C03E803 */ jal Audio_QueueSeqCmd /* 01398 808FE2D8 E600002C */ swc1 $f0, 0x002C($s0) ## 0000002C /* 0139C 808FE2DC 8FA90088 */ lw $t1, 0x0088($sp) @@ -1469,7 +1469,7 @@ glabel L808FEA08 /* 01AD0 808FEA10 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01AD4 808FEA14 15C10003 */ bne $t6, $at, .L808FEA24 /* 01AD8 808FEA18 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 -/* 01ADC 808FEA1C 0C03E803 */ jal Audio_SetBGM +/* 01ADC 808FEA1C 0C03E803 */ jal Audio_QueueSeqCmd /* 01AE0 808FEA20 24040065 */ addiu $a0, $zero, 0x0065 ## $a0 = 00000065 .L808FEA24: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s index 8276fc5697..513c941b18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFCFC.s @@ -23,7 +23,7 @@ glabel func_808FFCFC /* 02E0C 808FFD4C 94980088 */ lhu $t8, 0x0088($a0) ## 00000088 /* 02E10 808FFD50 0C240160 */ jal func_80900580 /* 02E14 808FFD54 A0800311 */ sb $zero, 0x0311($a0) ## 00000311 -/* 02E18 808FFD58 0C03E341 */ jal func_800F8D04 +/* 02E18 808FFD58 0C03E341 */ jal Audio_StopSfx /* 02E1C 808FFD5C 240439D9 */ addiu $a0, $zero, 0x39D9 ## $a0 = 000039D9 /* 02E20 808FFD60 10000010 */ beq $zero, $zero, .L808FFDA4 /* 02E24 808FFD64 8FBF0014 */ lw $ra, 0x0014($sp) @@ -40,7 +40,7 @@ glabel func_808FFCFC /* 02E4C 808FFD8C 8FA5001C */ lw $a1, 0x001C($sp) /* 02E50 808FFD90 0C240160 */ jal func_80900580 /* 02E54 808FFD94 A0800311 */ sb $zero, 0x0311($a0) ## 00000311 -/* 02E58 808FFD98 0C03E341 */ jal func_800F8D04 +/* 02E58 808FFD98 0C03E341 */ jal Audio_StopSfx /* 02E5C 808FFD9C 240439D9 */ addiu $a0, $zero, 0x39D9 ## $a0 = 000039D9 .L808FFDA0: /* 02E60 808FFDA0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index d79aea34a2..12e46bad2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -806,7 +806,7 @@ glabel L80901AB0 /* 04DD8 80901D18 2F010051 */ sltiu $at, $t8, 0x0051 /* 04DDC 80901D1C 5420015D */ bnel $at, $zero, .L80902294 /* 04DE0 80901D20 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04DE4 80901D24 0C03E803 */ jal Audio_SetBGM +/* 04DE4 80901D24 0C03E803 */ jal Audio_QueueSeqCmd /* 04DE8 80901D28 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 04DEC 80901D2C 3C0142E0 */ lui $at, 0x42E0 ## $at = 42E00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s index 3482167b8d..8002235c19 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80902524.s @@ -86,7 +86,7 @@ glabel func_80902524 /* 056F4 80902634 0C00BE0A */ jal Audio_PlayActorSound2 /* 056F8 80902638 2405399B */ addiu $a1, $zero, 0x399B ## $a1 = 0000399B -/* 056FC 8090263C 0C03E341 */ jal func_800F8D04 +/* 056FC 8090263C 0C03E341 */ jal Audio_StopSfx /* 05700 80902640 240439D9 */ addiu $a0, $zero, 0x39D9 ## $a0 = 000039D9 /* 05704 80902644 10000072 */ beq $zero, $zero, .L80902810 /* 05708 80902648 8FBF001C */ lw $ra, 0x001C($sp) @@ -105,7 +105,7 @@ glabel func_80902524 /* 05738 80902678 0C00BE0A */ jal Audio_PlayActorSound2 /* 0573C 8090267C 2405399B */ addiu $a1, $zero, 0x399B ## $a1 = 0000399B -/* 05740 80902680 0C03E341 */ jal func_800F8D04 +/* 05740 80902680 0C03E341 */ jal Audio_StopSfx /* 05744 80902684 240439D9 */ addiu $a0, $zero, 0x39D9 ## $a0 = 000039D9 /* 05748 80902688 920D00AF */ lbu $t5, 0x00AF($s0) ## 000000AF /* 0574C 8090268C 25AEFFFE */ addiu $t6, $t5, 0xFFFE ## $t6 = FFFFFFFE @@ -166,7 +166,7 @@ glabel func_80902524 /* 05814 80902754 0C00BE0A */ jal Audio_PlayActorSound2 /* 05818 80902758 AFA70020 */ sw $a3, 0x0020($sp) -/* 0581C 8090275C 0C03E341 */ jal func_800F8D04 +/* 0581C 8090275C 0C03E341 */ jal Audio_StopSfx /* 05820 80902760 240439D9 */ addiu $a0, $zero, 0x39D9 ## $a0 = 000039D9 /* 05824 80902764 8FA70020 */ lw $a3, 0x0020($sp) /* 05828 80902768 3C010900 */ lui $at, 0x0900 ## $at = 09000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s index 3fc1c16c85..47e6ac2576 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s @@ -153,7 +153,7 @@ glabel BossMo_Init /* 007DC 8091C2DC 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 /* 007E0 8091C2E0 11000009 */ beq $t0, $zero, .L8091C308 /* 007E4 8091C2E4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 007E8 8091C2E8 0C03E803 */ jal Audio_SetBGM +/* 007E8 8091C2E8 0C03E803 */ jal Audio_QueueSeqCmd /* 007EC 8091C2EC 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 007F0 8091C2F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index 6e7e05bef3..122ba9c73e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -3270,7 +3270,7 @@ glabel L8091ED18 /* 035F8 8091F0F8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 035FC 8091F0FC E7A40014 */ swc1 $f4, 0x0014($sp) -/* 03600 8091F100 0C03E803 */ jal Audio_SetBGM +/* 03600 8091F100 0C03E803 */ jal Audio_QueueSeqCmd /* 03604 8091F104 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 03608 8091F108 8FA401BC */ lw $a0, 0x01BC($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index bc24ec49c5..0668ce4e81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -205,7 +205,7 @@ glabel L8091F61C /* 03CB4 8091F7B4 A5600158 */ sh $zero, 0x0158($t3) ## 00000158 /* 03CB8 8091F7B8 8C6D0000 */ lw $t5, 0x0000($v1) ## 80925CD4 /* 03CBC 8091F7BC 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 103200FF -/* 03CC0 8091F7C0 0C03E803 */ jal Audio_SetBGM +/* 03CC0 8091F7C0 0C03E803 */ jal Audio_QueueSeqCmd /* 03CC4 8091F7C4 A5AC017E */ sh $t4, 0x017E($t5) ## 0000017E /* 03CC8 8091F7C8 0C041B33 */ jal func_80106CCC @@ -901,7 +901,7 @@ glabel L8091FF00 /* 046E8 809201E8 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 /* 046EC 809201EC 54410005 */ bnel $v0, $at, .L80920204 /* 046F0 809201F0 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 046F4 809201F4 0C03E803 */ jal Audio_SetBGM +/* 046F4 809201F4 0C03E803 */ jal Audio_QueueSeqCmd /* 046F8 809201F8 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 046FC 809201FC 86020182 */ lh $v0, 0x0182($s0) ## 00000182 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s index 06dca87b86..948d88c6b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80921280.s @@ -166,7 +166,7 @@ glabel func_80921280 /* 05950 80921450 0C00CB1F */ jal Enemy_StartFinishingBlow /* 05954 80921454 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05958 80921458 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 0595C 8092145C 0C03E803 */ jal Audio_SetBGM +/* 0595C 8092145C 0C03E803 */ jal Audio_QueueSeqCmd /* 05960 80921460 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 05964 80921464 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s index 6d559cabea..74b3db94e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s @@ -8,7 +8,7 @@ glabel func_80925C18 /* 0A130 80925C30 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 0A134 80925C34 1060000F */ beq $v1, $zero, .L80925C74 /* 0A138 80925C38 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 0A13C 80925C3C 0C03E803 */ jal Audio_SetBGM +/* 0A13C 80925C3C 0C03E803 */ jal Audio_QueueSeqCmd /* 0A140 80925C40 A44E1314 */ sh $t6, 0x1314($v0) ## 80161314 /* 0A144 80925C44 3C0F8016 */ lui $t7, %hi(gGameInfo) @@ -30,7 +30,7 @@ glabel func_80925C18 /* 0A180 80925C80 8FBF0014 */ lw $ra, 0x0014($sp) /* 0A184 80925C84 A4401318 */ sh $zero, 0x1318($v0) ## 80161318 /* 0A188 80925C88 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) -/* 0A18C 80925C8C 0C03E803 */ jal Audio_SetBGM +/* 0A18C 80925C8C 0C03E803 */ jal Audio_QueueSeqCmd /* 0A190 80925C90 9524131A */ lhu $a0, 0x131A($t1) ## 8016131A /* 0A194 80925C94 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 5834e50390..07def6a03d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -300,7 +300,7 @@ glabel BossTw_Init /* 00E30 80939B00 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 00E34 80939B04 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00E38 80939B08 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 00E3C 80939B0C 0C03E803 */ jal Audio_SetBGM +/* 00E3C 80939B0C 0C03E803 */ jal Audio_QueueSeqCmd /* 00E40 80939B10 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 00E44 80939B14 10000003 */ beq $zero, $zero, .L80939B24 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index 22a2931d57..7f5b3ad4dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -90,7 +90,7 @@ glabel func_8093C910 /* 03D40 8093CA10 A52000B4 */ sh $zero, 0x00B4($t1) ## 809500B4 /* 03D44 8093CA14 E63601A8 */ swc1 $f22, 0x01A8($s1) ## 000001A8 /* 03D48 8093CA18 E63601AC */ swc1 $f22, 0x01AC($s1) ## 000001AC -/* 03D4C 8093CA1C 0C03E803 */ jal Audio_SetBGM +/* 03D4C 8093CA1C 0C03E803 */ jal Audio_QueueSeqCmd /* 03D50 8093CA20 E62801B0 */ swc1 $f8, 0x01B0($s1) ## 000001B0 /* 03D54 8093CA24 A6200152 */ sh $zero, 0x0152($s1) ## 00000152 @@ -540,7 +540,7 @@ glabel func_8093C910 /* 043BC 8093D08C 0C00BE0A */ jal Audio_PlayActorSound2 /* 043C0 8093D090 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D -/* 043C4 8093D094 0C03E803 */ jal Audio_SetBGM +/* 043C4 8093D094 0C03E803 */ jal Audio_QueueSeqCmd /* 043C8 8093D098 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B .L8093D09C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index fa404e9777..bc52b393fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -107,7 +107,7 @@ glabel func_8093D5C0 /* 0495C 8093D62C 02402025 */ or $a0, $s2, $zero ## $a0 = 8094A7D0 /* 04960 8093D630 0C01E245 */ jal func_80078914 /* 04964 8093D634 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 -/* 04968 8093D638 0C03E803 */ jal Audio_SetBGM +/* 04968 8093D638 0C03E803 */ jal Audio_QueueSeqCmd /* 0496C 8093D63C 24040061 */ addiu $a0, $zero, 0x0061 ## $a0 = 00000061 /* 04970 8093D640 862205FE */ lh $v0, 0x05FE($s1) ## 000005FE @@ -1393,7 +1393,7 @@ glabel L8093E854 /* 05BE0 8093E8B0 14610005 */ bne $v1, $at, .L8093E8C8 /* 05BE4 8093E8B4 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 05BE8 8093E8B8 3C04105A */ lui $a0, 0x105A ## $a0 = 105A0000 -/* 05BEC 8093E8BC 0C03E803 */ jal Audio_SetBGM +/* 05BEC 8093E8BC 0C03E803 */ jal Audio_QueueSeqCmd /* 05BF0 8093E8C0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105A00FF /* 05BF4 8093E8C4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 @@ -1445,7 +1445,7 @@ glabel L8093E854 /* 05CA4 8093E974 944B0EE2 */ lhu $t3, 0x0EE2($v0) ## 8015F542 /* 05CA8 8093E978 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 05CAC 8093E97C 356C0020 */ ori $t4, $t3, 0x0020 ## $t4 = 00000020 -/* 05CB0 8093E980 0C03E803 */ jal Audio_SetBGM +/* 05CB0 8093E980 0C03E803 */ jal Audio_QueueSeqCmd /* 05CB4 8093E984 A44C0EE2 */ sh $t4, 0x0EE2($v0) ## 8015F542 /* 05CB8 8093E988 86230150 */ lh $v1, 0x0150($s1) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index da5a22d50d..0eb179a3af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -241,7 +241,7 @@ glabel func_8093F1C4 /* 067FC 8093F4CC 3C041050 */ lui $a0, 0x1050 ## $a0 = 10500000 /* 06800 8093F4D0 A7B90038 */ sh $t9, 0x0038($sp) /* 06804 8093F4D4 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105000FF -/* 06808 8093F4D8 0C03E803 */ jal Audio_SetBGM +/* 06808 8093F4D8 0C03E803 */ jal Audio_QueueSeqCmd /* 0680C 8093F4DC A7A3003A */ sh $v1, 0x003A($sp) /* 06810 8093F4E0 87A3003A */ lh $v1, 0x003A($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index 0969b502b0..0f7ddac7d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -319,7 +319,7 @@ glabel L8093FDC0 /* 0716C 8093FE3C 8C680054 */ lw $t0, 0x0054($v1) ## 00000054 /* 07170 8093FE40 AE480610 */ sw $t0, 0x0610($s2) ## 00000610 /* 07174 8093FE44 8C690058 */ lw $t1, 0x0058($v1) ## 00000058 -/* 07178 8093FE48 0C03E803 */ jal Audio_SetBGM +/* 07178 8093FE48 0C03E803 */ jal Audio_QueueSeqCmd /* 0717C 8093FE4C AE490614 */ sw $t1, 0x0614($s2) ## 00000614 /* 07180 8093FE50 10000212 */ beq $zero, $zero, .L8094069C @@ -631,7 +631,7 @@ glabel L809400CC /* 075F4 809402C4 2404390D */ addiu $a0, $zero, 0x390D ## $a0 = 0000390D /* 075F8 809402C8 0C01E221 */ jal func_80078884 /* 075FC 809402CC A30C0564 */ sb $t4, 0x0564($t8) ## 80950564 -/* 07600 809402D0 0C03E803 */ jal Audio_SetBGM +/* 07600 809402D0 0C03E803 */ jal Audio_QueueSeqCmd /* 07604 809402D4 24040061 */ addiu $a0, $zero, 0x0061 ## $a0 = 00000061 /* 07608 809402D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -835,7 +835,7 @@ glabel L809402FC /* 078D8 809405A8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 078DC 809405AC 0C00B7D5 */ jal func_8002DF54 /* 078E0 809405B0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 078E4 809405B4 0C03E803 */ jal Audio_SetBGM +/* 078E4 809405B4 0C03E803 */ jal Audio_QueueSeqCmd /* 078E8 809405B8 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 078EC 809405BC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s index ee2c3a4bbe..294818aeab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80950780.s @@ -791,7 +791,7 @@ glabel L809510AC /* 01F7C 8095123C 0061082A */ slt $at, $v1, $at /* 01F80 80951240 54200007 */ bnel $at, $zero, .L80951260 /* 01F84 80951244 862E01F2 */ lh $t6, 0x01F2($s1) ## 000001F2 -/* 01F88 80951248 0C03E803 */ jal Audio_SetBGM +/* 01F88 80951248 0C03E803 */ jal Audio_QueueSeqCmd /* 01F8C 8095124C 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 01F90 80951250 3C088096 */ lui $t0, %hi(D_80966918) ## $t0 = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s index ae5bfda360..8543bd27f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095335C.s @@ -13,7 +13,7 @@ glabel func_8095335C /* 040C8 80953388 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 /* 040CC 8095338C 01C17824 */ and $t7, $t6, $at /* 040D0 80953390 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 040D4 80953394 0C03E803 */ jal Audio_SetBGM +/* 040D4 80953394 0C03E803 */ jal Audio_QueueSeqCmd /* 040D8 80953398 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 040DC 8095339C 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s index ef8f6ac2b4..ba5b31cef1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s @@ -405,7 +405,7 @@ glabel L80953940 /* 04684 80953944 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 04688 80953948 54410005 */ bnel $v0, $at, .L80953960 /* 0468C 8095394C 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 04690 80953950 0C03E803 */ jal Audio_SetBGM +/* 04690 80953950 0C03E803 */ jal Audio_QueueSeqCmd /* 04694 80953954 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 04698 80953958 8E620198 */ lw $v0, 0x0198($s3) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s index 7bd859f1ef..4c2c9a190d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80999580.s @@ -11,7 +11,7 @@ glabel func_80999580 /* 00E20 809995A0 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 /* 00E24 809995A4 8FB80018 */ lw $t8, 0x0018($sp) /* 00E28 809995A8 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 -/* 00E2C 809995AC 0C03E803 */ jal Audio_SetBGM +/* 00E2C 809995AC 0C03E803 */ jal Audio_QueueSeqCmd /* 00E30 809995B0 A70F0192 */ sh $t7, 0x0192($t8) ## 00000192 /* 00E34 809995B4 3C05809A */ lui $a1, %hi(func_809995D4) ## $a1 = 809A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s index e2ff1ed2b7..e78793d136 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s @@ -282,9 +282,9 @@ glabel func_80B42F74 /* 0051C 80B432DC 8FB90030 */ lw $t9, 0x0030($sp) .L80B432E0: /* 00520 80B432E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00524 80B432E4 57210006 */ bnel $t9, $at, .L80B43300 -/* 00528 80B432E8 8FAF0030 */ lw $t7, 0x0030($sp) -/* 0052C 80B432EC 0C03E341 */ jal func_800F8D04 +/* 00524 80B432E4 57210006 */ bnel $t9, $at, .L80B43300 +/* 00528 80B432E8 8FAF0030 */ lw $t7, 0x0030($sp) +/* 0052C 80B432EC 0C03E341 */ jal Audio_StopSfx /* 00530 80B432F0 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 /* 00534 80B432F4 0C01E221 */ jal func_80078884 /* 00538 80B432F8 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_DrawQuestStatus.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_DrawQuestStatus.s index d816794d47..0e99374bf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_DrawQuestStatus.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_DrawQuestStatus.s @@ -365,7 +365,7 @@ glabel KaleidoScope_DrawQuestStatus /* 004B0 80813CD0 00812021 */ addu $a0, $a0, $at /* 004B4 80813CD4 0C03B301 */ jal func_800ECC04 /* 004B8 80813CD8 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000000 -/* 004BC 80813CDC 0C03B8FE */ jal func_800EE3F8 +/* 004BC 80813CDC 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* 004C0 80813CE0 00000000 */ nop /* 004C4 80813CE4 AE820194 */ sw $v0, 0x0194($s4) ## 00000194 /* 004C8 80813CE8 A0400002 */ sb $zero, 0x0002($v0) ## 00000002 @@ -629,7 +629,7 @@ glabel KaleidoScope_DrawQuestStatus /* 00890 808140B0 0C03B64F */ jal func_800ED93C /* 00894 808140B4 00042603 */ sra $a0, $a0, 24 /* 00898 808140B8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0089C 808140BC 0C03B8FE */ jal func_800EE3F8 +/* 0089C 808140BC 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* 008A0 808140C0 A69801E4 */ sh $t8, 0x01E4($s4) ## 000001E4 /* 008A4 808140C4 AE820194 */ sw $v0, 0x0194($s4) ## 00000194 /* 008A8 808140C8 A0400002 */ sb $zero, 0x0002($v0) ## 00000002 @@ -1686,7 +1686,7 @@ glabel KaleidoScope_DrawQuestStatus /* 017F8 80815018 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 017FC 8081501C 544100B9 */ bnel $v0, $at, .L80815304 /* 01800 80815020 28410004 */ slti $at, $v0, 0x0004 -/* 01804 80815024 0C03B8FE */ jal func_800EE3F8 +/* 01804 80815024 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* 01808 80815028 A7A9021A */ sh $t1, 0x021A($sp) /* 0180C 8081502C 87A9021A */ lh $t1, 0x021A($sp) /* 01810 80815030 AE820194 */ sw $v0, 0x0194($s4) ## 00000194 @@ -1885,8 +1885,8 @@ glabel KaleidoScope_DrawQuestStatus /* 01AF8 80815318 00000000 */ nop .L8081531C: /* 01AFC 8081531C 86860264 */ lh $a2, 0x0264($s4) ## 00000264 -/* 01B00 80815320 3C0F8013 */ lui $t7, %hi(D_80131C00) -/* 01B04 80815324 25EF1C00 */ addiu $t7, %lo(D_80131C00) +/* 01B00 80815320 3C0F8013 */ lui $t7, %hi(gOcarinaSongNotes) +/* 01B04 80815324 25EF1C00 */ addiu $t7, %lo(gOcarinaSongNotes) /* 01B08 80815328 0006C8C0 */ sll $t9, $a2, 3 /* 01B0C 8081532C 0326C821 */ addu $t9, $t9, $a2 /* 01B10 80815330 032FC021 */ addu $t8, $t9, $t7 @@ -2285,7 +2285,7 @@ glabel KaleidoScope_DrawQuestStatus /* 02100 80815920 00812021 */ addu $a0, $a0, $at /* 02104 80815924 0C03B301 */ jal func_800ECC04 /* 02108 80815928 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000000 -/* 0210C 8081592C 0C03B8FE */ jal func_800EE3F8 +/* 0210C 8081592C 0C03B8FE */ jal Audio_OcaGetDisplayStaff /* 02110 80815930 00000000 */ nop /* 02114 80815934 AE820194 */ sw $v0, 0x0194($s4) ## 00000194 /* 02118 80815938 A0400002 */ sb $zero, 0x0002($v0) ## 00000002 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index b38af86907..99a1ed692d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -91,7 +91,7 @@ glabel func_80811A20 /* 0DE28 80811B68 0C01BBC4 */ jal Font_LoadOrderedFont /* 0DE2C 80811B6C 02012021 */ addu $a0, $s0, $at /* 0DE30 80811B70 3C04F000 */ lui $a0, 0xF000 ## $a0 = F0000000 -/* 0DE34 80811B74 0C03E803 */ jal Audio_SetBGM +/* 0DE34 80811B74 0C03E803 */ jal Audio_QueueSeqCmd /* 0DE38 80811B78 3484000A */ ori $a0, $a0, 0x000A ## $a0 = F000000A /* 0DE3C 80811B7C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 diff --git a/data/code_800DACC0.data.s b/data/audio_synthesis.data.s similarity index 100% rename from data/code_800DACC0.data.s rename to data/audio_synthesis.data.s diff --git a/data/code_800DACC0.bss.s b/data/code_800DACC0.bss.s deleted file mode 100644 index 75ed35dba6..0000000000 --- a/data/code_800DACC0.bss.s +++ /dev/null @@ -1,304 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_8016B6E0 - .space 0x18 - -glabel D_8016B6F8 - .space 0x40 - -glabel D_8016B738 - .space 0x48 - -glabel D_8016B780 - .space 0x20 - -glabel D_8016B7A0 - .space 0x4 - -glabel D_8016B7A4 - .space 0x4 - -glabel D_8016B7A8 - .space 0x4 - -glabel D_8016B7AC - .space 0x4 - -glabel D_8016B7B0 - .space 0x8 - -glabel D_8016B7B8 - .space 0x10 - -glabel D_8016B7C8 - .space 0x10 - -glabel D_8016B7D8 - .space 0x4 - -glabel D_8016B7DC - .space 0x4 - -glabel D_8016B7E0 - .space 0x8 - -glabel D_8016B7E8 - .space 0x6 - -glabel D_8016B7EE - .space 0xC2 - -glabel D_8016B8B0 - .space 0x1 - -glabel D_8016B8B1 - .space 0x1 - -glabel D_8016B8B2 - .space 0x1 - -glabel D_8016B8B3 - .space 0x1 - -glabel D_8016B8B4 - .space 0x4 - -glabel D_8016B8B8 - .space 0xA - -glabel D_8016B8C2 - .space 0xF6 - -glabel D_8016B9B8 - .space 0x20 - -glabel D_8016B9D8 - .space 0x8 - -glabel D_8016B9E0 - .space 0x12 - -glabel D_8016B9F2 - .space 0x1 - -glabel D_8016B9F3 - .space 0x1 - -glabel D_8016B9F4 - .space 0x2 - -glabel D_8016B9F6 - .space 0x2 - -glabel D_8016B9F8 - .space 0x1 - -glabel D_8016B9F9 - .space 0x3 - -glabel D_8016B9FC - .space 0x4 - -glabel D_8016BA00 - .space 0x4 - -glabel D_8016BA04 - .space 0x4 - -glabel D_8016BA08 - .space 0x1 - -glabel D_8016BA09 - .space 0x3 - -glabel D_8016BA0C - .space 0x4 - -glabel D_8016BA10 - .space 0x4 - -glabel D_8016BA14 - .space 0x4 - -glabel D_8016BA18 - .space 0x8 - -glabel D_8016BA20 - .space 0x8 - -glabel D_8016BA28 - .space 0x1 - -glabel D_8016BA29 - .space 0x1 - -glabel D_8016BA2A - .space 0x1 - -glabel D_8016BA2B - .space 0x1 - -glabel D_8016BA2C - .space 0x2 - -glabel D_8016BA2E - .space 0x2 - -glabel D_8016BA30 - .space 0x20 - -glabel D_8016BA50 - .space 0x20 - -glabel D_8016BA70 - .space 0x20 - -glabel D_8016BA90 - .space 0x10 - -glabel D_8016BAA0 - .space 0x8 - -glabel D_8016BAA8 - .space 0x4 - -glabel D_8016BAAC - .space 0x4 - -glabel D_8016BAB0 - .space 0x4 - -glabel D_8016BAB4 - .space 0x4 - -glabel D_8016BAB8 - .space 0x4 - -glabel D_8016BABC - .space 0x4 - -glabel D_8016BAC0 - .space 0x10 - -glabel D_8016BAD0 - .space 0x1B0 - -glabel D_8016BC80 - .space 0x240 - -glabel D_8016BEC0 - .space 0x420 - -glabel D_8016C2E0 - .space 0x3C0 - -glabel D_8016C6A0 - .space 0x180 - -glabel D_8016C820 - .space 0x90 - -glabel D_8016C8B0 - .space 0xF0 - -glabel D_8016C9A0 - .space 0x1800 - -glabel D_8016E1A0 - .space 0x8 - -glabel D_8016E1A8 - .space 0x8 - -glabel D_8016E1B0 - .space 0x8 - -glabel D_8016E1B8 - .space 0xA8 - -glabel D_8016E260 - .space 0x4 - -glabel D_8016E264 - .space 0xC - -glabel D_8016E270 - .space 0x70 - -glabel D_8016E2E0 - .space 0x18 - -glabel D_8016E2F8 - .space 0x18 - -glabel D_8016E310 - .space 0x10 - -glabel D_8016E320 - .space 0x28 - -glabel D_8016E348 - .space 0x8 - -glabel D_8016E350 - .space 0x400 - -glabel D_8016E750 - .space 0x254 - -glabel D_8016E9A4 - .space 0x4E7 - -glabel D_8016EE8B - .space 0x2F5 - -glabel gAudioContext - .space 0x5b98 - -glabel gNoteFreeLists - .space 0x10 - -glabel D_80174D28 - .space 0x10 - -glabel D_80174D38 - .space 0x10 - -glabel D_80174D48 - .space 0x1C - -glabel D_80174D64 - .space 0x4 - -glabel D_80174D68 - .space 0x8 - -glabel D_80174D70 - .space 0x18 - -glabel D_80174D88 - .space 0x18 - -glabel D_80174DA0 - .space 0x18 - -glabel D_80174DB8 - .space 0x4 - -glabel D_80174DBC - .space 0x4 - -glabel D_80174DC0 - .space 0x810 - -glabel D_801755D0 - .space 0x20 diff --git a/data/code_800E11F0.data.s b/data/code_800E11F0.data.s deleted file mode 100644 index 7930292c92..0000000000 --- a/data/code_800E11F0.data.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_801304D0 - .word osEPiStartDma - -glabel D_801304D4 - .incbin "baserom.z64", 0xBA7674, 0x4 - -glabel D_801304D8 - .incbin "baserom.z64", 0xBA7678, 0x4 - -glabel D_801304DC - .incbin "baserom.z64", 0xBA767C, 0x4 - -glabel D_801304E0 - .incbin "baserom.z64", 0xBA7680, 0x4 - -glabel D_801304E4 - .incbin "baserom.z64", 0xBA7684, 0x4 - -glabel D_801304E8 - .incbin "baserom.z64", 0xBA7688, 0x4 - -glabel D_801304EC - .incbin "baserom.z64", 0xBA768C, 0x4 - -glabel D_801304F0 - .incbin "baserom.z64", 0xBA7690, 0x10 diff --git a/data/code_800E11F0.rodata.s b/data/code_800E11F0.rodata.s deleted file mode 100644 index 70eae68cfb..0000000000 --- a/data/code_800E11F0.rodata.s +++ /dev/null @@ -1,138 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80149420 - .asciz "SUPERDMA" - .balign 4 - -glabel D_8014942C - .asciz "FastCopy" - .balign 4 - -glabel D_80149438 - .asciz "FastCopy" - .balign 4 - -glabel D_80149444 - .asciz "SLOWCOPY" - .balign 4 - -glabel D_80149450 - .asciz "BGCOPY" - .balign 4 - -glabel jtbl_80149458 - .word L800E2610 - .word L800E2630 - .word L800E2654 - .word L800E2678 - .word L800E2678 - -glabel jtbl_8014946C - .word L800E2E30 - .word L800E2E5C - .word L800E2E80 - .word L800E2EA4 - .word L800E2EA4 - -glabel D_80149480 - .float 20.03042 - -glabel D_80149484 - .float 16.546 - -glabel D_80149488 - .float 16.713 - -.balign 16 # file split? - -glabel jtbl_80149490 - .word L800E58AC - .word L800E58AC - .word L800E58AC - .word L800E593C - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E569C - .word L800E56B0 - .word L800E5700 - .word L800E57D8 - .word L800E57F0 - .word L800E5810 - .word L800E5850 - .word L800E5944 - .word L800E5944 - .word L800E5880 - .word L800E5944 - .word L800E589C - .word L800E5830 - .word L800E5944 - .word L800E58C8 - -glabel jtbl_8014950C - .word L800E55EC - .word L800E5600 - .word L800E563C - .word L800E5944 - .word L800E5624 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5944 - .word L800E5860 - -glabel jtbl_8014954C - .word L800E6150 - .word L800E62F8 - .word L800E62F8 - .word L800E62F8 - .word L800E62F8 - .word L800E61C4 - .word L800E617C - .word L800E61B8 - .word L800E6194 - .word L800E61D8 - .word L800E61F8 - .word L800E6268 - .word L800E62B8 - .word L800E61AC - -glabel jtbl_80149584 - .word L800E6328 - .word L800E6354 - .word L800E6380 - .word L800E63C8 - .word L800E63F4 - .word L800E640C - .word L800E63A4 - .word L800E642C - .word L800E644C - .word L800E6458 - .word L800E6470 - .word L800E6488 - .word L800E6494 - .word L800E64A0 diff --git a/data/code_800EC960.data.s b/data/code_800EC960.data.s index 0b75da2457..1013a9eef2 100644 --- a/data/code_800EC960.data.s +++ b/data/code_800EC960.data.s @@ -42,7 +42,7 @@ glabel D_801305CC glabel D_801305D0 .incbin "baserom.z64", 0xBA7770, 0x10 -glabel D_801305E0 +glabel sPrevChargeLevel .incbin "baserom.z64", 0xBA7780, 0x4 glabel D_801305E4 @@ -132,34 +132,34 @@ glabel D_801306C8 glabel D_801306DC .incbin "baserom.z64", 0xBA787C, 0x820 -glabel D_80130EFC +glabel sOcarinaAllowedBtnMask .incbin "baserom.z64", 0xBA809C, 0x4 -glabel D_80130F00 +glabel sOcarinaABtnMap .incbin "baserom.z64", 0xBA80A0, 0x4 -glabel D_80130F04 +glabel sOcarinaCUPBtnMap .incbin "baserom.z64", 0xBA80A4, 0x4 -glabel D_80130F08 +glabel sOcarinaCDownBtnMap .incbin "baserom.z64", 0xBA80A8, 0x4 -glabel D_80130F0C +glabel sOcarinaInpEnabled .incbin "baserom.z64", 0xBA80AC, 0x4 glabel D_80130F10 .incbin "baserom.z64", 0xBA80B0, 0x4 -glabel D_80130F14 +glabel sCurOcarinaBtnVal .incbin "baserom.z64", 0xBA80B4, 0x4 -glabel D_80130F18 +glabel sPrevOcarinaNoteVal .incbin "baserom.z64", 0xBA80B8, 0x4 -glabel D_80130F1C +glabel sCurOcarinaBtnIdx .incbin "baserom.z64", 0xBA80BC, 0x4 -glabel D_80130F20 +glabel sLearnSongLastBtn .incbin "baserom.z64", 0xBA80C0, 0x4 glabel D_80130F24 @@ -177,7 +177,7 @@ glabel D_80130F30 glabel D_80130F34 .incbin "baserom.z64", 0xBA80D4, 0x4 -glabel D_80130F38 +glabel sPlaybackState .incbin "baserom.z64", 0xBA80D8, 0x4 glabel D_80130F3C @@ -186,68 +186,56 @@ glabel D_80130F3C glabel D_80130F3E .incbin "baserom.z64", 0xBA80DE, 0x2 -glabel D_80130F40 +glabel sNotePlaybackTimer .incbin "baserom.z64", 0xBA80E0, 0x4 -glabel D_80130F44 +glabel sPlaybackNotePos .incbin "baserom.z64", 0xBA80E4, 0x4 -glabel D_80130F48 +glabel sStaffPlaybackPos .incbin "baserom.z64", 0xBA80E8, 0x4 glabel D_80130F4C .incbin "baserom.z64", 0xBA80EC, 0x4 -glabel D_80130F50 +glabel sDisplayedNoteValue .incbin "baserom.z64", 0xBA80F0, 0x4 -glabel D_80130F54 +glabel sNotePlaybackVolume .incbin "baserom.z64", 0xBA80F4, 0x4 -glabel D_80130F58 +glabel sNotePlaybackVibrato .incbin "baserom.z64", 0xBA80F8, 0x4 -glabel D_80130F5C +glabel sNotePlaybackTone .incbin "baserom.z64", 0xBA80FC, 0x4 -glabel D_80130F60 +glabel sNormalizedNotePlaybackTone .incbin "baserom.z64", 0xBA8100, 0x4 -glabel D_80130F64 +glabel sNormalizedNotePlaybackVolume .incbin "baserom.z64", 0xBA8104, 0x4 glabel D_80130F68 .incbin "baserom.z64", 0xBA8108, 0x4 -glabel D_80130F6C +glabel sOcarinaNoteValues .incbin "baserom.z64", 0xBA810C, 0x8 -glabel D_80130F74 +glabel sOcaMinigameApndPos .incbin "baserom.z64", 0xBA8114, 0x4 -glabel D_80130F78 +glabel sOcaMinigameEndPos .incbin "baserom.z64", 0xBA8118, 0x4 -glabel D_80130F7C +glabel sOcaMinigameNoteCnts .incbin "baserom.z64", 0xBA811C, 0x4 -glabel D_80130F80 - .incbin "baserom.z64", 0xBA8120, 0x180 +glabel sOcarinaSongs + .incbin "baserom.z64", 0xBA8120, 0x8C0 -glabel D_80131100 - .incbin "baserom.z64", 0xBA82A0, 0x600 - -glabel D_80131700 - .incbin "baserom.z64", 0xBA88A0, 0xC - -glabel D_8013170C - .incbin "baserom.z64", 0xBA88AC, 0x94 - -glabel D_801317A0 - .incbin "baserom.z64", 0xBA8940, 0xA0 - -glabel D_80131840 - .word D_80130F80 +glabel sPlaybackSong + .word sOcarinaSongs glabel D_80131844 .incbin "baserom.z64", 0xBA89E4, 0x10 @@ -258,7 +246,7 @@ glabel gFrogsSongPtr glabel D_80131858 .incbin "baserom.z64", 0xBA89F8, 0x4 -glabel D_8013185C +glabel sRecordSongPos .incbin "baserom.z64", 0xBA89FC, 0x4 glabel D_80131860 @@ -288,25 +276,22 @@ glabel D_8013187C glabel D_80131880 .incbin "baserom.z64", 0xBA8A20, 0x4 -glabel D_80131884 - .incbin "baserom.z64", 0xBA8A24, 0x8 - -glabel D_8013188C - .incbin "baserom.z64", 0xBA8A2C, 0x358 +glabel sPierresSong + .incbin "baserom.z64", 0xBA8A24, 0x360 glabel gScarecrowCustomSongPtr - .word D_80131884 + .word sPierresSong glabel gScarecrowSpawnSongPtr - .word D_80131700 + .word sOcarinaSongs+0x780 glabel D_80131BEC - .word D_801317A0 + .word sOcarinaSongs+0x820 -glabel D_80131BF0 +glabel sNoteValueIndexMap .incbin "baserom.z64", 0xBA8D90, 0x10 -glabel D_80131C00 +glabel gOcarinaSongNotes .incbin "baserom.z64", 0xBA8DA0, 0x80 glabel D_80131C80 @@ -497,4 +482,3 @@ glabel D_8013331C .word D_80132FDC .word D_801330FC .word D_8013311C - .incbin "baserom.z64", 0xBAA4D8, 0x8 diff --git a/data/code_800F7260.bss.s b/data/code_800F7260.bss.s new file mode 100644 index 0000000000..ed5729457e --- /dev/null +++ b/data/code_800F7260.bss.s @@ -0,0 +1,85 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .bss + +.balign 16 + +glabel D_8016BAD0 + .space 0x1B0 + +glabel D_8016BC80 + .space 0x240 + +glabel D_8016BEC0 + .space 0x420 + +glabel D_8016C2E0 + .space 0x3C0 + +glabel D_8016C6A0 + .space 0x180 + +glabel D_8016C820 + .space 0x90 + +glabel D_8016C8B0 + .space 0xF0 + +glabel D_8016C9A0 + .space 0x1800 + +glabel D_8016E1A0 + .space 0x8 + +glabel D_8016E1A8 + .space 0x8 + +glabel D_8016E1B0 + .space 0x8 + +glabel D_8016E1B8 + .space 0xA8 + +glabel D_8016E260 + .space 0x4 + +glabel D_8016E264 + .space 0xC + +glabel D_8016E270 + .space 0x70 + +glabel D_8016E2E0 + .space 0x18 + +glabel D_8016E2F8 + .space 0x18 + +glabel D_8016E310 + .space 0x10 + +glabel D_8016E320 + .space 0x28 + +glabel D_8016E348 + .space 0x8 + +glabel sAudioSeqCmds + .space 0x400 + +glabel D_8016E750 + .space 0x990 + +glabel D_8016F0E0 # unused? + .space 0xA0 + +glabel gAudioContext + .space 0x6450 + +glabel D_801755D0 + .space 0x20 diff --git a/data/code_800F9280.data.s b/data/code_800F9280.data.s index 8ca21f6843..cfc5f42465 100644 --- a/data/code_800F9280.data.s +++ b/data/code_800F9280.data.s @@ -9,10 +9,10 @@ .balign 16 -glabel D_80133400 +glabel sSeqCmdWrPos .incbin "baserom.z64", 0xBAA5A0, 0x4 -glabel D_80133404 +glabel sSeqCmdRdPos .incbin "baserom.z64", 0xBAA5A4, 0x4 glabel D_80133408 @@ -64,82 +64,41 @@ glabel D_80133738 .incbin "baserom.z64", 0xBAA8D8, 0x90 glabel gAudioSessionPresets - .incbin "baserom.z64", 0xBAA968, 0x5 - -glabel D_801337CD - .incbin "baserom.z64", 0xBAA96D, 0x1 - -glabel D_801337CE - .incbin "baserom.z64", 0xBAA96E, 0x6 - -glabel D_801337D4 + .incbin "baserom.z64", 0xBAA968, 0xC .word D_80133420 .incbin "baserom.z64", 0xBAA978, 0x34 - -glabel D_8013380C .word D_80133468 .incbin "baserom.z64", 0xBAA9B0, 0x34 - -glabel D_80133844 .word D_801334B0 .incbin "baserom.z64", 0xBAA9E8, 0x34 - -glabel D_8013387C .word D_80133540 .incbin "baserom.z64", 0xBAAA20, 0x34 - -glabel D_801338B4 .word D_80133588 .incbin "baserom.z64", 0xBAAA58, 0x34 - -glabel D_801338EC .word D_801335D0 .incbin "baserom.z64", 0xBAAA90, 0x34 - -glabel D_80133924 .word D_80133618 .incbin "baserom.z64", 0xBAAAC8, 0x34 - -glabel D_8013395C .word D_80133660 .incbin "baserom.z64", 0xBAAB00, 0x34 - -glabel D_80133994 .word D_801336A8 .incbin "baserom.z64", 0xBAAB38, 0x34 - -glabel D_801339CC .word D_80133660 .incbin "baserom.z64", 0xBAAB70, 0x34 - -glabel D_80133A04 .word D_801336F0 .incbin "baserom.z64", 0xBAABA8, 0x34 - -glabel D_80133A3C .word D_80133738 .incbin "baserom.z64", 0xBAABE0, 0x34 - -glabel D_80133A74 .word D_80133738 .incbin "baserom.z64", 0xBAAC18, 0x34 - -glabel D_80133AAC .word D_80133420 .incbin "baserom.z64", 0xBAAC50, 0x34 - -glabel D_80133AE4 .word D_80133660 .incbin "baserom.z64", 0xBAAC88, 0x34 - -glabel D_80133B1C .word D_80133420 .incbin "baserom.z64", 0xBAACC0, 0x34 - -glabel D_80133B54 .word D_80133420 .incbin "baserom.z64", 0xBAACF8, 0x34 - -glabel D_80133B8C .word D_801334B0 .incbin "baserom.z64", 0xBAAD30, 0x30 + \ No newline at end of file diff --git a/data/code_800F9280.rodata.s b/data/code_800F9280.rodata.s deleted file mode 100644 index 0cf27c9dfd..0000000000 --- a/data/code_800F9280.rodata.s +++ /dev/null @@ -1,62 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel jtbl_8014A640 - .word L800F9588 - .word L800F95F4 - .word L800F9614 - .word L800F97E4 - .word L800F9940 - .word L800F9A00 - .word L800F9BD8 - .word L800F9CE4 - .word L800F9D20 - .word L800F9DB4 - .word L800F9DE8 - .word L800F9E84 - .word L800F9EB8 - .word L800F9B00 - .word L800F9F68 - .word L800F9FB8 - -glabel jtbl_8014A680 - .word L800FAAE4 - .word L800FAB28 - .word L800FAB48 - .word L800FAB84 - .word L800FABAC - .word L800FABD0 - .word L800FAC18 - .word L800FAAFC - .word L800FAC24 - .word L800FAC84 - .word L800FACA4 - .word L800FACD4 - .word L800FACD4 - .word L800FACD4 - .word L800FAC3C - -.balign 16 # file split? const data below used in multiple files - -glabel D_8014A6C0 - .half 0x1C00 - -glabel gTatumsPerBeat - .half 0x0030 - -glabel D_8014A6C4 - .word 0x37F00 - -glabel D_8014A6C8 - .word 0xE0E0 - -glabel D_8014A6CC - .word 0xBCE0 diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s index 9e18b32fc3..21453d2a5b 100644 --- a/data/rsp.rodata.s +++ b/data/rsp.rodata.s @@ -9,16 +9,16 @@ .balign 16 -glabel D_801550D0 +glabel gAudioBankTable .incbin "baserom.z64", 0xBCC270, 0x270 glabel D_80155340 .incbin "baserom.z64", 0xBCC4E0, 0x1C0 -glabel D_80155500 +glabel gSequenceTable .incbin "baserom.z64", 0xBCC6A0, 0x6F0 -glabel D_80155BF0 +glabel gAudioTable .incbin "baserom.z64", 0xBCCD90, 0x80 glabel D_80155C70 diff --git a/include/functions.h b/include/functions.h index 51a741b505..cdce868f27 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1893,7 +1893,7 @@ void UCodeDisas_RegisterUCode(UCodeDisas*, s32, UCodeInfo*); void UCodeDisas_SetCurUCode(UCodeDisas*, void*); // ? func_800DACC0(?); // ? func_800DB03C(?); -// ? func_800DB0C4(?); +// ? AudioSynth_Update(?); // ? func_800DB2C0(?); // ? func_800DB330(?); // ? func_800DB3D8(?); @@ -1905,24 +1905,24 @@ void UCodeDisas_SetCurUCode(UCodeDisas*, void*); // ? func_800DBAE8(?); // ? func_800DBB9C(?); // ? func_800DBBD4(?); -// ? func_800DBC20(?); -// ? func_800DBC64(?); -// ? func_800DBCB0(?); +// ? AudioSynth_SetBuffer(?); +// ? AudioSynth_DMemMove(?); +// ? AudioSynth_InterL(?); // ? func_800DBCD4(?); // ? func_800DBD10(?); -// ? func_800DBD38(?); -// ? func_800DBD60(?); -// ? func_800DBD94(?); -// ? func_800DBDB0(?); -// ? func_800DBDE4(?); -// ? func_800DBE38(?); -// ? func_800DBE74(?); -// ? func_800DBE98(?); +// ? AudioSynth_SaveBuffer(?); +// ? AudioSynth_EnvSetup2(?); +// ? AudioSynth_UnkCmd17(?); +// ? AudioSynth_HiLoGain(?); +// ? AudioSynth_UnkCmd19(?); +// ? AudioSynth_UnkCmd3(?); +// ? AudioSynth_SetFilter(?); +// ? AudioSynth_SetFilterCount(?); // ? func_800DBEB0(?); // ? func_800DBF5C(?); -// ? func_800DC008(?); -// ? func_800DC074(?); -// ? func_800DC0E0(?); +// ? AudioSynth_LoadRingBuffer(?); +// ? AudioSynth_SaveRingBuffer(?); +// ? AudioSynth_SaveBuffer(?); // ? func_800DC124(?); // ? func_800DC164(?); // ? func_800DC1D8(?); @@ -1963,9 +1963,9 @@ void func_800DF688(s16* arg0, s32 arg1, s32 arg2); void func_800DF7C4(void); void func_800DF888(void); s32 Audio_ResetStep(void); -void func_800DFBF8(void); +void Audio_InitHeap(void); void* func_800E04E8(s32 poolIdx, s32 id); -// ? func_800E0540(?); +void* func_800E0540(s32 poolIdx, s32 id, u32 size); void* func_800E05C4(u32 size, s32 arg1, void* arg2, s8 arg3, s32 arg4); void func_800E0634(u32 arg0, u32 arg1); UnkHeapEntry* func_800E06CC(u32 size); @@ -1979,103 +1979,49 @@ void func_800E0E6C(s32 id); void func_800E0E90(s32 id); void func_800E0EB4(s32 arg0, s32 id); void func_800E1148(void); -// ? func_800E11F0(?); -// ? func_800E12DC(?); +void func_800E11F0(void); +s32 func_800E12DC(s32 arg0, s32 arg1, s32 arg2, u8* arg3, s32 arg4); void func_800E1618(s32 arg0); s32 Audio_IsBankLoadComplete(s32 bankId); s32 Audio_IsSeqLoadComplete(s32 seqId); -void Audio_SetBankLoadStatus(s32 bankId, u8 status); -void Audio_SetSeqLoadStatus(s32 seqId, u8 status); -// ? func_800E1A78(?); -// ? func_800E1AD8(?); -// ? func_800E1B08(?); -// ? func_800E1B68(?); -// ? func_800E1C18(?); -// ? func_800E1C78(?); -// ? func_800E1D64(?); -// ? func_800E1E34(?); -// ? func_800E1E6C(?); -// ? func_800E1EB0(?); -// ? func_800E1EF4(?); -// ? func_800E1F38(?); -// ? func_800E1F7C(?); -// ? func_800E202C(?); -void func_800E20D4(s32, s32, s32); -// ? func_800E2124(?); -// ? func_800E217C(?); -// ? func_800E22C4(?); -// ? func_800E2318(?); -// ? func_800E2338(?); -// ? func_800E2454(?); -// ? func_800E2558(?); -// ? func_800E2768(?); -// ? func_800E27A4(?); -// ? func_800E27F8(?); -// ? func_800E283C(?); -// ? func_800E2AA8(?); -// ? func_800E2BCC(?); -// ? func_800E2BE0(?); -// ? func_800E2CE0(?); -// ? func_800E2FEC(?); +void Audio_SetBankLoadStatus(s32 bankId, s32 status); +void Audio_SetSeqLoadStatus(s32 seqId, s32 status); +void func_800E1C18(s32 channelIdx, s32 arg1); +s32 func_800E1D64(s32 arg0, s32 arg1, s32 arg2); +void Audio_AudioSeqAsyncLoad(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue* arg3); +void Audio_AudioTableAsyncLoad(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue* arg3); +void Audio_AudioBankAsyncLoad(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue* arg3); +u8* func_800E1F38(s32 arg0, u32* arg1); +void func_800E1F7C(s32 arg0); +s32 func_800E20D4(s32 playerIdx, s32 seqId, s32 arg2); +s32 func_800E2124(s32 playerIdx, s32 seqId, s32 arg2); +void Audio_ProcessLoads(s32 resetStatus); void func_800E301C(void* callback); -// ? func_800E3034(?); -// ? func_800E3094(?); -void func_800E3400(void); -// ? func_800E3414(?); -// ? func_800E35E0(?); -// ? func_800E3678(?); -// ? func_800E36EC(?); -// ? func_800E3874(?); -// ? func_800E38F8(?); -void func_800E390C(s32, void*, void*); -void func_800E3A14(void); -// ? func_800E3A44(?); -// ? func_800E3AC8(?); -// ? func_800E3BEC(?); -// ? func_800E3D10(?); -// ? func_800E3D1C(?); -// ? func_800E3E58(?); -// ? func_800E3FB4(?); -// ? func_800E4044(?); -// ? func_800E4058(?); -// ? func_800E4198(?); -// ? func_800E4590(?); -// ? func_800E4744(?); -// ? func_800E48C0(?); -// ? func_800E4918(?); +void Audio_ContextInit(void* heap, u32 heapSize); +void Audio_SyncLoadsInit(void); +s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, u8* arg2); +s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* arg2); +void Audio_AsyncLoadReqInit(void); void func_800E4D94(void); -void func_800E4EEC(u32, u32, s8*); -// ? func_800E4F58(?); +// ? func_800E4EEC(?); +void func_800E4F58(void); void func_800E4FB0(void); -Sub_AudioMgr_18* func_800E4FE0(void); -// ? func_800E5000(?); -// ? func_800E5584(?); -// ? func_800E5958(?); -// ? func_800E59AC(?); -// ? func_800E59F4(?); -// ? func_800E5A8C(?); -// ? func_800E5AD8(?); -// ? func_800E5AFC(?); -void func_800E5B20(u32, s8); -// ? func_800E5B50(?); -// ? func_800E5B80(?); -// ? func_800E5C10(?); -// ? func_800E5C28(?); -// ? func_800E5D6C(?); -// ? func_800E5E20(?); -// ? func_800E5E84(?); -// ? func_800E5EDC(?); -// ? func_800E5F34(?); -// ? func_800E5F88(?); -// ? func_800E6024(?); -// ? func_800E6128(?); -// ? func_800E6300(?); -// ? func_800E6680(?); -// ? func_800E66C0(?); -s32 Audio_NextRandom(void); -// ? func_800E6818(?); -// ? func_800E6840(?); -void func_800E6880(void* mem, s32 size); +AudioTask* func_800E4FE0(void); +void Audio_QueueCmdF32(u32 arg0, f32 arg1); +void Audio_QueueCmdS32(u32 arg0, s32 arg1); +void Audio_QueueCmdS8(u32 arg0, s8 arg1); +void Audio_QueueCmdU16(u32 arg0, u16 arg1); +s32 Audio_ScheduleProcessCmds(void); +u32 func_800E5E20(u32* arg0); +u8* func_800E5E84(s32 arg0, u32* arg1); +s32 func_800E5EDC(void); +s32 func_800E5F88(u32 arg0); +void Audio_PreNMIInternal(void); +s32 func_800E6680(void); +u32 Audio_NextRandom(void); +void Audio_InitMesgQueues(void); +void Audio_osInvalDCache(void* buf, s32 size); +void Audio_osWritebackDCache(void* mem, s32 size); s32 osAiSetNextBuffer(void*, u32); void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb); void Audio_NoteSetResamplingRate(NoteSubEu* noteSubEu, f32 resamplingRateInput); @@ -2128,10 +2074,10 @@ void Audio_ProcessSequence(SequencePlayer* seqPlayer); void Audio_ResetSequencePlayer(SequencePlayer* seqPlayer); void func_800EC734(s32 seqPlayerIdx); void Audio_InitSequencePlayers(void); -// ? func_800ECA00(?); -// ? func_800ECA60(?); +// ? Audio_GetOcaInput(?); +// ? Audio_OcaAdjStick(?); // ? func_800ECAF0(?); -// ? func_800ECB34(?); +// ? Audio_OcaMapNoteValue(?); // ? func_800ECB7C(?); void func_800ECC04(u16); // ? func_800ECDBC(?); @@ -2147,8 +2093,8 @@ void func_800ED93C(s8 songIdx, s8 arg1); // ? func_800EE2D4(?); // ? func_800EE318(?); // ? func_800EE3C8(?); -UnkAudioStruct* func_800EE3D4(void); -UnkAudioStruct* func_800EE3F8(void); +OcarinaStaff* func_800EE3D4(void); +OcarinaStaff* Audio_OcaGetDisplayStaff(void); // ? func_800EE404(?); // ? func_800EE57C(?); // ? func_800EE5EC(?); @@ -2167,7 +2113,7 @@ void func_800EEA50(GfxPrint* printer); // ? func_800F28B4(?); // ? func_800F29FC(?); // ? func_800F2A04(?); -void func_800F2D6C(u8*, u16 sfxId); +void func_800F2D6C(s8*, u16 sfxId); // ? func_800F2E28(?); void func_800F3054(void); // ? func_800F3188(?); @@ -2184,17 +2130,19 @@ void func_800F4010(Vec3f*, u16 sfxId, f32); void func_800F41E0(Vec3f*, u16 sfxId, u8); void func_800F4138(Vec3f*, u16 sfxId, f32); void func_800F4190(Vec3f*, u16 sfxId); +void func_800F436C(Vec3f* pos, u16 sfxId, f32 arg2); +void func_800F4414(Vec3f* pos, u16 sfxId, f32); +void func_800F44EC(s8 arg0, s8 arg1); +void func_800F4524(Vec3f* arg0, u16 arg1, s8 arg2); void func_800F4254(Vec3f* pos, u8 arg1); void func_800F436C(Vec3f*, u16 sfxId, f32 arg2); void func_800F4414(Vec3f*, u16 sfxId, f32 arg2); -void func_800F44EC(UNK_TYPE arg0, UNK_TYPE arg1); -void func_800F4524(Vec3f*, u16 sfxId, u8); void func_800F4634(Vec3f*, f32); void func_800F46E0(Vec3f* pos, f32 arg0); // ? func_800F4784(?); void func_800F47BC(void); void func_800F47FC(void); -void func_800F483C(UNK_TYPE arg0, UNK_TYPE arg1); +void func_800F483C(u8 arg0, u8 arg1); void func_800F4870(u8); // ? func_800F491C(?); void func_800F4A54(u8); @@ -2203,20 +2151,20 @@ void func_800F4BF4(Vec3f*, u16 sfxId, s8); void func_800F4C58(Vec3f*, u16 sfxId, u8); void func_800F4E30(Vec3f*, f32); // ? func_800F50CC(?); -void func_800F50EC(Vec3f*); +void* func_800F50EC(Vec3f*); // ? func_800F510C(?); void func_800F52A0(Vec3f*, u16, u16); void func_800F5504(); // ? func_800F5510(?); // ? func_800F5550(?); // ? func_800F56A8(?); +void func_800F574C(f32 arg0, u8 arg2); void func_800F5718(void); -void func_800F574C(f32 arg0, UNK_TYPE arg2); void func_800F5918(void); void func_800F595C(u16); void func_800F59E8(u16); -s32 func_800F5A58(s32, GlobalContext*); -void func_800F5ACC(u32 bgmID); +s32 func_800F5A58(u8); +void func_800F5ACC(u16 bgmID); void func_800F5B58(void); void func_800F5BF0(u8 arg0); void func_800F5C64(u16); @@ -2225,10 +2173,8 @@ void func_800F5C2C(void); // ? func_800F5E18(?); void func_800F5E90(u8); void func_800F6114(f32); -void func_800F6268(f32, UNK_TYPE); -void func_800F6584(UNK_TYPE); -void func_800F64E0(u8); -void func_800F6584(UNK_TYPE); +void func_800F6268(f32, u16); +void func_800F64E0(u8 arg0); void func_800F66C0(s8 echo); void func_800F66DC(s8); void func_800F6700(s8 outputMode); @@ -2238,22 +2184,22 @@ void func_800F68BC(s8); // ? func_800F68D4(?); // ? func_800F691C(?); void func_800F6964(u16); -void func_800F6AB0(u8); -// ? func_800F6B68(?); +void func_800F6AB0(u16); +// ? Audio_DisableAllSeq(?); // ? func_800F6BB8(?); -void func_800F6C14(); +void Audio_PreNMI(); // ? func_800F6C34(?); void func_800F6D58(u8, u8, u8); // ? func_800F6E7C(?); void func_800F6FB4(u8); void func_800F70F8(); void func_800F711C(); -// ? func_800F7170(?); +void func_800F7170(void); // ? func_800F71BC(?); void func_800F7260(u16); -void func_800F72B8(u8); -void func_800F731C(u8); -void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, f32* a5); +void Audio_QueueSeqCmdMute(u8); +void Audio_ClearBGMMute(u8); +void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, s8* a5); // ? func_800F74E0(?); void func_800F7680(void); void func_800F7B54(u8, u8); @@ -2263,25 +2209,25 @@ void func_800F87A0(u8); void func_800F8884(u8, Vec3f*); void func_800F89A0(u8, Vec3f*); void func_800F89E8(Vec3f*); +// ? func_800F9280(?); +void Audio_QueueSeqCmd(u32 bgmID); +u16 func_800FA0B4(u8 a0); +s32 func_800FA11C(u32, u32); void func_800F8A44(Vec3f* pos, u16 sfxId); void func_800F8BA0(u8, u16); -void func_800F8D04(u32 sfxId); +void Audio_StopSfx(u32 sfxId); void func_800F8E3C(void); void func_800F8EA0(u8, u8, u16); void func_800F8F34(u8); void func_800F8F88(void); u8 func_800F8FF4(u32 sfxId); void func_800F905C(void); -// ? func_800F9280(?); void func_800F9474(u8, u16); -void func_800F94FC(u32); -void Audio_SetBGM(u32 bgmId); -void func_800FA034(void); -u16 func_800FA0B4(u8 a0); -s32 func_800FA11C(u32, s32); +void Audio_ProcessSeqCmd(u32); +void Audio_ProcessSeqCmds(void); void func_800FA174(u8); void func_800FA18C(u8, u8); -void func_800FA240(u8, u8, u8, u8); +void Audio_SetVolScale(u8, u8, u8, u8); void func_800FA3DC(void); u8 func_800FAD34(void); void func_800FADF8(void); diff --git a/include/ultra64/abi.h b/include/ultra64/abi.h index f2949f53e1..635ed92e95 100644 --- a/include/ultra64/abi.h +++ b/include/ultra64/abi.h @@ -2,6 +2,7 @@ #define _ULTRA64_ABI_H_ /* Audio commands: */ +/* #define A_SPNOOP 0 #define A_ADPCM 1 #define A_CLEARBUFF 2 @@ -18,7 +19,32 @@ #define A_INTERLEAVE 13 #define A_POLEF 14 #define A_SETLOOP 15 +*/ +#define A_SPNOOP 0 +#define A_ADPCM 1 +#define A_CLEARBUFF 2 +#define A_UNK3 3 +#define A_ADDMIXER 4 +#define A_RESAMPLE 5 +#define A_RESAMPLE_ZOH 6 +#define A_FILTER 7 +#define A_SETBUFF 8 +#define A_DUPLICATE 9 +#define A_DMEMMOVE 10 +#define A_LOADADPCM 11 +#define A_MIXER 12 +#define A_INTERLEAVE 13 +#define A_HILOGAIN 14 +#define A_SETLOOP 15 +#define A_INTERL 17 +#define A_ENVSETUP1 18 +#define A_ENVMIXER 19 +#define A_LOADBUFF 20 +#define A_SAVEBUFF 21 +#define A_ENVSETUP2 22 +#define A_UNK17 23 +#define A_UNK19 25 #define ACMD_SIZE 32 /* * Audio flags @@ -271,6 +297,38 @@ typedef short ENVMIX_STATE[40]; _a->words.w1 = (unsigned int)(s); \ } +#define aHiLoGain(pkt, gain, count, dmem, a4) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_HILOGAIN, 24, 8) | _SHIFTL(gain, 16, 8) | _SHIFTL(count, 0, 16); \ + _a->words.w1 = _SHIFTL(dmem, 16, 16) | _SHIFTL(a4, 0, 16); \ + } + +#define aUnkCmd3(pkt, a1, a2, a3) \ + { \ + Acmd *_a = (Acmd *)pkt;\ + \ + _a->words.w0 = _SHIFTL(A_UNK3, 24, 8) | _SHIFTL(a3, 0, 16); \ + _a->words.w1 = _SHIFTL(a1, 16, 16) | _SHIFTL(a2, 0, 16); \ + } + +#define aUnkCmd19(pkt, a1, a2, a3, a4) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_UNK19, 24, 8) | _SHIFTL(a1, 16, 8) | _SHIFTL(a2, 0, 16); \ + _a->words.w1 = _SHIFTL(a3, 16, 16) | _SHIFTL(a4, 0, 16); \ + } + +#define aUnkCmd17(pkt, a1, a2) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_UNK17, 24, 8) | _SHIFTL(a1, 16, 8); \ + _a->words.w1 = (unsigned int)(a2); \ + } + #define aClearBuffer(pkt, d, c) \ { \ Acmd *_a = (Acmd *)pkt; \ @@ -279,6 +337,7 @@ typedef short ENVMIX_STATE[40]; _a->words.w1 = (unsigned int)(c); \ } +/* #define aEnvMixer(pkt, f, s) \ { \ Acmd *_a = (Acmd *)pkt; \ @@ -286,7 +345,19 @@ typedef short ENVMIX_STATE[40]; _a->words.w0 = _SHIFTL(A_ENVMIXER, 24, 8) | _SHIFTL(f, 16, 8); \ _a->words.w1 = (unsigned int)(s); \ } +*/ +extern u32 D_801304A0; + +#define aEnvMixer(pkt, dmemi, count, swapLR, x0, x1, x2, x3, m) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + _a->words.w0 = D_801304A0 | _SHIFTL(dmemi >> 4, 16, 8) | _SHIFTL(count, 8, 8) | \ + _SHIFTL(swapLR, 4, 1) | _SHIFTL(x0, 3, 1) | _SHIFTL(x1, 2, 1) | _SHIFTL(x2, 1, 1) | _SHIFTL(x3, 0, 1); \ + _a->words.w1 = (unsigned int)(m); \ + } + +/* #define aInterleave(pkt, l, r) \ { \ Acmd *_a = (Acmd *)pkt; \ @@ -294,7 +365,24 @@ typedef short ENVMIX_STATE[40]; _a->words.w0 = _SHIFTL(A_INTERLEAVE, 24, 8); \ _a->words.w1 = _SHIFTL(l, 16, 16) | _SHIFTL(r, 0, 16); \ } +*/ +#define aInterleave(pkt, count, d, l, r) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_INTERLEAVE, 24, 8) | _SHIFTL(count >> 4, 16, 8) | _SHIFTL(d, 0, 16); \ + _a->words.w1 = _SHIFTL(l, 16, 16) | _SHIFTL(r, 0, 16); \ + } + +#define aInterl(pkt, dmemi, dmemo, count) \ + { \ + Acmd *_a = (Acmd*)pkt; \ + _a->words.w0 = _SHIFTL(A_INTERL, 24, 8) | _SHIFTL(count, 0, 16); \ + _a->words.w1 = _SHIFTL(dmemi, 16, 16) | _SHIFTL(dmemo, 0, 16); \ + } + +/* #define aLoadBuffer(pkt, s) \ { \ Acmd *_a = (Acmd *)pkt; \ @@ -302,6 +390,16 @@ typedef short ENVMIX_STATE[40]; _a->words.w0 = _SHIFTL(A_LOADBUFF, 24, 8); \ _a->words.w1 = (unsigned int)(s); \ } +*/ + +#define aLoadBuffer(pkt, s, d, c) \ +{ \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_LOADBUFF, 24, 8) | \ + _SHIFTL((c) >> 4, 16, 8) | _SHIFTL(d, 0, 16); \ + _a->words.w1 = (unsigned int)(s); \ +} #define aMix(pkt, f, g, i, o) \ { \ @@ -330,6 +428,7 @@ typedef short ENVMIX_STATE[40]; _a->words.w1 = (unsigned int)(s); \ } +/* #define aSaveBuffer(pkt, s) \ { \ Acmd *_a = (Acmd *)pkt; \ @@ -337,6 +436,16 @@ typedef short ENVMIX_STATE[40]; _a->words.w0 = _SHIFTL(A_SAVEBUFF, 24, 8); \ _a->words.w1 = (unsigned int)(s); \ } +*/ + +#define aSaveBuffer(pkt, s, d, c) \ +{ \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_SAVEBUFF, 24, 8) | \ + _SHIFTL((c) >> 4, 16, 8) | _SHIFTL(s, 0, 16); \ + _a->words.w1 = (unsigned int)(d); \ +} #define aSegment(pkt, s, b) \ { \ @@ -352,7 +461,7 @@ typedef short ENVMIX_STATE[40]; \ _a->words.w0 = (_SHIFTL(A_SETBUFF, 24, 8) | _SHIFTL(f, 16, 8) | \ _SHIFTL(i, 0, 16)); \ - _a->words.w1 = _SHIFTL(c, 0, 16) | _SHIFTL(o, 16, 16); \ + _a->words.w1 = _SHIFTL(o, 16, 16) | _SHIFTL(c, 0, 16); \ } #define aSetVolume(pkt, f, v, t, r) \ @@ -388,4 +497,54 @@ typedef short ENVMIX_STATE[40]; _a->words.w1 = (unsigned int)d; \ } + + +#define aEnvSetup1(pkt, a, b, c, d) \ +{ \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | \ + _SHIFTL(a, 16, 8) | _SHIFTL(b, 0, 16)); \ + _a->words.w1 = _SHIFTL(c, 16, 16) | _SHIFTL(d, 0, 16); \ +} + +#define aEnvSetup2(pkt, volLeft, volRight) \ +{ \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_ENVSETUP2, 24, 8); \ + _a->words.w1 = _SHIFTL(volLeft, 16, 16) | \ + _SHIFTL(volRight, 0, 16); \ +} + +#define aFilter(pkt, f, countOrBuf, addr) \ +{ \ + Acmd *_a = (Acmd *)pkt; \ + \ + _a->words.w0 = _SHIFTL(A_FILTER, 24, 8) | _SHIFTL(f, 16, 8) | \ + _SHIFTL(countOrBuf, 0, 16); \ + _a->words.w1 = (unsigned int)(addr); \ +} + +#define aDuplicate(pkt, count, dmemi, dmemo, a4) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + _a->words.w0 = _SHIFTL(A_DUPLICATE, 24, 8) | _SHIFTL(count, 16, 8) | _SHIFTL(dmemi, 0, 16); \ + _a->words.w1 = _SHIFTL(dmemo, 16, 16) | _SHIFTL(a4, 0, 16); \ + } + +#define aAddMixer(pkt, count, dmemi, dmemo, a4) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + _a->words.w0 = _SHIFTL(A_ADDMIXER, 24, 8) | _SHIFTL(count >> 4, 16, 8) | _SHIFTL(a4, 0, 16); \ + _a->words.w1 = _SHIFTL(dmemi, 16, 16) | _SHIFTL(dmemo, 0, 16); \ + } + +#define aResampleZOH(pkt, pitch, pitchAccu) \ + { \ + Acmd *_a = (Acmd *)pkt; \ + _a->words.w0 = _SHIFTL(A_RESAMPLE_ZOH, 24, 8) | _SHIFTL(pitch, 0, 16); \ + _a->words.w1 = _SHIFTL(pitchAccu, 0, 16); \ + } + #endif /* _ULTRA64_ABI_H_ */ diff --git a/include/ultra64/vi.h b/include/ultra64/vi.h index 507f24e690..7830873613 100644 --- a/include/ultra64/vi.h +++ b/include/ultra64/vi.h @@ -97,6 +97,9 @@ typedef struct { #define OS_VI_PAL_HPN2 26 #define OS_VI_PAL_HPF2 27 +#define OS_TV_PAL 0 +#define OS_TV_NTSC 1 +#define OS_TV_MPAL 2 #define OS_VI_UNK28 28 #endif diff --git a/include/variables.h b/include/variables.h index bd85118a70..a79334cc6f 100644 --- a/include/variables.h +++ b/include/variables.h @@ -340,7 +340,7 @@ extern s32 gDebugArenaLogSeverity; //extern ? D_8012DDDC; //extern ? sUCodeDisasModeHMacros; //extern ? sUCodeDisasModeLMacros; -extern s16* gWaveSamples[6]; +extern s16* gWaveSamples[9]; extern f32 gPitchBendFrequencyScale[256]; //extern ? D_8012F098; //extern ? D_8012F0B0; @@ -366,14 +366,8 @@ extern s16 D_80130328[]; //extern ? D_801304A0; //extern ? D_801304AC; //extern ? D_801304C0; -//extern ? D_801304D0; -//extern ? D_801304D8; -//extern ? D_801304DC; -//extern ? D_801304E0; -//extern ? D_801304E4; +extern s32 gAudioContextInitalized; //extern ? D_801304E8; -//extern ? D_801304EC; -//extern ? D_801304F0; //extern ? D_80130500; extern f32 D_80130510; extern s32 D_80130514; @@ -386,7 +380,7 @@ extern u8 D_80130594[4][7]; //extern ? D_801305BC; //extern ? D_801305C0; //extern ? D_801305CC; -//extern ? D_801305E0; +//extern ? sPrevChargeLevel; //extern ? D_801305F4; //extern ? D_801305FF; //extern ? D_80130600; @@ -412,45 +406,45 @@ extern u8 D_80130594[4][7]; //extern ? D_80130654; //extern ? D_80130658; //extern ? D_801306DC; -//extern ? D_80130EFC; -//extern ? D_80130F00; -//extern ? D_80130F04; -//extern ? D_80130F08; -//extern ? D_80130F0C; +//extern ? sOcarinaAllowedBtnMask; +//extern ? sOcarinaABtnMap; +//extern ? sOcarinaCUPBtnMap; +//extern ? sOcarinaCDownBtnMap; +//extern ? sOcarinaInpEnabled; //extern ? D_80130F10; -//extern ? D_80130F14; -//extern ? D_80130F18; -//extern ? D_80130F1C; -//extern ? D_80130F20; +//extern ? sCurOcarinaBtnVal; +//extern ? sPrevOcarinaNoteVal; +//extern ? sCurOcarinaBtnIdx; +//extern ? sLearnSongLastBtn; //extern ? D_80130F24; //extern ? D_80130F28; //extern ? D_80130F2C; //extern ? D_80130F30; //extern ? D_80130F34; -//extern ? D_80130F38; +//extern ? sPlaybackState; //extern ? D_80130F3C; //extern ? D_80130F3E; -//extern ? D_80130F40; -//extern ? D_80130F44; -//extern ? D_80130F48; +//extern ? sNotePlaybackTimer; +//extern ? sPlaybackNotePos; +//extern ? sStaffPlaybackPos; //extern ? D_80130F4C; -//extern ? D_80130F50; -//extern ? D_80130F54; -//extern ? D_80130F58; -//extern ? D_80130F5C; -//extern ? D_80130F60; -//extern ? D_80130F64; +//extern ? sDisplayedNoteValue; +//extern ? sNotePlaybackVolume; +//extern ? sNotePlaybackVibrato; +//extern ? sNotePlaybackTone; +//extern ? sNormalizedNotePlaybackTone; +//extern ? sNormalizedNotePlaybackVolume; //extern ? D_80130F68; -//extern ? D_80130F6C; -//extern ? D_80130F74; -//extern ? D_80130F78; -//extern ? D_80130F80; +//extern ? sOcarinaNoteValues; +//extern ? sOcaMinigameApndPos; +//extern ? sOcaMinigameEndPos; +//extern ? sOcarinaSongs; //extern ? D_80131100; //extern ? D_8013170C; //extern ? D_80131840; extern u8* gFrogsSongPtr; // D_80131854: pointer to a u8 array of the notes you need to play for the frogs //extern ? D_80131858; -//extern ? D_8013185C; +//extern ? sRecordSongPos; //extern ? D_80131860; //extern ? D_80131864; //extern ? D_80131868; @@ -460,13 +454,13 @@ extern u8* gFrogsSongPtr; // D_80131854: pointer to a u8 array of the notes you //extern ? D_80131878; //extern ? D_8013187C; //extern ? D_80131880; -//extern ? D_80131884; +//extern ? sPierresSong; //extern ? D_8013188C; -extern u8* gScarecrowCustomSongPtr; +extern OcarinaSong* gScarecrowCustomSongPtr; extern u8* gScarecrowSpawnSongPtr; //extern ? D_80131BEC; //extern ? D_80131BF0; -extern u8 D_80131C00[][9]; +extern OcarinaSongInfo gOcarinaSongNotes[]; //extern ? D_80131C80; //extern ? D_80131C84; //extern ? D_80131C88; @@ -518,7 +512,7 @@ extern u8 D_80131C00[][9]; //extern ? D_80131F64; //extern ? D_80131F68; //extern ? D_80131F6C; -//extern ? D_8013331C; +extern Struct_8013331C *D_8013331C[]; extern u8 D_80133340[4]; //extern ? D_80133344; extern s32 D_8013338C; @@ -532,17 +526,17 @@ extern u8 D_801333CC; extern u16 D_801333D0; extern Vec3f D_801333D4; extern f32 D_801333E0; -extern f32 D_801333E8; +extern s8 D_801333E8; extern u8 D_801333F0; extern u8 D_801333F4; extern u8 D_801333F8; -//extern ? D_80133400; -//extern ? D_80133404; +//extern ? sSeqCmdWrPos; +//extern ? sSeqCmdRdPos; //extern ? D_80133408; //extern ? D_8013340C; //extern ? D_80133414; //extern ? D_80133418; -extern AudioSessionSettings gAudioSessionPresets[]; +extern AudioSessionSettings gAudioSessionPresets[18]; extern s32 gOverlayLogSeverity; //extern ? D_80134480; //extern ? D_80134484; @@ -2732,10 +2726,9 @@ extern char D_80146238[]; //extern ? D_8014A450; //extern ? D_8014A45C; //extern ? D_8014A460; -extern s16 gTatumsPerBeat; -//extern ? D_8014A6C4; -//extern ? D_8014A6C8; -//extern ? D_8014A6CC; +extern const s16 D_8014A6C0[]; +#define gTatumsPerBeat (D_8014A6C0[1]) +extern const AudioContextInitSizes D_8014A6C4; //extern ? D_8014A710; //extern ? D_8014A728; //extern ? D_8014A730; @@ -2990,10 +2983,10 @@ extern s16 D_80153960[]; //extern ? D_80154AE8; //extern ? D_80154AFC; //extern ? D_80154B00; -//extern ? D_801550D0; -//extern ? D_80155340; -//extern ? D_80155500; -//extern ? D_80155BF0; +extern u8 gAudioBankTable[]; +extern u8 D_80155340[]; +extern u8 gSequenceTable[]; +extern u8 gAudioTable[]; //extern ? D_80155C70; extern u8 D_80155F50[]; extern u8 D_80157580[]; @@ -3229,11 +3222,12 @@ extern FaultThreadStruct gFaultStruct; //extern ? D_8016B6A0; //extern ? D_8016B6B5; //extern ? D_8016B6B8; -//extern ? D_8016B6E0; -//extern ? D_8016B6F8; -//extern ? D_8016B780; -//extern ? D_8016B7A0; -//extern ? D_8016B7A4; +extern OSMesgQueue D_8016B6E0; +//extern OSMesg D_8016B6F8; +extern u8* D_8016B738[]; +//extern u32 D_8016B780; +//extern ? sAudioUpdateStartTime; +//extern ? sAudioUpdateEndTime; //extern ? D_8016B7A8; //extern ? D_8016B7AC; //extern ? D_8016B7B0; @@ -3258,33 +3252,31 @@ extern FaultThreadStruct gFaultStruct; //extern ? D_8016B9F6; //extern ? D_8016B9F8; //extern ? D_8016B9F9; -//extern ? D_8016B9FC; //extern ? D_8016BA00; //extern ? D_8016BA04; //extern ? D_8016BA08; //extern ? D_8016BA09; -//extern ? D_8016BA0C; +//extern ? sCurOcarinaBtnPress; //extern ? D_8016BA10; -//extern ? D_8016BA14; +//extern ? sPrevOcarinaBtnPress; //extern ? D_8016BA18; -//extern ? D_8016BA20; -//extern ? D_8016BA28; -//extern ? D_8016BA29; -//extern ? D_8016BA2A; -//extern ? D_8016BA2B; -//extern ? D_8016BA2C; +//extern ? sCurOcarinaSong; +//extern ? sOcarinaSongAppendPos; +//extern ? sOcarinaHasStartedSong; +//extern ? gOcarinaSongNotestartIdx; +//extern ? sOcarinaSongCnt; +//extern ? sOcarinaAvailSongs; //extern ? D_8016BA2E; -//extern ? D_8016BA30; //extern ? D_8016BA50; //extern ? D_8016BA70; -//extern ? D_8016BA90; +//extern ? sLearnSongExpectedNote; //extern ? D_8016BAA0; //extern ? D_8016BAA8; //extern ? D_8016BAB0; -//extern ? D_8016BAB4; -//extern ? D_8016BAB8; -//extern ? D_8016BABC; -//extern ? D_8016BAC0; +//extern ? sDebugPadPressRaw; +//extern ? sDebugPadPress; +//extern ? sAudioUpdateTaskStart; +//extern ? sAudioUpdateTaskEnd; extern SoundBankEntry D_8016BAD0[9]; extern SoundBankEntry D_8016BC80[12]; extern SoundBankEntry D_8016BEC0[22]; @@ -3296,7 +3288,7 @@ extern SoundBankEntry D_8016C8B0[5]; extern u8 D_8016E1A0[7]; extern u8 D_8016E1A8[7]; extern u8 D_8016E1B0[7]; -//extern ? D_8016E1B8; +extern Struct_800F7CEC D_8016E1B8[7][3]; // total size = 0xA8 extern u8 D_8016E260; extern u8 D_8016E264[]; //extern ? D_8016E270; @@ -3305,12 +3297,10 @@ extern u16 D_8016E2F8[]; extern u8 D_8016E310[]; //extern ? D_8016E320; //extern ? D_8016E348; -//extern ? D_8016E350; -//extern ? D_8016E750; -//extern ? D_8016E9A4; +//extern ? sAudioSeqCmds; +extern unk_D_8016E750 D_8016E750[4]; //extern ? D_8016EE8B; -extern AudioContext gAudioContext; // at 0x8016f180 -extern NotePool gNoteFreeLists; // probably includes this and further members, too +extern AudioContext gAudioContext; // at 0x8016F180 //extern ? D_80174D28; //extern ? D_80174D38; //extern ? D_80174D48; @@ -3321,7 +3311,7 @@ extern NotePool gNoteFreeLists; // probably includes this and further members, t //extern ? D_80174DB8; //extern ? D_80174DBC; //extern ? D_80174DC0; -//extern ? D_801755D0; +extern void(*D_801755D0)(void); // not sure about arguments yet. extern u32 __osMalloc_FreeBlockTest_Enable; //extern ? D_80175640; //extern ? D_80175670; diff --git a/include/z64.h b/include/z64.h index 3acdb65a1f..4fd67ab287 100644 --- a/include/z64.h +++ b/include/z64.h @@ -510,7 +510,7 @@ typedef struct { /* 0x0168 */ Vtx* cursorVtx; /* 0x016C */ Vtx* saveVtx; /* 0x0170 */ char unk_170[0x24]; - /* 0x0194 */ UnkAudioStruct* unk_194; + /* 0x0194 */ OcarinaStaff* unk_194; /* 0x0198 */ char unk_198[0x20]; /* 0x01B8 */ OSMesgQueue loadQueue; /* 0x01D0 */ OSMesg loadMsg; @@ -1505,24 +1505,12 @@ typedef struct { #define OS_SC_YIELD 0x0010 #define OS_SC_YIELDED 0x0020 -typedef struct { - struct { - /* 0x0000 */ s32 unk_0[0x10]; // not char to avoid generating lwl/lwr swl/swr in a struct copy - } unk_0; - /* 0x0040 */ OSMesgQueue* unk_40; -} Sub_AudioMgr_18; // size = 0x44 - typedef struct { /* 0x0000 */ IrqMgr* irqMgr; /* 0x0004 */ SchedContext* sched; - /* 0x0008 */ OSMesg unk_8; - /* 0x000C */ char unk_C[0x04]; - /* 0x0010 */ s32 unk_10; - /* 0x0014 */ s32 unk_14; - /* 0x0018 */ Sub_AudioMgr_18 unk_18; - /* 0x005C */ UNK_PTR unk_5C; + /* 0x0008 */ OSScTask audioTask; /* 0x0060 */ char unk_60[0x10]; - /* 0x0070 */ Sub_AudioMgr_18* unk_70; + /* 0x0070 */ AudioTask* rspTask; /* 0x0074 */ OSMesgQueue unk_74; /* 0x008C */ OSMesg unk_8C; /* 0x0090 */ OSMesgQueue unk_90; @@ -1535,7 +1523,6 @@ typedef struct { /* 0x00E8 */ OSThread unk_E8; } AudioMgr; // size = 0x298 - struct ArenaNode; typedef struct Arena { diff --git a/include/z64audio.h b/include/z64audio.h index 6183a9aec8..1cf82689e9 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -1,6 +1,8 @@ #ifndef _Z64_AUDIO_H_ #define _Z64_AUDIO_H_ +#define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0)) + /** * Structs in this repository have primarily been imported from the SM64 Decompilation. * Many struct members are wrong; the symbol '?' next to an offset means the member is a guess. @@ -11,7 +13,7 @@ #define TATUMS_PER_BEAT 48 -#define IS_SEQUENCE_CHANNEL_VALID(ptr) ((u32)(ptr) != (u32)&gAudioContext.gSequenceChannelNone) +#define IS_SEQUENCE_CHANNEL_VALID(ptr) ((u32)(ptr) != (u32)&gAudioContext.sequenceChannelNone) #define ADSR_STATE_DISABLED 0 #define ADSR_STATE_INITIAL 1 @@ -28,6 +30,8 @@ #define ADSR_GOTO -2 #define ADSR_RESTART -3 +#define AIBUF_LEN 0xB00 + struct Note; struct NotePool; struct SequenceChannel; @@ -88,10 +92,16 @@ typedef struct { } AdpcmBook; typedef struct { - /* 0x00 */ u8 bits4 : 4; - /* 0x00 */ u8 bits2 : 2; - /* 0x00 */ u8 unk_bits2 : 2; - /* 0x01 */ u32 bits24 : 24; + union{ + struct { + /* 0x00 */ u32 bits4 : 4; + /* 0x00 */ u32 bits2 : 2; + /* 0x00 */ u32 unk_bits26 : 1; + /* 0x00 */ u32 unk_bits25 : 1; + /* 0x01 */ u32 size : 24; + }; + u32 bits; + }; /* 0x04 */ u8* sampleAddr; /* 0x08 */ AdpcmLoop* loop; /*?0x0C */ AdpcmBook* book; @@ -110,35 +120,43 @@ typedef struct { /*?0x0C */ s32 startPos; // start pos in ring buffer /*?0x10 */ s16 lengthA; // first length in ring buffer (from startPos, at most until end) /*?0x12 */ s16 lengthB; // second length in ring buffer (from pos 0) - /* 0x14 */ u8 pad[8]; + /* 0x14 */ u16 unk_14; + /* 0x16 */ u16 unk_16; + /* 0x18 */ u16 unk_18; + /* 0x1A */ char unk_1A[2]; } ReverbRingBufferItem; // size = 0x1C typedef struct { - /* 0x000 */ u8 unk_00; + /* 0x000 */ u8 resampleFlags; /* 0x001 */ u8 useReverb; - /* 0x002 */ u8 unk_02; - /* 0x003 */ u8 unk_03; + /* 0x002 */ u8 framesToIgnore; + /* 0x003 */ u8 curFrame; /* 0x004 */ u8 downsampleRate; - /* 0x005 */ u8 unk_05; + /* 0x005 */ s8 unk_05; /* 0x006 */ u16 windowSize; - /* 0x008 */ u16 unk_08; - /* 0x00A */ u16 unk_0A; + /* 0x008 */ s16 unk_08; + /* 0x00A */ s16 unk_0A; /* 0x00C */ u16 unk_0C; /* 0x00E */ u16 unk_0E; - /* 0x010 */ u16 unk_10; - /* 0x012 */ u16 unk_12; + /* 0x010 */ s16 unk_10; + /* 0x012 */ s16 unk_12; /* 0x014 */ u16 unk_14; - /* 0x016 */ u16 unk_16; + /* 0x016 */ s16 unk_16; + /* 0x018 */ u8 unk_18; - /* 0x01C */ s32 unk_1C; + /* 0x019 */ u8 unk_19; + /* 0x01A */ u8 unk_1A; + /* 0x01B */ u8 unk_1B; + /* 0x01C */ s32 nextRingBufPos; /* 0x020 */ s32 unk_20; - /* 0x024 */ s32 unk_24; - /* 0x028 */ s16* unk_28; - /* 0x02C */ s16* unk_2C; + /* 0x024 */ s32 bufSizePerChan; + /* 0x028 */ s16* leftRingBuf; + /* 0x02C */ s16* rightRingBuf; /* 0x030 */ void* unk_30; /* 0x034 */ void* unk_34; /* 0x038 */ void* unk_38; /* 0x03C */ void* unk_3C; + /* 0x040 */ ReverbRingBufferItem items[2][5]; /*?0x158 */ ReverbRingBufferItem items2[2][5]; /* 0x270 */ s16* unk_270; @@ -166,7 +184,7 @@ typedef struct { /* 0x01 */ u8 pan; /*?0x02 */ u8 loaded; /* 0x04 */ AudioBankSound sound; - /* 0x14 */ AdsrEnvelope *envelope; + /* 0x14 */ AdsrEnvelope* envelope; } Drum; // size >= 0x14 typedef struct { @@ -229,7 +247,7 @@ typedef struct { /* 0x010 */ u16 delay; /* 0x012 */ u16 fadeTimer; /* 0x014 */ u16 fadeTimerUnkEu; - /* 0x016 */ char pad_16[0x2]; + /* 0x016 */ char unk_16[0x2]; /* 0x018 */ u8* seqData; /* 0x01C */ f32 fadeVolume; /* 0x020 */ f32 fadeVelocity; @@ -282,8 +300,8 @@ typedef struct { /* 0x0C */ f32 fadeOutVel; /* 0x10 */ f32 current; /* 0x14 */ f32 target; - /* */ char pad_18[4]; - /* 0x1C */ AdsrEnvelope *envelope; + /* 0x18 */ char unk_18[4]; + /* 0x1C */ AdsrEnvelope* envelope; } AdsrState; typedef struct { @@ -407,7 +425,7 @@ typedef struct SequenceChannelLayer { /* 0x0E */ u16 portamentoTime; /* 0x10 */ s16 transposition; // #semitones added to play commands // (m64 instruction encoding only allows referring to the limited range - // 0..0x3f; this makes 0x40..0x7f accessible as well) + // 0..0x3F; this makes 0x40..0x7F accessible as well) /* 0x12 */ s16 shortNoteDefaultPlayPercentage; /* 0x14 */ s16 playPercentage; /* 0x18 */ AdsrSettings adsr; @@ -427,25 +445,33 @@ typedef struct SequenceChannelLayer { } SequenceChannelLayer; // size = 0x80 typedef struct { - /*?00 */ s16 adpcmdecState[0x10]; - /*?00 */ s16 finalResampleState[0x10]; - /*?00 */ s16 mixEnvelopeState[0x28]; - /*?00 */ s16 panResampleState[0x10]; - /*?00 */ s16 panSamplesBuffer[0x20]; - /*?00 */ s16 dummyResampleState[0x10]; -} NoteSynthesisBuffers; + /* 0x0000 */ s16 adpcmdecState[0x10]; + /* 0x0020 */ s16 finalResampleState[0x10]; + /* 0x0040 */ s16 mixEnvelopeState[0x28]; + /* 0x0090 */ s16 panResampleState[0x10]; + /* 0x00B0 */ s16 panSamplesBuffer[0x20]; + /* 0x00F0 */ s16 dummyResampleState[0x10]; +} NoteSynthesisBuffers; // size = 0x110 typedef struct { /*?0x00 */ u8 restart; /*?0x01 */ u8 sampleDmaIndex; /*?0x02 */ u8 prevHeadsetPanRight; /*?0x03 */ u8 prevHeadsetPanLeft; - /*?0x04 */ u16 samplePosFrac; + /*?0x04 */ u8 samplePosFrac; + /* 0x05 */ u8 unk_05; + /* 0x06 */ u16 unk_06; /*?0x08 */ s32 samplePosInt; /* 0x0C */ NoteSynthesisBuffers* synthesisBuffers; /*?0x10 */ s16 curVolLeft; /*?0x12 */ s16 curVolRight; -} NoteSynthesisState; + /* 0x14 */ u16 unk_14; + /* 0x16 */ u16 unk_16; + /* 0x18 */ u16 unk_18; + /* 0x1A */ u8 unk_1A; + /* 0x1C */ u16 unk_1C; + /* 0x1E */ u16 unk_1E; +} NoteSynthesisState; // size = 0x20 typedef struct { /* 0x00 */ struct SequenceChannel* seqChannel; @@ -523,11 +549,10 @@ typedef struct { typedef struct Note { /* 0x00 */ AudioListItem listItem; /*?0x10 */ NoteSynthesisState synthesisState; - /* 0x24 */ char pad_24[0xC]; /* 0x30 */ NotePlaybackState playbackState; /* 0x90 */ Portamento portamento; /* 0x9C */ VibratoState vibratoState; - /* 0xB8 */ char pad_B8[0x4]; + /* 0xB8 */ char unk_B8[0x4]; /* 0xBC */ u32 unk_BC; /* 0xC0 */ NoteSubEu noteSubEu; } Note; // size = 0xE0 @@ -552,9 +577,9 @@ typedef struct { /*?0x04 */ u8 unk_04; /* 0x05 */ u8 maxSimultaneousNotes; /* 0x06 */ u8 numSequencePlayers; - /* 0x07 */ u8 pad_07[2]; + /* 0x07 */ u8 unk_07[0x2]; /* 0x09 */ u8 numReverbs; - /* 0x0A */ u8 pad_0A[2]; + /* 0x0A */ u8 unk_0A[0x2]; /* 0x0C */ ReverbSettings* reverbSettings; /* 0x10 */ u16 unk_10; /* 0x12 */ u16 unk_12; @@ -605,7 +630,7 @@ typedef struct { /* 0x00 */ s8 unk_00; /* 0x01 */ s8 unk_01; /* 0x02 */ s8 unk_02; - /* 0x03 */ char pad[0x5]; + /* 0x03 */ char unk_03[0x5]; /* 0x08 */ u8* unk_08; /* 0x0C */ void* unk_0C; /* 0x10 */ u32 size; @@ -635,7 +660,7 @@ typedef struct { /* 0x000*/ PersistentPool persistent; /* 0x0D4*/ TemporaryPool temporary; - /* 0x100*/ u8 pad[0x10]; + /* 0x100*/ u8 unk_100[0x10]; } SoundMultiPool; // size = 0x110 typedef struct { @@ -661,96 +686,327 @@ typedef struct { u8* unk_4; u32 unk_8; s8 unk_C; + s8 unk_D; + s16 unk_E; } Struct_800E0E0C_2; typedef struct { - char pad[0xC]; + char unk_00[0x2]; + s16 unk_02; + char unk_04[0x8]; Struct_800E0E0C_2 unk_C[1]; // unknown size } ManyStruct_800E0E0C_2; typedef struct { - /* 0x00 */ s32 unk_00; + /* 0x00 */ u8* unk_00; /* 0x04 */ AudioBankSample* sample; /* 0x08 */ u8* unk_08; /* 0x0C */ s32 pad; /* 0x10 */ s32 unk_10; } AudioStruct0D68; // size = 0x14 +typedef struct { + union{ + u32 opArgs; + struct { + u8 op; + u8 arg0; + u8 arg1; + u8 arg2; + }; + }; + union { + void* data; + f32 asFloat; + s32 asInt; + u16 asUShort; + s8 asSbyte; + u8 asUbyte; + u32 asUInt; + }; +} AudioCmd; + +typedef struct { + union{ + struct { + s16 unk_00; + u16 unk_02; + }; + u32 unk_00w; + }; + u32 unk_04; + s8 unk_08; + char unk_09[0x7]; +} unk_dma_s; + +#define MK_ASYNC_MSG(b0,b1,b2,b3)(((b0) << 0x18) | ((b1) << 0x10) | ((b2) << 0x08) | ((b3) << 0x00)) +#define ASYNC_TBLTYPE(v)((u8)(v >> 0x10)) +#define ASYNC_B2(v)((u8)(v >> 0x08)) +#define ASYNC_B3(v)((u8)(v >> 0x00)) +#define AYSNC_B0(v)(((u8)(v >> 0x18)) + +typedef struct { + /* 0x00 */ s8 status; + /* 0x01 */ s8 unk_01; + /* 0x02 */ s8 unk_02; // type? + /* 0x03 */ char unk_03[0x1]; + /* 0x04 */ u32 unk_04; + /* 0x08 */ u32 devAddr; + /* 0x0C */ u8* ramAddr; + /* 0x10 */ u32 bytesRemaining; + /* 0x14 */ u32 chunkSize; + /* 0x18 */ s32 unk_18; + /* 0x1C */ u32 retMsg; + /* 0x20 */ OSMesgQueue* retQueue; + /* 0x24 */ OSMesgQueue msgQueue; + /* 0x3C */ OSMesg msg[1]; + /* 0x40 */ OSIoMesg ioMesg; +} AsyncLoadReq; // size = 0x58 + +typedef struct { + /* 0x0000 */ u8 unk_00; + /* 0x0001 */ u8 unk_01; + /* 0x0002 */ u16 unk_02; + /* 0x0004 */ s32 unk_04; + /* 0x0008 */ s32 devAddr; + /* 0x000C */ u8* ramAddr; + /* 0x0010 */ u8* unk_10; + /* 0x0014 */ s32 status; + /* 0x0018 */ s32 size; + /* 0x001C */ s8* isDone; + /* 0x0020 */ AudioBankSample sample; + /* 0x0030 */ OSMesgQueue msgqueue; + /* 0x0048 */ OSMesg msg[1]; + /* 0x004C */ OSIoMesg ioMesg; +} AudioSyncLoad; // size = 0x64 + +typedef struct { + u16 offsets[18]; + char data[1]; +} unk_283C; + +typedef struct { + /* 0x0000 */ s16 entryCnt; + /* 0x0002 */ s16 unk_02; + /* 0x0004 */ u32 romAddr; + /* 0x0008 */ char pad[0x8]; +} AudioTableHeader; // size = 0x10 + +typedef struct { + /* 0x0000 */ u32 romAddr; + /* 0x0004 */ u32 size; + /* 0x0008 */ s8 unk_08; + /* 0x0009 */ s8 type; + /* 0x000A */ char pad[6]; +} SequenceTableEntry; // size = 0x10 + +typedef struct { + /* 0x0000 */ u32 romAddr; + /* 0x0004 */ u32 size; + /* 0x0008 */ u8 unk_08; + /* 0x0009 */ u8 unk_09; + /* 0x000A */ s16 unk_0A; + /* 0x000C */ s16 unk_0C; + /* 0x000E */ s16 unk_0E; +} AudioBankTableEntry; // size = 0x10 + +typedef struct { + /* 0x0000 */ u32 romAddr; + /* 0x0004 */ u32 size; + /* 0x0008 */ s8 unk_08; + /* 0x0009 */ s8 unk_09; + /* 0x000A */ char pad[6]; +} AudioTableEntry; // size = 0x10 + +typedef struct { + /* 0x0000 */ AudioTableHeader header; + /* 0x0010 */ SequenceTableEntry entries[1]; +} SequenceTable; // size >= 0x20 + +typedef struct { + /* 0x0000 */ AudioTableHeader header; + /* 0x0010 */ AudioBankTableEntry entries[1]; +} AudioBankTable; // size >= 0x20 + +typedef struct { + /* 0x0000 */ AudioTableHeader header; + /* 0x0010 */ AudioTableEntry entries[1]; +} AudioTable; // size >= 0x20 + +typedef struct { + /* 0x0000 */ OSTask task; + /* 0x0040 */ OSMesgQueue* taskQueue; + /* 0x0044 */ void* unk_44; // probbly a message that gets unused. + /* 0x0048 */ char unk_48[0x8]; +} AudioTask; // size = 0x50 + +typedef struct { + /* 0x0000 */ u8* ramAddr; + /* 0x0004 */ u32 devAddr; + /* 0x0008 */ u16 unk_08; + /* 0x000A */ u16 size; + /* 0x000C */ u8 unk_0C; + /* 0x000D */ u8 unk_0D; + /* 0x000E */ u8 unk_0E; + /* 0x000F */ u8 unk_0F; +} SampleDmaReq; // size = 0x10 + +typedef struct { + s32 unk_00; + s32 unk_04; + s32 unk_08; + s32 unk_0C; + s32 unk_10; + s32 unk_14; +} RelocInfo; + +typedef enum { + SEQUENCE_TABLE, + BANK_TABLE, + AUDIO_TABLE +} AudioTableType; + +typedef struct { + Drum** drums; + AudioBankSound* sfx; + Instrument* instruments[1]; +} unk_ldr; + typedef struct { /* 0x0000 */ char unk_0000; - /* 0x0001 */ s8 gNumSynthesisReverbs; + /* 0x0001 */ s8 numSynthesisReverbs; /* 0x0002 */ u16 unk_2; /* 0x0004 */ u16 unk_4; - /* 0x0006 */ char unk_0006[0x0e]; - /* 0x0014 */ NoteSubEu* gNoteSubsEu; - /* 0x0018 */ SynthesisReverb gSynthesisReverbs[4]; - /* 0x0B38 */ char unk_0B38[0x230]; - /* 0x0D68 */ AudioStruct0D68 unk_0D68[128]; // guessing at size - /* 0x1768 */ char unk_1768[4]; + /* 0x0006 */ char unk_0006[0x0A]; + /* 0x0000 */ s32 unk_0x10; + /* 0x0014 */ NoteSubEu* noteSubsEu; + /* 0x0018 */ SynthesisReverb synthesisReverbs[4]; + /* 0x0B38 */ char unk_0B38[0x30]; + /* 0x0B68 */ AudioBankSample* unk_B68[1]; // unknown size. + /* 0x0B6C */ char unk_B6C[0x1E8]; + /* 0x0D54 */ AudioStruct0D68 unk_0D54[129]; // guessing at size + /* 0x1768 */ s32 unk_1768; /* 0x176C */ s32 unk_176C; - /* 0x1770 */ char unk_1770[0xEB0]; - /* 0x2620 */ s32 gSampleDmaNumListItems; - /* 0x2624 */ char unk_2624[0x210]; - /* 0x2834 */ s16* unk_2834; - /* 0x2838 */ ManyStruct_800E0E0C_2* unk_2838; - /* 0x283C */ u8* unk_283C; - /* 0x2840 */ char unk_2840[0x4]; - /* 0x2844 */ CtlEntry* gCtlEntries; - /* 0x2848 */ AudioBufferParameters gAudioBufferParameters; + /* 0x1770 */ AsyncLoadReq asyncReqs[0x10]; + /* 0x1CF0 */ OSMesgQueue asyncLoadQueue; + /* 0x1D08 */ char unk_1D08[0x40]; + /* 0x1D48 */ AsyncLoadReq* curAsyncReq; + /* 0x1D4C */ u32 syncLoadPos; + /* 0x1D50 */ AudioSyncLoad syncLoads[2]; + /* 0x1E18 */ OSPiHandle* cartHandle; + /* probably an unused PI handle for n64 disk drive */ + /* 0x1E1C */ OSPiHandle* unk_1E1C; + /* 0x1E20 */ OSMesgQueue unk_1E20; + /* 0x1E38 */ OSMesg unk_1E38; + /* 0x1E38 */ char unk_1E3C[0x3C]; + /* 0x1E78 */ OSMesgQueue unk_1E78; + /* 0x1E90 */ OSMesg unk_1E90; + /* 0x1E94 */ char unk_1E94[0x3C]; + /* 0x1ED0 */ OSMesgQueue unk_1ED0; + /* 0x1EE8 */ OSMesg unk_1EE8; + /* 0x1EEC */ char unk_1EEC[0xFC]; + /* 0x1FE8 */ OSIoMesg sampIoReq[1]; // unknown size + /* 0x2000 */ char unk_2000[0x5E8]; + /* 0x25E8 */ OSMesgQueue unk_25E8; + /* 0x2600 */ OSMesg unk_2600; + /* 0x2604 */ OSIoMesg unk_2604; + /* 0x261C */ SampleDmaReq* sampleDmaReqs; + /* 0x2620 */ u32 sampleDmaReqCnt; + /* 0x2624 */ u32 unk_2624; // sample start idx? + /* 0x2628 */ s32 unk_2628; + /* 0x262C */ u8 unk_262C[0x100]; + /* 0x272C */ u8 unk_272C[0x100]; + /* 0x282C */ u8 unk_282C; + /* 0x282D */ u8 unk_282D; + /* 0x282E */ u8 unk_282E; + /* 0x282F */ u8 unk_282F; + /* 0x2830 */ SequenceTable* sequenceTable; + /* 0x2834 */ AudioBankTable* audioBankTable; + /* 0x2838 */ AudioTable* audioTable; + union { + /* 0x283C */ u16* unk_283C; + /* 0x283C */ char* unk_283Cb; + }; + /* 0x2840 */ u16 seqTabEntCnt; // channels used? + /* 0x2844 */ CtlEntry* ctlEntries; + /* 0x2848 */ AudioBufferParameters audioBufferParameters; /* 0x2870 */ f32 unk_2870; /* 0x2874 */ s32 unk_2874; /* 0x2874 */ s32 unk_2878; - /* 0x287C */ char unk_287C[0x14]; - /* 0x2890 */ s32 gMaxAudioCmds; - /* 0x2894 */ s32 gMaxSimultaneousNotes; // (bad name) - /* 0x2898 */ s16 gTempoInternalToExternal; - /* 0x289A */ s8 gSoundMode; - /* 0x289B */ char unk_289B[0xD]; - /* 0x28A8 */ s32 unk_28A8; - /* 0x28AC */ u64* gAudioCmdBuffers[2]; - /* 0x28B4 */ char unk_28B4[0xAC]; + /* 0x287C */ char unk_287C[0x10]; + /* 0x288C */ s32 unk_288C; + /* 0x2890 */ s32 maxAudioCmds; + /* 0x2894 */ s32 maxSimultaneousNotes; // (bad name) + /* 0x2898 */ s16 tempoInternalToExternal; + /* 0x289A */ s8 soundMode; + /* 0x289C */ s32 totalTaskCnt; + /* 0x28A0 */ s32 sampleIoReqIdx; + /* 0x28A4 */ s32 rspTaskIdx; + /* 0x28A8 */ s32 curAIBufIdx; + /* 0x28AC */ u64* abiCmdBufs[2]; + /* 0x28B4 */ u64* curAbiCmdBuf; + /* 0x28B8 */ AudioTask* currTask; + /* 0x28BC */ char unk_28BC[0x4]; + /* 0x28C0 */ AudioTask rspTask[2]; /* 0x2960 */ f32 unk_2960; - /* 0x2964 */ s32 gRefreshRate; - /* 0x2968 */ s16* unk_2968[3]; - /* 0x2974 */ s16 unk_2974[3]; - /* 0x297C */ u32 gAudioRandom; - /* 0x2980 */ s32 gAudioErrorFlags; - /* 0x2984 */ char unk_2984[0xC]; - /* 0x2990 */ SoundAllocPool gAudioSessionPool; - /* 0x29A0 */ SoundAllocPool gUnkPool; - /* 0x29B0 */ SoundAllocPool gAudioInitPool; - /* 0x29C0 */ SoundAllocPool gNotesAndBuffersPool; + /* 0x2964 */ s32 refreshRate; + /* 0x2968 */ s16* aiBuffers[3]; + /* 0x2974 */ s16 aiBufLengths[3]; + /* 0x297C */ u32 audioRandom; + /* 0x2980 */ s32 audioErrorFlags; + /* 0x2984 */ volatile u32 resetTimer; + /* 0x2988 */ char unk_2988[0x8]; + /* 0x2990 */ SoundAllocPool audioSessionPool; + /* 0x29A0 */ SoundAllocPool unkPool; + /* 0x29B0 */ SoundAllocPool audioInitPool; + /* 0x29C0 */ SoundAllocPool notesAndBuffersPool; /* 0x29D0 */ char unk_29D0[0x20]; // probably two unused pools - /* 0x29F0 */ SoundAllocPool gSeqAndBankPool; - /* 0x2A00 */ SoundAllocPool gPersistentCommonPool; - /* 0x2A10 */ SoundAllocPool gTemporaryCommonPool; - /* 0x2A20 */ SoundMultiPool gSeqLoadedPool; - /* 0x2B30 */ SoundMultiPool gBankLoadedPool; - /* 0x2C40 */ SoundMultiPool gUnusedLoadedPool; // rename after we figure out what this is + /* 0x29F0 */ SoundAllocPool seqAndBankPool; + /* 0x2A00 */ SoundAllocPool persistentCommonPool; + /* 0x2A10 */ SoundAllocPool temporaryCommonPool; + /* 0x2A20 */ SoundMultiPool seqLoadedPool; + /* 0x2B30 */ SoundMultiPool bankLoadedPool; + /* 0x2C40 */ SoundMultiPool unusedLoadedPool; // rename after we figure out what this is /* 0x2D50 */ SoundAllocPool unk_2D50; /* 0x2D60 */ SeqOrBankEntry unk_2D60[32]; /* 0x2EE0 */ UnkPool unk_2EE0; /* 0x3174 */ UnkPool unk_3174; - /* 0x3408 */ AudioPoolSplit4 sSessionPoolSplit; - /* 0x3418 */ AudioPoolSplit2 sSeqAndBankPoolSplit; - /* 0x3420 */ AudioPoolSplit3 sPersistentCommonPoolSplit; - /* 0x342C */ AudioPoolSplit3 sTemporaryCommonPoolSplit; - /* 0x3438 */ u8 gUnusedLoadStatus[0x30]; - /* 0x3468 */ u8 gBankLoadStatus[0x30]; - /* 0x3498 */ u8 gSeqLoadStatus[0x80]; - /* 0x3518 */ volatile u8 gAudioResetStatus; - /* 0x3519 */ u8 gAudioResetPresetIdToLoad; - /* 0x351C */ s32 gAudioResetFadeOutFramesLeft; + /* 0x3408 */ AudioPoolSplit4 sessionPoolSplit; + /* 0x3418 */ AudioPoolSplit2 seqAndBankPoolSplit; + /* 0x3420 */ AudioPoolSplit3 persistentCommonPoolSplit; + /* 0x342C */ AudioPoolSplit3 temporaryCommonPoolSplit; + /* 0x3438 */ u8 audioTableLoadStatus[0x30]; + /* 0x3468 */ u8 bankLoadStatus[0x30]; + /* 0x3498 */ u8 seqLoadstatus[0x80]; + /* 0x3518 */ volatile u8 resetStatus; + /* 0x3519 */ u8 audioResetPresetIdToLoad; + /* 0x351C */ s32 audioResetFadeOutFramesLeft; /* 0x3520 */ f32* unk_3520; - /* 0x3524 */ u8* gAudioHeap; - /* 0x3528 */ u32 gAudioHeapSize; - /* 0x352C */ Note* gNotes; - /* 0x3530 */ SequencePlayer gSequencePlayers[4]; - /* 0x3AB0 */ SequenceChannelLayer gSequenceLayers[64]; - /* 0x5AB0 */ SequenceChannel gSequenceChannelNone; - /* 0x5B84 */ s32 gNoteSubEuOffset; - /* 0x5B88 */ AudioListItem gLayerFreeList; -} AudioContext; // size >= 0x5c50 + /* 0x3524 */ u8* audioHeap; + /* 0x3528 */ u32 audioHeapSize; + /* 0x352C */ Note* notes; + /* 0x3530 */ SequencePlayer seqPlayers[4]; + /* 0x3AB0 */ SequenceChannelLayer sequenceLayers[64]; + /* 0x5AB0 */ SequenceChannel sequenceChannelNone; + /* 0x5B84 */ s32 noteSubEuOffset; + /* 0x5B88 */ AudioListItem layerFreeList; + /* 0x5B98 */ NotePool noteFreeLists; + /* 0x5BD8 */ u8 cmdWrPos; + /* 0x5BD9 */ u8 cmdRdPos; + /* 0x5BDA */ u8 cmdQueueFinished; + /* 0x5BDB */ char unk_5BDB[0x1]; + /* 0x5BDC */ u16 unk_5BDC[4]; + /* 0x5BE4 */ OSMesgQueue* audioResetQueueP; + /* 0x5BE8 */ OSMesgQueue* taskStartQueueP; + /* 0x5BEC */ OSMesgQueue* cmdProcQueueP; + /* 0x5BF0 */ OSMesgQueue taskStartQueue; + /* 0x5C08 */ OSMesgQueue cmdProcQueue; + /* 0x5C20 */ OSMesgQueue audioResetQueue; + /* 0x5C38 */ OSMesg taskStartMsgs[1]; + /* 0x5C3C */ OSMesg audioResetMesgs[1]; + /* 0x5C40 */ OSMesg cmdProcMsgs[4]; + /* 0x5C50 */ AudioCmd cmdBuf[0x100]; +} AudioContext; // size = 0x6450 typedef struct { /* 0x00 */ u8 reverb; // i.e. volume @@ -765,6 +1021,65 @@ typedef struct { /* 0x16 */ u16 unk_16; } Reverb; // size >= 0x18 +typedef struct { + /* 0x0000 */ u32 heap; + /* 0x0004 */ u32 mainPool; + /* 0x0008 */ u32 initPool; +} AudioContextInitSizes; // size = 0xC + +typedef struct { + /* 0x0000 */ f32 unk_00; + /* 0x0004 */ f32 unk_04; + /* 0x0008 */ f32 unk_08; + /* 0x000C */ u16 unk_0C; + /* 0x0010 */ f32 unk_10; + /* 0x0014 */ f32 unk_14; + /* 0x0018 */ f32 unk_18; + /* 0x001C */ u16 unk_1C; +} unk_50_s; // size = 0x20 + +typedef struct { + /* 0x0000 */ f32 volCur; + /* 0x0004 */ f32 volTarget; + /* 0x0008 */ f32 unk_08; + /* 0x000C */ u16 unk_0C; + /* 0x000E */ u8 volScales[0x4]; + /* 0x0012 */ u8 volFadeTimer; + /* 0x0013 */ u8 fadeVolUpdate; + /* 0x0014 */ u32 unk_14; + /* 0x0018 */ u16 unk_18; + /* 0x001C */ f32 unk_1C; + /* 0x0020 */ f32 unk_20; + /* 0x0024 */ f32 unk_24; + /* 0x0028 */ u16 unk_28; + /* 0x002A */ char unk_2A[0x2]; + /* 0x002C */ u32 unk_2C[8]; + /* 0x004C */ u8 unk_4C; + /* 0x004D */ u8 unk_4D; + /* 0x004E */ u8 unk_4E; + /* 0x004F */ char unk_4F; + /* 0x0050 */ unk_50_s unk_50[0x10]; + /* 0x0250 */ u16 unk_250; + /* 0x0252 */ u16 unk_252; + /* 0x0254 */ u16 unk_254; + /* 0x0256 */ u16 unk_256; + /* 0x0258 */ u16 unk_258; + /* 0x025A */ char unk_25A[0x2]; + /* 0x025C */ u32 unk_25C; + /* 0x0260 */ u8 unk_260; + /* 0x0261 */ char unk_261[0x3]; +} unk_D_8016E750; // size = 0x264 + +typedef enum { + BANK_PLAYER, + BANK_ITEM, + BANK_ENV, + BANK_ENEMY, + BANK_SYSTEM, + BANK_OCARINA, + BANK_VOICE +} SoundBankTypes; + typedef struct { /* 0x00 */ f32* posX; /* 0x04 */ f32* posY; @@ -772,7 +1087,7 @@ typedef struct { /* 0x0C */ u8 unk_C; /* 0x10 */ f32* unk_10; /* 0x14 */ f32* unk_14; - /* 0x18 */ f32* unk_18; + /* 0x18 */ s8* unk_18; /* 0x1C */ f32 unk_1C; /* 0x20 */ u32 unk_20; /* 0x24 */ u8 unk_24; @@ -808,4 +1123,62 @@ typedef struct { #define SFX_INDEX(sfxId) ((sfxId) & 0x01FF) #define SFX_BANK(sfxId) SFX_BANK_SHIFT(SFX_BANK_MASK(sfxId)) +typedef struct { + u32 unk_0; + u8 unk_4; +} Struct_800F7CEC; + +typedef struct { + u8 unk_0; + u16 unk_2; +} Struct_8013331C; + +typedef struct { + /* 0x0000 */ u8 noteIdx; + /* 0x0001 */ u8 unk_01; + /* 0x0002 */ u16 unk_02; + /* 0x0004 */ u8 volume; + /* 0x0005 */ u8 vibrato; + /* 0x0006 */ s8 tone; + /* 0x0007 */ u8 semitone; +} OcarinaNote; // size = 0x8 + +typedef struct { + /* 0x0000 */ OcarinaNote notes[20]; +} OcarinaSong; // size = 0xA0 + +#define Audio_DisableSeq(seqIdx, fadeOut) Audio_QueueCmdS32(0x83000000 | ((u8)seqIdx << 16), fadeOut) +#define Audio_Cmd82(seqIdx, a, b) Audio_QueueCmdS32(0x82000000 | ((u8)seqIdx << 16) | ((u8)a << 8), b) +#define Audio_StartSeq(seqIdx, fadeTimer, seqId) Audio_QueueSeqCmd(0x00000000 | ((u8)seqIdx << 24) | ((u8)(fadeTimer) << 0x10) | (u16)seqId) +#define Audio_SeqCmd7(seqIdx, a, b) Audio_QueueSeqCmd(0x70000000 | ((u8)seqIdx << 0x18) | ((u8)a << 0x10) | (u8)(b)) +#define Audio_SeqCmdC(seqIdx, a, b, c) Audio_QueueSeqCmd(0xC0000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)(c))) +#define Audio_SeqCmdA(seqIdx, a) Audio_QueueSeqCmd(0xA0000000 | ((u8)seqIdx << 24) | ((u16)(a))) +#define Audio_SeqCmd1(seqIdx, a) Audio_QueueSeqCmd(0x100000FF | ((u8)seqIdx << 24) | ((u8)(a) << 16)) +#define Audio_SeqCmdB(seqIdx, a, b, c) Audio_QueueSeqCmd(0xB0000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)c)) +#define Audio_SeqCmdB30(seqIdx, a, b) Audio_QueueSeqCmd(0xB0003000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b)) +#define Audio_SeqCmdB40(seqIdx, a, b) Audio_QueueSeqCmd(0xB0004000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b)) +#define Audio_SeqCmd6(seqIdx, a, b, c) Audio_QueueSeqCmd(0x60000000 | ((u8)seqIdx << 24) | ((u8)(a) << 16) | ((u8)b << 8) | ((u8)c)) +#define Audio_SeqCmdE0(seqIdx, a) Audio_QueueSeqCmd(0xE0000000 | ((u8)seqIdx << 24) | ((u8)a)) +#define Audio_SeqCmdE01(seqIdx, a) Audio_QueueSeqCmd(0xE0000100 | ((u8)seqIdx << 24) | ((u16)a)) +#define Audio_SeqCmd8(seqIdx, a, b, c) Audio_QueueSeqCmd(0x80000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)c)) +#define Audio_SeqCmd3(seqIdx, a) Audio_QueueSeqCmd(0x80000000 | ((u8)seqIdx << 24) | ((u16)a)) +#define Audio_SeqCmd5(seqIdx, a, b) Audio_QueueSeqCmd(0x50000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u16)(b))) +#define Audio_SeqCmd4(seqIdx, a, b) Audio_QueueSeqCmd(0x40000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)(b))) +#define Audio_SeqCmdF(seqIdx, a) Audio_QueueSeqCmd(0xF0000000 | ((u8)seqIdx << 24) | ((u8)a)) +#define Unk2C_B8(v) (((v & 0x00F00000) >> 20)) +#define Unk2C_B12(v) (((v & 0x000F0000) >> 16)) +#define Unk2C_B16(v) (((v & 0x0000FF00) >> 8)) +#define Unk2C_B24(v) (((v & 0x000000FF) >> 0)) + +typedef struct { + u8 len; + u8 notesIdx[8]; +} OcarinaSongInfo; + +typedef struct { + u8 noteIdx; + u8 state; + u8 pos; +} OcarinaStaff; + #endif diff --git a/spec b/spec index 36f3573a58..1666bef200 100644 --- a/spec +++ b/spec @@ -404,13 +404,11 @@ beginseg include "build/src/code/fault_drawer.o" include "build/asm/code_800D71F0.o" include "build/src/code/ucode_disas.o" - include "build/src/code/code_800DACC0.o" - include "build/data/code_800DACC0.data.o" - include "build/data/code_800DACC0.bss.o" + include "build/src/code/audio_synthesis.o" + include "build/data/audio_synthesis.data.o" include "build/src/code/audio_heap.o" - include "build/src/code/code_800E11F0.o" - include "build/data/code_800E11F0.data.o" - include "build/data/code_800E11F0.rodata.o" + include "build/src/code/audio_load.o" + include "build/src/code/code_800E4FE0.o" include "build/src/libultra_code_O2/code_800E6840.o" include "build/src/libultra_code_O2/osAiSetNextBuffer.o" include "build/src/code/audio_playback.o" @@ -420,9 +418,10 @@ beginseg include "build/src/code/code_800EC960.o" include "build/data/code_800EC960.data.o" include "build/src/code/code_800F7260.o" + include "build/data/code_800F7260.bss.o" include "build/src/code/code_800F9280.o" include "build/data/code_800F9280.data.o" - include "build/data/code_800F9280.rodata.o" + include "build/src/code/audio_rodata.o" include "build/src/code/logseverity.o" include "build/src/code/gfxprint.o" include "build/src/code/code_800FBCE0.o" diff --git a/src/boot/idle.c b/src/boot/idle.c index d9c35be0dd..080fdcfb35 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -56,17 +56,17 @@ void Idle_ThreadEntry(void* arg) { gViConfigYScale = 1.0f; switch (osTvType) { - case 1: + case OS_TV_NTSC: D_80013960 = 2; gViConfigMode = osViModeNtscLan1; break; - case 2: + case OS_TV_MPAL: D_80013960 = 0x1E; gViConfigMode = osViModeMpalLan1; break; - case 0: + case OS_TV_PAL: D_80013960 = 0x2C; gViConfigMode = osViModeFpalLan1; gViConfigYScale = 0.833f; diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index 5e0b7c9083..4c6830c997 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -8,7 +8,7 @@ void ViConfig_UpdateVi(u32 mode) { if (mode != 0) { osSyncPrintf(VT_COL(YELLOW, BLACK) "osViSetYScale1(%f);\n" VT_RST, 1.0f); - if (osTvType == 0) { + if (osTvType == OS_TV_PAL) { osViSetMode(&osViModePalLan1); } diff --git a/src/code/audioMgr.c b/src/code/audioMgr.c index ebe5307e97..f64f4ba914 100644 --- a/src/code/audioMgr.c +++ b/src/code/audioMgr.c @@ -1,52 +1,52 @@ #include "global.h" void func_800C3C80(AudioMgr* audioMgr) { - Sub_AudioMgr_18* sub = audioMgr->unk_70; + AudioTask* task; - if (audioMgr->unk_70->unk_40 != NULL) { - osSendMesg(sub->unk_40, NULL, OS_MESG_BLOCK); + task = audioMgr->rspTask; + if (audioMgr->rspTask->taskQueue != NULL) { + osSendMesg(task->taskQueue, NULL, OS_MESG_BLOCK); } } void AudioMgr_HandleRetrace(AudioMgr* audioMgr) { - Sub_AudioMgr_18* sub; + AudioTask* rspTask; if (SREG(20) > 0) { - audioMgr->unk_70 = NULL; + audioMgr->rspTask = NULL; } - if (audioMgr->unk_70 != NULL) { - audioMgr->unk_8 = NULL; - audioMgr->unk_10 = 2; - audioMgr->unk_14 = 0; + if (audioMgr->rspTask != NULL) { + audioMgr->audioTask.next = NULL; + audioMgr->audioTask.flags = 2; + audioMgr->audioTask.framebuffer = NULL; - audioMgr->unk_18.unk_0 = audioMgr->unk_70->unk_0; - audioMgr->unk_18.unk_40 = &audioMgr->unk_AC; + audioMgr->audioTask.list = audioMgr->rspTask->task; + audioMgr->audioTask.msgQ = &audioMgr->unk_AC; - audioMgr->unk_5C = NULL; - osSendMesg(&audioMgr->sched->cmdQ, &audioMgr->unk_8, OS_MESG_BLOCK); + audioMgr->audioTask.msg = NULL; + osSendMesg(&audioMgr->sched->cmdQ, &audioMgr->audioTask, OS_MESG_BLOCK); Sched_SendEntryMsg(audioMgr->sched); } D_8016A550 = osGetTime(); if (SREG(20) >= 2) { - sub = NULL; + rspTask = NULL; } else { - sub = func_800E4FE0(); + rspTask = func_800E4FE0(); } D_8016A558 += osGetTime() - D_8016A550; D_8016A550 = 0; - - if (audioMgr->unk_70 != NULL) { + if (audioMgr->rspTask != NULL) { osRecvMesg(&audioMgr->unk_AC, NULL, OS_MESG_BLOCK); func_800C3C80(audioMgr); } - audioMgr->unk_70 = sub; + audioMgr->rspTask = rspTask; } void AudioMgr_HandlePRENMI(AudioMgr* audioMgr) { // Audio manager received OS_SC_PRE_NMI_MSG osSyncPrintf("オーディオマネージャが OS_SC_PRE_NMI_MSG を受け取りました\n"); - func_800F6C14(); + Audio_PreNMI(); } void AudioMgr_ThreadEntry(void* arg0) { @@ -94,7 +94,7 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedCon audioMgr->sched = sched; audioMgr->irqMgr = irqMgr; - audioMgr->unk_70 = NULL; + audioMgr->rspTask = NULL; osCreateMesgQueue(&audioMgr->unk_AC, &audioMgr->unk_C4, 1); osCreateMesgQueue(&audioMgr->unk_74, &audioMgr->unk_8C, 8); diff --git a/src/code/audio_effects.c b/src/code/audio_effects.c index 45d267fb07..73b5c9d1ab 100644 --- a/src/code/audio_effects.c +++ b/src/code/audio_effects.c @@ -258,7 +258,7 @@ f32 Audio_AdsrUpdate(AdsrState* adsr) { break; default: - adsr->delay *= gAudioContext.gAudioBufferParameters.unk_24; + adsr->delay *= gAudioContext.audioBufferParameters.unk_24; if (adsr->delay == 0) { adsr->delay = 1; } diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index ff221da46b..f7874ed38a 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -2,7 +2,7 @@ #include "global.h" f32 func_800DDE20(f32 arg0) { - return 256.0f * gAudioContext.gAudioBufferParameters.unkUpdatesPerFrameScaled / arg0; + return 256.0f * gAudioContext.audioBufferParameters.unkUpdatesPerFrameScaled / arg0; } void func_800DDE3C(void) { @@ -33,20 +33,20 @@ void Audio_ResetLoadStatus(void) { s32 i; for (i = 0; i < 0x30; i++) { - if (gAudioContext.gBankLoadStatus[i] != 5) { - gAudioContext.gBankLoadStatus[i] = 0; + if (gAudioContext.bankLoadStatus[i] != 5) { + gAudioContext.bankLoadStatus[i] = 0; } } for (i = 0; i < 0x30; i++) { - if (gAudioContext.gUnusedLoadStatus[i] != 5) { - gAudioContext.gUnusedLoadStatus[i] = 0; + if (gAudioContext.audioTableLoadStatus[i] != 5) { + gAudioContext.audioTableLoadStatus[i] = 0; } } for (i = 0; i < 0x80; i++) { - if (gAudioContext.gSeqLoadStatus[i] != 5) { - gAudioContext.gSeqLoadStatus[i] = 0; + if (gAudioContext.seqLoadstatus[i] != 5) { + gAudioContext.seqLoadstatus[i] = 0; } } } @@ -54,8 +54,8 @@ void Audio_ResetLoadStatus(void) { void Audio_DiscardBank(s32 bankId) { s32 i; - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - Note* note = &gAudioContext.gNotes[i]; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + Note* note = &gAudioContext.notes[i]; if (note->playbackState.bankId == bankId) { if (note->playbackState.unk_04 == 0 && note->playbackState.priority != 0) { @@ -64,7 +64,7 @@ void Audio_DiscardBank(s32 bankId) { } Audio_NoteDisable(note); Audio_AudioListRemove(¬e->listItem); - Audio_AudioListPushBack(&gNoteFreeLists.disabled, ¬e->listItem); + Audio_AudioListPushBack(&gAudioContext.noteFreeLists.disabled, ¬e->listItem); } } } @@ -72,14 +72,14 @@ void Audio_DiscardBank(s32 bankId) { void func_800DE12C(s32 bankId) { s32 i; - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - Note* note = &gAudioContext.gNotes[i]; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + Note* note = &gAudioContext.notes[i]; NotePlaybackState* state = ¬e->playbackState; if (state->bankId == bankId) { if (state->priority != 0 && state->adsr.action.s.state == ADSR_STATE_DECAY) { state->priority = 1; - state->adsr.fadeOutVel = gAudioContext.gAudioBufferParameters.updatesPerFrameInv; + state->adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv; state->adsr.action.s.release = true; } } @@ -89,22 +89,22 @@ void func_800DE12C(s32 bankId) { void Audio_DiscardSequence(s32 seqId) { s32 i; - for (i = 0; i < gAudioContext.gAudioBufferParameters.numSequencePlayers; i++) { - if (gAudioContext.gSequencePlayers[i].enabled && gAudioContext.gSequencePlayers[i].seqId == seqId) { - Audio_SequencePlayerDisable(&gAudioContext.gSequencePlayers[i]); + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + if (gAudioContext.seqPlayers[i].enabled && gAudioContext.seqPlayers[i].seqId == seqId) { + Audio_SequencePlayerDisable(&gAudioContext.seqPlayers[i]); } } } void func_800DE238(void* mem, u32 size) { - func_800E6880(mem, size); + Audio_osWritebackDCache(mem, size); } void* func_800DE258(SoundAllocPool* pool, u32 size) { void* ret = NULL; - if (gAudioContext.gUnkPool.start != 0) { - ret = Audio_AllocZeroed(&gAudioContext.gUnkPool, size); + if (gAudioContext.unkPool.start != 0) { + ret = Audio_AllocZeroed(&gAudioContext.unkPool, size); } if (ret == NULL) { ret = Audio_AllocZeroed(pool, size); @@ -115,8 +115,8 @@ void* func_800DE258(SoundAllocPool* pool, u32 size) { void* func_800DE2B0(SoundAllocPool* pool, u32 size) { void* ret = NULL; - if (gAudioContext.gUnkPool.start != NULL) { - ret = Audio_Alloc(&gAudioContext.gUnkPool, size); + if (gAudioContext.unkPool.start != NULL) { + ret = Audio_Alloc(&gAudioContext.unkPool, size); } if (ret == NULL) { ret = Audio_Alloc(pool, size); @@ -206,16 +206,16 @@ void func_800DE4B0(s32 poolIdx) { switch (poolIdx) { case 0: - loadedPool = &gAudioContext.gSeqLoadedPool; - table = gAudioContext.gSeqLoadStatus; + loadedPool = &gAudioContext.seqLoadedPool; + table = gAudioContext.seqLoadstatus; break; case 1: - loadedPool = &gAudioContext.gBankLoadedPool; - table = gAudioContext.gBankLoadStatus; + loadedPool = &gAudioContext.bankLoadedPool; + table = gAudioContext.bankLoadStatus; break; case 2: - loadedPool = &gAudioContext.gUnusedLoadedPool; - table = gAudioContext.gUnusedLoadStatus; + loadedPool = &gAudioContext.unusedLoadedPool; + table = gAudioContext.audioTableLoadStatus; break; } @@ -241,52 +241,52 @@ void func_800DE4B0(s32 poolIdx) { } void Audio_InitMainPools(s32 sizeForAudioInitPool) { - Audio_SoundAllocPoolInit(&gAudioContext.gAudioInitPool, gAudioContext.gAudioHeap, sizeForAudioInitPool); - Audio_SoundAllocPoolInit(&gAudioContext.gAudioSessionPool, gAudioContext.gAudioHeap + sizeForAudioInitPool, - gAudioContext.gAudioHeapSize - sizeForAudioInitPool); - gAudioContext.gUnkPool.start = NULL; + Audio_SoundAllocPoolInit(&gAudioContext.audioInitPool, gAudioContext.audioHeap, sizeForAudioInitPool); + Audio_SoundAllocPoolInit(&gAudioContext.audioSessionPool, gAudioContext.audioHeap + sizeForAudioInitPool, + gAudioContext.audioHeapSize - sizeForAudioInitPool); + gAudioContext.unkPool.start = NULL; } void Audio_SessionPoolsInit(AudioPoolSplit4* split) { - gAudioContext.gAudioSessionPool.cur = gAudioContext.gAudioSessionPool.start; - Audio_SoundAllocPoolInit(&gAudioContext.gNotesAndBuffersPool, - Audio_Alloc(&gAudioContext.gAudioSessionPool, split->wantSeq), split->wantSeq); - Audio_SoundAllocPoolInit(&gAudioContext.gSeqAndBankPool, - Audio_Alloc(&gAudioContext.gAudioSessionPool, split->wantCustom), split->wantCustom); + gAudioContext.audioSessionPool.cur = gAudioContext.audioSessionPool.start; + Audio_SoundAllocPoolInit(&gAudioContext.notesAndBuffersPool, + Audio_Alloc(&gAudioContext.audioSessionPool, split->wantSeq), split->wantSeq); + Audio_SoundAllocPoolInit(&gAudioContext.seqAndBankPool, + Audio_Alloc(&gAudioContext.audioSessionPool, split->wantCustom), split->wantCustom); } void Audio_SeqAndBankPoolInit(AudioPoolSplit2* split) { - gAudioContext.gSeqAndBankPool.cur = gAudioContext.gSeqAndBankPool.start; - Audio_SoundAllocPoolInit(&gAudioContext.gPersistentCommonPool, - Audio_Alloc(&gAudioContext.gSeqAndBankPool, split->wantPersistent), split->wantPersistent); - Audio_SoundAllocPoolInit(&gAudioContext.gTemporaryCommonPool, - Audio_Alloc(&gAudioContext.gSeqAndBankPool, split->wantTemporary), split->wantTemporary); + gAudioContext.seqAndBankPool.cur = gAudioContext.seqAndBankPool.start; + Audio_SoundAllocPoolInit(&gAudioContext.persistentCommonPool, + Audio_Alloc(&gAudioContext.seqAndBankPool, split->wantPersistent), split->wantPersistent); + Audio_SoundAllocPoolInit(&gAudioContext.temporaryCommonPool, + Audio_Alloc(&gAudioContext.seqAndBankPool, split->wantTemporary), split->wantTemporary); } void Audio_PersistentPoolsInit(AudioPoolSplit3* split) { - gAudioContext.gPersistentCommonPool.cur = gAudioContext.gPersistentCommonPool.start; - Audio_SoundAllocPoolInit(&gAudioContext.gSeqLoadedPool.persistent.pool, - Audio_Alloc(&gAudioContext.gPersistentCommonPool, split->wantSeq), split->wantSeq); - Audio_SoundAllocPoolInit(&gAudioContext.gBankLoadedPool.persistent.pool, - Audio_Alloc(&gAudioContext.gPersistentCommonPool, split->wantBank), split->wantBank); - Audio_SoundAllocPoolInit(&gAudioContext.gUnusedLoadedPool.persistent.pool, - Audio_Alloc(&gAudioContext.gPersistentCommonPool, split->wantUnused), split->wantUnused); - Audio_PersistentPoolClear(&gAudioContext.gSeqLoadedPool.persistent); - Audio_PersistentPoolClear(&gAudioContext.gBankLoadedPool.persistent); - Audio_PersistentPoolClear(&gAudioContext.gUnusedLoadedPool.persistent); + gAudioContext.persistentCommonPool.cur = gAudioContext.persistentCommonPool.start; + Audio_SoundAllocPoolInit(&gAudioContext.seqLoadedPool.persistent.pool, + Audio_Alloc(&gAudioContext.persistentCommonPool, split->wantSeq), split->wantSeq); + Audio_SoundAllocPoolInit(&gAudioContext.bankLoadedPool.persistent.pool, + Audio_Alloc(&gAudioContext.persistentCommonPool, split->wantBank), split->wantBank); + Audio_SoundAllocPoolInit(&gAudioContext.unusedLoadedPool.persistent.pool, + Audio_Alloc(&gAudioContext.persistentCommonPool, split->wantUnused), split->wantUnused); + Audio_PersistentPoolClear(&gAudioContext.seqLoadedPool.persistent); + Audio_PersistentPoolClear(&gAudioContext.bankLoadedPool.persistent); + Audio_PersistentPoolClear(&gAudioContext.unusedLoadedPool.persistent); } void Audio_TemporaryPoolsInit(AudioPoolSplit3* split) { - gAudioContext.gTemporaryCommonPool.cur = gAudioContext.gTemporaryCommonPool.start; - Audio_SoundAllocPoolInit(&gAudioContext.gSeqLoadedPool.temporary.pool, - Audio_Alloc(&gAudioContext.gTemporaryCommonPool, split->wantSeq), split->wantSeq); - Audio_SoundAllocPoolInit(&gAudioContext.gBankLoadedPool.temporary.pool, - Audio_Alloc(&gAudioContext.gTemporaryCommonPool, split->wantBank), split->wantBank); - Audio_SoundAllocPoolInit(&gAudioContext.gUnusedLoadedPool.temporary.pool, - Audio_Alloc(&gAudioContext.gTemporaryCommonPool, split->wantUnused), split->wantUnused); - Audio_TemporaryPoolClear(&gAudioContext.gSeqLoadedPool.temporary); - Audio_TemporaryPoolClear(&gAudioContext.gBankLoadedPool.temporary); - Audio_TemporaryPoolClear(&gAudioContext.gUnusedLoadedPool.temporary); + gAudioContext.temporaryCommonPool.cur = gAudioContext.temporaryCommonPool.start; + Audio_SoundAllocPoolInit(&gAudioContext.seqLoadedPool.temporary.pool, + Audio_Alloc(&gAudioContext.temporaryCommonPool, split->wantSeq), split->wantSeq); + Audio_SoundAllocPoolInit(&gAudioContext.bankLoadedPool.temporary.pool, + Audio_Alloc(&gAudioContext.temporaryCommonPool, split->wantBank), split->wantBank); + Audio_SoundAllocPoolInit(&gAudioContext.unusedLoadedPool.temporary.pool, + Audio_Alloc(&gAudioContext.temporaryCommonPool, split->wantUnused), split->wantUnused); + Audio_TemporaryPoolClear(&gAudioContext.seqLoadedPool.temporary); + Audio_TemporaryPoolClear(&gAudioContext.bankLoadedPool.temporary); + Audio_TemporaryPoolClear(&gAudioContext.unusedLoadedPool.temporary); } void* Audio_AllocBankOrSeq(s32 poolIdx, s32 size, s32 arg2, s32 id) { @@ -303,16 +303,16 @@ void* Audio_AllocBankOrSeq(s32 poolIdx, s32 size, s32 arg2, s32 id) { switch (poolIdx) { case 0: - loadedPool = &gAudioContext.gSeqLoadedPool; - table = gAudioContext.gSeqLoadStatus; + loadedPool = &gAudioContext.seqLoadedPool; + table = gAudioContext.seqLoadstatus; break; case 1: - loadedPool = &gAudioContext.gBankLoadedPool; - table = gAudioContext.gBankLoadStatus; + loadedPool = &gAudioContext.bankLoadedPool; + table = gAudioContext.bankLoadStatus; break; case 2: - loadedPool = &gAudioContext.gUnusedLoadedPool; - table = gAudioContext.gUnusedLoadStatus; + loadedPool = &gAudioContext.unusedLoadedPool; + table = gAudioContext.audioTableLoadStatus; break; } @@ -329,28 +329,28 @@ void* Audio_AllocBankOrSeq(s32 poolIdx, s32 size, s32 arg2, s32 id) { if (poolIdx == 1) { if (firstVal == 4) { - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - if (gAudioContext.gNotes[i].playbackState.bankId == tp->entries[0].id && - gAudioContext.gNotes[i].noteSubEu.bitField0.s.enabled != 0) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + if (gAudioContext.notes[i].playbackState.bankId == tp->entries[0].id && + gAudioContext.notes[i].noteSubEu.bitField0.s.enabled != 0) { break; } } - if (i == gAudioContext.gMaxSimultaneousNotes) { + if (i == gAudioContext.maxSimultaneousNotes) { Audio_SetBankLoadStatus(tp->entries[0].id, 3); firstVal = 3; } } if (secondVal == 4) { - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - if (gAudioContext.gNotes[i].playbackState.bankId == tp->entries[1].id && - gAudioContext.gNotes[i].noteSubEu.bitField0.s.enabled != 0) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + if (gAudioContext.notes[i].playbackState.bankId == tp->entries[1].id && + gAudioContext.notes[i].noteSubEu.bitField0.s.enabled != 0) { break; } } - if (i == gAudioContext.gMaxSimultaneousNotes) { + if (i == gAudioContext.maxSimultaneousNotes) { Audio_SetBankLoadStatus(tp->entries[1].id, 3); secondVal = 3; } @@ -371,54 +371,54 @@ void* Audio_AllocBankOrSeq(s32 poolIdx, s32 size, s32 arg2, s32 id) { // Check if there is a side which isn't in active use, if so, evict that one. if (poolIdx == 0) { if (firstVal == 2) { - for (i = 0; i < gAudioContext.gAudioBufferParameters.numSequencePlayers; i++) { - if (gAudioContext.gSequencePlayers[i].enabled != 0 && - gAudioContext.gSequencePlayers[i].seqId == tp->entries[0].id) { + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + if (gAudioContext.seqPlayers[i].enabled != 0 && + gAudioContext.seqPlayers[i].seqId == tp->entries[0].id) { break; } } - if (i == gAudioContext.gAudioBufferParameters.numSequencePlayers) { + if (i == gAudioContext.audioBufferParameters.numSequencePlayers) { tp->nextSide = 0; goto done; } } if (secondVal == 2) { - for (i = 0; i < gAudioContext.gAudioBufferParameters.numSequencePlayers; i++) { - if (gAudioContext.gSequencePlayers[i].enabled != 0 && - gAudioContext.gSequencePlayers[i].seqId == tp->entries[1].id) { + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + if (gAudioContext.seqPlayers[i].enabled != 0 && + gAudioContext.seqPlayers[i].seqId == tp->entries[1].id) { break; } } - if (i == gAudioContext.gAudioBufferParameters.numSequencePlayers) { + if (i == gAudioContext.audioBufferParameters.numSequencePlayers) { tp->nextSide = 1; goto done; } } } else if (poolIdx == 1) { if (firstVal == 2) { - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - if (gAudioContext.gNotes[i].playbackState.bankId == tp->entries[0].id && - gAudioContext.gNotes[i].noteSubEu.bitField0.s.enabled != 0) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + if (gAudioContext.notes[i].playbackState.bankId == tp->entries[0].id && + gAudioContext.notes[i].noteSubEu.bitField0.s.enabled != 0) { break; } } - if (i == gAudioContext.gMaxSimultaneousNotes) { + if (i == gAudioContext.maxSimultaneousNotes) { tp->nextSide = 0; goto done; } } if (secondVal == 2) { - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - if (gAudioContext.gNotes[i].playbackState.bankId == tp->entries[1].id && - gAudioContext.gNotes[i].noteSubEu.bitField0.s.enabled != 0) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + if (gAudioContext.notes[i].playbackState.bankId == tp->entries[1].id && + gAudioContext.notes[i].noteSubEu.bitField0.s.enabled != 0) { break; } } - if (i == gAudioContext.gMaxSimultaneousNotes) { + if (i == gAudioContext.maxSimultaneousNotes) { tp->nextSide = 1; goto done; } @@ -565,13 +565,13 @@ void* func_800DF0CC(s32 poolIdx, s32 arg1, s32 bankId) { switch (poolIdx) { case 0: - loadedPool = &gAudioContext.gSeqLoadedPool; + loadedPool = &gAudioContext.seqLoadedPool; break; case 1: - loadedPool = &gAudioContext.gBankLoadedPool; + loadedPool = &gAudioContext.bankLoadedPool; break; case 2: - loadedPool = &gAudioContext.gUnusedLoadedPool; + loadedPool = &gAudioContext.unusedLoadedPool; break; } @@ -673,15 +673,15 @@ void func_800DF7C4(void) { s32 i; s32 j; - if (gAudioContext.gAudioBufferParameters.presetUnk4 == 2) { + if (gAudioContext.audioBufferParameters.presetUnk4 == 2) { count = 2; } else { count = 1; } - for (i = 0; i < gAudioContext.gNumSynthesisReverbs; i++) { + for (i = 0; i < gAudioContext.numSynthesisReverbs; i++) { for (j = 0; j < count; j++) { - func_800DF7BC(&gAudioContext.gSynthesisReverbs[i]); + func_800DF7BC(&gAudioContext.synthesisReverbs[i]); } } } @@ -690,11 +690,11 @@ void func_800DF888(void) { s32 ind; s32 i; - ind = gAudioContext.unk_28A8; - gAudioContext.unk_2974[ind] = gAudioContext.gAudioBufferParameters.minAiBufferLength; + ind = gAudioContext.curAIBufIdx; + gAudioContext.aiBufLengths[ind] = gAudioContext.audioBufferParameters.minAiBufferLength; for (i = 0; i < 0x580; i++) { - gAudioContext.unk_2968[ind][i] = 0; + gAudioContext.aiBuffers[ind][i] = 0; } } @@ -703,80 +703,80 @@ s32 Audio_ResetStep(void) { s32 j; s32 sp24; - if (gAudioContext.gAudioBufferParameters.presetUnk4 == 2) { + if (gAudioContext.audioBufferParameters.presetUnk4 == 2) { sp24 = 2; } else { sp24 = 1; } - switch (gAudioContext.gAudioResetStatus) { + switch (gAudioContext.resetStatus) { case 5: - for (i = 0; i < gAudioContext.gAudioBufferParameters.numSequencePlayers; i++) { - Audio_SequencePlayerDisableAsFinished(&gAudioContext.gSequencePlayers[i]); + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + Audio_SequencePlayerDisableAsFinished(&gAudioContext.seqPlayers[i]); } - gAudioContext.gAudioResetFadeOutFramesLeft = 2 / sp24; - gAudioContext.gAudioResetStatus--; + gAudioContext.audioResetFadeOutFramesLeft = 2 / sp24; + gAudioContext.resetStatus--; break; case 4: - if (gAudioContext.gAudioResetFadeOutFramesLeft != 0) { - gAudioContext.gAudioResetFadeOutFramesLeft--; + if (gAudioContext.audioResetFadeOutFramesLeft != 0) { + gAudioContext.audioResetFadeOutFramesLeft--; func_800DF7C4(); } else { - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - if (gAudioContext.gNotes[i].noteSubEu.bitField0.s.enabled && - gAudioContext.gNotes[i].playbackState.adsr.action.s.state != ADSR_STATE_DISABLED) { - gAudioContext.gNotes[i].playbackState.adsr.fadeOutVel = - gAudioContext.gAudioBufferParameters.updatesPerFrameInv; - gAudioContext.gNotes[i].playbackState.adsr.action.s.release = true; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + if (gAudioContext.notes[i].noteSubEu.bitField0.s.enabled && + gAudioContext.notes[i].playbackState.adsr.action.s.state != ADSR_STATE_DISABLED) { + gAudioContext.notes[i].playbackState.adsr.fadeOutVel = + gAudioContext.audioBufferParameters.updatesPerFrameInv; + gAudioContext.notes[i].playbackState.adsr.action.s.release = true; } } - gAudioContext.gAudioResetFadeOutFramesLeft = 8 / sp24; - gAudioContext.gAudioResetStatus--; + gAudioContext.audioResetFadeOutFramesLeft = 8 / sp24; + gAudioContext.resetStatus--; } break; case 3: - if (gAudioContext.gAudioResetFadeOutFramesLeft != 0) { - gAudioContext.gAudioResetFadeOutFramesLeft--; + if (gAudioContext.audioResetFadeOutFramesLeft != 0) { + gAudioContext.audioResetFadeOutFramesLeft--; func_800DF7C4(); } else { - gAudioContext.gAudioResetFadeOutFramesLeft = 2 / sp24; - gAudioContext.gAudioResetStatus--; + gAudioContext.audioResetFadeOutFramesLeft = 2 / sp24; + gAudioContext.resetStatus--; } break; case 2: func_800DF888(); - if (gAudioContext.gAudioResetFadeOutFramesLeft != 0) { - gAudioContext.gAudioResetFadeOutFramesLeft--; + if (gAudioContext.audioResetFadeOutFramesLeft != 0) { + gAudioContext.audioResetFadeOutFramesLeft--; } else { - gAudioContext.gAudioResetStatus--; + gAudioContext.resetStatus--; func_800E0CBC(); func_800E1148(); } break; case 1: - func_800DFBF8(); - gAudioContext.gAudioResetStatus = 0; + Audio_InitHeap(); + gAudioContext.resetStatus = 0; for (i = 0; i < 3; i++) { - gAudioContext.unk_2974[i] = gAudioContext.gAudioBufferParameters.maxAiBufferLength; + gAudioContext.aiBufLengths[i] = gAudioContext.audioBufferParameters.maxAiBufferLength; for (j = 0; j < 0x580; j++) { - gAudioContext.unk_2968[i][j] = 0; + gAudioContext.aiBuffers[i][j] = 0; } } break; } - if (gAudioContext.gAudioResetStatus < 3) { + if (gAudioContext.resetStatus < 3) { return 0; } return 1; } -void func_800DFBF8(void) { +void Audio_InitHeap(void) { s32 pad1[4]; s16* mem; s32 persistentMem; @@ -787,112 +787,113 @@ void func_800DFBF8(void) { s32 i; s32 j; s32 pad2; - AudioSessionSettings* preset = &gAudioSessionPresets[gAudioContext.gAudioResetPresetIdToLoad]; + AudioSessionSettings* preset = &gAudioSessionPresets[gAudioContext.audioResetPresetIdToLoad]; - gAudioContext.gSampleDmaNumListItems = 0; - gAudioContext.gAudioBufferParameters.frequency = preset->frequency; - gAudioContext.gAudioBufferParameters.aiFrequency = osAiSetFrequency(gAudioContext.gAudioBufferParameters.frequency); - gAudioContext.gAudioBufferParameters.samplesPerFrameTarget = - ((gAudioContext.gAudioBufferParameters.frequency / gAudioContext.gRefreshRate) + 0xF) & 0xFFF0; - gAudioContext.gAudioBufferParameters.minAiBufferLength = - gAudioContext.gAudioBufferParameters.samplesPerFrameTarget - 0x10; - gAudioContext.gAudioBufferParameters.maxAiBufferLength = - gAudioContext.gAudioBufferParameters.samplesPerFrameTarget + 0x10; - gAudioContext.gAudioBufferParameters.updatesPerFrame = - ((gAudioContext.gAudioBufferParameters.samplesPerFrameTarget + 0x10) / 0xD0) + 1; - gAudioContext.gAudioBufferParameters.samplesPerUpdate = - (gAudioContext.gAudioBufferParameters.samplesPerFrameTarget / - gAudioContext.gAudioBufferParameters.updatesPerFrame) & + preset = &gAudioSessionPresets[gAudioContext.audioResetPresetIdToLoad]; + gAudioContext.sampleDmaReqCnt = 0; + gAudioContext.audioBufferParameters.frequency = preset->frequency; + gAudioContext.audioBufferParameters.aiFrequency = osAiSetFrequency(gAudioContext.audioBufferParameters.frequency); + gAudioContext.audioBufferParameters.samplesPerFrameTarget = + ((gAudioContext.audioBufferParameters.frequency / gAudioContext.refreshRate) + 0xF) & 0xFFF0; + gAudioContext.audioBufferParameters.minAiBufferLength = + gAudioContext.audioBufferParameters.samplesPerFrameTarget - 0x10; + gAudioContext.audioBufferParameters.maxAiBufferLength = + gAudioContext.audioBufferParameters.samplesPerFrameTarget + 0x10; + gAudioContext.audioBufferParameters.updatesPerFrame = + ((gAudioContext.audioBufferParameters.samplesPerFrameTarget + 0x10) / 0xD0) + 1; + gAudioContext.audioBufferParameters.samplesPerUpdate = + (gAudioContext.audioBufferParameters.samplesPerFrameTarget / + gAudioContext.audioBufferParameters.updatesPerFrame) & ~7; - gAudioContext.gAudioBufferParameters.samplesPerUpdateMax = - gAudioContext.gAudioBufferParameters.samplesPerUpdate + 8; - gAudioContext.gAudioBufferParameters.samplesPerUpdateMin = - gAudioContext.gAudioBufferParameters.samplesPerUpdate - 8; - gAudioContext.gAudioBufferParameters.resampleRate = 32000.0f / (s32)gAudioContext.gAudioBufferParameters.frequency; - gAudioContext.gAudioBufferParameters.unkUpdatesPerFrameScaled = - (1.0f / 256.0f) / gAudioContext.gAudioBufferParameters.updatesPerFrame; - gAudioContext.gAudioBufferParameters.unk_24 = gAudioContext.gAudioBufferParameters.updatesPerFrame * 0.25f; - gAudioContext.gAudioBufferParameters.updatesPerFrameInv = - 1.0f / gAudioContext.gAudioBufferParameters.updatesPerFrame; + gAudioContext.audioBufferParameters.samplesPerUpdateMax = + gAudioContext.audioBufferParameters.samplesPerUpdate + 8; + gAudioContext.audioBufferParameters.samplesPerUpdateMin = + gAudioContext.audioBufferParameters.samplesPerUpdate - 8; + gAudioContext.audioBufferParameters.resampleRate = 32000.0f / (s32)gAudioContext.audioBufferParameters.frequency; + gAudioContext.audioBufferParameters.unkUpdatesPerFrameScaled = + (1.0f / 256.0f) / gAudioContext.audioBufferParameters.updatesPerFrame; + gAudioContext.audioBufferParameters.unk_24 = gAudioContext.audioBufferParameters.updatesPerFrame * 0.25f; + gAudioContext.audioBufferParameters.updatesPerFrameInv = + 1.0f / gAudioContext.audioBufferParameters.updatesPerFrame; gAudioContext.unk_2874 = preset->unk_10; gAudioContext.unk_2878 = preset->unk_12; - gAudioContext.gMaxSimultaneousNotes = preset->maxSimultaneousNotes; - gAudioContext.gAudioBufferParameters.numSequencePlayers = preset->numSequencePlayers; - if (gAudioContext.gAudioBufferParameters.numSequencePlayers > 4) { - gAudioContext.gAudioBufferParameters.numSequencePlayers = 4; + gAudioContext.maxSimultaneousNotes = preset->maxSimultaneousNotes; + gAudioContext.audioBufferParameters.numSequencePlayers = preset->numSequencePlayers; + if (gAudioContext.audioBufferParameters.numSequencePlayers > 4) { + gAudioContext.audioBufferParameters.numSequencePlayers = 4; } gAudioContext.unk_2 = preset->unk_14; - gAudioContext.gTempoInternalToExternal = (u32)(gAudioContext.gAudioBufferParameters.updatesPerFrame * 2880000.0f / + gAudioContext.tempoInternalToExternal = (u32)(gAudioContext.audioBufferParameters.updatesPerFrame * 2880000.0f / gTatumsPerBeat / gAudioContext.unk_2960); - gAudioContext.unk_2870 = gAudioContext.gRefreshRate; - gAudioContext.unk_2870 *= gAudioContext.gAudioBufferParameters.updatesPerFrame; - gAudioContext.unk_2870 /= gAudioContext.gAudioBufferParameters.aiFrequency; - gAudioContext.unk_2870 /= gAudioContext.gTempoInternalToExternal; + gAudioContext.unk_2870 = gAudioContext.refreshRate; + gAudioContext.unk_2870 *= gAudioContext.audioBufferParameters.updatesPerFrame; + gAudioContext.unk_2870 /= gAudioContext.audioBufferParameters.aiFrequency; + gAudioContext.unk_2870 /= gAudioContext.tempoInternalToExternal; - gAudioContext.gAudioBufferParameters.presetUnk4 = preset->unk_04; - gAudioContext.gAudioBufferParameters.samplesPerFrameTarget *= gAudioContext.gAudioBufferParameters.presetUnk4; - gAudioContext.gAudioBufferParameters.maxAiBufferLength *= gAudioContext.gAudioBufferParameters.presetUnk4; - gAudioContext.gAudioBufferParameters.minAiBufferLength *= gAudioContext.gAudioBufferParameters.presetUnk4; - gAudioContext.gAudioBufferParameters.updatesPerFrame *= gAudioContext.gAudioBufferParameters.presetUnk4; + gAudioContext.audioBufferParameters.presetUnk4 = preset->unk_04; + gAudioContext.audioBufferParameters.samplesPerFrameTarget *= gAudioContext.audioBufferParameters.presetUnk4; + gAudioContext.audioBufferParameters.maxAiBufferLength *= gAudioContext.audioBufferParameters.presetUnk4; + gAudioContext.audioBufferParameters.minAiBufferLength *= gAudioContext.audioBufferParameters.presetUnk4; + gAudioContext.audioBufferParameters.updatesPerFrame *= gAudioContext.audioBufferParameters.presetUnk4; - if (gAudioContext.gAudioBufferParameters.presetUnk4 >= 2) { - gAudioContext.gAudioBufferParameters.maxAiBufferLength -= 0x10; + if (gAudioContext.audioBufferParameters.presetUnk4 >= 2) { + gAudioContext.audioBufferParameters.maxAiBufferLength -= 0x10; } - gAudioContext.gMaxAudioCmds = - gAudioContext.gMaxSimultaneousNotes * 0x10 * gAudioContext.gAudioBufferParameters.updatesPerFrame + + gAudioContext.maxAudioCmds = + gAudioContext.maxSimultaneousNotes * 0x10 * gAudioContext.audioBufferParameters.updatesPerFrame + preset->numReverbs * 0x18 + 0x140; persistentMem = preset->persistentSeqMem + preset->persistentBankMem + preset->persistentUnusedMem + 0x10; temporaryMem = preset->temporarySeqMem + preset->temporaryBankMem + preset->temporaryUnusedMem + 0x10; totalMem = persistentMem + temporaryMem; - wantMisc = gAudioContext.gAudioSessionPool.size - totalMem - 0x100; + wantMisc = gAudioContext.audioSessionPool.size - totalMem - 0x100; - if (gAudioContext.gUnkPool.start != NULL) { - gAudioContext.gUnkPool.cur = gAudioContext.gUnkPool.start; + if (gAudioContext.unkPool.start != NULL) { + gAudioContext.unkPool.cur = gAudioContext.unkPool.start; } - gAudioContext.sSessionPoolSplit.wantSeq = wantMisc; - gAudioContext.sSessionPoolSplit.wantCustom = totalMem; - Audio_SessionPoolsInit(&gAudioContext.sSessionPoolSplit); - gAudioContext.sSeqAndBankPoolSplit.wantPersistent = persistentMem; - gAudioContext.sSeqAndBankPoolSplit.wantTemporary = temporaryMem; - Audio_SeqAndBankPoolInit(&gAudioContext.sSeqAndBankPoolSplit); - gAudioContext.sPersistentCommonPoolSplit.wantSeq = preset->persistentSeqMem; - gAudioContext.sPersistentCommonPoolSplit.wantBank = preset->persistentBankMem; - gAudioContext.sPersistentCommonPoolSplit.wantUnused = preset->persistentUnusedMem; - Audio_PersistentPoolsInit(&gAudioContext.sPersistentCommonPoolSplit); - gAudioContext.sTemporaryCommonPoolSplit.wantSeq = preset->temporarySeqMem; - gAudioContext.sTemporaryCommonPoolSplit.wantBank = preset->temporaryBankMem; - gAudioContext.sTemporaryCommonPoolSplit.wantUnused = preset->temporaryUnusedMem; - Audio_TemporaryPoolsInit(&gAudioContext.sTemporaryCommonPoolSplit); + gAudioContext.sessionPoolSplit.wantSeq = wantMisc; + gAudioContext.sessionPoolSplit.wantCustom = totalMem; + Audio_SessionPoolsInit(&gAudioContext.sessionPoolSplit); + gAudioContext.seqAndBankPoolSplit.wantPersistent = persistentMem; + gAudioContext.seqAndBankPoolSplit.wantTemporary = temporaryMem; + Audio_SeqAndBankPoolInit(&gAudioContext.seqAndBankPoolSplit); + gAudioContext.persistentCommonPoolSplit.wantSeq = preset->persistentSeqMem; + gAudioContext.persistentCommonPoolSplit.wantBank = preset->persistentBankMem; + gAudioContext.persistentCommonPoolSplit.wantUnused = preset->persistentUnusedMem; + Audio_PersistentPoolsInit(&gAudioContext.persistentCommonPoolSplit); + gAudioContext.temporaryCommonPoolSplit.wantSeq = preset->temporarySeqMem; + gAudioContext.temporaryCommonPoolSplit.wantBank = preset->temporaryBankMem; + gAudioContext.temporaryCommonPoolSplit.wantUnused = preset->temporaryUnusedMem; + Audio_TemporaryPoolsInit(&gAudioContext.temporaryCommonPoolSplit); Audio_ResetLoadStatus(); - gAudioContext.gNotes = - Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, gAudioContext.gMaxSimultaneousNotes * sizeof(Note)); + gAudioContext.notes = + Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, gAudioContext.maxSimultaneousNotes * sizeof(Note)); Audio_NoteInitAll(); Audio_InitNoteFreeList(); - gAudioContext.gNoteSubsEu = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, - gAudioContext.gAudioBufferParameters.updatesPerFrame * - gAudioContext.gMaxSimultaneousNotes * sizeof(NoteSubEu)); + gAudioContext.noteSubsEu = Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, + gAudioContext.audioBufferParameters.updatesPerFrame * + gAudioContext.maxSimultaneousNotes * sizeof(NoteSubEu)); for (i = 0; i != 2; i++) { - gAudioContext.gAudioCmdBuffers[i] = - Audio_AllocDmaMemoryZeroed(&gAudioContext.gNotesAndBuffersPool, gAudioContext.gMaxAudioCmds * sizeof(u64)); + gAudioContext.abiCmdBufs[i] = + Audio_AllocDmaMemoryZeroed(&gAudioContext.notesAndBuffersPool, gAudioContext.maxAudioCmds * sizeof(u64)); } - gAudioContext.unk_3520 = Audio_Alloc(&gAudioContext.gNotesAndBuffersPool, 0x100 * sizeof(f32)); + gAudioContext.unk_3520 = Audio_Alloc(&gAudioContext.notesAndBuffersPool, 0x100 * sizeof(f32)); func_800DDE3C(); for (i = 0; i < 4; i++) { - gAudioContext.gSynthesisReverbs[i].useReverb = 0; + gAudioContext.synthesisReverbs[i].useReverb = 0; } - gAudioContext.gNumSynthesisReverbs = preset->numReverbs; - for (i = 0; i < gAudioContext.gNumSynthesisReverbs; i++) { + gAudioContext.numSynthesisReverbs = preset->numReverbs; + for (i = 0; i < gAudioContext.numSynthesisReverbs; i++) { ReverbSettings* settings = &preset->reverbSettings[i]; - SynthesisReverb* reverb = &gAudioContext.gSynthesisReverbs[i]; + SynthesisReverb* reverb = &gAudioContext.synthesisReverbs[i]; reverb->downsampleRate = settings->downsampleRate; reverb->windowSize = settings->windowSize * 64; reverb->windowSize /= reverb->downsampleRate; @@ -906,52 +907,52 @@ void func_800DFBF8(void) { reverb->unk_05 = settings->unk_10; reverb->unk_08 = settings->unk_12; reverb->useReverb = 8; - reverb->unk_28 = func_800DE258(&gAudioContext.gNotesAndBuffersPool, reverb->windowSize * sizeof(s16)); - reverb->unk_2C = func_800DE258(&gAudioContext.gNotesAndBuffersPool, reverb->windowSize * sizeof(s16)); - reverb->unk_1C = 0; + reverb->leftRingBuf = func_800DE258(&gAudioContext.notesAndBuffersPool, reverb->windowSize * sizeof(s16)); + reverb->rightRingBuf = func_800DE258(&gAudioContext.notesAndBuffersPool, reverb->windowSize * sizeof(s16)); + reverb->nextRingBufPos = 0; reverb->unk_20 = 0; - reverb->unk_03 = 0; - reverb->unk_24 = reverb->windowSize; - reverb->unk_02 = 2; - reverb->unk_00 = 1; + reverb->curFrame = 0; + reverb->bufSizePerChan = reverb->windowSize; + reverb->framesToIgnore = 2; + reverb->resampleFlags = 1; reverb->sound.sample = &reverb->sample; reverb->sample.loop = &reverb->loop; reverb->sound.tuning = 1.0f; reverb->sample.bits4 = 4; reverb->sample.bits2 = 0; - reverb->sample.bits24 = reverb->windowSize * 2; - reverb->sample.sampleAddr = (u8*)reverb->unk_28; + reverb->sample.size = reverb->windowSize * 2; + reverb->sample.sampleAddr = (u8*)reverb->leftRingBuf; reverb->loop.start = 0; reverb->loop.count = 1; reverb->loop.end = reverb->windowSize; if (reverb->downsampleRate != 1) { reverb->unk_0E = 0x8000 / reverb->downsampleRate; - reverb->unk_30 = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, 0x20); - reverb->unk_34 = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, 0x20); - reverb->unk_38 = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, 0x20); - reverb->unk_3C = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, 0x20); - for (j = 0; j < gAudioContext.gAudioBufferParameters.updatesPerFrame; j++) { - mem = func_800DE258(&gAudioContext.gNotesAndBuffersPool, 0x340); + reverb->unk_30 = Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, 0x20); + reverb->unk_34 = Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, 0x20); + reverb->unk_38 = Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, 0x20); + reverb->unk_3C = Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, 0x20); + for (j = 0; j < gAudioContext.audioBufferParameters.updatesPerFrame; j++) { + mem = func_800DE258(&gAudioContext.notesAndBuffersPool, 0x340); reverb->items[0][j].toDownsampleLeft = mem; reverb->items[0][j].toDownsampleRight = mem + 0x1A0 / sizeof(s16); - mem = func_800DE258(&gAudioContext.gNotesAndBuffersPool, 0x340); + mem = func_800DE258(&gAudioContext.notesAndBuffersPool, 0x340); reverb->items[1][j].toDownsampleLeft = mem; reverb->items[1][j].toDownsampleRight = mem + 0x1A0 / sizeof(s16); } } if (settings->unk_14 != 0) { - reverb->unk_278 = Audio_AllocDmaMemoryZeroed(&gAudioContext.gNotesAndBuffersPool, 0x40); - reverb->unk_270 = Audio_AllocDmaMemory(&gAudioContext.gNotesAndBuffersPool, 8 * sizeof(s16)); + reverb->unk_278 = Audio_AllocDmaMemoryZeroed(&gAudioContext.notesAndBuffersPool, 0x40); + reverb->unk_270 = Audio_AllocDmaMemory(&gAudioContext.notesAndBuffersPool, 8 * sizeof(s16)); func_800DF5DC(reverb->unk_270, settings->unk_14); } else { reverb->unk_270 = NULL; } if (settings->unk_16 != 0) { - reverb->unk_27C = Audio_AllocDmaMemoryZeroed(&gAudioContext.gNotesAndBuffersPool, 0x40); - reverb->unk_274 = Audio_AllocDmaMemory(&gAudioContext.gNotesAndBuffersPool, 8 * sizeof(s16)); + reverb->unk_27C = Audio_AllocDmaMemoryZeroed(&gAudioContext.notesAndBuffersPool, 0x40); + reverb->unk_274 = Audio_AllocDmaMemory(&gAudioContext.notesAndBuffersPool, 8 * sizeof(s16)); func_800DF5DC(reverb->unk_274, settings->unk_16); } else { reverb->unk_274 = NULL; @@ -959,17 +960,17 @@ void func_800DFBF8(void) { } Audio_InitSequencePlayers(); - for (j = 0; j < gAudioContext.gAudioBufferParameters.numSequencePlayers; j++) { + for (j = 0; j < gAudioContext.audioBufferParameters.numSequencePlayers; j++) { func_800EC734(j); - Audio_ResetSequencePlayer(&gAudioContext.gSequencePlayers[j]); + Audio_ResetSequencePlayer(&gAudioContext.seqPlayers[j]); } func_800E0634(preset->unk_30, preset->unk_34); - func_800E1618(gAudioContext.gMaxSimultaneousNotes); + func_800E1618(gAudioContext.maxSimultaneousNotes); gAudioContext.unk_176C = 0; - func_800E3400(); + Audio_SyncLoadsInit(); func_800E4FB0(); - func_800E3A14(); + Audio_AsyncLoadReqInit(); gAudioContext.unk_4 = 0x1000; func_800E4D94(); intMask = osSetIntMask(1); @@ -1027,13 +1028,13 @@ void* func_800E05C4(u32 size, s32 arg1, void* arg2, s8 arg3, s32 arg4) { void func_800E0634(u32 arg0, u32 arg1) { void* mem; - mem = func_800DE2B0(&gAudioContext.gNotesAndBuffersPool, arg0); + mem = func_800DE2B0(&gAudioContext.notesAndBuffersPool, arg0); if (mem == NULL) { gAudioContext.unk_2EE0.pool.size = 0; } else { Audio_SoundAllocPoolInit(&gAudioContext.unk_2EE0.pool, mem, arg0); } - mem = func_800DE2B0(&gAudioContext.gNotesAndBuffersPool, arg1); + mem = func_800DE2B0(&gAudioContext.notesAndBuffersPool, arg1); if (mem == NULL) { gAudioContext.unk_3174.pool.size = 0; } else { @@ -1073,10 +1074,10 @@ UnkHeapEntry* func_800E06CC(u32 size) { index = -1; for (i = 0; i < gAudioContext.unk_176C; i++) { - thing = &gAudioContext.unk_0D68[i]; + thing = &gAudioContext.unk_0D54[i + 1]; if (thing->unk_10 == 0) { start = thing->unk_08; - end = thing->unk_08 + thing->sample->bits24 - 1; + end = thing->unk_08 + thing->sample->size - 1; if (end < allocBefore && start < allocBefore) { continue; @@ -1131,7 +1132,7 @@ void func_800E0964(UnkHeapEntry* entry, s32 bankId) { s32 drumId; s32 sfxId; - for (instId = 0; instId < gAudioContext.gCtlEntries[bankId].numInstruments; instId++) { + for (instId = 0; instId < gAudioContext.ctlEntries[bankId].numInstruments; instId++) { inst = Audio_GetInstrumentInner(bankId, instId); if (inst != NULL) { if (inst->normalRangeLo != 0) { @@ -1144,14 +1145,14 @@ void func_800E0964(UnkHeapEntry* entry, s32 bankId) { } } - for (drumId = 0; drumId < gAudioContext.gCtlEntries[bankId].numDrums; drumId++) { + for (drumId = 0; drumId < gAudioContext.ctlEntries[bankId].numDrums; drumId++) { drum = Audio_GetDrum(bankId, drumId); if (drum != NULL) { func_800E0BB4(entry, drum->sound.sample); } } - for (sfxId = 0; sfxId < gAudioContext.gCtlEntries[bankId].numSfx; sfxId++) { + for (sfxId = 0; sfxId < gAudioContext.ctlEntries[bankId].numSfx; sfxId++) { sfx = Audio_GetSfx(bankId, sfxId); if (sfx != NULL) { func_800E0BB4(entry, sfx->sample); @@ -1165,10 +1166,10 @@ void func_800E0AD8(UnkHeapEntry* entry) { s32 unk3; s32 bankId; - numBanks = *gAudioContext.unk_2834; + numBanks = gAudioContext.audioBankTable->header.entryCnt; for (bankId = 0; bankId < numBanks; bankId++) { - unk2 = gAudioContext.gCtlEntries[bankId].unk_02; - unk3 = gAudioContext.gCtlEntries[bankId].unk_03; + unk2 = gAudioContext.ctlEntries[bankId].unk_02; + unk3 = gAudioContext.ctlEntries[bankId].unk_03; if (((unk2 != 0xFF) && (entry->unk_02 == unk2)) || ((unk3 != 0xFF) && (entry->unk_02 == unk3)) || entry->unk_02 == 0) { if (func_800DF074(1, 2, bankId) != NULL) { @@ -1220,10 +1221,10 @@ void func_800E0CBC(void) { s32 bankId; s32 j; - numBanks = *gAudioContext.unk_2834; + numBanks = gAudioContext.audioBankTable->header.entryCnt; for (bankId = 0; bankId < numBanks; bankId++) { - unk2 = gAudioContext.gCtlEntries[bankId].unk_02; - unk3 = gAudioContext.gCtlEntries[bankId].unk_03; + unk2 = gAudioContext.ctlEntries[bankId].unk_02; + unk3 = gAudioContext.ctlEntries[bankId].unk_03; if ((unk2 == 0xFF) && (unk3 == 0xFF)) { continue; } @@ -1268,8 +1269,8 @@ void func_800E0E90(s32 id) { } void func_800E0EB4(s32 arg0, s32 id) { - ManyStruct_800E0E0C_2* manyThing; - Struct_800E0E0C_2* thing; + AudioTable* audioTable; + AudioTableEntry* thing; s32 numBanks; s32 instId; s32 drumId; @@ -1284,19 +1285,19 @@ void func_800E0EB4(s32 arg0, s32 id) { u8** fakematch; s32 pad[4]; - manyThing = gAudioContext.unk_2838; - numBanks = *gAudioContext.unk_2834; + audioTable = gAudioContext.audioTable; + numBanks = gAudioContext.audioBankTable->header.entryCnt; sp78.unk_0 = func_800DF074(2, 2, id); if (sp78.unk_0 == NULL) { return; } - thing = &manyThing->unk_C[id]; - sp78.unk_8 = thing->unk_8; - sp78.unk_C = thing->unk_C; + thing = &audioTable->entries[id]; + sp78.unk_8 = thing->size; + sp78.unk_C = thing->unk_08; if ((sp78.unk_C == 2) || (sp78.unk_C == 3)) { - sp78.unk_4 = thing->unk_4; + sp78.unk_4 = thing->romAddr; } else { sp78.unk_4 = NULL; } @@ -1310,8 +1311,8 @@ void func_800E0EB4(s32 arg0, s32 id) { } for (bankId = 0; bankId < numBanks; bankId++) { - unk2 = gAudioContext.gCtlEntries[bankId].unk_02; - unk3 = gAudioContext.gCtlEntries[bankId].unk_03; + unk2 = gAudioContext.ctlEntries[bankId].unk_02; + unk3 = gAudioContext.ctlEntries[bankId].unk_03; if ((unk2 != 0xFF) || (unk3 != 0xFF)) { if (!Audio_IsBankLoadComplete(bankId) || func_800DF074(1, 2, bankId) == NULL) { continue; @@ -1323,7 +1324,7 @@ void func_800E0EB4(s32 arg0, s32 id) { continue; } - for (instId = 0; instId < gAudioContext.gCtlEntries[bankId].numInstruments; instId++) { + for (instId = 0; instId < gAudioContext.ctlEntries[bankId].numInstruments; instId++) { inst = Audio_GetInstrumentInner(bankId, instId); if (inst != NULL) { if (inst->normalRangeLo != 0) { @@ -1336,14 +1337,14 @@ void func_800E0EB4(s32 arg0, s32 id) { } } - for (drumId = 0; drumId < gAudioContext.gCtlEntries[bankId].numDrums; drumId++) { + for (drumId = 0; drumId < gAudioContext.ctlEntries[bankId].numDrums; drumId++) { drum = Audio_GetDrum(bankId, drumId); if (drum != NULL) { func_800E0E0C(&sp78, drum->sound.sample); } } - for (sfxId = 0; sfxId < gAudioContext.gCtlEntries[bankId].numSfx; sfxId++) { + for (sfxId = 0; sfxId < gAudioContext.ctlEntries[bankId].numSfx; sfxId++) { sfx = Audio_GetSfx(bankId, sfxId); if (sfx != NULL) { func_800E0E0C(&sp78, sfx->sample); @@ -1359,7 +1360,7 @@ void func_800E1148(void) { TemporaryPool* temporary; u32 i; - pool = &gAudioContext.gUnusedLoadedPool; + pool = &gAudioContext.unusedLoadedPool; temporary = &pool->temporary; if (temporary->entries[0].id != -1) { diff --git a/src/code/audio_load.c b/src/code/audio_load.c new file mode 100644 index 0000000000..3d6da12c92 --- /dev/null +++ b/src/code/audio_load.c @@ -0,0 +1,1652 @@ +#include "ultra64.h" +#include "global.h" + +typedef enum { LOAD_STATUS_WAITING, LOAD_STATUS_START, LOAD_STATUS_LOADING, LOAD_STATUS_DONE } SyncLoadStatus; + +#define RELOC(v, base) (reloc = (void*)((u32)v + (u32)base)) + +/* forward declarations */ +s32 func_800E217C(s32 playerIdx, s32, s32); +unk_ldr* func_800E2454(u32 arg0); +AudioBankSample* Audio_GetBankSample(s32 bankId, s32 sfxId); +void Audio_ProcessAsyncLoads(s32 arg0); +void Audio_HandleAsyncMsg(AsyncLoadReq* arg0, s32 arg1); +void Audio_UpdateAsyncReq(AsyncLoadReq* arg0, s32 arg1); +void func_800E4198(s32, unk_ldr*, RelocInfo*, s32); +void Audio_SampleReloc(AudioBankSound* sound, u32, RelocInfo*); +void func_800E202C(s32 arg0); +u32 func_800E2338(u32 arg0, u32* arg1, s32 arg2); +u8* func_800E2558(u32 tableType, u32 bankId, s32* didAllocate); +u32 Audio_GetTableIndex(s32 tableType, u32 tableIdx); +void* func_800E27A4(s32 tableType, s32 id); +void* Audio_GetLoadTable(s32 tableType); +void Audio_DMAFastCopy(u32 devAddr, u8* addr, u32 size, s32 handleType); +void func_800E2BCC(u32 devAddr, u8* addr, u32 size, s32 handleType); +s32 Audio_DMA(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, OSMesgQueue* reqQueue, + s32 handleType, const char* dmaFuncType); +void* Audio_AsyncLoadInner(s32 tableType, s32 arg1, s32 arg2, s32 arg3, OSMesgQueue* retQueue); +AsyncLoadReq* func_800E3A44(s32 arg0, s32 devAddr, void* ramAddr, s32 size, s32 arg4, s32 nChunks, + OSMesgQueue* retQueue, s32 retMsg); +AsyncLoadReq* Audio_InitAsyncReq(s32 devAddr, void* ramAddr, s32 size, s32 arg3, s32 nChunks, OSMesgQueue* retQueue, + s32 retMsg); +void func_800E3FB4(AsyncLoadReq* req, u32 size); +void func_800E4044(u32 devAddr, void* ramAddr, u32 size, s16 arg3); +u8* func_800E22C4(s32 seqId); +s32 func_800E4590(s32 resetStatus); +void func_800E3874(AudioSyncLoad* arg0, s32 size); +void Audio_ProcessSyncLoads(s32 resetStatus); +void func_800E38F8(s32 arg0, s32 arg1, s32 arg2, s32 arg3); + +OSMesgQueue D_8016B6E0; +u8 D_8016B6F8[0x40]; +u8* D_8016B738[0x12]; +u32 D_8016B780[8]; + +void func_800E11F0(void) { + s32 i; + + for (i = 0; i < gAudioContext.unk_2624; i++) { + SampleDmaReq* req = &gAudioContext.sampleDmaReqs[i]; + if (req->unk_0E != 0) { + req->unk_0E--; + if ((req->unk_0E) == 0) { + req->unk_0D = gAudioContext.unk_282E; + gAudioContext.unk_262C[gAudioContext.unk_282E] = i; + gAudioContext.unk_282E++; + } + } + } + + for (i = gAudioContext.unk_2624; i < gAudioContext.sampleDmaReqCnt; i++) { + SampleDmaReq* req = &gAudioContext.sampleDmaReqs[i]; + if (req->unk_0E != 0) { + req->unk_0E--; + if (req->unk_0E == 0) { + req->unk_0D = gAudioContext.unk_282F; + gAudioContext.unk_272C[gAudioContext.unk_282F] = i; + gAudioContext.unk_282F++; + } + } + } + + gAudioContext.unk_2628 = 0; +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_800E12DC.s") + +#ifdef NON_MATCHING +void func_800E1618(s32 arg0) { + SampleDmaReq* temp_s0; + s32 i; + s32 t2; + + gAudioContext.unk_288C = gAudioContext.unk_2874; + gAudioContext.sampleDmaReqs = + Audio_Alloc(&gAudioContext.notesAndBuffersPool, + (gAudioContext.maxSimultaneousNotes * 0x40) * gAudioContext.audioBufferParameters.presetUnk4); + t2 = gAudioContext.maxSimultaneousNotes * 3 * gAudioContext.audioBufferParameters.presetUnk4; + for (i = 0; i < t2; i++) { + SampleDmaReq* temp_s0 = &gAudioContext.sampleDmaReqs[gAudioContext.sampleDmaReqCnt]; + temp_s0->ramAddr = func_800DE2B0(&gAudioContext.notesAndBuffersPool, gAudioContext.unk_288C); + if (temp_s0->ramAddr == NULL) { + break; + } else { + func_800DE238(temp_s0->ramAddr, gAudioContext.unk_288C); + temp_s0->size = gAudioContext.unk_288C; + temp_s0->devAddr = 0; + temp_s0->unk_08 = 0; + temp_s0->unk_0C = 0; + temp_s0->unk_0E = 0; + gAudioContext.sampleDmaReqCnt++; + } + } + + for (i = 0; i < gAudioContext.sampleDmaReqCnt; i++) { + gAudioContext.unk_262C[i] = i; + gAudioContext.sampleDmaReqs[i].unk_0D = i; + } + + for (i = gAudioContext.sampleDmaReqCnt; i < 0x100; i++) { + gAudioContext.unk_262C[i] = 0; + } + + gAudioContext.unk_282C = 0; + gAudioContext.unk_282E = gAudioContext.sampleDmaReqCnt; + gAudioContext.unk_2624 = gAudioContext.sampleDmaReqCnt; + gAudioContext.unk_288C = gAudioContext.unk_2878; + + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + SampleDmaReq* temp_s0 = &gAudioContext.sampleDmaReqs[gAudioContext.sampleDmaReqCnt]; + temp_s0->ramAddr = func_800DE2B0(&gAudioContext.notesAndBuffersPool, gAudioContext.unk_288C); + if (temp_s0->ramAddr == NULL) { + break; + } else { + func_800DE238(temp_s0->ramAddr, gAudioContext.unk_288C); + temp_s0->size = gAudioContext.unk_288C; + temp_s0->devAddr = 0U; + temp_s0->unk_08 = 0; + temp_s0->unk_0C = 0; + temp_s0->unk_0E = 0; + gAudioContext.sampleDmaReqCnt++; + } + } + + for (i = gAudioContext.unk_2624; i < gAudioContext.sampleDmaReqCnt; i++) { + SampleDmaReq* temp_s0 = &gAudioContext.sampleDmaReqs[i + gAudioContext.unk_2624]; + gAudioContext.unk_272C[i - gAudioContext.unk_2624] = gAudioContext.unk_2624; + temp_s0->unk_0D = i - gAudioContext.unk_2624; + } + + for (i = gAudioContext.sampleDmaReqCnt; i < 0x100; i++) { + gAudioContext.unk_272C[i] = gAudioContext.unk_2624; + } + + gAudioContext.unk_282D = 0; + gAudioContext.unk_282F = gAudioContext.sampleDmaReqCnt - gAudioContext.unk_2624; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_800E1618.s") +#endif + +s32 Audio_IsBankLoadComplete(s32 bankId) { + if (bankId == 0xFF) { + return true; + } else if (gAudioContext.bankLoadStatus[bankId] >= 2) { + return true; + } else if (gAudioContext.bankLoadStatus[Audio_GetTableIndex(BANK_TABLE, bankId)] >= 2) { + return true; + } else { + return false; + } +} + +s32 Audio_IsSeqLoadComplete(s32 seqId) { + if (seqId == 0xFF) { + return 1; + } else if (gAudioContext.seqLoadstatus[seqId] >= 2) { + return 1; + } else if (gAudioContext.seqLoadstatus[Audio_GetTableIndex(SEQUENCE_TABLE, seqId)] >= 2) { + return true; + } else { + return false; + } +} + +s32 Audio_IsAudTabLoadComplete(s32 tabId) { + if (tabId == 0xFF) { + return true; + } else if (gAudioContext.audioTableLoadStatus[tabId] >= 2) { + return true; + } else if (gAudioContext.audioTableLoadStatus[Audio_GetTableIndex(AUDIO_TABLE, tabId)] >= 2) { + return true; + } else { + return false; + } +} + +void Audio_SetBankLoadStatus(s32 bankId, s32 status) { + if ((bankId != 0xFF) && (gAudioContext.bankLoadStatus[bankId] != 5)) { + gAudioContext.bankLoadStatus[bankId] = status; + } +} + +void Audio_SetSeqLoadStatus(s32 seqId, s32 status) { + if ((seqId != 0xFF) && (gAudioContext.seqLoadstatus[seqId] != 5)) { + gAudioContext.seqLoadstatus[seqId] = status; + } +} + +void func_800E1A78(s32 arg0, s32 arg1) { + if (arg0 != 0xFF) { + if (gAudioContext.audioTableLoadStatus[arg0] != 5) { + gAudioContext.audioTableLoadStatus[arg0] = arg1; + } + + if ((gAudioContext.audioTableLoadStatus[arg0] == 5) || (gAudioContext.audioTableLoadStatus[arg0] == 2)) { + func_800E0E90(arg0); + } + } +} + +void Aduio_SetAudtabLoadstatus(s32 tabId, s32 status) { + if ((tabId != 0xFF) && (gAudioContext.audioTableLoadStatus[tabId] != 5)) { + gAudioContext.audioTableLoadStatus[tabId] = status; + } +} + +void Audio_InitAudioTable(AudioTable* table, u32 romAddr, u16 arg2) { + s32 i; + + table->header.unk_02 = arg2; + table->header.romAddr = romAddr; + + for (i = 0; i < table->header.entryCnt; i++) { + if ((table->entries[i].size != 0) && (table->entries[i].unk_08 == 2)) { + table->entries[i].romAddr += romAddr; + } + } +} + +unk_ldr* func_800E1B68(s32 arg0, u32* arg1) { + char pad[0x8]; + s32 phi_s0; + unk_ldr* sp28; + s32 phi_s1; + s32 phi_s2; + s32 i; + + if (arg0 >= gAudioContext.seqTabEntCnt) { + return 0; + } + + phi_s2 = 0xFF; + phi_s0 = gAudioContext.unk_283C[arg0]; // ofset into unk_283C for cnt? + phi_s1 = *(phi_s0 + gAudioContext.unk_283Cb); + phi_s0++; + + while (phi_s1 > 0) { + phi_s2 = gAudioContext.unk_283Cb[phi_s0++]; + sp28 = func_800E2454(phi_s2); + phi_s1--; + } + + *arg1 = phi_s2; + return sp28; +} + +void func_800E1C18(s32 channelIdx, s32 arg1) { + s32 pad; + u32 sp18; + + if (channelIdx < gAudioContext.seqTabEntCnt) { + if (arg1 & 2) { + func_800E1B68(channelIdx, &sp18); + } + if (arg1 & 1) { + func_800E22C4(channelIdx); + } + } +} + +s32 func_800E1C78(AudioBankSample* sample, s32 arg1) { + void* sampleAddr; + + if (sample->unk_bits25 == 1) { + if (sample->bits2 != 0) { + sampleAddr = func_800E05C4(sample->size, arg1, (void*)sample->sampleAddr, sample->bits2, 1); + if (sampleAddr == NULL) { + return -1; + } + + if (sample->bits2 == 1) { + func_800E2BCC(sample->sampleAddr, sampleAddr, sample->size, gAudioContext.audioTable->header.unk_02); + } else { + Audio_DMAFastCopy(sample->sampleAddr, sampleAddr, sample->size, sample->bits2); + } + sample->bits2 = 0; + sample->sampleAddr = sampleAddr; + } + } +} + +s32 func_800E1D64(s32 arg0, s32 arg1, s32 arg2) { + if (arg1 < 0x7F) { + Instrument* instrument = Audio_GetInstrumentInner(arg0, arg1); + + if (instrument == NULL) { + return -1; + } + if (instrument->normalRangeLo != 0) { + func_800E1C78(instrument->lowNotesSound.sample, arg0); + } + func_800E1C78(instrument->normalNotesSound.sample, arg0); + if (instrument->normalRangeHi != 0x7F) { + func_800E1C78(instrument->highNotesSound.sample, arg0); + return; + } + } else if (arg1 == 0x7F) { + Drum* drum = Audio_GetDrum(arg0, arg2); + + if (drum == 0) { + return -1; + } + func_800E1C78(drum->sound.sample, arg0); + return 0; + } +} + +void Audio_AsyncLoad(s32 arg0, s32 arg1, s32 arg2, s32 arg3, OSMesgQueue* queue) { + if (Audio_AsyncLoadInner(arg0, arg1, arg2, arg3, queue) == NULL) { + osSendMesg(queue, -1, OS_MESG_NOBLOCK); + } +} + +void Audio_AudioSeqAsyncLoad(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue* queue) { + Audio_AsyncLoad(SEQUENCE_TABLE, arg0, 0, arg2, queue); +} + +void Audio_AudioTableAsyncLoad(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue* queue) { + Audio_AsyncLoad(AUDIO_TABLE, arg0, 0, arg2, queue); +} + +void Audio_AudioBankAsyncLoad(s32 arg0, s32 arg1, s32 arg2, OSMesgQueue* queue) { + Audio_AsyncLoad(BANK_TABLE, arg0, 0, arg2, queue); +} + +u8* func_800E1F38(s32 arg0, u32* arg1) { + s32 temp_v1; + + temp_v1 = gAudioContext.unk_283C[arg0]; + + *arg1 = *(temp_v1 + gAudioContext.unk_283Cb); + temp_v1++; + if (*arg1 == 0) { + return NULL; + } + return &gAudioContext.unk_283Cb[temp_v1]; +} + +void func_800E1F7C(s32 arg0) { + s32 temp_s0; + s32 phi_s1; + s32 phi_s2; + + phi_s1 = gAudioContext.unk_283C[arg0]; + phi_s2 = *(phi_s1 + gAudioContext.unk_283Cb); + phi_s1++; + + while (phi_s2 > 0) { + phi_s2--; + temp_s0 = Audio_GetTableIndex(1, gAudioContext.unk_283Cb[phi_s1++]); + if (func_800E04E8(1, temp_s0) == NULL) { + func_800E202C(temp_s0); + Audio_SetBankLoadStatus(temp_s0, 0); + } + } +} + +void func_800E202C(s32 arg0) { + s32 i; + SoundMultiPool* pool = &gAudioContext.bankLoadedPool; + PersistentPool* persistent; + + if (arg0 == pool->temporary.entries[0].id) { + pool->temporary.entries[0].id = -1; + } else if (arg0 == pool->temporary.entries[1].id) { + pool->temporary.entries[1].id = -1; + } + + persistent = &pool->persistent; + for (i = 0; i < persistent->numEntries; i++) { + if (arg0 == persistent->entries[i].id) { + persistent->entries[i].id = -1; + } + } + + Audio_DiscardBank(arg0); +} + +s32 func_800E20D4(s32 playerIdx, s32 seqId, s32 arg2) { + if (gAudioContext.resetTimer != 0) { + return 0; + } else { + gAudioContext.seqPlayers[playerIdx].unk_DC = 0; + return func_800E217C(playerIdx, seqId, arg2); + } +} + +s32 func_800E2124(s32 playerIdx, s32 seqId, s32 arg2) { + if (gAudioContext.resetTimer != 0) { + return 0; + } + + gAudioContext.seqPlayers[playerIdx].unk_DC = arg2; + return func_800E217C(playerIdx, seqId, 0); +} + +// InitSeqPlayer +s32 func_800E217C(s32 playerIdx, s32 seqId, s32 arg2) { + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[playerIdx]; + u8* seqData; + s32 phi_s0; + s32 phi_s1; + s32 phi_s2; + + if (seqId >= gAudioContext.seqTabEntCnt) { + return 0; + } + + Audio_SequencePlayerDisable(seqPlayer); + + phi_s2 = 0xFF; + phi_s0 = gAudioContext.unk_283C[seqId]; + phi_s1 = gAudioContext.unk_283Cb[phi_s0++]; + + while (phi_s1 > 0) { + phi_s2 = gAudioContext.unk_283Cb[phi_s0++]; + func_800E2454(phi_s2); + phi_s1--; + } + + seqData = func_800E22C4(seqId); + if (seqData == NULL) { + return 0; + } + + Audio_ResetSequencePlayer(seqPlayer); + seqPlayer->seqId = seqId; + seqPlayer->defaultBank = Audio_GetTableIndex(1, phi_s2); + seqPlayer->seqData = seqData; + seqPlayer->enabled = 1; + seqPlayer->scriptState.pc = seqData; + seqPlayer->scriptState.depth = 0; + seqPlayer->delay = 0; + seqPlayer->finished = 0; + seqPlayer->seqVariationEu = playerIdx; + Audio_ProcessSequence(seqPlayer); +} + +// LoadSequence +u8* func_800E22C4(s32 seqId) { + s32 pad; + s32 sp20; + + if (gAudioContext.seqLoadstatus[Audio_GetTableIndex(0, seqId)] == 1) { + return NULL; + } + + return func_800E2558(0, seqId, &sp20); +} + +u32 func_800E2318(u32 arg0, u32* arg1) { + return func_800E2338(arg0, arg1, 1); +} + +u32 func_800E2338(u32 arg0, u32* arg1, s32 arg2) { + void* temp_v0; + AudioTable* audioTable; + u32 temp_s0; + s8 tmp; + + temp_s0 = Audio_GetTableIndex(2, arg0); + audioTable = Audio_GetLoadTable(2); + if (temp_v0 = func_800E27A4(2, temp_s0), temp_v0 != NULL) { + if (gAudioContext.audioTableLoadStatus[temp_s0] != 1) { + Aduio_SetAudtabLoadstatus(temp_s0, 2); + } + *arg1 = 0; + return temp_v0; + } else if (tmp = audioTable->entries[arg0].unk_09, tmp == 4 || arg2 == 1) { + *arg1 = audioTable->entries[arg0].unk_08; + return audioTable->entries[temp_s0].romAddr; + } else if (temp_v0 = func_800E2558(2, arg0, &arg2), temp_v0 != NULL) { + *arg1 = 0; + return temp_v0; + } else { + *arg1 = audioTable->entries[arg0].unk_08; + return audioTable->entries[temp_s0].romAddr; + } +} + +unk_ldr* func_800E2454(u32 arg0) { + u8* temp_ret; + s32 unk02; + s32 unk03; + s32 sp38; + RelocInfo relocInfo; + s32 idx; + + idx = Audio_GetTableIndex(BANK_TABLE, arg0); + if (gAudioContext.bankLoadStatus[idx] == 1) { + return NULL; + } + unk02 = gAudioContext.ctlEntries[idx].unk_02; + unk03 = gAudioContext.ctlEntries[idx].unk_03; + + relocInfo.unk_00 = unk02; + relocInfo.unk_04 = unk03; + if (relocInfo.unk_00 != 0xFF) { + relocInfo.unk_08 = func_800E2338(relocInfo.unk_00, &relocInfo.unk_10, 0); + } else { + relocInfo.unk_08 = 0; + } + + if (unk03 != 0xFF) { + relocInfo.unk_0C = func_800E2338(unk03, &relocInfo.unk_14, 0); + } else { + relocInfo.unk_0C = 0; + } + + temp_ret = func_800E2558(1, arg0, &sp38); + if (temp_ret == 0) { + return NULL; + } + if (sp38 == 1) { + func_800E4198(idx, temp_ret, &relocInfo, 0); + } + + return temp_ret; +} + +u8* func_800E2558(u32 tableType, u32 bankId, s32* didAllocate) { + u32 size; + AudioTable* table; + s32 pad; + u32 sp40; + s32 status; + u32 romAddr; + s32 sp24; + u8* ret; + u32 id; + + id = Audio_GetTableIndex(tableType, bankId); + ret = func_800E27A4(tableType, id); + if (ret != NULL) { + *didAllocate = false; + status = 2; + } else { + table = Audio_GetLoadTable(tableType); + size = table->entries[id].size; + size = ALIGN16(size); + sp40 = table->entries[bankId].unk_08; + sp24 = table->entries[bankId].unk_09; + romAddr = table->entries[id].romAddr; + switch (sp24) { + case 0: + ret = func_800E0540(tableType, id, size); + if (ret == NULL) { + return ret; + } + break; + case 1: + ret = Audio_AllocBankOrSeq(tableType, size, 1, id); + if (ret == NULL) { + return ret; + } + break; + case 2: + ret = Audio_AllocBankOrSeq(tableType, size, 0, id); + if (ret == NULL) { + return ret; + } + break; + case 3: + case 4: + ret = Audio_AllocBankOrSeq(tableType, size, 2, id); + if (ret == NULL) { + return ret; + } + break; + } + + *didAllocate = true; + if (sp40 == 1) { + func_800E2BCC(romAddr, ret, size, (s16)table->header.unk_02); + } else { + Audio_DMAFastCopy(romAddr, ret, size, sp40); + } + + status = sp24 == 0 ? 5 : 2; + } + + switch (tableType) { + case SEQUENCE_TABLE: + Audio_SetSeqLoadStatus(id, status); + break; + case BANK_TABLE: + Audio_SetBankLoadStatus(id, status); + break; + case AUDIO_TABLE: + func_800E1A78(id, status); + break; + default: + break; + } + + return ret; +} + +u32 Audio_GetTableIndex(s32 tableType, u32 tableIdx) { + AudioTable* table = Audio_GetLoadTable(tableType); + + if (table->entries[tableIdx].size == 0) { + tableIdx = table->entries[tableIdx].romAddr; + } + + return tableIdx; +} + +void* func_800E27A4(s32 tableType, s32 id) { + void* ret; + + ret = func_800E04E8(tableType, id); + if (ret != NULL) { + return ret; + } + + ret = func_800DF074(tableType, 2, id); + if (ret != NULL) { + return ret; + } + + return NULL; +} + +void* Audio_GetLoadTable(s32 tableType) { + void* ret; + + switch (tableType) { + case SEQUENCE_TABLE: + ret = gAudioContext.sequenceTable; + break; + case BANK_TABLE: + ret = gAudioContext.audioBankTable; + break; + default: + ret = NULL; + break; + case AUDIO_TABLE: + ret = gAudioContext.audioTable; + break; + } + return ret; +} + +#define BASE_OFFSET(x, off) (void*)((u32)(x) + (u32)(off)) + +#ifdef NON_MATCHING +void func_800E283C(s32 arg0, unk_ldr* arg1, RelocInfo* arg2) { + s32 sp50; + s32 temp_v1_3; + s32 temp_s5; + s32 temp_a3; + void* reloc; + s32 i; + Drum* drum; + AudioBankSound* sfx; + Instrument* inst; + Instrument** end; + Instrument** instIt; + Drum** drums; + + temp_a3 = gAudioContext.ctlEntries[arg0].numDrums; + sp50 = gAudioContext.ctlEntries[arg0].numInstruments; + temp_s5 = gAudioContext.ctlEntries[arg0].numSfx; + + drums = arg1->drums; + if ((drums != NULL) && (temp_a3 != 0)) { + if (1) { + arg1->drums = RELOC(drums, arg1); + } + for (i = 0; i < temp_a3; i++) { + reloc = arg1->drums[i]; + if (reloc != NULL) { + arg1->drums[i] = drum = RELOC(reloc, arg1); + if (!drum->loaded) { + Audio_SampleReloc(&drum->sound, arg1, arg2); + reloc = drum->envelope; + drum->envelope = BASE_OFFSET(reloc, arg1); + drum->loaded = 1; + } + } + } + } + + if ((arg1->sfx != NULL) && (temp_s5 != 0)) { + if (1) { + arg1->sfx = RELOC(arg1->sfx, arg1); + } + for (i = 0; i < temp_s5; i++) { + sfx = &arg1->sfx[i]; + if ((sfx != NULL) && (sfx->sample != NULL)) { + Audio_SampleReloc(sfx, arg1, arg2); + } + } + } + + if (sp50 >= 0x7F) { + sp50 = 0x7E; + } + + temp_v1_3 = sp50 + 1; + if (temp_v1_3 > 1) { + instIt = arg1->instruments; + end = instIt + temp_v1_3 - 2; + do { + if (*instIt != NULL) { + inst = *instIt; + *instIt = RELOC(inst, arg1); + if (0) {} + inst = *instIt; + if (!inst->loaded) { + if (inst->normalRangeLo != 0) { + Audio_SampleReloc(&inst->lowNotesSound, arg1, arg2); + } + Audio_SampleReloc(&inst->normalNotesSound, arg1, arg2); + if (inst->normalRangeHi != 0x7F) { + Audio_SampleReloc(&inst->highNotesSound, arg1, arg2); + } + + inst->loaded = 1; + inst->envelope = RELOC(inst->envelope, arg1); + } + } + instIt++; + } while (instIt <= end); + } + + gAudioContext.ctlEntries[arg0].drums = arg1->drums; + gAudioContext.ctlEntries[arg0].soundEffects = arg1->sfx; + gAudioContext.ctlEntries[arg0].instruments = arg1->instruments; +} +#else +void func_800E283C(s32 arg0, unk_ldr* arg1, RelocInfo* arg2); +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_800E283C.s") +#endif + +void Audio_DMAFastCopy(u32 devAddr, u8* addr, u32 size, s32 handleType) { + OSMesgQueue* msgQueue = &gAudioContext.unk_25E8; + OSIoMesg* ioMesg = &gAudioContext.unk_2604; + size = ALIGN16(size); + + Audio_osInvalDCache(addr, size); + + while (true) { + if (size < 0x400) { + break; + } + Audio_DMA(ioMesg, OS_MESG_PRI_HIGH, OS_READ, devAddr, addr, 0x400, msgQueue, handleType, "FastCopy"); + osRecvMesg(msgQueue, NULL, OS_MESG_BLOCK); + size -= 0x400; + devAddr += 0x400; + addr += 0x400; + } + + if (size != 0) { + Audio_DMA(ioMesg, OS_MESG_PRI_HIGH, OS_READ, devAddr, addr, size, msgQueue, handleType, "FastCopy"); + osRecvMesg(msgQueue, NULL, OS_MESG_BLOCK); + } +} + +void func_800E2BCC(u32 devAddr, u8* addr, u32 size, s32 handleType) { +} + +s32 (*sDmaHandler)(OSPiHandle* handle, OSIoMesg* mb, s32 direction) = osEPiStartDma; + +s32 Audio_DMA(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, OSMesgQueue* reqQueue, + s32 handleType, const char* dmaFuncType) { + OSPiHandle* handle; + + if (gAudioContext.resetTimer > 0x10) { + return -1; + } + + switch (handleType) { + case 2: + handle = gAudioContext.cartHandle; + break; + case 3: + handle = gAudioContext.unk_1E1C; + break; + default: + return 0; + } + + if ((size % 0x10) != 0) { + size = ALIGN16(size); + } + + mesg->hdr.pri = priority; + mesg->hdr.retQueue = reqQueue; + mesg->dramAddr = ramAddr; + mesg->devAddr = devAddr; + mesg->size = size; + handle->transferInfo.cmdType = 2; + sDmaHandler(handle, mesg, direction); + return 0; +} + +void func_800E2CB8(void) { +} + +void func_800E2CC0(u32 arg0, u32 arg1) { + s32 sp1C; + + func_800E2558(arg0, arg1, &sp1C); +} + +void* Audio_AsyncLoadInner(s32 tableType, s32 arg1, s32 arg2, s32 arg3, OSMesgQueue* retQueue) { + u32 sp54; + AudioTable* sp50; + void* sp4C; + s32 sp48; + s8 temp_a1; + u32 sp40; + s32 sp3C; + u32 temp_v0; + u32 sp34; + + sp34 = Audio_GetTableIndex(tableType, arg1); + switch (tableType) { + case SEQUENCE_TABLE: + if (gAudioContext.seqLoadstatus[sp34] == 1) { + return NULL; + } + break; + case BANK_TABLE: + if (gAudioContext.bankLoadStatus[sp34] == 1) { + return NULL; + } + break; + case AUDIO_TABLE: + if (gAudioContext.audioTableLoadStatus[sp34] == 1) { + return NULL; + } + break; + } + + sp4C = func_800E27A4(tableType, sp34); + if (sp4C != NULL) { + sp3C = 2; + osSendMesg(retQueue, arg3 << 0x18, 0); + } else { + sp50 = Audio_GetLoadTable(tableType); + sp54 = sp50->entries[sp34].size; + sp54 = ALIGN16(sp54); + sp48 = sp50->entries[arg1].unk_08; + temp_a1 = sp50->entries[arg1].unk_09; + sp40 = sp50->entries[sp34].romAddr; + sp3C = 2; + switch (temp_a1) { + case 0: + sp4C = func_800E0540(tableType, sp34, sp54); + if (sp4C == NULL) { + return sp4C; + } + sp3C = 5; + break; + case 1: + sp4C = Audio_AllocBankOrSeq(tableType, sp54, 1, sp34); + if (sp4C == NULL) { + return sp4C; + } + break; + case 2: + sp4C = Audio_AllocBankOrSeq(tableType, sp54, 0, sp34); + if (sp4C == NULL) { + return sp4C; + } + break; + case 3: + case 4: + sp4C = Audio_AllocBankOrSeq(tableType, sp54, 2, sp34); + if (sp4C == NULL) { + return sp4C; + } + break; + } + + if (sp48 == 1) { + func_800E3A44((s16)sp50->header.unk_02, sp40, sp4C, sp54, sp48, arg2, retQueue, + (arg3 << 0x18) | (tableType << 0x10) | (arg1 << 8) | sp3C); + } else { + Audio_InitAsyncReq(sp40, sp4C, sp54, sp48, arg2, retQueue, MK_ASYNC_MSG(arg3, tableType, sp34, sp3C)); + } + sp3C = 1; + } + + switch (tableType) { + case 0: + Audio_SetSeqLoadStatus(sp34, sp3C); + break; + case 1: + Audio_SetBankLoadStatus(sp34, sp3C); + break; + case 2: + func_800E1A78(sp34, sp3C); + break; + default: + break; + } + + return sp4C; +} + +void Audio_ProcessLoads(s32 resetStatus) { + Audio_ProcessSyncLoads(resetStatus); + func_800E4590(resetStatus); + Audio_ProcessAsyncLoads(resetStatus); +} + +// SetDmaCallback +void func_800E301C(void* callback) { + sDmaHandler = callback; +} + +u32 D_801304D4 = 0; +void func_800E3028(u32 arg0) { + D_801304D4 = arg0; +} + +// InitCtlTable +void func_800E3034(s32 arg0) { + CtlEntry* ctlEnt = &gAudioContext.ctlEntries[arg0]; + AudioBankTableEntry* tableEnt = &gAudioContext.audioBankTable->entries[arg0]; + + ctlEnt->unk_02 = (tableEnt->unk_0A >> 8) & 0xFF; + ctlEnt->unk_03 = (tableEnt->unk_0A) & 0xFF; + ctlEnt->numInstruments = (tableEnt->unk_0C >> 8) & 0xFF; + ctlEnt->numDrums = tableEnt->unk_0C & 0xFF; + ctlEnt->numSfx = tableEnt->unk_0E; +} + +s32 gAudioContextInitalized = 0; + +void Audio_ContextInit(void* heap, u32 heapSize) { + char pad[0x48]; + s32 sp24; + void* temp_v0_3; + s32 i; + u64* heapP; + u8* ctxP; + s16* u2974p; + + D_801755D0 = NULL; + gAudioContext.resetTimer = 0; + + { + s32 i; + u8* ctxP = &gAudioContext; + for (i = sizeof(gAudioContext); i >= 0; i--) { + *ctxP++ = 0; + } + } + + switch (osTvType) { + case OS_TV_PAL: + gAudioContext.unk_2960 = 20.03042f; + gAudioContext.refreshRate = 50; + break; + case OS_TV_MPAL: + gAudioContext.unk_2960 = 16.546f; + gAudioContext.refreshRate = 60; + break; + case OS_TV_NTSC: + default: + gAudioContext.unk_2960 = 16.713f; + gAudioContext.refreshRate = 60; + } + + Audio_InitMesgQueues(); + + for (i = 0; i < 3; i++) { + gAudioContext.aiBufLengths[i] = 0xA0; + } + + gAudioContext.totalTaskCnt = 0; + gAudioContext.rspTaskIdx = 0; + gAudioContext.curAIBufIdx = 0; + gAudioContext.soundMode = 0; + gAudioContext.currTask = NULL; + gAudioContext.rspTask[0].task.t.data_size = 0; + gAudioContext.rspTask[1].task.t.data_size = 0; + osCreateMesgQueue(&gAudioContext.unk_25E8, &gAudioContext.unk_2600, 1); + osCreateMesgQueue(&gAudioContext.unk_1ED0, &gAudioContext.unk_1EE8, 0x40); + osCreateMesgQueue(&gAudioContext.unk_1E20, &gAudioContext.unk_1E38, 0x10); + osCreateMesgQueue(&gAudioContext.unk_1E78, &gAudioContext.unk_1E90, 0x10); + gAudioContext.sampleIoReqIdx = 0; + gAudioContext.sampleDmaReqCnt = 0; + gAudioContext.cartHandle = osCartRomInit(); + + if (heap == NULL) { + gAudioContext.audioHeap = gAudioHeap; + gAudioContext.audioHeapSize = D_8014A6C4.heap; + } else { + void** hp = &heap; + gAudioContext.audioHeap = *hp; + gAudioContext.audioHeapSize = heapSize; + } + + for (i = 0; i < (s32)gAudioContext.audioHeapSize / 8; i++) { + ((u64*)gAudioContext.audioHeap)[i] = 0; + } + + Audio_InitMainPools(D_8014A6C4.mainPool); + + for (i = 0; i < 3; i++) { + gAudioContext.aiBuffers[i] = Audio_AllocZeroed(&gAudioContext.audioInitPool, AIBUF_LEN); + } + + gAudioContext.sequenceTable = &gSequenceTable; + gAudioContext.audioBankTable = &gAudioBankTable; + gAudioContext.audioTable = &gAudioTable; + gAudioContext.unk_283C = &D_80155340; + gAudioContext.seqTabEntCnt = gAudioContext.sequenceTable->header.entryCnt; + + gAudioContext.audioResetPresetIdToLoad = 0; + gAudioContext.resetStatus = 1; + + Audio_ResetStep(); + Audio_InitAudioTable(gAudioContext.sequenceTable, _AudioseqSegmentRomStart, 0); + Audio_InitAudioTable(gAudioContext.audioBankTable, _AudiobankSegmentRomStart, 0); + Audio_InitAudioTable(gAudioContext.audioTable, _AudiotableSegmentRomStart, 0); + sp24 = gAudioContext.audioBankTable->header.entryCnt; + gAudioContext.ctlEntries = Audio_Alloc(&gAudioContext.audioInitPool, sp24 * sizeof(CtlEntry)); + + for (i = 0; i < sp24; i++) { + func_800E3034(i); + } + + if (temp_v0_3 = Audio_Alloc(&gAudioContext.audioInitPool, D_8014A6C4.initPool), temp_v0_3 == NULL) { + + *((u32*)&D_8014A6C4.initPool) = 0; + } + + Audio_SoundAllocPoolInit(&gAudioContext.unk_2D50, temp_v0_3, D_8014A6C4.initPool); + gAudioContextInitalized = 1; + osSendMesg(gAudioContext.taskStartQueueP, (void*)gAudioContext.totalTaskCnt, 0); +} + +void Audio_SyncLoadsInit(void) { + gAudioContext.syncLoads[0].status = 0; + gAudioContext.syncLoads[1].status = 0; +} + +s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, u8* isDone) { + AudioBankSample* sample; + AudioSyncLoad* syncLoad; + + sample = Audio_GetBankSample(arg0, arg1); + if (sample == NULL) { + *isDone = 0; + return -1; + } + + if (sample->bits2 == 0) { + *isDone = 2; + return 0; + } + + syncLoad = &gAudioContext.syncLoads[gAudioContext.syncLoadPos]; + if (syncLoad->status == LOAD_STATUS_DONE) { + syncLoad->status = LOAD_STATUS_WAITING; + } + + syncLoad->sample = *sample; + syncLoad->isDone = isDone; + syncLoad->ramAddr = func_800E05C4(sample->size, arg0, sample->sampleAddr, sample->bits2, 0); + + if (syncLoad->ramAddr == NULL) { + if (sample->bits2 == 1 || sample->bits4 == 2) { + *isDone = 0; + return -1; + } else { + *isDone = 3; + return -1; + } + } + + syncLoad->status = LOAD_STATUS_START; + syncLoad->size = ALIGN16(sample->size); + syncLoad->unk_10 = syncLoad->ramAddr; + syncLoad->devAddr = sample->sampleAddr; + syncLoad->unk_00 = sample->bits2; + syncLoad->unk_01 = arg0; + syncLoad->unk_02 = arg1; + if (syncLoad->unk_00 == 1) { + syncLoad->unk_04 = gAudioContext.audioTable->header.unk_02; + } + + gAudioContext.syncLoadPos ^= 1; + return 0; +} + +AudioBankSample* Audio_GetBankSample(s32 bankId, s32 sfxId) { + AudioBankSample* ret; + + if (sfxId < 0x80) { + Instrument* instrument = Audio_GetInstrumentInner(bankId, sfxId); + if (instrument == NULL) { + return NULL; + } + ret = instrument->normalNotesSound.sample; + } else if (sfxId < 0x100) { + Drum* drum = Audio_GetDrum(bankId, sfxId - 0x80); + if (drum == NULL) { + return NULL; + } + ret = drum->sound.sample; + } else { + AudioBankSound* bankSound = Audio_GetSfx(bankId, sfxId - 0x100); + if (bankSound == NULL) { + return NULL; + } + ret = bankSound->sample; + } + return ret; +} + +void func_800E3670(void) { +} + +void func_800E3678(AudioSyncLoad* syncLoad) { + AudioBankSample* sample; + + if (syncLoad->sample.sampleAddr == NULL) { + return; + } + + sample = Audio_GetBankSample(syncLoad->unk_01, syncLoad->unk_02); + if (sample == NULL) { + return; + } + + syncLoad->sample = *sample; + sample->sampleAddr = syncLoad->unk_10; + sample->bits2 = 0; +} + +void Audio_ProcessSyncLoads(s32 resetStatus) { + AudioSyncLoad* syncLoad; + s32 i; + + for (i = 0; i < ARRAY_COUNT(gAudioContext.syncLoads); i++) { + syncLoad = &gAudioContext.syncLoads[i]; + switch (gAudioContext.syncLoads[i].status) { + case LOAD_STATUS_LOADING: + if (syncLoad->unk_00 != 1) { + osRecvMesg(&syncLoad->msgqueue, NULL, OS_MESG_BLOCK); + } + + if (resetStatus != 0) { + syncLoad->status = LOAD_STATUS_DONE; + continue; + } + case LOAD_STATUS_START: + syncLoad->status = LOAD_STATUS_LOADING; + if (syncLoad->size == 0) { + func_800E3678(syncLoad); + syncLoad->status = LOAD_STATUS_DONE; + *syncLoad->isDone = 1; + } else if (syncLoad->size < 0x400) { + if (syncLoad->unk_00 == 1) { + u32 size = syncLoad->size; + func_800E38F8(syncLoad->devAddr, syncLoad->ramAddr, size, syncLoad->unk_04); + } else { + func_800E3874(syncLoad, syncLoad->size); + } + syncLoad->size = 0; + } else { + if (syncLoad->unk_00 == 1) { + func_800E38F8(syncLoad->devAddr, syncLoad->ramAddr, 0x400, syncLoad->unk_04); + } else { + func_800E3874(syncLoad, 0x400); + } + syncLoad->size -= 0x400; + syncLoad->ramAddr += 0x400; + syncLoad->devAddr += 0x400; + } + break; + } + } +} + +void func_800E3874(AudioSyncLoad* arg0, s32 size) { + Audio_osInvalDCache(arg0->ramAddr, size); + osCreateMesgQueue(&arg0->msgqueue, &arg0->msg, 1); + Audio_DMA(&arg0->ioMesg, 0U, 0, arg0->devAddr, arg0->ramAddr, size, &arg0->msgqueue, arg0->unk_00, "SLOWCOPY"); +} + +void func_800E38F8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +} + +s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* isDone) { + AudioSyncLoad* syncLoad; + SequenceTable* seqTable; + u32 size; + + if (seqIdx >= gAudioContext.seqTabEntCnt) { + *isDone = 0; + return -1; + } + + seqIdx = Audio_GetTableIndex(0, seqIdx); + seqTable = Audio_GetLoadTable(0); + syncLoad = &gAudioContext.syncLoads[gAudioContext.syncLoadPos]; + if (syncLoad->status == LOAD_STATUS_DONE) { + syncLoad->status = LOAD_STATUS_WAITING; + } + + syncLoad->sample.sampleAddr = NULL; + syncLoad->isDone = isDone; + size = seqTable->entries[seqIdx].size; + size = ALIGN16(size); + syncLoad->ramAddr = ramAddr; + syncLoad->status = LOAD_STATUS_START; + syncLoad->size = size; + syncLoad->unk_10 = ramAddr; + syncLoad->devAddr = seqTable->entries[seqIdx].romAddr; + syncLoad->unk_00 = seqTable->entries[seqIdx].unk_08; + syncLoad->unk_01 = seqIdx; + + if (syncLoad->unk_00 == 1) { + syncLoad->unk_04 = seqTable->header.unk_02; + } + + gAudioContext.syncLoadPos ^= 1; + return 0; +} + +void Audio_AsyncLoadReqInit(void) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gAudioContext.asyncReqs); i++) { + gAudioContext.asyncReqs[i].status = 0; + } +} + +AsyncLoadReq* func_800E3A44(s32 arg0, s32 devAddr, void* ramAddr, s32 size, s32 arg4, s32 nChunks, + OSMesgQueue* retQueue, s32 retMsg) { + AsyncLoadReq* loadReq; + + loadReq = Audio_InitAsyncReq(devAddr, ramAddr, size, arg4, nChunks, retQueue, retMsg); + + if (loadReq == NULL) { + return NULL; + } + + osSendMesg(&gAudioContext.asyncLoadQueue, loadReq, 0); + loadReq->unk_18 = arg0; + return loadReq; +} + +AsyncLoadReq* Audio_InitAsyncReq(s32 devAddr, void* ramAddr, s32 size, s32 arg3, s32 nChunks, OSMesgQueue* retQueue, + s32 retMsg) { + AsyncLoadReq* loadReq; + s32 i; + + for (i = 0; i < ARRAY_COUNT(gAudioContext.asyncReqs); i++) { + if (gAudioContext.asyncReqs[i].status == 0) { + loadReq = &gAudioContext.asyncReqs[i]; + break; + } + } + + // no more available async reqs + if (i == ARRAY_COUNT(gAudioContext.asyncReqs)) { + return NULL; + } + + loadReq->status = LOAD_STATUS_START; + loadReq->devAddr = devAddr; + loadReq->unk_04 = ramAddr; + loadReq->ramAddr = ramAddr; + loadReq->bytesRemaining = size; + + if (nChunks == 0) { + loadReq->chunkSize = 0x1000; + } else if (nChunks == 1) { + loadReq->chunkSize = size; + } else { + loadReq->chunkSize = ((size / nChunks) + 0xFF) & ~0xFF; + if (loadReq->chunkSize < 0x100) { + loadReq->chunkSize = 0x100; + } + } + + loadReq->retQueue = retQueue; + loadReq->unk_01 = 3; + loadReq->unk_02 = arg3; + loadReq->retMsg = retMsg; + osCreateMesgQueue(&loadReq->msgQueue, loadReq->msg, ARRAY_COUNT(loadReq->msg)); + return loadReq; +} + +void Audio_ProcessAsyncLoads(s32 resetStatus) { + AsyncLoadReq* loadReq; + s32 i; + + if (gAudioContext.resetTimer == 1) { + return; + } + + if (gAudioContext.curAsyncReq == NULL) { + if (resetStatus != 0) { + do { + } while (osRecvMesg(&gAudioContext.asyncLoadQueue, &loadReq, OS_MESG_NOBLOCK) != -1); + } else if (osRecvMesg(&gAudioContext.asyncLoadQueue, &loadReq, OS_MESG_NOBLOCK) == -1) { + gAudioContext.curAsyncReq = NULL; + } else { + gAudioContext.curAsyncReq = loadReq; + } + } + + if (gAudioContext.curAsyncReq != NULL) { + Audio_HandleAsyncMsg(gAudioContext.curAsyncReq, resetStatus); + } + + for (i = 0; i < ARRAY_COUNT(gAudioContext.asyncReqs); i++) { + if (gAudioContext.asyncReqs[i].status == 1) { + loadReq = &gAudioContext.asyncReqs[i]; + if (loadReq->unk_02 != 1) { + Audio_UpdateAsyncReq(loadReq, resetStatus); + } + } + } +} + +void Audio_HandleAsyncMsg(AsyncLoadReq* arg0, s32 arg1) { +} + +void Audio_AsyncReqDone(AsyncLoadReq* loadReq) { + u32 retMsg = loadReq->retMsg; + u32 b2; + u32 pad; + u32 t1; + OSMesg doneMsg; + u32 t2; + RelocInfo sp30; + + if (1) {} + switch (ASYNC_TBLTYPE(retMsg)) { + case SEQUENCE_TABLE: + Audio_SetSeqLoadStatus(ASYNC_B2(retMsg), ASYNC_B3(retMsg)); + break; + case AUDIO_TABLE: + func_800E1A78(ASYNC_B2(retMsg), ASYNC_B3(retMsg)); + break; + case BANK_TABLE: + b2 = ASYNC_B2(retMsg); + t1 = gAudioContext.ctlEntries[b2].unk_02; + t2 = gAudioContext.ctlEntries[b2].unk_03; + sp30.unk_00 = t1; + sp30.unk_04 = t2; + sp30.unk_08 = t1 != 0xFF ? func_800E2318(t1, &sp30.unk_10) : 0; + sp30.unk_0C = t2 != 0xFF ? func_800E2318(t2, &sp30.unk_14) : 0; + Audio_SetBankLoadStatus(b2, ASYNC_B3(retMsg)); + func_800E4198(b2, loadReq->unk_04, &sp30, 1); + break; + } + + doneMsg = loadReq->retMsg; + if (1) {} + loadReq->status = LOAD_STATUS_WAITING; + osSendMesg(loadReq->retQueue, doneMsg, OS_MESG_NOBLOCK); +} + +void Audio_UpdateAsyncReq(AsyncLoadReq* req, s32 resetStatus) { + AudioTable* audioTable = gAudioContext.audioTable; + + if (req->unk_01 >= 2) { + req->unk_01--; + return; + } + + if (req->unk_01 == 1) { + req->unk_01 = 0; + } else if (resetStatus != 0) { + osRecvMesg(&req->msgQueue, NULL, OS_MESG_BLOCK); + req->status = LOAD_STATUS_WAITING; + return; + } else if (osRecvMesg(&req->msgQueue, NULL, OS_MESG_NOBLOCK) == -1) { + return; + } + + if (req->bytesRemaining == 0) { + Audio_AsyncReqDone(req); + return; + } + + if (req->bytesRemaining < req->chunkSize) { + if (req->unk_02 == 1) { + func_800E4044(req->devAddr, req->ramAddr, req->bytesRemaining, audioTable->header.unk_02); + } else { + func_800E3FB4(req, req->bytesRemaining); + } + req->bytesRemaining = 0; + return; + } + + if (req->unk_02 == 1) { + func_800E4044(req->devAddr, req->ramAddr, req->chunkSize, audioTable->header.unk_02); + } else { + func_800E3FB4(req, req->chunkSize); + } + + req->bytesRemaining -= req->chunkSize; + req->devAddr += req->chunkSize; + req->ramAddr = req->ramAddr + req->chunkSize; +} + +void func_800E3FB4(AsyncLoadReq* req, u32 size) { + size = ALIGN16(size); + Audio_osInvalDCache(req->ramAddr, size); + osCreateMesgQueue(&req->msgQueue, &req->msg, 1); + Audio_DMA(&req->ioMesg, 0, 0, req->devAddr, req->ramAddr, size, &req->msgQueue, req->unk_02, "BGCOPY"); +} + +void func_800E4044(u32 devAddr, void* ramAddr, u32 size, s16 arg3) { +} + +void Audio_SampleReloc(AudioBankSound* sound, u32 arg1, RelocInfo* arg2) { + AudioBankSample* sample; + void* reloc; + + if ((u32)sound->sample <= 0x80000000) { + sample = sound->sample = RELOC(sound->sample, arg1); + if (sample->size != 0 && sample->unk_bits25 != 1) { + sample->loop = RELOC(sample->loop, arg1); + sample->book = RELOC(sample->book, arg1); + switch (sample->bits2) { + case 0: + sample->sampleAddr = RELOC(sample->sampleAddr, arg2->unk_08); + sample->bits2 = arg2->unk_10; + break; + case 1: + sample->sampleAddr = RELOC(sample->sampleAddr, arg2->unk_0C); + sample->bits2 = arg2->unk_14; + break; + case 2: + case 3: + break; + } + + sample->unk_bits25 = 1; + if (sample->unk_bits26 && (sample->bits2 != 0)) { + gAudioContext.unk_B68[gAudioContext.unk_1768++] = sample; + } + } + } +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_800E4198.s") + +#ifdef NON_MATCHING +s32 func_800E4590(s32 resetStatus) { + u32 sp4C; + AudioBankSample* temp_v0_3; + AudioStruct0D68* temp_v1_2; + s32 temp_a0_2; + s32 temp_v0_2; + u32 temp_a0; + u32 temp_a0_3; + u32 temp_a2_2; + u32 temp_t0; + u8* temp_s0; + AudioStruct0D68* temp_a2; + AudioBankSample* temp_v0; + AudioStruct0D68* temp_v1; + + if (gAudioContext.unk_176C > 0) { + if (resetStatus != 0) { + osRecvMesg(&gAudioContext.unk_1E78, &sp4C, 0); + gAudioContext.unk_176C = 0; + return 0; + } + if (osRecvMesg(&gAudioContext.unk_1E78, &sp4C, 0) == -1) { + return 0; + } + + sp4C >>= 0x18; + + if (gAudioContext.unk_0D54[sp4C + 1].unk_10 == 0) { + if ((temp_v0_3->sampleAddr + temp_v0_3->size + temp_v0_3->bits2) == + gAudioContext.unk_0D54[sp4C + 1].unk_00) { + temp_v0_3->bits2 = 0; + temp_v0_3->sampleAddr = temp_v0_3->loop; + } + gAudioContext.unk_0D54[sp4C + 1].unk_10 = 1; + } + + while (gAudioContext.unk_176C > 0) { + if (gAudioContext.unk_0D54[gAudioContext.unk_176C].unk_10 == 1) { + gAudioContext.unk_176C--; + continue; + } else { + temp_v0_3 = gAudioContext.unk_0D54[gAudioContext.unk_176C].sample; + if (&temp_v0_3->sampleAddr[temp_v0_3->size + temp_v0_3->bits2] != + gAudioContext.unk_0D54[gAudioContext.unk_176C].unk_00) { + gAudioContext.unk_0D54[gAudioContext.unk_176C].unk_10 = 1; + gAudioContext.unk_176C--; + continue; + } else { + Audio_InitAsyncReq(temp_v0_3->sampleAddr, gAudioContext.unk_0D54[gAudioContext.unk_176C].unk_08, + temp_v0_3->size, temp_v0_3->bits2, (temp_a2_2 >> 0xC) + 1, + &gAudioContext.unk_1E78, gAudioContext.unk_0D54[gAudioContext.unk_176C].pad); + break; + } + } + } + } + return 1; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_800E4590.s") +#endif + +s32 func_800E4744(AudioBankSample* sample, s32 sampleCnt, AudioBankSample** sampleList) { + s32 i; + + for (i = 0; i < sampleCnt; i++) { + if (sample->sampleAddr == sampleList[i]->sampleAddr) { + break; + } + } + + if (i == sampleCnt) { + sampleList[sampleCnt] = sample; + sampleCnt++; + } + + return sampleCnt; +} + +s32 func_800E478C(s32 bankId, AudioBankSample** sampleList) { + s32 i; + s32 drumCnt; + s32 instrumentCnt; + s32 sampleCnt = 0; + + drumCnt = gAudioContext.ctlEntries[bankId].numDrums; + instrumentCnt = gAudioContext.ctlEntries[bankId].numInstruments; + + for (i = 0; i < drumCnt; i++) { + Drum* drum = Audio_GetDrum(bankId, i); + if (1) {} + if (drum != NULL) { + sampleCnt = func_800E4744(drum->sound.sample, sampleCnt, sampleList); + } + } + + for (i = 0; i < instrumentCnt; i++) { + Instrument* instrument = Audio_GetInstrumentInner(bankId, i); + if (instrument != NULL) { + if (instrument->normalRangeLo != 0) { + sampleCnt = func_800E4744(instrument->lowNotesSound.sample, sampleCnt, sampleList); + } + if (instrument->normalRangeHi != 0x7F) { + sampleCnt = func_800E4744(instrument->highNotesSound.sample, sampleCnt, sampleList); + } + sampleCnt = func_800E4744(instrument->normalNotesSound.sample, sampleCnt, sampleList); + } + } + return sampleCnt; +} + +void func_800E48C0(AudioBankSound* sound) { + AudioBankSample* sample = sound->sample; + + if ((sample->size != 0) && (sample->unk_bits26) && (sample->bits2)) { + gAudioContext.unk_B68[gAudioContext.unk_1768++] = sample; + } +} + +// large +void func_800E4918(s32, s32, RelocInfo*); +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_load/func_800E4918.s") + +void func_800E4D94(void) { + s32 pad; + u32 temp_s2; + AudioTable* audioTable; + s32 pad2; + s32 i; + + audioTable = Audio_GetLoadTable(AUDIO_TABLE); + for (i = 0; i < gAudioContext.unk_2D50.unused; i++) { + RelocInfo sp4C; + if (gAudioContext.unk_2D60[i].poolIndex == 1) { + temp_s2 = Audio_GetTableIndex(BANK_TABLE, gAudioContext.unk_2D60[i].id); + sp4C.unk_00 = gAudioContext.ctlEntries[temp_s2].unk_02; + sp4C.unk_04 = gAudioContext.ctlEntries[temp_s2].unk_03; + + if (sp4C.unk_00 != 0xFF) { + sp4C.unk_00 = Audio_GetTableIndex(AUDIO_TABLE, sp4C.unk_00); + sp4C.unk_10 = audioTable->entries[sp4C.unk_00].unk_08; + } + + if (sp4C.unk_04 != 0xFF) { + sp4C.unk_04 = Audio_GetTableIndex(AUDIO_TABLE, sp4C.unk_04); + sp4C.unk_14 = audioTable->entries[sp4C.unk_04].unk_08; + } + func_800E4918(temp_s2, 0, &sp4C); + } + } +} + +void func_800E4ED4(void) { +} + +void func_800E4EDC(void) { +} + +void func_800E4EE4(void) { +} + +void func_800E4EEC(s32 arg0, s32 arg1, u8* arg2) { + static u32 D_801304DC = 0; + D_8016B738[D_801304DC] = arg2; + Audio_AsyncLoad(arg0, arg1, 0, D_801304DC, &D_8016B6E0); + D_801304DC++; + if (D_801304DC == 0x10) { + D_801304DC = 0; + } +} + +void func_800E4F58(void) { + u32 pad; + u32 sp20; + u8* temp_v0; + + if (osRecvMesg(&D_8016B6E0, &sp20, OS_MESG_NOBLOCK) != -1) { + pad = sp20 >> 0x18; + temp_v0 = D_8016B738[pad]; + if (temp_v0 != NULL) { + *temp_v0 = 0; + } + } +} + +void func_800E4FB0(void) { + osCreateMesgQueue(&D_8016B6E0, &D_8016B6F8, 0x10); +} diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 03cbd6099a..a9ce8e9c2c 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -30,7 +30,7 @@ void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { sub->bitField0.s.stereoStrongLeft = false; sub->bitField0.s.stereoHeadsetEffects = sp24.stereoHeadsetEffects; sub->bitField0.s.usesHeadsetPanEffects = sp24.usesHeadsetPanEffects; - if (stereoHeadsetEffects && gAudioContext.gSoundMode == 1) { + if (stereoHeadsetEffects && gAudioContext.soundMode == 1) { smallPanIndex = pan >> 1; if (smallPanIndex > 0x3f) { smallPanIndex = 0x3f; @@ -42,7 +42,7 @@ void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { volLeft = gHeadsetPanVolume[pan]; volRight = gHeadsetPanVolume[0x7f - pan]; - } else if (stereoHeadsetEffects && gAudioContext.gSoundMode == 0) { + } else if (stereoHeadsetEffects && gAudioContext.soundMode == 0) { strongLeft = strongRight = 0; sub->headsetPanRight = 0; sub->headsetPanLeft = 0; @@ -76,7 +76,7 @@ void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { break; } - } else if (gAudioContext.gSoundMode == 3) { + } else if (gAudioContext.soundMode == 3) { sub->bitField0.s.stereoHeadsetEffects = false; sub->bitField0.s.usesHeadsetPanEffects = false; volLeft = 0.707f; @@ -164,9 +164,9 @@ void Audio_ProcessNotes(void) { f32 scale; s32 i; - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - note = &gAudioContext.gNotes[i]; - noteSubEu2 = &gAudioContext.gNoteSubsEu[gAudioContext.gNoteSubEuOffset + i]; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + note = &gAudioContext.notes[i]; + noteSubEu2 = &gAudioContext.noteSubsEu[gAudioContext.noteSubEuOffset + i]; playbackState = ¬e->playbackState; if (playbackState->parentLayer != NO_LAYER) { if ((u32)playbackState->parentLayer < 0x7FFFFFFFU) { @@ -175,7 +175,7 @@ void Audio_ProcessNotes(void) { if (note != playbackState->parentLayer->note && playbackState->unk_04 == 0) { playbackState->adsr.action.s.release = true; - playbackState->adsr.fadeOutVel = gAudioContext.gAudioBufferParameters.updatesPerFrameInv; + playbackState->adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv; playbackState->priority = 1; playbackState->unk_04 = 2; goto out; @@ -286,7 +286,7 @@ void Audio_ProcessNotes(void) { } reverb.frequency *= playbackState->vibratoFreqScale * playbackState->portamentoFreqScale; - reverb.frequency *= gAudioContext.gAudioBufferParameters.resampleRate; + reverb.frequency *= gAudioContext.audioBufferParameters.resampleRate; reverb.velocity *= scale; Audio_NoteSetVelPanReverb(note, noteSubEu2, &reverb); noteSubEu->bitField1.s.bookOffset = bookOffset; @@ -315,18 +315,18 @@ Instrument* Audio_GetInstrumentInner(s32 bankId, s32 instId) { } if (!Audio_IsBankLoadComplete(bankId)) { - gAudioContext.gAudioErrorFlags = bankId + 0x10000000; + gAudioContext.audioErrorFlags = bankId + 0x10000000; return NULL; } - if (instId >= gAudioContext.gCtlEntries[bankId].numInstruments) { - gAudioContext.gAudioErrorFlags = ((bankId << 8) + instId) + 0x3000000; + if (instId >= gAudioContext.ctlEntries[bankId].numInstruments) { + gAudioContext.audioErrorFlags = ((bankId << 8) + instId) + 0x3000000; return NULL; } - inst = gAudioContext.gCtlEntries[bankId].instruments[instId]; + inst = gAudioContext.ctlEntries[bankId].instruments[instId]; if (inst == NULL) { - gAudioContext.gAudioErrorFlags = ((bankId << 8) + instId) + 0x1000000; + gAudioContext.audioErrorFlags = ((bankId << 8) + instId) + 0x1000000; return inst; } @@ -341,21 +341,21 @@ Drum* Audio_GetDrum(s32 bankId, s32 drumId) { } if (!Audio_IsBankLoadComplete(bankId)) { - gAudioContext.gAudioErrorFlags = bankId + 0x10000000; + gAudioContext.audioErrorFlags = bankId + 0x10000000; return NULL; } - if (drumId >= gAudioContext.gCtlEntries[bankId].numDrums) { - gAudioContext.gAudioErrorFlags = ((bankId << 8) + drumId) + 0x4000000; + if (drumId >= gAudioContext.ctlEntries[bankId].numDrums) { + gAudioContext.audioErrorFlags = ((bankId << 8) + drumId) + 0x4000000; return NULL; } - if ((u32)gAudioContext.gCtlEntries[bankId].drums < 0x80000000U) { + if ((u32)gAudioContext.ctlEntries[bankId].drums < 0x80000000U) { return NULL; } - drum = gAudioContext.gCtlEntries[bankId].drums[drumId]; + drum = gAudioContext.ctlEntries[bankId].drums[drumId]; if (drum == NULL) { - gAudioContext.gAudioErrorFlags = ((bankId << 8) + drumId) + 0x5000000; + gAudioContext.audioErrorFlags = ((bankId << 8) + drumId) + 0x5000000; } return drum; @@ -369,23 +369,23 @@ AudioBankSound* Audio_GetSfx(s32 bankId, s32 sfxId) { } if (!Audio_IsBankLoadComplete(bankId)) { - gAudioContext.gAudioErrorFlags = bankId + 0x10000000; + gAudioContext.audioErrorFlags = bankId + 0x10000000; return NULL; } - if (sfxId >= gAudioContext.gCtlEntries[bankId].numSfx) { - gAudioContext.gAudioErrorFlags = ((bankId << 8) + sfxId) + 0x4000000; + if (sfxId >= gAudioContext.ctlEntries[bankId].numSfx) { + gAudioContext.audioErrorFlags = ((bankId << 8) + sfxId) + 0x4000000; return NULL; } - if ((u32)gAudioContext.gCtlEntries[bankId].soundEffects < 0x80000000U) { + if ((u32)gAudioContext.ctlEntries[bankId].soundEffects < 0x80000000U) { return NULL; } - sfx = &gAudioContext.gCtlEntries[bankId].soundEffects[sfxId]; + sfx = &gAudioContext.ctlEntries[bankId].soundEffects[sfxId]; if (sfx == NULL) { - gAudioContext.gAudioErrorFlags = ((bankId << 8) + sfxId) + 0x5000000; + gAudioContext.audioErrorFlags = ((bankId << 8) + sfxId) + 0x5000000; } if (sfx->sample == NULL) { @@ -406,24 +406,24 @@ s32 func_800E7744(s32 instrument, s32 bankId, s32 instId, void* arg3) { switch (instrument) { case 0: - if (instId >= gAudioContext.gCtlEntries[bankId].numDrums) { + if (instId >= gAudioContext.ctlEntries[bankId].numDrums) { return -3; } - gAudioContext.gCtlEntries[bankId].drums[instId] = arg3; + gAudioContext.ctlEntries[bankId].drums[instId] = arg3; break; case 1: - if (instId >= gAudioContext.gCtlEntries[bankId].numSfx) { + if (instId >= gAudioContext.ctlEntries[bankId].numSfx) { return -3; } - gAudioContext.gCtlEntries[bankId].soundEffects[instId] = *(AudioBankSound*)arg3; + gAudioContext.ctlEntries[bankId].soundEffects[instId] = *(AudioBankSound*)arg3; break; default: - if (instId >= gAudioContext.gCtlEntries[bankId].numInstruments) { + if (instId >= gAudioContext.ctlEntries[bankId].numInstruments) { return -3; } - gAudioContext.gCtlEntries[bankId].instruments[instId] = arg3; + gAudioContext.ctlEntries[bankId].instruments[instId] = arg3; break; } @@ -456,7 +456,7 @@ void Audio_SeqChanLayerDecayRelease(SequenceChannelLayer* seqLayer, s32 target) if (note->playbackState.parentLayer != seqLayer) { if (note->playbackState.parentLayer == NO_LAYER && note->playbackState.wantedParentLayer == NO_LAYER && note->playbackState.prevParentLayer == seqLayer && target != ADSR_STATE_DECAY) { - note->playbackState.adsr.fadeOutVel = gAudioContext.gAudioBufferParameters.updatesPerFrameInv; + note->playbackState.adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv; note->playbackState.adsr.action.s.release = true; } return; @@ -500,7 +500,7 @@ void Audio_SeqChanLayerDecayRelease(SequenceChannelLayer* seqLayer, s32 target) note->playbackState.prevParentLayer = note->playbackState.parentLayer; note->playbackState.parentLayer = NO_LAYER; if (target == ADSR_STATE_RELEASE) { - note->playbackState.adsr.fadeOutVel = gAudioContext.gAudioBufferParameters.updatesPerFrameInv; + note->playbackState.adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv; note->playbackState.adsr.action.s.release = true; note->playbackState.unk_04 = 2; } else { @@ -602,11 +602,11 @@ void Audio_InitNoteLists(NotePool* pool) { void Audio_InitNoteFreeList(void) { s32 i; - Audio_InitNoteLists(&gNoteFreeLists); - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - gAudioContext.gNotes[i].listItem.u.value = &gAudioContext.gNotes[i]; - gAudioContext.gNotes[i].listItem.prev = NULL; - Audio_AudioListPushBack(&gNoteFreeLists.disabled, &gAudioContext.gNotes[i].listItem); + Audio_InitNoteLists(&gAudioContext.noteFreeLists); + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + gAudioContext.notes[i].listItem.u.value = &gAudioContext.notes[i]; + gAudioContext.notes[i].listItem.prev = NULL; + Audio_AudioListPushBack(&gAudioContext.noteFreeLists.disabled, &gAudioContext.notes[i].listItem); } } @@ -620,22 +620,22 @@ void Audio_NotePoolClear(NotePool* pool) { switch (i) { case 0: source = &pool->disabled; - dest = &gNoteFreeLists.disabled; + dest = &gAudioContext.noteFreeLists.disabled; break; case 1: source = &pool->decaying; - dest = &gNoteFreeLists.decaying; + dest = &gAudioContext.noteFreeLists.decaying; break; case 2: source = &pool->releasing; - dest = &gNoteFreeLists.releasing; + dest = &gAudioContext.noteFreeLists.releasing; break; case 3: source = &pool->active; - dest = &gNoteFreeLists.active; + dest = &gAudioContext.noteFreeLists.active; break; } @@ -666,22 +666,22 @@ void Audio_NotePoolFill(NotePool* pool, s32 count) { switch (i) { case 0: - source = &gNoteFreeLists.disabled; + source = &gAudioContext.noteFreeLists.disabled; dest = &pool->disabled; break; case 1: - source = &gNoteFreeLists.decaying; + source = &gAudioContext.noteFreeLists.decaying; dest = &pool->decaying; break; case 2: - source = &gNoteFreeLists.releasing; + source = &gAudioContext.noteFreeLists.releasing; dest = &pool->releasing; break; case 3: - source = &gNoteFreeLists.active; + source = &gAudioContext.noteFreeLists.active; dest = &pool->active; break; } @@ -790,7 +790,7 @@ void Audio_NoteReleaseAndTakeOwnership(Note* note, SequenceChannelLayer* seqLaye note->playbackState.wantedParentLayer = seqLayer; note->playbackState.priority = seqLayer->seqChannel->notePriority; - note->playbackState.adsr.fadeOutVel = gAudioContext.gAudioBufferParameters.updatesPerFrameInv; + note->playbackState.adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv; note->playbackState.adsr.action.s.release = true; } @@ -884,9 +884,9 @@ Note* Audio_AllocNote(SequenceChannelLayer* seqLayer) { } if (policy & 8) { - if (!(ret = Audio_AllocNoteFromDisabled(&gNoteFreeLists, seqLayer)) && - !(ret = Audio_AllocNoteFromDecaying(&gNoteFreeLists, seqLayer)) && - !(ret = Audio_AllocNoteFromActive(&gNoteFreeLists, seqLayer))) { + if (!(ret = Audio_AllocNoteFromDisabled(&gAudioContext.noteFreeLists, seqLayer)) && + !(ret = Audio_AllocNoteFromDecaying(&gAudioContext.noteFreeLists, seqLayer)) && + !(ret = Audio_AllocNoteFromActive(&gAudioContext.noteFreeLists, seqLayer))) { goto null_return; } return ret; @@ -894,13 +894,13 @@ Note* Audio_AllocNote(SequenceChannelLayer* seqLayer) { if (!(ret = Audio_AllocNoteFromDisabled(&seqLayer->seqChannel->notePool, seqLayer)) && !(ret = Audio_AllocNoteFromDisabled(&seqLayer->seqChannel->seqPlayer->notePool, seqLayer)) && - !(ret = Audio_AllocNoteFromDisabled(&gNoteFreeLists, seqLayer)) && + !(ret = Audio_AllocNoteFromDisabled(&gAudioContext.noteFreeLists, seqLayer)) && !(ret = Audio_AllocNoteFromDecaying(&seqLayer->seqChannel->notePool, seqLayer)) && !(ret = Audio_AllocNoteFromDecaying(&seqLayer->seqChannel->seqPlayer->notePool, seqLayer)) && - !(ret = Audio_AllocNoteFromDecaying(&gNoteFreeLists, seqLayer)) && + !(ret = Audio_AllocNoteFromDecaying(&gAudioContext.noteFreeLists, seqLayer)) && !(ret = Audio_AllocNoteFromActive(&seqLayer->seqChannel->notePool, seqLayer)) && !(ret = Audio_AllocNoteFromActive(&seqLayer->seqChannel->seqPlayer->notePool, seqLayer)) && - !(ret = Audio_AllocNoteFromActive(&gNoteFreeLists, seqLayer))) { + !(ret = Audio_AllocNoteFromActive(&gAudioContext.noteFreeLists, seqLayer))) { goto null_return; } return ret; @@ -914,8 +914,8 @@ void Audio_NoteInitAll(void) { Note* note; s32 i; - for (i = 0; i < gAudioContext.gMaxSimultaneousNotes; i++) { - note = &gAudioContext.gNotes[i]; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + note = &gAudioContext.notes[i]; note->noteSubEu = gZeroNoteSub; note->playbackState.priority = 0; note->playbackState.unk_04 = 0; @@ -931,6 +931,6 @@ void Audio_NoteInitAll(void) { note->portamento.speed = 0; note->playbackState.stereoHeadsetEffects = false; note->unk_BC = 0; - note->synthesisState.synthesisBuffers = Audio_AllocDmaMemory(&gAudioContext.gNotesAndBuffersPool, 0x1E0); + note->synthesisState.synthesisBuffers = Audio_AllocDmaMemory(&gAudioContext.notesAndBuffersPool, 0x1E0); } } diff --git a/src/code/audio_rodata.c b/src/code/audio_rodata.c new file mode 100644 index 0000000000..469c5fc357 --- /dev/null +++ b/src/code/audio_rodata.c @@ -0,0 +1,7 @@ +#include "global.h" + +const s16 D_8014A6C0[] = { + 0x1C00, + 0x0030, +}; +const AudioContextInitSizes D_8014A6C4 = { 0x37F00, 0xE0E0, 0xBCE0 }; diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c index 297d725461..5998ae702f 100644 --- a/src/code/audio_seqplayer.c +++ b/src/code/audio_seqplayer.c @@ -107,7 +107,7 @@ s32 Audio_HandleScriptFlowControl(SequencePlayer* seqPlayer, M64ScriptState* sta void Audio_SequenceChannelInit(SequenceChannel* seqChannel) { s32 i; - if (seqChannel == &gAudioContext.gSequenceChannelNone) { + if (seqChannel == &gAudioContext.sequenceChannelNone) { return; } @@ -164,7 +164,7 @@ s32 Audio_SeqChannelSetLayer(SequenceChannel* seqChannel, s32 layerIdx) { if (seqChannel->layers[layerIdx] == NULL) { SequenceChannelLayer* layer; - layer = Audio_AudioListPopBack(&gAudioContext.gLayerFreeList); + layer = Audio_AudioListPopBack(&gAudioContext.layerFreeList); seqChannel->layers[layerIdx] = layer; if (layer == NULL) { seqChannel->layers[layerIdx] = NULL; @@ -206,7 +206,7 @@ s32 Audio_SeqChannelSetLayer(SequenceChannel* seqChannel, s32 layerIdx) { void Audio_SeqChannelLayerDisable(SequenceChannelLayer* layer) { if (layer != NULL) { - if (layer->seqChannel != &gAudioContext.gSequenceChannelNone && layer->seqChannel->seqPlayer->finished == 1) { + if (layer->seqChannel != &gAudioContext.sequenceChannelNone && layer->seqChannel->seqPlayer->finished == 1) { Audio_SeqChanLayerNoteRelease(layer); } else { Audio_SeqChanLayerNoteDecay(layer); @@ -220,7 +220,7 @@ void Audio_SeqChannelLayerFree(SequenceChannel* seqChannel, s32 layerIdx) { SequenceChannelLayer* layer = seqChannel->layers[layerIdx]; if (layer != NULL) { - Audio_AudioListPushBack(&gAudioContext.gLayerFreeList, &layer->listItem); + Audio_AudioListPushBack(&gAudioContext.layerFreeList, &layer->listItem); Audio_SeqChannelLayerDisable(layer); seqChannel->layers[layerIdx] = NULL; } @@ -303,10 +303,10 @@ void Audio_SequencePlayerDisable(SequencePlayer* seqPlayer) { Audio_SetBankLoadStatus(seqPlayer->defaultBank, 4); } - if (seqPlayer->defaultBank == gAudioContext.gBankLoadedPool.temporary.entries[0].id) { - gAudioContext.gBankLoadedPool.temporary.nextSide = 0; - } else if (seqPlayer->defaultBank == gAudioContext.gBankLoadedPool.temporary.entries[1].id) { - gAudioContext.gBankLoadedPool.temporary.nextSide = 1; + if (seqPlayer->defaultBank == gAudioContext.bankLoadedPool.temporary.entries[0].id) { + gAudioContext.bankLoadedPool.temporary.nextSide = 0; + } else if (seqPlayer->defaultBank == gAudioContext.bankLoadedPool.temporary.entries[1].id) { + gAudioContext.bankLoadedPool.temporary.nextSide = 1; } } @@ -338,15 +338,15 @@ void* Audio_AudioListPopBack(AudioListItem* list) { void Audio_InitLayerFreelist(void) { s32 i; - gAudioContext.gLayerFreeList.prev = &gAudioContext.gLayerFreeList; - gAudioContext.gLayerFreeList.next = &gAudioContext.gLayerFreeList; - gAudioContext.gLayerFreeList.u.count = 0; - gAudioContext.gLayerFreeList.pool = NULL; + gAudioContext.layerFreeList.prev = &gAudioContext.layerFreeList; + gAudioContext.layerFreeList.next = &gAudioContext.layerFreeList; + gAudioContext.layerFreeList.u.count = 0; + gAudioContext.layerFreeList.pool = NULL; - for (i = 0; i < ARRAY_COUNT(gAudioContext.gSequenceLayers); i++) { - gAudioContext.gSequenceLayers[i].listItem.u.value = &gAudioContext.gSequenceLayers[i]; - gAudioContext.gSequenceLayers[i].listItem.prev = NULL; - Audio_AudioListPushBack(&gAudioContext.gLayerFreeList, &gAudioContext.gSequenceLayers[i].listItem); + for (i = 0; i < ARRAY_COUNT(gAudioContext.sequenceLayers); i++) { + gAudioContext.sequenceLayers[i].listItem.u.value = &gAudioContext.sequenceLayers[i]; + gAudioContext.sequenceLayers[i].listItem.prev = NULL; + Audio_AudioListPushBack(&gAudioContext.layerFreeList, &gAudioContext.sequenceLayers[i].listItem); } } @@ -704,7 +704,7 @@ s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1) { layer->sound = NULL; tuning = 1.0f; if (instOrWave >= 0xC0) { - layer->sound = &gAudioContext.gSynthesisReverbs[instOrWave - 0xC0].sound; + layer->sound = &gAudioContext.synthesisReverbs[instOrWave - 0xC0].sound; } } @@ -732,12 +732,12 @@ s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1) { portamento->extent = (freqScale2 / freqScale) - 1.0f; if (PORTAMENTO_IS_SPECIAL(*portamento)) { - speed = seqPlayer->tempo * 0x8000 / gAudioContext.gTempoInternalToExternal; + speed = seqPlayer->tempo * 0x8000 / gAudioContext.tempoInternalToExternal; if (layer->delay != 0) { speed = speed * 0x100 / (layer->delay * layer->portamentoTime); } } else { - speed = 0x20000 / (layer->portamentoTime * gAudioContext.gAudioBufferParameters.updatesPerFrame); + speed = 0x20000 / (layer->portamentoTime * gAudioContext.audioBufferParameters.updatesPerFrame); } if (speed >= 0x7FFF) { @@ -764,7 +764,7 @@ s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1) { layer->sound = NULL; layer->freqScale = gNoteFrequencies[cmd2]; if (instOrWave >= 0xC0) { - layer->sound = &gAudioContext.gSynthesisReverbs[instOrWave - 0xC0].sound; + layer->sound = &gAudioContext.synthesisReverbs[instOrWave - 0xC0].sound; } } break; @@ -791,7 +791,7 @@ s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1) { // set when this is reached...) if (PORTAMENTO_IS_SPECIAL(*portamento)) { s32 speed2; - speed2 = seqPlayer->tempo * 0x8000 / gAudioContext.gTempoInternalToExternal; + speed2 = seqPlayer->tempo * 0x8000 / gAudioContext.tempoInternalToExternal; speed2 = speed2 * 0x100 / (layer->delay * layer->portamentoTime); if (speed2 >= 0x7FFF) { speed2 = 0x7FFF; @@ -870,8 +870,8 @@ s32 func_800EAAE0(SequenceChannelLayer* layer, s32 arg1) { if (seqChannel->velocityRandomVariance != 0) { floatDelta = - layer->velocitySquare * (f32)(gAudioContext.gAudioRandom % seqChannel->velocityRandomVariance) / 100.0f; - if ((gAudioContext.gAudioRandom & 0x8000) != 0) { + layer->velocitySquare * (f32)(gAudioContext.audioRandom % seqChannel->velocityRandomVariance) / 100.0f; + if ((gAudioContext.audioRandom & 0x8000) != 0) { floatDelta = -floatDelta; } layer->velocitySquare2 = layer->velocitySquare + floatDelta; @@ -888,8 +888,8 @@ s32 func_800EAAE0(SequenceChannelLayer* layer, s32 arg1) { layer->duration = (layer->noteDuration * playPercentage) >> 8; if (seqChannel->durationRandomVariance != 0) { //! @bug should probably be durationRandomVariance - intDelta = (layer->duration * (gAudioContext.gAudioRandom % seqChannel->velocityRandomVariance)) / 100; - if ((gAudioContext.gAudioRandom & 0x4000) != 0) { + intDelta = (layer->duration * (gAudioContext.audioRandom % seqChannel->velocityRandomVariance)) / 100; + if ((gAudioContext.audioRandom & 0x4000) != 0) { intDelta = -intDelta; } layer->duration += intDelta; @@ -1327,12 +1327,12 @@ void Audio_SequenceChannelProcessScript(SequenceChannel* channel) { scriptState->value = (*channel->dynTable)[0][scriptState->value]; break; case 0xB7: - channel->unk_22 = (parameters[0] == 0) ? gAudioContext.gAudioRandom // odd load here - : gAudioContext.gAudioRandom % parameters[0]; + channel->unk_22 = (parameters[0] == 0) ? gAudioContext.audioRandom // odd load here + : gAudioContext.audioRandom % parameters[0]; break; case 0xB8: - scriptState->value = (parameters[0] == 0) ? gAudioContext.gAudioRandom - : gAudioContext.gAudioRandom % parameters[0]; + scriptState->value = (parameters[0] == 0) ? gAudioContext.audioRandom + : gAudioContext.audioRandom % parameters[0]; break; case 0xBD: { result = Audio_NextRandom(); @@ -1498,11 +1498,11 @@ void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) { seqPlayer->tempoAcc += seqPlayer->tempo; seqPlayer->tempoAcc += (s16)seqPlayer->unk_0C; - if (seqPlayer->tempoAcc < gAudioContext.gTempoInternalToExternal) { + if (seqPlayer->tempoAcc < gAudioContext.tempoInternalToExternal) { return; } - seqPlayer->tempoAcc -= (u16)gAudioContext.gTempoInternalToExternal; + seqPlayer->tempoAcc -= (u16)gAudioContext.tempoInternalToExternal; if (seqPlayer->unk_0b2 == true) { return; @@ -1558,8 +1558,8 @@ void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) { break; case 0xDD: seqPlayer->tempo = Audio_M64ReadU8(seqScript) * 48; - if (seqPlayer->tempo > gAudioContext.gTempoInternalToExternal) { - seqPlayer->tempo = (u16)gAudioContext.gTempoInternalToExternal; + if (seqPlayer->tempo > gAudioContext.tempoInternalToExternal) { + seqPlayer->tempo = (u16)gAudioContext.tempoInternalToExternal; } if ((s16)seqPlayer->tempo <= 0) { seqPlayer->tempo = 1; @@ -1641,9 +1641,9 @@ void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) { case 0xCE: command = Audio_M64ReadU8(seqScript); if (command == 0) { - seqScript->value = (gAudioContext.gAudioRandom >> 2) & 0xff; + seqScript->value = gAudioContext.audioRandom / 4; } else { - seqScript->value = (gAudioContext.gAudioRandom >> 2) % command; + seqScript->value = (gAudioContext.audioRandom / 4) % command; } break; case 0xCD: { @@ -1760,10 +1760,10 @@ void Audio_ProcessSequences(s32 arg0) { SequencePlayer* seqPlayer; u32 i; - gAudioContext.gNoteSubEuOffset = - (gAudioContext.gAudioBufferParameters.updatesPerFrame - arg0 - 1) * gAudioContext.gMaxSimultaneousNotes; - for (i = 0; i < (u32)gAudioContext.gAudioBufferParameters.numSequencePlayers; i++) { - seqPlayer = &gAudioContext.gSequencePlayers[i]; + gAudioContext.noteSubEuOffset = + (gAudioContext.audioBufferParameters.updatesPerFrame - arg0 - 1) * gAudioContext.maxSimultaneousNotes; + for (i = 0; i < (u32)gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + seqPlayer = &gAudioContext.seqPlayers[i]; if (seqPlayer->enabled == 1) { Audio_SequencePlayerProcessSequence(seqPlayer); Audio_SequencePlayerProcessSound(seqPlayer); @@ -1809,13 +1809,13 @@ void Audio_ResetSequencePlayer(SequencePlayer* seqPlayer) { void func_800EC734(s32 seqPlayerIdx) { SequenceChannel* seqChannel; - SequencePlayer* seqPlayer = &gAudioContext.gSequencePlayers[seqPlayerIdx]; + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[seqPlayerIdx]; s32 i, j; for (i = 0; i < 0x10; i++) { - seqPlayer->channels[i] = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, sizeof(SequenceChannel)); + seqPlayer->channels[i] = Audio_AllocZeroed(&gAudioContext.notesAndBuffersPool, sizeof(SequenceChannel)); if (seqPlayer->channels[i] == NULL) { - seqPlayer->channels[i] = &gAudioContext.gSequenceChannelNone; + seqPlayer->channels[i] = &gAudioContext.sequenceChannelNone; } else { seqChannel = seqPlayer->channels[i]; seqChannel->seqPlayer = seqPlayer; @@ -1832,7 +1832,7 @@ void Audio_InitSequencePlayer(SequencePlayer* seqPlayer) { s32 i, j; for (i = 0; i < 0x10; i++) { - seqPlayer->channels[i] = &gAudioContext.gSequenceChannelNone; + seqPlayer->channels[i] = &gAudioContext.sequenceChannelNone; } seqPlayer->enabled = false; @@ -1856,11 +1856,11 @@ void Audio_InitSequencePlayers(void) { Audio_InitLayerFreelist(); for (i = 0; i < 64; i++) { - gAudioContext.gSequenceLayers[i].seqChannel = NULL; - gAudioContext.gSequenceLayers[i].enabled = false; + gAudioContext.sequenceLayers[i].seqChannel = NULL; + gAudioContext.sequenceLayers[i].enabled = false; } for (i = 0; i < 4; i++) { - Audio_InitSequencePlayer(&gAudioContext.gSequencePlayers[i]); + Audio_InitSequencePlayer(&gAudioContext.seqPlayers[i]); } } diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c new file mode 100644 index 0000000000..1c86f42120 --- /dev/null +++ b/src/code/audio_synthesis.c @@ -0,0 +1,1199 @@ +#include "ultra64.h" +#include "global.h" + +Acmd* AudioSynth_LoadRingBuffer(Acmd* arg0, u16 arg1, u16 arg2, s32 arg3, SynthesisReverb* arg4); +Acmd* AudioSynth_SaveBuffer(Acmd* arg0, u16 arg1, u16 arg2, s32 arg3, s16* arg4); +Acmd* AudioSynth_SaveRingBuffer(Acmd* arg0, u16 arg1, u16 arg2, s32 arg3, SynthesisReverb* arg4); +Acmd* func_800DC384(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIdx); +Acmd* func_800DC910(s32 noteIdx, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, s32 aiBufLen, + Acmd* cmd, s32 updateIdx); +Acmd* func_800DD9F4(Acmd* arg0, NoteSubEu* arg1, NoteSynthesisState* arg2, s32 arg3); +Acmd* func_800DDB64(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 arg3, s32 arg4, s32 arg5); +Acmd* func_800DD6CC(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 aiBufLen, u16, s32, s32); +Acmd* func_800DD62C(Acmd* cmd, NoteSynthesisState* synthState, s32 count, u16 pitch, u16 inpDmem, s32 resampleFlags); +extern s16 D_8012FBAA[]; +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/pad_800DACB0.s") + +void AudioSynth_InitNextRingBuf(s32 chunkSize, s32 bufIdx, s32 reverbIdx) { + ReverbRingBufferItem* bufItem; + s32 pad[3]; + SynthesisReverb* reverb = &gAudioContext.synthesisReverbs[reverbIdx]; + s32 temp_a0_2; + s32 temp_a0_4; + s32 sampleCnt; + s32 extraSamples; + s32 i; + s32 j; + + if (reverb->downsampleRate >= 2) { + if (reverb->framesToIgnore == 0) { + bufItem = &reverb->items[reverb->curFrame][bufIdx]; + // inval dcache + Audio_osInvalDCache(bufItem->toDownsampleLeft, 0x340); + + for (j = 0, i = 0; i < bufItem->lengthA / 2; j += reverb->downsampleRate, i++) { + reverb->leftRingBuf[bufItem->startPos + i] = bufItem->toDownsampleLeft[j]; + reverb->rightRingBuf[bufItem->startPos + i] = bufItem->toDownsampleRight[j]; + } + + for (i = 0; i < bufItem->lengthB / 2; j += reverb->downsampleRate, i++) { + reverb->leftRingBuf[i] = bufItem->toDownsampleLeft[j]; + reverb->rightRingBuf[i] = bufItem->toDownsampleRight[j]; + } + } + } + + bufItem = &reverb->items[reverb->curFrame][bufIdx]; + sampleCnt = chunkSize / reverb->downsampleRate; + extraSamples = (sampleCnt + reverb->nextRingBufPos) - reverb->bufSizePerChan; + temp_a0_2 = reverb->nextRingBufPos; + if (extraSamples < 0) { + bufItem->lengthA = sampleCnt * 2; + bufItem->lengthB = 0; + bufItem->startPos = reverb->nextRingBufPos; + reverb->nextRingBufPos += sampleCnt; + } else { + bufItem->lengthA = (sampleCnt - extraSamples) * 2; + bufItem->lengthB = extraSamples * 2; + bufItem->startPos = reverb->nextRingBufPos; + reverb->nextRingBufPos = extraSamples; + } + + bufItem->numSamplesAfterDownsampling = sampleCnt; + bufItem->chunkLen = chunkSize; + + if (reverb->unk_14 != 0) { + temp_a0_4 = reverb->unk_14 + temp_a0_2; + if (temp_a0_4 >= reverb->bufSizePerChan) { + temp_a0_4 -= reverb->bufSizePerChan; + } + bufItem = &reverb->items2[reverb->curFrame][bufIdx]; + sampleCnt = chunkSize / reverb->downsampleRate; + extraSamples = (temp_a0_4 + sampleCnt) - reverb->bufSizePerChan; + if (extraSamples < 0) { + bufItem->lengthA = sampleCnt * 2; + bufItem->lengthB = 0; + bufItem->startPos = temp_a0_4; + } else { + bufItem->lengthA = (sampleCnt - extraSamples) * 2; + bufItem->lengthB = extraSamples * 2; + bufItem->startPos = temp_a0_4; + } + bufItem->numSamplesAfterDownsampling = sampleCnt; + bufItem->chunkLen = chunkSize; + } +} + +void func_800DB03C(s32 arg0) { + NoteSubEu* temp_v0_2; + NoteSubEu* subEu; + s32 t; + s32 i; + + t = gAudioContext.maxSimultaneousNotes * arg0; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + subEu = &gAudioContext.notes[i].noteSubEu; + temp_v0_2 = &gAudioContext.noteSubsEu[t + i]; + if (subEu->bitField0.s.enabled) { + subEu->bitField0.s.needsInit = 0; + } else { + temp_v0_2->bitField0.s.enabled = 0; + } + + subEu->unk_06 = 0; + } +} + +Acmd* AudioSynth_Update(Acmd* cmdStart, s32* cmdCnt, s16* aiStart, s32 aiBufLen) { + s32 chunkSize; + s16* aiBufP; + Acmd* cmdP; + s32 i; + s32 j; + SynthesisReverb* reverb; + + cmdP = cmdStart; + for (i = gAudioContext.audioBufferParameters.updatesPerFrame; i > 0; i--) { + Audio_ProcessSequences(i - 1); + func_800DB03C(gAudioContext.audioBufferParameters.updatesPerFrame - i); + } + + aiBufP = aiStart; + gAudioContext.unk_0x10 = 0; + for (i = gAudioContext.audioBufferParameters.updatesPerFrame; i > 0; i--) { + if (i == 1) { + chunkSize = aiBufLen; + } else if ((aiBufLen / i) >= gAudioContext.audioBufferParameters.samplesPerUpdateMax) { + chunkSize = gAudioContext.audioBufferParameters.samplesPerUpdateMax; + } else if (gAudioContext.audioBufferParameters.samplesPerUpdateMin >= (aiBufLen / i)) { + chunkSize = gAudioContext.audioBufferParameters.samplesPerUpdateMin; + } else { + chunkSize = gAudioContext.audioBufferParameters.samplesPerUpdate; + } + + for (j = 0; j < gAudioContext.numSynthesisReverbs; j++) { + if (gAudioContext.synthesisReverbs[j].useReverb) { + AudioSynth_InitNextRingBuf(chunkSize, gAudioContext.audioBufferParameters.updatesPerFrame - i, j); + } + } + + cmdP = func_800DC384(aiBufP, chunkSize, cmdP, gAudioContext.audioBufferParameters.updatesPerFrame - i); + aiBufLen -= chunkSize; + aiBufP += chunkSize * 2; + } + + for (j = 0; j < gAudioContext.numSynthesisReverbs; j++) { + if (gAudioContext.synthesisReverbs[j].framesToIgnore != 0) { + gAudioContext.synthesisReverbs[j].framesToIgnore--; + } + gAudioContext.synthesisReverbs[j].curFrame ^= 1; + } + + *cmdCnt = cmdP - cmdStart; + return cmdP; +} + +void func_800DB2C0(s32 arg0, s32 arg1) { + NoteSubEu* temp_v1; + s32 i; + + for (i = arg0 + 1; i < gAudioContext.audioBufferParameters.updatesPerFrame; i++) { + temp_v1 = &gAudioContext.noteSubsEu[(gAudioContext.maxSimultaneousNotes * i) + arg1]; + if (!temp_v1->bitField0.s.needsInit) { + temp_v1->bitField0.s.enabled = 0; + } else { + break; + } + } +} + +Acmd* func_800DB330(Acmd* arg0, SynthesisReverb* reverb, s16 arg2) { + ReverbRingBufferItem* bufItem = &reverb->items[reverb->curFrame][arg2]; + + arg0 = AudioSynth_LoadRingBuffer(arg0, 0x3E0, bufItem->startPos, bufItem->lengthA, reverb); + if (bufItem->lengthB != 0) { + arg0 = AudioSynth_LoadRingBuffer(arg0, bufItem->lengthA + 0x3E0, 0, bufItem->lengthB, reverb); + } + return arg0; +} + +Acmd* func_800DB3D8(Acmd* arg0, SynthesisReverb* arg1, s16 arg2) { + ReverbRingBufferItem* temp_v1; + + temp_v1 = &arg1->items[arg1->curFrame][arg2]; + arg0 = AudioSynth_SaveRingBuffer(arg0, 0x3E0, temp_v1->startPos, temp_v1->lengthA, arg1); + if (temp_v1->lengthB != 0) { + arg0 = AudioSynth_SaveRingBuffer(arg0, temp_v1->lengthA + 0x3E0, 0, temp_v1->lengthB, arg1); + } + return arg0; +} + +Acmd* func_800DB480(Acmd* arg0, SynthesisReverb* arg1) { + void* temp_a2; + void* temp_a3; + + aDMEMMove(arg0++, 0xC80, 0x720, 0x1A0); + aMix(arg0++, 0x1A, arg1->unk_10, 0xE20, 0xC80); + aMix(arg0++, 0x1A, arg1->unk_12, 0x720, 0xE20); + return arg0; +} + +Acmd* func_800DB4E4(Acmd* arg0, s32 arg1, SynthesisReverb* arg2, s16 arg3) { + ReverbRingBufferItem* temp_v1; + s16 temp_t0_2; + s16 temp_t1_2; + + temp_v1 = &arg2->items[arg2->curFrame][arg3]; + temp_t0_2 = (temp_v1->startPos & 7) * 2; + temp_t1_2 = ALIGN16(temp_t0_2 + temp_v1->lengthA); + arg0 = AudioSynth_LoadRingBuffer(arg0, 0x3E0, temp_v1->startPos - (temp_t0_2 / 2), 0x1A0, arg2); + if (temp_v1->lengthB != 0) { + arg0 = AudioSynth_LoadRingBuffer(arg0, temp_t1_2 + 0x3E0, 0, 0x1A0 - temp_t1_2, arg2); + } + aSetBuffer(arg0++, 0, temp_t0_2 + 0x3E0, 0xC80, arg1 * 2); + aResample(arg0++, arg2->resampleFlags, arg2->unk_0E, arg2->unk_30); + aSetBuffer(arg0++, 0, temp_t0_2 + 0x580, 0xE20, arg1 * 2); + aResample(arg0++, arg2->resampleFlags, arg2->unk_0E, arg2->unk_34); + return arg0; +} + +Acmd* func_800DB680(Acmd* cmd, SynthesisReverb* reverb, s16 bufIdx) { + ReverbRingBufferItem* bufItem = &reverb->items[reverb->curFrame][bufIdx]; + + aSetBuffer(cmd++, 0, 0xC80, 0x720, bufItem->unk_18 * 2); + aResample(cmd++, reverb->resampleFlags, bufItem->unk_16, reverb->unk_38); + + cmd = AudioSynth_SaveBuffer(cmd, 0x720, bufItem->startPos, bufItem->lengthA, reverb->leftRingBuf); + if (bufItem->lengthB != 0) { + cmd = AudioSynth_SaveBuffer(cmd, bufItem->lengthA + 0x720, 0, bufItem->lengthB, reverb->leftRingBuf); + } + aSetBuffer(cmd++, 0, 0xE20, 0x720, bufItem->unk_18 * 2); + aResample(cmd++, reverb->resampleFlags, bufItem->unk_16, reverb->unk_3C); + cmd = AudioSynth_SaveBuffer(cmd, 0x720, bufItem->startPos, bufItem->lengthA, reverb->rightRingBuf); + + if (bufItem->lengthB != 0) { + cmd = AudioSynth_SaveBuffer(cmd, bufItem->lengthA + 0x720, 0, bufItem->lengthB, reverb->rightRingBuf); + } + + return cmd; +} + +Acmd* func_800DB828(Acmd* arg0, s32 arg1, SynthesisReverb* arg2, s16 arg3) { + ReverbRingBufferItem* temp_v1; + s16 temp_t1; + s16 temp_t2_2; + + temp_v1 = &arg2->items[arg2->curFrame][arg3]; + temp_v1->unk_14 = (temp_v1->unk_18 << 0xF) / arg1; + temp_t1 = (temp_v1->startPos & 7) * 2; + temp_v1->unk_16 = (arg1 << 0xF) / temp_v1->unk_18; + temp_t2_2 = ALIGN16(temp_t1 + temp_v1->lengthA); + arg0 = AudioSynth_LoadRingBuffer(arg0, 0x3E0, temp_v1->startPos - (temp_t1 / 2), 0x1A0, arg2); + if (temp_v1->lengthB != 0) { + arg0 = AudioSynth_LoadRingBuffer(arg0, temp_t2_2 + 0x3E0, 0, 0x1A0 - temp_t2_2, arg2); + } + aSetBuffer(arg0++, 0, temp_t1 + 0x3E0, 0xC80, arg1 * 2); + aResample(arg0++, arg2->resampleFlags, temp_v1->unk_14, arg2->unk_30); + aSetBuffer(arg0++, 0, temp_t1 + 0x580, 0xE20, arg1 * 2); + aResample(arg0++, arg2->resampleFlags, temp_v1->unk_14, arg2->unk_34); + return arg0; +} + +Acmd* func_800DBA40(Acmd* arg0, s32 arg1, SynthesisReverb* arg2) { + if (arg2->unk_270 != NULL) { + aFilter(arg0++, 2, arg1, arg2->unk_270); + aFilter(arg0++, arg2->resampleFlags, 0xC80, arg2->unk_278); + } + + if (arg2->unk_274 != NULL) { + aFilter(arg0++, 2, arg1, arg2->unk_274); + aFilter(arg0++, arg2->resampleFlags, 0xE20, arg2->unk_27C); + } + return arg0; +} + +Acmd* func_800DBAE8(Acmd* arg0, SynthesisReverb* arg1, s32 arg2) { + SynthesisReverb* temp_a3; + + temp_a3 = &gAudioContext.synthesisReverbs[arg1->unk_05]; + if (temp_a3->downsampleRate == 1) { + arg0 = func_800DB330(arg0, temp_a3, arg2); + aMix(arg0++, 0x34, arg1->unk_08, 0xC80, 0x3E0); + arg0 = func_800DB3D8(arg0, temp_a3, arg2); + } + return arg0; +} + +void func_800DBB94(void) { +} + +void func_800DBB9C(Acmd* arg0, s32 arg1, s32 arg2) { + aClearBuffer(arg0, arg1, arg2); +} + +void func_800DBBBC(void) { +} + +void func_800DBBC4(void) { +} + +void func_800DBBCC(void) { +} + +void func_800DBBD4(Acmd* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + aMix(arg0, arg1, arg2, arg3, arg4); +} + +void func_800DBC08(void) { +} + +void func_800DBC10(void) { +} + +void func_800DBC18(void) { +} + +void AudioSynth_SetBuffer(Acmd* cmd, s32 flag, s32 dmemIn, s32 dmemOut, s32 count) { + aSetBuffer(cmd, flag, dmemIn, dmemOut, count); +} + +void func_800DBC54(void) { +} + +void func_800DBC5C(void) { +} + +// possible fake match? +void AudioSynth_DMemMove(Acmd* cmd, s32 dmemIn, s32 dmemOut, s32 count) { + cmd->words.w0 = _SHIFTL(A_DMEMMOVE, 24, 8) | _SHIFTL(dmemIn, 0, 24); + cmd->words.w1 = _SHIFTL(dmemOut, 16, 16) | _SHIFTL(count, 0, 16); +} + +void func_800DBC90(void) { +} + +void func_800DBC98(void) { +} + +void func_800DBCA0(void) { +} + +void func_800DBCA8(void) { +} + +void AudioSynth_InterL(Acmd* cmd, s32 dmemIn, s32 dmemOut, s32 count) { + cmd->words.w0 = _SHIFTL(A_INTERL, 24, 8) | _SHIFTL(count, 0, 16); + cmd->words.w1 = _SHIFTL(dmemIn, 16, 16) | _SHIFTL(dmemOut, 0, 16); +} + +void func_800DBCD4(Acmd* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + aEnvSetup1(arg0, arg1, arg2, arg3, arg4); +} + +void func_800DBD08(void) { +} + +void func_800DBD10(Acmd* arg0, s32 arg1, s32 arg2, s32 arg3) { + aLoadBuffer(arg0, arg3, arg1, arg2); +} + +void func_800DBD38(Acmd* arg0, s32 arg1, s32 arg2, s32 arg3) { + aSaveBuffer(arg0, arg1, arg3, arg2); +} + +void AudioSynth_EnvSetup2(Acmd* cmd, s32 volLeft, s32 volRight) { + cmd->words.w0 = _SHIFTL(A_ENVSETUP2, 24, 8); + cmd->words.w1 = _SHIFTL(volLeft, 16, 16) | _SHIFTL(volRight, 0, 16); +} + +void func_800DBD7C(void) { +} + +void func_800DBD84(void) { +} + +void func_800DBD8C(void) { +} + +void AudioSynth_UnkCmd17(Acmd* arg0, s32 arg1, s32 arg2) { + aUnkCmd17(arg0, arg1, arg2); +} + +void AudioSynth_HiLoGain(Acmd* cmd, s32 gain, s32 dmemIn, s32 dmemOut, s32 count) { + cmd->words.w0 = _SHIFTL(A_HILOGAIN, 24, 8) | _SHIFTL(gain, 16, 8) | _SHIFTL(count, 0, 16); + cmd->words.w1 = _SHIFTL(dmemIn, 16, 16) | _SHIFTL(dmemOut, 0, 16); +} + +void AudioSynth_UnkCmd19(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + cmd->words.w0 = _SHIFTL(A_UNK19, 24, 8) | _SHIFTL(arg4, 16, 8) | _SHIFTL(arg3, 0, 16); + cmd->words.w1 = _SHIFTL(arg1, 16, 16) | _SHIFTL(arg2, 0, 16); +} + +void func_800DBE18(void) { +} + +void func_800DBE20(void) { +} + +void func_800DBE28(void) { +} + +void func_800DBE30(void) { +} + +void AudioSynth_UnkCmd3(Acmd* cmd, s32 arg1, s32 arg2, s32 arg3) { + cmd->words.w0 = _SHIFTL(A_UNK3, 24, 8) | _SHIFTL(arg3, 0, 16); + cmd->words.w1 = _SHIFTL(arg1, 16, 16) | _SHIFTL(arg2, 0, 16); +} + +void func_800DBE5C(void) { +} + +void func_800DBE64(void) { +} + +void func_800DBE6C(void) { +} + +void AudioSynth_SetFilter(Acmd* cmd, s32 flags, s32 countOrBuf, s32 addr) { + aFilter(cmd, flags, countOrBuf, addr); +} + +void AudioSynth_SetFilterCount(Acmd* cmd, s32 count, s32 addr) { + aFilter(cmd, 2, count, addr); +} + +Acmd* func_800DBEB0(Acmd* cmd, s32 arg1, SynthesisReverb* reverb, s16 arg3) { + ReverbRingBufferItem* ringBufferItem = &reverb->items[reverb->curFrame][arg3]; + + cmd = AudioSynth_LoadRingBuffer(cmd, 0xC80, ringBufferItem->startPos, ringBufferItem->lengthA, reverb); + if (ringBufferItem->lengthB != 0) { + cmd = AudioSynth_LoadRingBuffer(cmd, ringBufferItem->lengthA + 0xC80, 0, ringBufferItem->lengthB, reverb); + } + + return cmd; +} + +Acmd* func_800DBF5C(Acmd* cmd, s32 arg1, SynthesisReverb* reverb, s16 bufIdx) { + ReverbRingBufferItem* bufItem = &reverb->items2[reverb->curFrame][bufIdx]; + + cmd = AudioSynth_LoadRingBuffer(cmd, 0xC80, bufItem->startPos, bufItem->lengthA, reverb); + if (bufItem->lengthB != 0) { + cmd = AudioSynth_LoadRingBuffer(cmd, bufItem->lengthA + 0xC80, 0, bufItem->lengthB, reverb); + } + return cmd; +} + +Acmd* AudioSynth_LoadRingBuffer(Acmd* cmd, u16 dmem, u16 startPos, s32 length, SynthesisReverb* reverb) { + aLoadBuffer(cmd++, &reverb->leftRingBuf[startPos], dmem, length); + aLoadBuffer(cmd++, &reverb->rightRingBuf[startPos], dmem + 0x1A0, length); + return cmd; +} + +Acmd* AudioSynth_SaveRingBuffer(Acmd* cmd, u16 dmem, u16 startPos, s32 length, SynthesisReverb* reverb) { + aSaveBuffer(cmd++, dmem, &reverb->leftRingBuf[startPos], length); + aSaveBuffer(cmd++, dmem + 0x1A0, &reverb->rightRingBuf[startPos], length); + return cmd; +} + +Acmd* AudioSynth_SaveBuffer(Acmd* cmd, u16 dmem, u16 offset, s32 length, s16* buf) { + aSaveBuffer(cmd++, dmem, &buf[offset], length); + return cmd; +} + +Acmd* func_800DC124(Acmd* cmd, s32 arg1, SynthesisReverb* reverb, s16 arg3) { + if (reverb->downsampleRate == 1) { + cmd = func_800DBF5C(cmd, arg1, reverb, arg3); + } + + return cmd; +} + +Acmd* func_800DC164(Acmd* cmd, s32 arg1, SynthesisReverb* reverb, s16 arg3) { + if (reverb->downsampleRate == 1) { + if (reverb->unk_18 != 0) { + cmd = func_800DB828(cmd, arg1, reverb, arg3); + } else { + cmd = func_800DBEB0(cmd, arg1, reverb, arg3); + } + } else { + cmd = func_800DB4E4(cmd, arg1, reverb, arg3); + } + return cmd; +} + +Acmd* func_800DC1D8(Acmd* cmd, SynthesisReverb* reverb, s16 bufIdx) { + ReverbRingBufferItem* bufItem = &reverb->items[reverb->curFrame][bufIdx]; + + if (reverb->downsampleRate == 1) { + if (reverb->unk_18 != 0) { + cmd = func_800DB680(cmd, reverb, bufIdx); + } else { + cmd = AudioSynth_SaveRingBuffer(cmd, 0xC80, bufItem->startPos, bufItem->lengthA, reverb); + if (bufItem->lengthB != 0) { + cmd = AudioSynth_SaveRingBuffer(cmd, bufItem->lengthA + 0xC80, 0, bufItem->lengthB, reverb); + } + } + } else { + func_800DBD38(cmd++, 0xC80, 0x340, reverb->items[reverb->curFrame][bufIdx].toDownsampleLeft); + } + + reverb->resampleFlags = 0; + return cmd; +} + +Acmd* func_800DC2DC(Acmd* cmd, SynthesisReverb* reverb, s16 bufIdx) { + ReverbRingBufferItem* bufItem = &reverb->items2[reverb->curFrame][bufIdx]; + + cmd = AudioSynth_SaveRingBuffer(cmd, 0xC80, bufItem->startPos, bufItem->lengthA, reverb); + if (bufItem->lengthB != 0) { + cmd = AudioSynth_SaveRingBuffer(cmd, bufItem->lengthA + 0xC80, 0, bufItem->lengthB, reverb); + } + return cmd; +} + +#ifdef NON_MATCHING +Acmd* func_800DC384(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIdx) { + NoteSubEu* phi_v0; + u8 sp9C[88]; + s16 phi_s2; + s16 phi_s4; + s32 t; + s32 useReverb; + SynthesisReverb* temp_t8; + u8 t2; + s32 i; + s32 unk14; + + t = gAudioContext.maxSimultaneousNotes * updateIdx; + phi_s2 = 0; + if (gAudioContext.numSynthesisReverbs == 0) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + phi_v0 = &gAudioContext.noteSubsEu[t + i]; + if (phi_v0->bitField0.s.enabled) { + sp9C[phi_s2++] = i; + } + } + i = 0; + } else { + for (phi_s4 = 0; phi_s4 < gAudioContext.numSynthesisReverbs; phi_s4++) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + phi_v0 = &gAudioContext.noteSubsEu[t + i]; + if (phi_v0->bitField0.s.enabled && phi_v0->bitField1.s.reverbIndex == phi_s4) { + sp9C[phi_s2++] = i; + } + } + } + + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + phi_v0 = &gAudioContext.noteSubsEu[t + i]; + if (phi_v0->bitField0.s.enabled && phi_v0->bitField1.s.reverbIndex >= gAudioContext.numSynthesisReverbs) { + sp9C[phi_s2++] = i; + } + } + i = 0; + } + + aClearBuffer(cmd++, 0x940, 0x340); + for (phi_s4 = 0; phi_s4 < gAudioContext.numSynthesisReverbs; phi_s4++) { + temp_t8 = &gAudioContext.synthesisReverbs[phi_s4]; + useReverb = temp_t8->useReverb; + if (useReverb) { + cmd = func_800DC164(cmd, aiBufLen, temp_t8, updateIdx); + aMix(cmd++, 0x34, temp_t8->unk_0A, 0xC80, 0x940); + unk14 = temp_t8->unk_14; + if (unk14) { + aDMEMMove(cmd++, 0xC80, 0x3E0, 0x340); + } + + aMix(cmd++, 0x34, temp_t8->unk_0C + 0x8000, 0xC80, 0xC80); + if ((temp_t8->unk_10 != 0) || (temp_t8->unk_12 != 0)) { + cmd = func_800DB480(cmd, temp_t8); + } + + if (unk14) { + cmd = func_800DC1D8(cmd, temp_t8, updateIdx); + if (temp_t8->unk_05 != -1) { + cmd = func_800DBAE8(cmd, temp_t8, updateIdx); + } + cmd = func_800DC124(cmd, aiBufLen, temp_t8, updateIdx); + aMix(cmd++, 0x34, temp_t8->unk_16, 0x3E0, 0xC80); + } + } + + while (i < phi_s2) { + phi_v0 = &gAudioContext.noteSubsEu[sp9C[i] + t]; + if (phi_v0->bitField1.s.reverbIndex == phi_s4) { + cmd = func_800DC910(sp9C[i], phi_v0, &gAudioContext.notes[sp9C[i]].synthesisState, aiBuf, aiBufLen, + cmd, updateIdx); + } else { + break; + } + i++; + } + + if (useReverb) { + if ((temp_t8->unk_270 != NULL) || (temp_t8->unk_274 != NULL)) { + cmd = func_800DBA40(cmd, aiBufLen * 2, temp_t8); + } + if (unk14) { + cmd = func_800DC2DC(cmd, temp_t8, updateIdx); + } else { + cmd = func_800DC1D8(cmd, temp_t8, updateIdx); + if (temp_t8->unk_05 != -1) { + cmd = func_800DBAE8(cmd, temp_t8, updateIdx); + } + } + } + } + + while (i < phi_s2) { + cmd = func_800DC910(sp9C[i], &gAudioContext.noteSubsEu[t + sp9C[i]], + &gAudioContext.notes[sp9C[i]].synthesisState, aiBuf, aiBufLen, cmd, updateIdx); + i++; + } + + updateIdx = aiBufLen * 2; + aInterleave(cmd++, updateIdx, 0x3C0, 0x940, 0xAE0); + aSaveBuffer(cmd++, 0x3C0, aiBuf, updateIdx * 2); + + return cmd; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_800DC384.s") +#endif + +#ifdef NON_MATCHING +Acmd* func_800DC910(s32 noteIdx, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, s32 aiBufLen, + Acmd* cmd, s32 updateIdx) { + AudioBankSample* sp150; + AdpcmLoop* sp14C; + s32 sp140; + s32 sp13C; + s32 sp138; + u16 sp136; + s32 sp120; + s32 sp110; + s32 sp104; + s32 sp100; + s32 spFC; + s32 spD4; + s32 spCC; + s32 spC8; + s32 spC0; + s32 spBC; + s32 spB0; + u16 spAE; + Note* sp9C; + u32 sp8C; + u32 sp88; + u32 sp50; + Acmd* temp_a0_3; + Acmd* temp_v0; + Acmd* temp_v0_10; + Acmd* temp_v0_11; + Acmd* temp_v0_12; + Acmd* temp_v0_13; + Acmd* temp_v0_8; + Acmd* temp_v0_9; + Acmd* temp_v1_3; + NoteSubEu* temp_a1; + NoteSynthesisState* temp_a2; + s32 temp_a1_3; + s32 temp_a2_2; + s32 temp_a2_3; + s32 temp_a2_4; + s32 temp_s1; + s32 temp_s1_2; + s32 temp_s1_3; + s32 temp_s4; + s32 temp_t0_3; + s32 temp_t1; + s32 temp_t9; + s32 temp_v0_3; + s32 temp_v0_5; + s32 temp_v0_7; + s32 temp_v1; + s32 temp_v1_4; + s32 temp_v1_5; + s32 temp_v1_6; + s32 temp_t0; + u16 temp_t6; + u16 temp_v1_7; + u32 temp_a3; + u32 temp_a3_3; + u32 temp_a3_4; + u32 temp_a3_5; + u32 temp_t0_2; + u32 temp_v0_6; + u8 temp_a1_4; + AdpcmLoop* temp_a1_2; + AudioBankSample* temp_v0_2; + AdpcmBook* temp_v0_4; + s32 phi_t1; + u8 phi_v1; + s32 phi_fp; + s32 phi_t1_2; + s32 phi_s3; + s32 phi_s1; + s32 phi_a1; + s32 phi_t1_3; + s32 phi_t0; + s32 phi_s4; + s32 phi_s0; + s32 phi_s5; + s32 phi_s6; + s32 phi_s7; + s32 phi_t1_4; + s32 phi_v1_2; + u8 phi_v1_3; + s32 phi_v1_4; + s32 phi_t1_5; + s32 phi_a1_2; + NoteSubEu* phi_s6_2; + s32 phi_s1_2; + NoteSubEu* phi_s6_3; + + sp8C = noteSubEu->bitField1.s.bookOffset; + sp88 = noteSubEu->bitField0.s.finished; + sp9C = &gAudioContext.notes[noteIdx]; + sp138 = 0; + + if (noteSubEu->bitField0.s.needsInit == 1) { + synthState->restart = 0; + synthState->unk_06 = 0; + synthState->curVolLeft = 0; + synthState->curVolRight = 0; + synthState->samplePosInt = sp9C->unk_BC; + synthState->samplePosFrac = noteSubEu->reverbVol; + synthState->unk_05 = 0; + synthState->prevHeadsetPanRight = 0; + synthState->prevHeadsetPanLeft = 0; + synthState->unk_1A = 1; + sp9C->noteSubEu.bitField0.s.finished = 0; + sp88 = 0; + sp138 = 1; + } + + sp136 = noteSubEu->resamplingRateFixedPoint; + spC0 = noteSubEu->bitField1.s.isSyntheticWave + 1; + temp_t0 = (sp136 * aiBufLen * 2) + synthState->unk_06; + synthState->unk_06 = temp_t0; + if (1 != synthState->unk_05) {} + synthState->unk_05 = spC0; + if (noteSubEu->bitField1.s.bit2) { + sp50 = temp_t0 >> 0x10; + cmd = func_800DD9F4(cmd, noteSubEu, synthState, sp50); + spAE = (synthState->samplePosInt * 2) + 0x580; + synthState->samplePosInt += sp50; + + // OLD BLOCK 94 + + } else { + sp50 = temp_t0 >> 0x10; + sp150 = noteSubEu->sound.audioBankSound->sample; + sp14C = sp150->loop; + sp100 = sp14C->end; + spB0 = 0; + spBC = 0; + sp110 = sp150->sampleAddr; + for (spBC = 0; !sp88 && spBC < spC0; spBC++) { + if (spC0 == 1) { + phi_fp = sp50; + } else if (sp50 & 1) { + phi_fp = (sp50 & ~1) + (spBC * 2); + } else { + phi_fp = sp50; + } + + if (sp150->bits4 == 0 || sp150->bits4 == 3) { + if (gAudioContext.unk_0x10 != sp150->bits4 + 8) { + switch (sp8C) { + case 1: + gAudioContext.unk_0x10 = D_8012FBAA; + ; + break; + case 2: + gAudioContext.unk_0x10 = sp150->bits4 + 8; + break; + case 3: + default: + break; + } + + aLoadADPCM(cmd++, sp150->book->order * 0x10 * sp150->book->npredictors, gAudioContext.unk_0x10); + } + } + sp104 = 0; + phi_s5 = 0; + while (sp104 != phi_fp) { + sp140 = 0; + sp13C = 0; + spFC = phi_fp - sp104; + phi_s3 = synthState->samplePosInt & 0xF; + if (phi_s3 == 0 && synthState->restart == 0) { + phi_s3 = 0x10; + } + if (spFC < (sp14C->end - synthState->samplePosInt)) { + phi_s1 = (s32)((spFC - (0x10 - phi_s3)) + 0xF) / 0x10; + phi_s0 = phi_s1 * 0x10; + phi_s6 = (0x10 - phi_s3); + phi_s7 = ((0x10 - phi_s3) + phi_s0) - spFC; + } else { + phi_s0 = (sp14C->end - synthState->samplePosInt) - (0x10 - phi_s3); + phi_s6 = (0x10 - phi_s3); + if (phi_s0 <= 0) { + phi_s0 = 0; + phi_s6 = (sp14C->end - synthState->samplePosInt); + } + phi_s1 = (s32)(phi_s0 + 0xF) / 0x10; + if (sp14C->count != 0) { + sp13C = 1; + phi_s7 = 0; + } else { + sp140 = 1; + phi_s7 = 0; + } + } + switch (sp150->bits4) { + case 0: + spCC = 0x10; + spC8 = 0; + spD4 = 9; + goto block_39; + case 3: + spCC = 0x10; + spC8 = 0; + spD4 = 5; + goto block_39; + case 1: + spCC = 0x10; + spC8 = 0; + spD4 = 0x10; + goto block_39; + case 2: + sp138 = 0; + sp120 = 0; + sp104 = phi_fp; + func_800DBB9C(cmd++, 0x580, (phi_fp * 2) + 0x20); + phi_s5 = phi_fp; + break; + case 5: + sp138 = 0; + sp120 = 0; + sp104 = phi_fp; + func_800DBB9C(cmd++, 0x580, (phi_fp * 2) + 0x20); + phi_s5 = phi_fp; + break; + // OLD BLOCK 71 + // OLD BLOCK 78 + + case 4: + block_39: + if (phi_s1 != 0) { + temp_v1_5 = (s32)((synthState->samplePosInt + spCC) - phi_s3) / 0x10; + if (sp150->bits2 == 0) { + phi_a1 = spC8 + (temp_v1_5 * spD4) + sp110; + } else if (sp150->bits2 != 1) { + phi_a1 = + func_800E12DC(spC8 + (temp_v1_5 * spD4) + sp110, ((phi_s1 * spD4) + 0x1F) & ~0xF, + sp138, &synthState->sampleDmaIndex, sp150->bits2); + } else { + return cmd; + } + + if (phi_a1 != 0) { + phi_t0 = phi_a1 & 0xF; + temp_v0_7 = ((phi_s1 * spD4) + 0x1F) & 0xFFF0; + aLoadBuffer(cmd++, phi_a1 - phi_t0, 0x940 - temp_v0_7, temp_v0_7); + } else { + phi_t0 = 0; + phi_s0 = 0; + } + + if (synthState->restart) { + aSetLoop(cmd++, sp150->loop); + sp138 = 2; + synthState->restart = 0; + } + + if (sp104 == 0) { + sp120 = phi_s3 * 2; + phi_s4 = 0; + } else { + phi_s4 = (phi_s5 + 0x1F) & ~0xF; + } + switch (sp150->bits4) { + case 0: + aSetBuffer(cmd++, 0, ((0x940 - (((phi_s1 * spD4) + 0x1F) & 0xFFF0)) + phi_t0), + phi_s4 + 0x580, phi_s0 * 2); + aADPCMdec(cmd++, sp138, synthState->synthesisBuffers); + break; + case 3: + aSetBuffer(cmd++, 0, ((0x940 - (((phi_s1 * spD4) + 0x1F) & 0xFFF0)) + phi_t0), + phi_s4 + 0x580, phi_s0 * 2); + aADPCMdec(cmd++, sp138 | 4, synthState->synthesisBuffers); + break; + case 1: + AudioSynth_SetBuffer(cmd++, 0, 0x940 - (((phi_s1 * spD4) + 0x1F) & 0xFFF0) + phi_t0, + phi_s4 + 0x580, phi_s0 * 2); + AudioSynth_UnkCmd17(cmd++, sp138, (s32)synthState->synthesisBuffers); + break; + } + + if (sp104 != 0) { + aDMEMMove(cmd++, phi_s4 + (phi_s3 * 2) + 0x580, phi_s5 + 0x580, + (((phi_s0 + phi_s6) - phi_s7) * 2)); + } + + temp_v1_6 = (phi_s0 + phi_s6) - phi_s7; + temp_t1 = sp104 + temp_v1_6; + + switch (sp138) { + case 1: + sp120 = 0x20; + phi_s5 = (phi_s0 * 2) + 0x20; + break; + case 2: + phi_s5 += (temp_v1_6 * 2); + break; + default: + if (phi_s5 != 0) { + phi_s5 += (temp_v1_6 * 2); + } else { + phi_s5 = (phi_s3 + temp_v1_6) * 2; + } + break; + } + + sp138 = 0; + break; + } + } + + if (sp140 != 0) { + sp88 = 1; + func_800DBB9C(cmd++, phi_s5 + 0x580, (phi_fp - sp104) * 2); + sp9C->noteSubEu.bitField0.s.finished = 1; + func_800DB2C0(updateIdx, noteIdx); + } else { + if (sp13C != 0) { + synthState->restart = 1; + synthState->samplePosInt = sp14C->start; + } else { + synthState->samplePosInt += spFC; + } + } + phi_v1_2 = spC0; + } + + switch (spC0) { + case 1: + spAE = sp120 + 0x580; + break; + case 2: + break; + default: + switch (spBC) { + case 0: + spAE = 0x3E0; + AudioSynth_InterL(cmd++, sp120 + 0x580, 0x3E0, ((phi_fp / 2) + 7) & ~7); + spB0 = phi_fp; + if (sp88 != 0) { + func_800DBB9C(cmd++, phi_fp + 0x3E0, phi_fp + 0x10); + } + break; + case 1: + AudioSynth_InterL(cmd++, sp120 + 0x580, spB0 + 0x3E0, ((phi_fp / 2) + 7) & ~7); + break; + } + } + } + } + + sp138 = 0; + if (noteSubEu->bitField0.s.needsInit == 1) { + noteSubEu->bitField0.s.needsInit = 0; + sp138 = 1; + } + + cmd = func_800DD62C(cmd++, synthState, aiBufLen * 2, sp136, spAE, sp138); + if (sp8C == 3) { + AudioSynth_UnkCmd19(cmd++, 0x3C0, 0x3C0, aiBufLen * 2, 0); + } + + if (sp8C == 2) { + AudioSynth_UnkCmd3(cmd++, 0x3C0, 0x3C0, aiBufLen * 2); + } + + phi_a1_2 = noteSubEu->unk_2; + if (phi_a1_2 != 0) { + if (phi_a1_2 < 0x10) { + phi_a1_2 = 0x10; + } + AudioSynth_HiLoGain(cmd++, phi_a1_2, 0x3C0, 0, (aiBufLen * 2) + 0x20); + } + + if (noteSubEu->unk_14 != 0) { + AudioSynth_SetFilterCount(cmd++, aiBufLen * 2, noteSubEu->unk_14); + AudioSynth_SetFilter(cmd++, sp138, 0x3C0, synthState->synthesisBuffers->mixEnvelopeState); + } + + if (noteSubEu->unk_07 != 0 && noteSubEu->unk_10 != 0) { + AudioSynth_DMemMove(cmd++, 0x3C0, 0x760, aiBufLen * 2); + if (synthState->unk_1A != 0) { + func_800DBB9C(cmd++, 0x760 - noteSubEu->unk_07, noteSubEu->unk_07); + synthState->unk_1A = 0; + } else { + func_800DBD10(cmd++, 0x760 - noteSubEu->unk_07, noteSubEu->unk_07, + &synthState->synthesisBuffers->panSamplesBuffer[0x18]); + } + AudioSynth_SaveBuffer(cmd++, ((aiBufLen * 2) - noteSubEu->unk_07) + 0x3C0, noteSubEu->unk_07, + &synthState->synthesisBuffers->panSamplesBuffer[0x18], NULL); + func_800DBBD4(cmd++, (aiBufLen * 2) >> 4, noteSubEu->unk_10, 0x760, 0x760 - noteSubEu->unk_07); + AudioSynth_DMemMove(cmd++, 0x760 - noteSubEu->unk_07, 0x3C0, aiBufLen * 2); + } else { + synthState->unk_1A = 1; + } + + if ((noteSubEu->headsetPanRight != 0) || (synthState->prevHeadsetPanRight != 0)) { + phi_s0 = 1; + } else if ((noteSubEu->headsetPanLeft != 0) || synthState->prevHeadsetPanLeft != 0) { + phi_s0 = 2; + } else { + phi_s0 = 0; + } + cmd = func_800DD6CC(cmd, noteSubEu, synthState, aiBufLen, 0x3C0, phi_s0, sp138); + if (noteSubEu->bitField0.s.usesHeadsetPanEffects) { + if (!(sp138 & 1)) { + sp138 = 0; + } + cmd = func_800DDB64(cmd, noteSubEu, synthState, aiBufLen * 2, sp138, phi_s0); + } + return cmd; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_800DC910.s") +#endif + +Acmd* func_800DD62C(Acmd* cmd, NoteSynthesisState* synthState, s32 count, u16 pitch, u16 inpDmem, s32 resampleFlags) { + if (pitch == 0) { + func_800DBB9C(cmd++, 0x3C0, count); + } else { + aSetBuffer(cmd++, 0, inpDmem, 0x3C0, count); + aResample(cmd++, resampleFlags, pitch, synthState->synthesisBuffers->finalResampleState); + } + return cmd; +} + +extern u32 D_801304A4; +extern u32 D_801304A8; +extern u32 D_801304AC; + +Acmd* func_800DD6CC(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 aiBufLen, u16 arg4, s32 arg5, + s32 arg6) { + u32 phi_a1; + u16 curVolLeft; + u16 targetVolLeft; + s32 phi_t1; + s16 reverVol; + u16 curVolRight; + s16 phi_a3; + s16 phi_t0; + s16 sp52; + s16 sp50; + u16 targetVolRight; + s32 pad; + + curVolLeft = synthState->curVolLeft; + targetVolLeft = noteSubEu->targetVolLeft; + targetVolLeft *= 0x10; + reverVol = noteSubEu->reverbVol; + curVolRight = synthState->curVolRight; + targetVolRight = noteSubEu->targetVolRight; + targetVolRight *= 0x10; + + phi_a3 = targetVolLeft != curVolLeft ? (targetVolLeft - curVolLeft) / (aiBufLen >> 3) : 0; + phi_t0 = targetVolRight != curVolRight ? (targetVolRight - curVolRight) / (aiBufLen >> 3) : 0; + + sp50 = synthState->samplePosFrac; + phi_t1 = sp50 & 0x7F; + + if (sp50 != reverVol) { + sp52 = (((reverVol & 0x7F) - phi_t1) << 9) / (aiBufLen >> 3); + synthState->samplePosFrac = reverVol; + } else { + sp52 = 0; + } + + synthState->curVolLeft = curVolLeft + (phi_a3 * (aiBufLen >> 3)); + synthState->curVolRight = curVolRight + (phi_t0 * (aiBufLen >> 3)); + + if (noteSubEu->bitField1.s.hasTwoAdpcmParts) { + func_800DBB9C(cmd++, 0x5C0, 0x1A0); + func_800DBCD4(cmd++, phi_t1 * 2, sp52, phi_a3, phi_t0); + AudioSynth_EnvSetup2(cmd++, curVolLeft, curVolRight); + switch (arg5) { + case 1: + phi_a1 = D_801304A4; + break; + case 2: + phi_a1 = D_801304A8; + break; + default: + phi_a1 = D_801304AC; + break; + } + } else { + aEnvSetup1(cmd++, phi_t1 * 2, sp52, phi_a3, phi_t0); + aEnvSetup2(cmd++, curVolLeft, curVolRight); + phi_a1 = D_801304AC; + } + + aEnvMixer(cmd++, arg4, aiBufLen, (sp50 & 0x80) >> 7, noteSubEu->bitField0.s.stereoHeadsetEffects, + noteSubEu->bitField0.s.usesHeadsetPanEffects, noteSubEu->bitField0.s.stereoStrongRight, + noteSubEu->bitField0.s.stereoStrongLeft, phi_a1); + return cmd; +} + +extern u8 D_801304C0[]; +Acmd* func_800DD9F4(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 arg3) { + s32 temp_v0; + s32 temp_t0; + s32 samplePosInt; + + temp_t0 = noteSubEu->unk_06; + samplePosInt = synthState->samplePosInt; + if (noteSubEu->bitField1.s.bookOffset != 0) { + func_800DBD10(cmd++, 0x580, ALIGN16(arg3 * 2), gWaveSamples[8]); + gWaveSamples[8] += arg3 * 2; + return cmd; + } else { + aLoadBuffer(cmd++, noteSubEu->sound.samples, 0x580, 0x80); + if (temp_t0 != 0) { + samplePosInt = (samplePosInt * D_801304C0[temp_t0 >> 2]) / D_801304C0[temp_t0 & 3]; + } + samplePosInt &= 0x3F; + temp_v0 = 0x40 - samplePosInt; + if (temp_v0 < arg3 && ((arg3 - temp_v0 + 0x3F) / 0x40) != 0) { + aDuplicate(cmd++, ((arg3 - temp_v0 + 0x3F) / 0x40), 0x580, 0x600, 0x80); + } + synthState->samplePosInt = samplePosInt; + } + return cmd; +} + +#ifdef NON_MATCHING +Acmd* func_800DDB64(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 arg3, s32 arg4, s32 arg5) { + s32 phi_v0; + s32 phi_v1; + s32 phi_t0; + + switch (arg5) { + case 1: + phi_v1 = noteSubEu->headsetPanRight; + phi_v0 = synthState->prevHeadsetPanRight; + synthState->prevHeadsetPanLeft = 0; + synthState->prevHeadsetPanRight = noteSubEu->headsetPanRight; + phi_t0 = 0x940; + break; + case 2: + phi_v1 = noteSubEu->headsetPanLeft; + phi_v0 = synthState->prevHeadsetPanLeft; + synthState->prevHeadsetPanLeft = noteSubEu->headsetPanLeft; + synthState->prevHeadsetPanRight = 0; + phi_t0 = 0xAE0; + break; + default: + return cmd; + } + + if (arg4 != 1) { + if (phi_v0 != phi_v1) { + aSetBuffer(cmd++, 0, 0x5C0, 0x3C0, (arg3 + phi_v1) - phi_v0); + aResampleZOH(cmd++, (u16)((((arg3 << 0xF) / 2) - 1) / ((((arg3 + phi_v1) - phi_v0) - 2) / 2)), 0); + } else { + aDMEMMove(cmd++, 0x5C0, 0x3C0, arg3); + } + + if (phi_v0 != 0) { + aLoadBuffer(cmd++, &synthState->synthesisBuffers->panResampleState[0x8], 0x5C0, ALIGN16(phi_v0)); + aDMEMMove(cmd++, 0x3C0, phi_v0 + 0x5C0, (arg3 + phi_v1) - phi_v0); + } else { + aDMEMMove(cmd++, 0x3C0, 0x5C0, (arg3 + phi_v1)); + } + } else { + aDMEMMove(cmd++, 0x5C0, 0x3C0, arg3); + aClearBuffer(cmd++, 0x5C0, phi_v1); + aDMEMMove(cmd++, 0x3C0, phi_v1 + 0x5C0, arg3); + } + + if (phi_v1 != 0) { + aSaveBuffer(cmd++, arg3 + 0x5C0, &synthState->synthesisBuffers->panResampleState[0x8], ALIGN16(phi_v1)); + } + aAddMixer(cmd++, ((arg3 + 0x3F) & ~0x3F), 0x5C0, phi_t0, 0x7FFF); + return cmd; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_800DDB64.s") +#endif diff --git a/src/code/code_800DACC0.c b/src/code/code_800DACC0.c deleted file mode 100644 index 10ebbce752..0000000000 --- a/src/code/code_800DACC0.c +++ /dev/null @@ -1,136 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/pad_800DACB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DACC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB03C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB0C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB2C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB330.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB3D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB4E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB680.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DB828.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBA40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBAE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBB94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBB9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBBBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBBC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBBCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBBD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBC98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBCA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBCA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBCB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBCD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBD94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBDB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBDE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBE98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBEB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DBF5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC008.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC074.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC0E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC124.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC164.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC1D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC2DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC384.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DC910.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DD62C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DD6CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DD9F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/func_800DDB64.s") diff --git a/src/code/code_800E11F0.c b/src/code/code_800E11F0.c deleted file mode 100644 index 43d3ac1054..0000000000 --- a/src/code/code_800E11F0.c +++ /dev/null @@ -1,234 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -// like audio_load in sm64, but completely rewritten - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E11F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E12DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1618.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E19A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1A78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1AD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1B08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1B68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1C18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1C78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1D64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1E34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1E6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1EB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1EF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1F7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E202C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E20D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2124.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E217C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E22C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2318.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2338.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2454.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2558.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2768.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E27A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E27F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E283C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2AA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2BCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2BE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2CB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2CC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2CE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E2FEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E301C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3028.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3094.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3400.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3414.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E35E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3670.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E36EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3874.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E38F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E390C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3A14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3A44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3AC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3BEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3D10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3D1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3E58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E3FB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4044.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4058.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4198.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E478C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E48C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4918.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4D94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4ED4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4EDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4EE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4EEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4F58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4FB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E4FE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5000.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5584.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5958.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E59AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E59F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5A8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5AD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5AFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5B20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5B50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5B80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5C10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5C28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5D6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5E20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5E84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5EA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5EDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5F34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E5F88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6024.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6070.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E60C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E60EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E611C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6128.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6300.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E64B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E64F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E651C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6550.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6680.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E66A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E66C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_NextRandom.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E6818.s") diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c new file mode 100644 index 0000000000..6be070381f --- /dev/null +++ b/src/code/code_800E4FE0.c @@ -0,0 +1,844 @@ +#include "global.h" + +typedef enum { + CHAN_UPD_UNK_0, // 0 + CHAN_UPD_VOL_SCALE, // 1 + CHAN_UPD_VOL, // 2 + CHAN_UPD_PAN_SIGNED, // 3 + CHAN_UPD_FREQ_SCALE, // 4 + CHAN_UPD_REVERB, // 5 + CHAN_UPD_SCRIPT_IO, // 6 + CHAN_UPD_PAN_UNSIGNED, // 7 + CHAN_UPD_STOP_SOMETHING2, // 8 + CHAN_UPD_MUTE_BEHAVE, // 9 + CHAN_UPD_VIBE_X8, // 10 + CHAN_UPD_VIBE_X32, // 11 + CHAN_UPD_UNK_0F, // 12 + CHAN_UPD_UNK_20, // 13 + CHAN_UPD_REVERB_FLG // 14 +} ChannelUpdateType; + +void func_800E6300(SequenceChannel* channel, AudioCmd* arg1); +void func_800E59AC(s32 playerIdx, s32 fadeTimer); +void Audio_InitMesgQueues(void); +AudioTask* func_800E5000(void); +void Audio_ProcessCmds(u32); +void func_800E6128(SequencePlayer* seqPlayer, AudioCmd* arg1); +void func_800E5958(s32 playerIdx, s32 fadeTimer); +s32 func_800E66C0(s32 arg0); + +// AudioMgr_Retrace +AudioTask* func_800E4FE0(void) { + return func_800E5000(); +} + +u32 D_801304E0 = 0x80; +AudioTask* D_801304E4 = NULL; + +extern u8 D_80155C70[]; +#ifdef NON_EQUIVALENT +// haven't verified Equivalency yet. +AudioTask* func_800E5000(void) { + u32 sp6C; + s32 abiCmdCnt; + s32 sp5C; + s16* sp58; + u32 sp4C; + s32 sp48; + void* sp3C; + void* sp34; + OSTask_t* temp_v1_10; + OSMesgQueue* temp_s1; + s16 temp_a0_2; + s16 temp_v0_2; + s16 temp_v1; + s16 temp_v1_2; + s16 temp_v1_9; + s32 temp_a0; + s32 temp_a3; + s32 temp_a3_2; + s32 temp_hi; + s32 temp_s0; + s32 temp_s0_2; + s32 temp_s0_3; + s32 temp_s0_4; + s32 temp_s0_5; + s32 temp_t4; + s32 temp_t6; + s32 temp_t7; + s32 temp_v1_6; + s32 temp_v1_7; + s32 temp_v1_8; + u32 temp_t3; + u32 temp_t4_2; + void* temp_t0; + void* temp_v1_3; + void* temp_v1_4; + void* temp_v1_5; + s16 phi_v1; + s32 phi_a0; + void* phi_v1_2; + s32 phi_s0; + s32 phi_v1_3; + void* phi_v1_4; + s32 phi_s0_2; + s32 phi_v1_5; + s32 phi_s0_3; + s32 phi_s0_4; + void* phi_v1_6; + s32 phi_s0_5; + s32 i; + + gAudioContext.totalTaskCnt++; + if (gAudioContext.totalTaskCnt % (gAudioContext.audioBufferParameters.presetUnk4) != 0) { + if (D_801755D0 != 0) { + D_801755D0(); + } + + if (gAudioContext.audioBufferParameters.presetUnk4 == + ((gAudioContext.totalTaskCnt % (gAudioContext.audioBufferParameters.presetUnk4)) + 1)) { + return D_801304E4; + } else { + return NULL; + } + } + + osSendMesg(gAudioContext.taskStartQueueP, gAudioContext.totalTaskCnt, 0); + temp_t4 = gAudioContext.curAIBufIdx + 1; + temp_t6 = (gAudioContext.curAIBufIdx + 1) % 3; + gAudioContext.rspTaskIdx ^= 1; + gAudioContext.curAIBufIdx++; + gAudioContext.curAIBufIdx %= 3; + temp_hi = (gAudioContext.curAIBufIdx - 2 + 3) % 3; + sp6C = osAiGetLength() / 4; + if (gAudioContext.resetTimer < 16) { + if (gAudioContext.aiBufLengths[temp_hi] != 0) { + sp34 = &gAudioContext + (temp_hi * 4); + sp3C = &gAudioContext + (temp_hi * 2); + osAiSetNextBuffer(gAudioContext.aiBuffers[temp_hi], gAudioContext.aiBufLengths[temp_hi] * 4); + } + } + + if (D_801755D0 != NULL) { + D_801755D0(); + } + + sp5C = gAudioContext.sampleIoReqIdx; + for (i = 0; i < gAudioContext.sampleIoReqIdx; i++) { + if (osRecvMesg(&gAudioContext.unk_1ED0, NULL, 0) == 0) { + sp5C--; + } + } + + if (sp5C != 0) { + for (i = 0; i < sp5C; i++) { + osRecvMesg(&gAudioContext.unk_1ED0, NULL, 1); + } + } + + sp48 = gAudioContext.unk_1ED0.validCount; + if (gAudioContext.unk_1ED0.validCount != 0) { + for (i = 0; i < sp48; i++) { + osRecvMesg(&gAudioContext.unk_1ED0, NULL, 0); + } + } + gAudioContext.sampleIoReqIdx = 0; + func_800E11F0(); + Audio_ProcessLoads(gAudioContext.resetStatus); + func_800E4F58(); + if ((gAudioContext.resetStatus != 0) && (Audio_ResetStep() == 0)) { + if (gAudioContext.resetStatus == 0) { + osSendMesg(gAudioContext.audioResetQueueP, gAudioContext.audioResetPresetIdToLoad, 0); + } + + D_801304E4 = NULL; + return NULL; + } + + if (gAudioContext.resetTimer > 16) { + return NULL; + } else if (gAudioContext.resetTimer != 0) { + gAudioContext.resetTimer++; + } + + gAudioContext.currTask = &gAudioContext.rspTask[gAudioContext.rspTaskIdx]; + gAudioContext.curAbiCmdBuf = gAudioContext.abiCmdBufs[gAudioContext.rspTaskIdx]; + gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] = + (s16)((((gAudioContext.audioBufferParameters.samplesPerFrameTarget - sp6C) + 0x80) & 0xFFF0) + 0x10); + if (gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] < + gAudioContext.audioBufferParameters.minAiBufferLength) { + gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] = gAudioContext.audioBufferParameters.minAiBufferLength; + } + + if (gAudioContext.audioBufferParameters.maxAiBufferLength < + gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx]) { + gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] = gAudioContext.audioBufferParameters.maxAiBufferLength; + } + + if (gAudioContext.resetStatus == 0) { + i = 0; + // msg = 0000RREE R = read pos, E = End Pos + while (osRecvMesg(gAudioContext.cmdProcQueueP, &sp4C, 0) != -1) { + Audio_ProcessCmds(sp4C); + i++; + } + if ((i == 0) && (gAudioContext.cmdQueueFinished)) { + Audio_ScheduleProcessCmds(); + } + } + + gAudioContext.curAbiCmdBuf = + AudioSynth_Update(gAudioContext.curAbiCmdBuf, &abiCmdCnt, gAudioContext.aiBuffers[gAudioContext.curAIBufIdx], + gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx]); + gAudioContext.audioRandom = osGetCount() * (gAudioContext.audioRandom + gAudioContext.totalTaskCnt); + gAudioContext.audioRandom = gAudioContext.aiBuffers[gAudioContext.curAIBufIdx][gAudioContext.totalTaskCnt & 0xFF] + + gAudioContext.audioRandom; + ; + gWaveSamples[8] = (s16*)((((u8*)func_800E4FE0)) + (gAudioContext.audioRandom & 0xFFF0)); + gAudioContext.currTask->taskQueue = NULL; + gAudioContext.currTask->unk_44 = NULL; + temp_v1_10 = &gAudioContext.currTask->task.t; + temp_v1_10->type = 2U; + temp_v1_10->flags = 0U; + temp_v1_10->ucode_boot = D_801120C0; + temp_v1_10->ucode_boot_size = 0x1000; + temp_v1_10->ucode_data_size = (((s32)(D_80155F50 - D_80155C70) >> 3) * 8) - 1; + temp_v1_10->ucode = D_801120C0; + temp_v1_10->ucode_data = D_80155C70; + temp_v1_10->ucode_size = 0x1000; + temp_v1_10->dram_stack = NULL; + temp_v1_10->dram_stack_size = 0; + temp_v1_10->output_buff = NULL; + temp_v1_10->output_buff_size = NULL; + temp_v1_10->data_ptr = gAudioContext.abiCmdBufs[gAudioContext.rspTaskIdx]; + temp_v1_10->yield_data_ptr = NULL; + temp_v1_10->yield_data_size = 0; + temp_v1_10->data_size = abiCmdCnt * sizeof(ACmd); + + if (D_801304E0 < abiCmdCnt) { + D_801304E0 = abiCmdCnt; + } + + if (gAudioContext.audioBufferParameters.presetUnk4 == 1) { + return gAudioContext.currTask; + } + D_801304E4 = gAudioContext.currTask; + return NULL; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E4FE0/func_800E5000.s") +#endif + +#define ACMD_SND_MDE ((u32)0xF0000000) +#define ACMD_MUTE ((u32)0xF1000000) + +void func_800E5584(AudioCmd* cmd) { + s32 i; + s32 pad; + s32 pad2; + u32 temp_a1_5; + u32 temp_t7; + + switch (cmd->op) { + case 0x81: + func_800E1C18(cmd->arg1, cmd->arg2); + return; + case 0x82: + func_800E20D4(cmd->arg0, cmd->arg1, cmd->arg2); + func_800E59AC(cmd->arg0, cmd->data); + return; + case 0x85: + func_800E2124(cmd->arg0, cmd->arg1, cmd->data); + return; + case 0x83: + if (gAudioContext.seqPlayers[cmd->arg0].enabled) { + if (cmd->asInt == 0) { + Audio_SequencePlayerDisableAsFinished(&gAudioContext.seqPlayers[cmd->arg0]); + } else { + func_800E5958(cmd->arg0, cmd->asInt); + } + } + return; + case 0xF0: + gAudioContext.soundMode = cmd->asUInt; + return; + case 0xF1: + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[i]; + seqPlayer->muted = 1; + seqPlayer->recalculateVolume = 1; + } + return; + case 0xF2: + if (cmd->asUInt == 1) { + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + Note* note = &gAudioContext.notes[i]; + NoteSubEu* subEu = ¬e->noteSubEu.bitField0; + if (subEu->bitField0.s.enabled && note->playbackState.unk_04 == 0) { + if (note->playbackState.parentLayer->seqChannel->muteBehavior & 8) { + subEu->bitField0.s.finished = 1; + } + } + } + } + + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[i]; + seqPlayer->muted = 0; + seqPlayer->recalculateVolume = 1; + } + + return; + case 0xF3: + func_800E1D64(cmd->arg0, cmd->arg1, cmd->arg2); + return; + case 0xF4: + Audio_AudioTableAsyncLoad(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.unk_1E20); + return; + case 0xF5: + Audio_AudioBankAsyncLoad(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.unk_1E20); + return; + case 0xFC: + Audio_AudioSeqAsyncLoad(cmd->arg0, cmd->arg1, cmd->arg2, &gAudioContext.unk_1E20); + return; + case 0xF6: + func_800E1F7C(cmd->arg1); + return; + case 0x90: + gAudioContext.unk_5BDC[cmd->arg0] = cmd->asUShort; + return; + case 0xF9: + gAudioContext.resetStatus = 5; + gAudioContext.audioResetPresetIdToLoad = cmd->asUInt; + return; + case 0xFB: + D_801755D0 = cmd->asUInt; + return; + case 0xE0: + case 0xE1: + case 0xE2: + func_800E7744(cmd->op - 0xE0, cmd->arg0, cmd->arg1, cmd->data); + return; + case 0xFE: + temp_t7 = cmd->asUInt; + if (temp_t7 == 1) { + for (i = 0; i < gAudioContext.audioBufferParameters.numSequencePlayers; i++) { + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[i]; + if (seqPlayer->enabled) { + Audio_SequencePlayerDisableAsFinished(seqPlayer); + } + } + } + func_800E66C0(temp_t7); + return; + case 0xE3: + func_800DE4B0(cmd->asInt); + return; + default: + return; + } +} + +// SetFadeOutTimer +void func_800E5958(s32 playerIdx, s32 fadeTimer) { + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[playerIdx]; + + if (fadeTimer == 0) { + fadeTimer = 1; + } + + seqPlayer->fadeVelocity = -(seqPlayer->fadeVolume / fadeTimer); + seqPlayer->state = 2; + seqPlayer->fadeTimer = fadeTimer; +} + +// SetFadeInTimer +void func_800E59AC(s32 playerIdx, s32 fadeTimer) { + SequencePlayer* seqPlayer; + if (fadeTimer != 0) { + seqPlayer = &gAudioContext.seqPlayers[playerIdx]; + seqPlayer->state = 1; + seqPlayer->fadeTimerUnkEu = fadeTimer; + seqPlayer->fadeTimer = fadeTimer; + seqPlayer->fadeVolume = 0.0f; + seqPlayer->fadeVelocity = 0.0f; + } +} + +void Audio_InitMesgQueuesInternal(void) { + gAudioContext.cmdWrPos = 0; + gAudioContext.cmdRdPos = 0; + gAudioContext.cmdQueueFinished = 0; + gAudioContext.taskStartQueueP = &gAudioContext.taskStartQueue; + gAudioContext.cmdProcQueueP = &gAudioContext.cmdProcQueue; + gAudioContext.audioResetQueueP = &gAudioContext.audioResetQueue; + osCreateMesgQueue(gAudioContext.taskStartQueueP, gAudioContext.taskStartMsgs, + ARRAY_COUNT(gAudioContext.taskStartMsgs)); + osCreateMesgQueue(gAudioContext.cmdProcQueueP, gAudioContext.cmdProcMsgs, ARRAY_COUNT(gAudioContext.cmdProcMsgs)); + osCreateMesgQueue(gAudioContext.audioResetQueueP, gAudioContext.audioResetMesgs, + ARRAY_COUNT(gAudioContext.audioResetMesgs)); +} + +void Audio_QueueCmd(u32 opArgs, void** data) { + AudioCmd* cmd = &gAudioContext.cmdBuf[gAudioContext.cmdWrPos & 0xFF]; + + cmd->opArgs = opArgs; + cmd->data = *data; + + gAudioContext.cmdWrPos++; + + if (gAudioContext.cmdWrPos == gAudioContext.cmdRdPos) { + gAudioContext.cmdWrPos--; + } +} + +void Audio_QueueCmdF32(u32 opArgs, f32 data) { + Audio_QueueCmd(opArgs, &data); +} + +void Audio_QueueCmdS32(u32 opArgs, s32 data) { + Audio_QueueCmd(opArgs, &data); +} + +void Audio_QueueCmdS8(u32 opArgs, s8 data) { + u32 uData = data << 0x18; + + Audio_QueueCmd(opArgs, &uData); +} + +void Audio_QueueCmdU16(u32 opArgs, u16 data) { + u32 uData = data << 0x10; + + Audio_QueueCmd(opArgs, &uData); +} + +s32 Audio_ScheduleProcessCmds(void) { + static s32 D_801304E8 = 0; + s32 ret; + + if (D_801304E8 < (u8)((gAudioContext.cmdWrPos - gAudioContext.cmdRdPos) + 0x100)) { + D_801304E8 = (u8)((gAudioContext.cmdWrPos - gAudioContext.cmdRdPos) + 0x100); + } + + ret = + osSendMesg(gAudioContext.cmdProcQueueP, + (void*)(((gAudioContext.cmdRdPos & 0xFF) << 8) | (gAudioContext.cmdWrPos & 0xFF)), OS_MESG_NOBLOCK); + if (ret != -1) { + gAudioContext.cmdRdPos = gAudioContext.cmdWrPos; + ret = 0; + } else { + return -1; + } + + return ret; +} + +void Audio_ResetCmdQueue(void) { + gAudioContext.cmdQueueFinished = 0; + gAudioContext.cmdRdPos = gAudioContext.cmdWrPos; +} + +void Audio_ProcessCmd(AudioCmd* cmd) { + SequencePlayer* seqPlayer; + u16 phi_v0; + s32 i; + + if ((cmd->op & 0xF0) == 0xF0) { + func_800E5584(cmd); + return; + } + + if (cmd->arg0 < gAudioContext.audioBufferParameters.numSequencePlayers) { + seqPlayer = &gAudioContext.seqPlayers[cmd->arg0]; + if (cmd->op & 0x80) { + func_800E5584(cmd); + return; + } + if (cmd->op & 0x40) { + func_800E6128(seqPlayer, cmd); + return; + } + + if (cmd->arg1 < 0x10) { + func_800E6300(seqPlayer->channels[cmd->arg1], cmd); + return; + } + if (cmd->arg1 == 0xFF) { + phi_v0 = gAudioContext.unk_5BDC[cmd->arg0]; + for (i = 0; i < 0x10; i++) { + if (phi_v0 & 1) { + func_800E6300(seqPlayer->channels[i], cmd); + } + phi_v0 = phi_v0 >> 1; + } + } + } +} + +void Audio_ProcessCmds(u32 msg) { + static u8 curCmdRdPos = 0; + AudioCmd* cmd; + u8 endPos; + + if (!gAudioContext.cmdQueueFinished) { + curCmdRdPos = msg >> 8; + } + + while (true) { + endPos = msg & 0xFF; + if (curCmdRdPos == endPos) { + gAudioContext.cmdQueueFinished = 0; + return; + } + + cmd = &gAudioContext.cmdBuf[curCmdRdPos++ & 0xFF]; + if (cmd->op == 0xF8) { + gAudioContext.cmdQueueFinished = 1; + return; + } + + Audio_ProcessCmd(cmd); + cmd->op = 0; + } +} + +u32 func_800E5E20(u32* arg0) { + u32 sp1C; + + if (osRecvMesg(&gAudioContext.unk_1E20, &sp1C, 0) == -1) { + *arg0 = 0; + return 0; + } + *arg0 = sp1C & 0xFFFFFF; + return sp1C >> 0x18; +} + +u8* func_800E5E84(s32 arg0, u32* arg1) { + return func_800E1F38(arg0, arg1); +} + +void func_800E5EA4(s32 arg0, u32* arg1, u32* arg2) { + *arg1 = gAudioContext.ctlEntries[arg0].unk_02; + *arg2 = gAudioContext.ctlEntries[arg0].unk_03; +} + +s32 func_800E5EDC(void) { + s32 pad; + s32 sp18; + + if (osRecvMesg(gAudioContext.audioResetQueueP, &sp18, OS_MESG_NOBLOCK) == -1) { + return 0; + } else if (gAudioContext.audioResetPresetIdToLoad != sp18) { + return -1; + } else { + return 1; + } +} + +void func_800E5F34(void) { + // probably a macro of some type? + s32 chk = -1;s32 sp28;do { } while (osRecvMesg(gAudioContext.audioResetQueueP, &sp28, 0) != chk); +} + +s32 func_800E5F88(u32 resetPreloadID) { + s32 resetStatus; + OSMesg msg; + s32 pad; + + func_800E5F34(); + resetStatus = gAudioContext.resetStatus; + if (resetStatus != 0) { + Audio_ResetCmdQueue(); + if (gAudioContext.audioResetPresetIdToLoad == resetPreloadID) { + return -2; + } else if (resetStatus > 2) { + gAudioContext.audioResetPresetIdToLoad = resetPreloadID; + return -3; + } else { + osRecvMesg(gAudioContext.audioResetQueueP, &msg, OS_MESG_BLOCK); + } + } + + func_800E5F34(); + Audio_QueueCmdS32(0xF9000000, resetPreloadID); + + return Audio_ScheduleProcessCmds(); +} + +void Audio_PreNMIInternal(void) { + gAudioContext.resetTimer = 1; + if (gAudioContextInitalized) { + func_800E5F88(0); + gAudioContext.resetStatus = 0; + } +} + +s8 func_800E6070(s32 playerIdx, s32 channelIdx, s32 scriptIdx) { + SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[playerIdx]; + SequenceChannel* channel; + if (seqPlayer->enabled) { + channel = seqPlayer->channels[channelIdx]; + return channel->soundScriptIO[scriptIdx]; + } else { + return -1; + } +} + +s8 func_800E60C4(s32 arg0, s32 arg1) { + return gAudioContext.seqPlayers[arg0].unk_158[arg1]; +} + +void func_800E60EC(void* memAddr, u32 size) { + Audio_SoundAllocPoolInit(&gAudioContext.unkPool, memAddr, size); +} + +void func_800E611C(void) { + gAudioContext.unkPool.start = NULL; +} + +void func_800E6128(SequencePlayer* seqPlayer, AudioCmd* cmd) { + f32 fadeVolume; + switch (cmd->op) { + case 0x41: + if (seqPlayer->fadeVolumeScale != cmd->asFloat) { + seqPlayer->fadeVolumeScale = cmd->asFloat; + seqPlayer->recalculateVolume = 1; + } + return; + case 0x47: + seqPlayer->tempo = cmd->asInt * 0x30; + return; + case 0x49: + seqPlayer->unk_0C = cmd->asInt * 0x30; + return; + case 0x4E: + seqPlayer->unk_0C = cmd->asInt; + return; + case 0x48: + seqPlayer->transposition = cmd->asSbyte; + return; + case 0x46: + seqPlayer->unk_158[cmd->arg2] = cmd->asSbyte; + return; + case 0x4A: + fadeVolume = (s32)cmd->arg1 / 127.0f; + goto block_11; + case 0x4B: + fadeVolume = ((s32)cmd->arg1 / 100.0f) * seqPlayer->fadeVolume; + block_11: + if (seqPlayer->state != 2) { + seqPlayer->volume = seqPlayer->fadeVolume; + if (cmd->asInt == 0) { + seqPlayer->fadeVolume = fadeVolume; + } else { + s32 tmp = cmd->asInt; + seqPlayer->state = 0; + seqPlayer->fadeTimer = tmp; + seqPlayer->fadeVelocity = (fadeVolume - seqPlayer->fadeVolume) / tmp; + } + } + return; + case 0x4C: + if (seqPlayer->state != 2) { + if (cmd->asInt == 0) { + seqPlayer->fadeVolume = seqPlayer->volume; + } else { + s32 tmp = cmd->asInt; + seqPlayer->state = 0; + seqPlayer->fadeTimer = tmp; + seqPlayer->fadeVelocity = (seqPlayer->volume - seqPlayer->fadeVolume) / tmp; + } + } + return; + case 0x4D: + seqPlayer->unk_34 = cmd->asFloat; + if (seqPlayer->unk_34 == 1.0f) { + seqPlayer->unk_0b1 = 0; + } else { + seqPlayer->unk_0b1 = 1; + } + } +} + +void func_800E6300(SequenceChannel* channel, AudioCmd* cmd) { + switch (cmd->op) { + case CHAN_UPD_VOL_SCALE: + if (channel->volumeScale != cmd->asFloat) { + channel->volumeScale = cmd->asFloat; + channel->changes.s.volume = 1; + } + return; + case CHAN_UPD_VOL: + if (channel->volume != cmd->asFloat) { + channel->volume = cmd->asFloat; + channel->changes.s.volume = 1; + } + return; + case CHAN_UPD_PAN_SIGNED: + if (channel->newPan != cmd->asSbyte) { + channel->newPan = cmd->asSbyte; + channel->changes.s.pan = 1; + } + return; + case CHAN_UPD_PAN_UNSIGNED: + if (channel->newPan != cmd->asSbyte) { + channel->panChannelWeight = cmd->asSbyte; + channel->changes.s.pan = 1; + } + return; + case CHAN_UPD_FREQ_SCALE: + if (channel->freqScale != cmd->asFloat) { + channel->freqScale = cmd->asFloat; + channel->changes.s.freqScale = 1; + } + return; + case CHAN_UPD_REVERB: + if (channel->reverb != cmd->asSbyte) { + channel->reverb = cmd->asSbyte; + } + return; + case CHAN_UPD_SCRIPT_IO: + if (cmd->arg2 < 8) { + channel->soundScriptIO[cmd->arg2] = cmd->asSbyte; + } + return; + case CHAN_UPD_STOP_SOMETHING2: + channel->stopSomething2 = cmd->asSbyte; + return; + case CHAN_UPD_MUTE_BEHAVE: + channel->muteBehavior = cmd->asSbyte; + return; + case CHAN_UPD_VIBE_X8: + channel->vibratoExtentTarget = cmd->asUbyte * 8; + channel->vibratoExtentChangeDelay = 1; + return; + case CHAN_UPD_VIBE_X32: + channel->vibratoRateTarget = cmd->asUbyte * 32; + channel->vibratoRateChangeDelay = 1; + return; + case CHAN_UPD_UNK_0F: + channel->unk_0F = cmd->asUbyte; + return; + case CHAN_UPD_UNK_20: + channel->unk_20 = cmd->asUShort; + return; + case CHAN_UPD_REVERB_FLG: + channel->reverbBits.asByte = cmd->asUbyte; + return; + } +} + +void func_800E64B0(s32 arg0, s32 arg1, s32 arg2) { + Audio_QueueCmdS32(((arg0 & 0xFF) << 0x10) | 0xFA000000 | ((arg1 & 0xFF) << 8) | (arg2 & 0xFF), 1); +} + +void func_800E64F8(void) { + Audio_QueueCmdS32(0xFA000000, 0); +} + +void func_800E651C(u32 arg0, s32 arg1) { + Audio_QueueCmdS32((arg1 & 0xFF) | 0xFD000000, arg0); +} + +void Audio_WaitForAudioTask(void) { + osRecvMesg(gAudioContext.taskStartQueueP, NULL, OS_MESG_NOBLOCK); + osRecvMesg(gAudioContext.taskStartQueueP, NULL, OS_MESG_BLOCK); +} + +#ifdef NON_MATCHING +s32 func_800E6590(s32 arg0, s32 arg1, s32 arg2) { + u32 temp_v1_2; + AudioBankSound* temp_a0; + Note* temp_a0_2; + SequenceChannelLayer* temp_v0; + SequenceChannel* temp_v1; + SequencePlayer* seqPlayer; + + seqPlayer = &gAudioContext.seqPlayers[arg0]; + if (seqPlayer->enabled && seqPlayer->channels[arg1]->enabled) { + temp_v0 = seqPlayer->channels[arg1]->layers[arg2]; + if (temp_v0 == NULL) { + return 0; + } + + if (temp_v0->enabled) { + temp_a0_2 = temp_v0->note; + if (temp_a0_2 == NULL) { + return 0; + } + + if (!temp_v0->bit3) { + return 0; + } + + if (temp_v0 == temp_a0_2->playbackState.parentLayer) { + temp_a0 = temp_a0_2->noteSubEu.sound.audioBankSound; + if (temp_a0 == 0) { + return 0; + } + return temp_a0->sample->loop->end - temp_a0_2->synthesisState.samplePosInt; + } + return 0; + } + } + return 0; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E4FE0/func_800E6590.s") +#endif + +s32 func_800E6680(void) { + return func_800E66C0(0); +} + +void func_800E66A0(void) { + func_800E66C0(2); +} + +s32 func_800E66C0(s32 arg0) { + s32 phi_v1; + NotePlaybackState* temp_a2; + NoteSubEu* temp_a3; + s32 i; + Note* note; + AudioBankSound* sound; + + phi_v1 = 0; + for (i = 0; i < gAudioContext.maxSimultaneousNotes; i++) { + note = &gAudioContext.notes[i]; + temp_a2 = ¬e->playbackState; + if (note->noteSubEu.bitField0.s.enabled) { + temp_a3 = ¬e->noteSubEu; + if (temp_a2->adsr.action.s.state != 0) { + if (arg0 >= 2) { + sound = temp_a3->sound.audioBankSound; + if (sound == NULL || temp_a3->bitField1.s.bit2) { + continue; + } + if (sound->sample->bits2 == 0) { + continue; + } + } + + phi_v1++; + if ((arg0 & 1) == 1) { + temp_a2->adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv; + temp_a2->adsr.action.s.release = 1; + } + } + } + } + return phi_v1; +} + +u32 Audio_NextRandom(void) { + static u32 audRand = 0x12345678; + + audRand = ((osGetCount() + 0x1234567) * (audRand + gAudioContext.totalTaskCnt)); + audRand += gAudioContext.audioRandom; + return audRand; +} + +void Audio_InitMesgQueues(void) { + Audio_InitMesgQueuesInternal(); +} diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 962e73557b..f6cd656116 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -1,268 +1,3350 @@ #include "ultra64.h" #include "global.h" -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EC960.s") +typedef struct { + f32 unk_00; + f32 unk_04; + s8 unk_08; + s8 unk_09; + s8 unk_0A; + u8 unk_0B; + u8 unk_0C; +} unk_s1; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECA00.s") +typedef struct { + f32 unk_00; + f32 unk_04; + f32 unk_08; + s32 unk_0C; +} unk_s2; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECA60.s") +void Audio_SetVolScale(u8, u8, u8, u8); +void func_800F5550(u16); +void func_800F5E18(u8 arg0, u16 arg1, u8 arg2, s8 arg3, s8 arg4); +void func_800F4784(unk_s2* arg0); +void func_800F56A8(void); +void func_800F6FB4(u8); +s32 func_800F491C(u8 arg0); -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECAF0.s") +// stick float vals +extern f32 D_8012F6B4[]; +extern u32 sOcarinaAllowedBtnMask; // 80130EFC +extern s32 sOcarinaABtnMap; // 80130F00 +extern s32 sOcarinaCUPBtnMap; // 80130F04 +extern s32 sOcarinaCDownBtnMap; // 80130F08 +extern u8 D_80131F64; +extern u8 D_80133408; +extern s8 D_8013060C; +extern s8 D_80130604; +extern s8 D_80130614; +extern f32 D_80130620; +extern s8 D_80130624; +extern u8 D_80131878; +extern u32 D_80130F3C; +extern u8 sCurOcarinaBtnVal; // 80130F14 +extern u8 sPrevOcarinaNoteVal; // 80130F18 +extern u8 sCurOcarinaBtnIdx; // note index? +extern u8 sLearnSongLastBtn; +extern u8 sOcarinaInpEnabled; // D_80130F0C +extern u8 sPlaybackState; +extern u16 sStaffPlaybackPos; +extern s8 D_80130F10; // ocarina active? +extern u8 sNoteValueIndexMap[]; +extern s8 D_80130618; +extern u8 D_8013061C; +extern u8 D_8013063C; +extern u8 D_80130640; +extern u8 D_80130644; +extern u8 D_80130648; +extern s8 D_801306C8[]; +extern u8 D_80133414; +extern s8 D_80130610; +extern u8 D_80130600; +extern u8 D_801305F8[]; +extern s8 D_80130608; +extern u8 D_801305FF; +extern Vec3f* D_8013064C; +extern u8 D_801305CC; +extern u8 D_8013062C; +extern u8 D_80130630; +extern u8 D_80130658[]; +extern u8 D_80133418; +extern u16 D_80130628; +extern s8 D_80130F2C; // pitch? +extern f32 D_80130650; +extern s8 D_801305B8; +extern s8 D_801305BC; +extern s8 D_801305C0; +extern f32 D_801305E4[]; +extern u8 sPrevChargeLevel; +extern f32 D_801305F4; +extern u32 D_801305B0; +extern u32 D_801305B4; +extern f32 D_80131C8C; +extern u8 D_80131C98; +extern u8 D_80131C9C; +extern u8 D_80131CA0; +extern u8 D_80131CA8; +extern u16 D_80131E08[]; +extern u8 D_8013340C; +extern u8 D_80131EEE; +extern s8 D_80131EBC; +extern s8 D_80131EC0; +extern s8 D_80131EC4; +extern s8 D_80131EC8[]; +extern u16 D_80131E20[]; +extern u8 D_80131CA4; +extern u8 sOcaMinigameEndPos; +extern u8 sOcaMinigameApndPos; +extern u8 sOcaMinigameNoteCnts[]; +extern u16 D_80130F3E; +extern u8 sOcarinaNoteValues[5]; +extern u8 D_8013170C; +/** bit field of songs that can be played + * 0x0800 storms + * 0x0400 song of time + * 0x0200 suns + * 0x0100 lullaby + * 0x0080 epona + * 0x0040 sarias + * 0x0020 prelude + * 0x0010 nocturne + * 0x0008 requiem + * 0x0004 serenade + * 0x0002 bolero + * 0x0001 minuet + */ +extern u8 D_8013187C; +extern u16 D_80130F4C; +extern u8 D_80131880; +extern u8 D_80131858; +extern f32 D_80130F24; +extern s8 D_80130F34; +extern u32 D_80130F28; +extern u8 D_80131F4C[]; +extern u8 D_80131F50; +extern OcarinaSong sOcarinaSongs[]; // 80130F80 +extern u32 sNotePlaybackTimer; +extern u16 sPlaybackNotePos; +extern u32 D_80131860; +extern u8 D_8013186; +extern u8 D_80131868; +extern u8 D_8013186C; +extern s8 D_80131870; +extern u8 D_80131874; +extern u8 sRecordSongPos; +extern u8 D_80131864; +extern s8 D_80130F30; +extern OcarinaSong* sPlaybackSong; +extern OcarinaSong sPierresSong; +extern u8 sDisplayedNoteValue; // Note to display on screen? +extern s32 D_80130F68; +extern OcarinaNote* D_80131BE4; +extern OcarinaSong* D_80131BEC; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECB34.s") +typedef struct { + u8 unk_00; + char unk_01[0x37]; +} unk_dstruct; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECB7C.s") +extern u8 D_80131EFC; +extern unk_dstruct D_801337CE[]; +extern u8 D_80131F28; +extern u8 D_80131F2C; +extern u8 D_80131F30[]; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECC04.s") +/** + * BSS + */ +u32 sAudioUpdateStartTime; // 8016B7A0 +u32 sAudioUpdateEndTime; +f32 D_8016B7A8; +f32 D_8016B7AC; // maybe padding? +f32 D_8016B7B0; +f32 D_8016B7B4; +unk_s2 D_8016B7B8; +unk_s2 D_8016B7C8; +f32 D_8016B7D8; +s8 D_8016B7DC; +f32 D_8016B7E0; +u16 D_8016B7E4; +typedef struct { + char unk_00[6]; + s16 unk_06; +} unk_D_8016B7E8; +unk_D_8016B7E8 D_8016B7E8[0x19]; +u8 D_8016B8B0; +u8 D_8016B8B1; +u8 D_8016B8B2; +u8 D_8016B8B3; +u8 D_8016B8B4; +unk_s1 D_8016B8B8[0x10]; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECDBC.s") +// maybe a struct? +u8 D_8016B9B8[0x20]; +u8 D_8016B9D8[0x8]; // probably array. +u8 D_8016B9E0[0x12]; +u8 D_8016B9F2; +u8 D_8016B9F3; +u8 D_8016B9F4; +u16 D_8016B9F6; +OcarinaStaff D_8016B9F8; // playing along staff? +OcarinaStaff sDisplayedStaff; // displayed staff? +OcarinaStaff D_8016BA00; // ?? note and status not updated, pos updated as you play +u32 D_8016BA04; +typedef struct { + s8 x; + s8 y; +} OcarinaStick; +OcarinaStick sCurOcaStick; +u32 sCurOcarinaBtnPress; +u32 D_8016BA10; +u32 sPrevOcarinaBtnPress; +s32 D_8016BA18; +s32 D_8016BA1C; +u8 sCurOcarinaSong[8]; +u8 sOcarinaSongAppendPos; +u8 sOcarinaHasStartedSong; +u8 gOcarinaSongNotestartIdx; +u8 sOcarinaSongCnt; +u16 sOcarinaAvailSongs; +u8 D_8016BA2E; +u16 sLearnSongPos[0x10]; +u16 D_8016BA50[0x10]; +u16 D_8016BA70[0x10]; +u8 sLearnSongExpectedNote[0x10]; +OcarinaNote D_8016BAA0; +u8 D_8016BAA8; +f32 D_8016BAAC; +u32 D_8016BAB0; +u32 sDebugPadPressRaw; +u32 sDebugPadPress; +s32 sAudioUpdateTaskStart; +s32 sAudioUpdateTaskEnd; + +void func_800EC960(u8 custom) { + if (!custom) { + osSyncPrintf("AUDIO : Ocarina Control Assign Normal\n"); + sOcarinaAllowedBtnMask = (BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT); + sOcarinaABtnMap = BTN_A; + sOcarinaCUPBtnMap = BTN_CUP; + sOcarinaCDownBtnMap = BTN_CDOWN; + } else { + osSyncPrintf("AUDIO : Ocarina Control Assign Custom\n"); + sOcarinaAllowedBtnMask = (BTN_A | BTN_B | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT); + sOcarinaABtnMap = BTN_B; + sOcarinaCUPBtnMap = BTN_CDOWN; + sOcarinaCDownBtnMap = BTN_A; + } +} + +void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode); +void Audio_GetOcaInput(void) { + Input input[4]; + Input* inputP = &input[0]; + u32 sp18; + + sp18 = sCurOcarinaBtnPress; + inputP = input; + PadMgr_RequestPadData(&gPadMgr, input, 0); + sCurOcarinaBtnPress = inputP->cur.button; + sPrevOcarinaBtnPress = sp18; + sCurOcaStick.x = inputP->rel.stick_x; + sCurOcaStick.y = inputP->rel.stick_y; +} + +f32 Audio_OcaAdjStick(s8 inp) { + s8 inpAdj; + f32 ret; + + if (inp > 0x40) { + inpAdj = 127; + } else if (inp < -0x40) { + inpAdj = -128; + } else if (inp >= 0) { + inpAdj = (inp * 127) / 64; + } else { + inpAdj = (inp * 128) / 64; + } + ret = D_8012F6B4[inpAdj]; + return ret; +} + +u8 func_800ECAF0(void) { + u8 ret; + + if (D_80131878 != 0) { + ret = D_80131878 - 1; + D_80131878 = 0; + } else if (D_80130F3C != 0) { + ret = 0xFE; + } else { + ret = 0xFF; + } + + return ret; +} + +u8 Audio_OcaMapNoteValue(u8 arg0) { + u8 temp_v1; + + temp_v1 = sNoteValueIndexMap[arg0 & 0x3F]; + if (temp_v1 == 5) { + if (arg0 & 0x80) { + return 2; + } + return 3; + } + return temp_v1; +} + +void func_800ECB7C(u8 songIdx) { + u8 savedSongIdx; + u8 scarecrowSongIdx; + u8 noteIdx; + + savedSongIdx = 0; + scarecrowSongIdx = 0; + while (savedSongIdx < 8 && scarecrowSongIdx < 0x10) { + noteIdx = sOcarinaSongs[songIdx].notes[scarecrowSongIdx++].noteIdx; + if (noteIdx != 0xFF) { + gOcarinaSongNotes[0xC].notesIdx[savedSongIdx++] = sNoteValueIndexMap[noteIdx]; + } + } +} + +// start ocarina. +void func_800ECC04(u16 flg) { + u8 i; + + if ((sOcarinaSongs[0xC].notes[1].volume != 0xFF) && ((flg & 0xFFF) == 0xFFF)) { + flg |= 0x1000; + } + + if ((flg == 0xCFFF) && (sOcarinaSongs[0xC].notes[1].volume != 0xFF)) { + flg = 0xDFFF; + } + + if ((flg == 0xFFF) && (sOcarinaSongs[0xC].notes[1].volume != 0xFF)) { + flg = 0x1FFF; + } + + if (flg != 0xFFFF) { + D_80130F3C = 0x80000000 + (u32)flg; + gOcarinaSongNotestartIdx = 0; + sOcarinaSongCnt = 0xE; + if (flg != 0xA000) { + sOcarinaSongCnt--; + } + sOcarinaAvailSongs = flg & 0x3FFF; + D_8013187C = 8; + sOcarinaHasStartedSong = 0; + D_80131878 = 0; + D_8016BA2E = 0; + D_8016B9F8.state = func_800ECAF0(); + sOcarinaInpEnabled = 1; + D_80130F4C = 0; + for (i = 0; i < 0xE; i++) { + sLearnSongPos[i] = 0; + D_8016BA50[i] = 0; + D_8016BA70[i] = 0; + sLearnSongExpectedNote[i] = 0; + } + + if (flg & 0x8000) { + D_8013187C = 0; + } + + if (flg & 0x4000) { + sOcarinaSongAppendPos = 0; + } + + if (flg & 0xD000) { + func_800ECB7C(0xC); + return; + } + } else { + D_80130F3C = 0; + sOcarinaInpEnabled = 0; + } +} + +void func_800ECDBC(void) { + if (sCurOcarinaBtnVal != 0xFF && sOcarinaHasStartedSong == 0) { + sOcarinaHasStartedSong = 1; + sLearnSongLastBtn = 0xFF; + } +} + +#ifdef NON_MATCHING +void func_800ECDF8(void) { + u16 sh; + u16 pad; + u8 inputChanged = 0; + u16 pad2; + s8 sp57 = 0; + u8 i; + OcarinaNote* prevNote; + OcarinaNote* note; + + func_800ECDBC(); + + if (sOcarinaHasStartedSong) { + if ((D_80130F2C < 0 ? -D_80130F2C : D_80130F2C) >= 0x15) { + D_80130F3C = 0; + return; + } + + if (sPrevOcarinaNoteVal == sCurOcarinaBtnVal || sCurOcarinaBtnVal == 0xFF) { + inputChanged = 1; + } + + for (i = gOcarinaSongNotestartIdx; i < sOcarinaSongCnt; i++) { + sh = 1 << i; + if (sOcarinaAvailSongs & sh) { + D_8016BA50[i] = D_8016BA70[i] + 0x12; + if (inputChanged) { + if ((D_8016BA50[i] >= D_8016BA70[i] - 0x12) && (D_8016BA50[i] >= D_8016BA70[i]) && + (sOcarinaSongs[i].notes[sLearnSongPos[i]].unk_02 == 0) && + (sLearnSongLastBtn == sLearnSongExpectedNote[i])) { + D_80131878 = i + 1; + sOcarinaInpEnabled = 0; + D_80130F3C = 0; + } + } else if (D_8016BA50[i] >= (D_8016BA70[i] - 0x12)) { + if (sLearnSongLastBtn != 0xFF) { + if (sLearnSongLastBtn == sLearnSongExpectedNote[i]) { + if (i == 0xC) { + D_8016BA50[i] = 0; + } + } else { + sOcarinaAvailSongs ^= sh; + } + } + + prevNote = &sOcarinaSongs[i].notes[sLearnSongPos[i]]; + note = &sOcarinaSongs[i].notes[++sLearnSongPos[i]]; + D_8016BA70[i] = prevNote->unk_02; + sLearnSongExpectedNote[i] = prevNote->noteIdx; + + if (sCurOcarinaBtnVal != sLearnSongExpectedNote[i]) { + sOcarinaAvailSongs ^= sh; + } + for (; prevNote->noteIdx == note->noteIdx || (note->noteIdx == 0xFF && note->unk_02 != 0); + sLearnSongPos[i]++) { + D_8016BA70[i] += note->unk_02; + note = &sOcarinaSongs[i].notes[sLearnSongPos[i] + 1]; + prevNote = &sOcarinaSongs[i].notes[sLearnSongPos[i]]; + } + } else if (D_8016BA50[i] < 0xA) { + sp57 = -1; + D_8016BA50[i] = 0; + sLearnSongLastBtn = sCurOcarinaBtnVal; + } else { + sOcarinaAvailSongs ^= sh; + } + } + + if (sOcarinaAvailSongs == 0 && D_8016BA2E >= D_8013187C) { + sOcarinaInpEnabled = 0; + if (CHECK_BTN_ANY(D_80130F3C, BTN_B) && sCurOcarinaBtnVal == sOcarinaSongs[i].notes[0].noteIdx) { + D_80130F4C = D_80130F3C; + } + D_80130F3C = 0; + return; + } + } + + if (!inputChanged) { + sLearnSongLastBtn = sCurOcarinaBtnVal; + D_8016BA2E += sp57 + 1; + } + } +} +#else +void func_800ECDF8(void); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ECDF8.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ED200.s") +void func_800ED200(void) { + u32 temp_v0; + u8 i; + u8 j; + u8 k; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ED458.s") + if (CHECK_BTN_ANY(sCurOcarinaBtnPress, BTN_L) && CHECK_BTN_ANY(sCurOcarinaBtnPress, sOcarinaAllowedBtnMask)) { + func_800ECC04(D_80130F3E); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ED848.s") + func_800ECDBC(); -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ED858.s") + if (sOcarinaHasStartedSong) { + if ((sPrevOcarinaNoteVal != sCurOcarinaBtnVal) && (sCurOcarinaBtnVal != 0xFF)) { + D_8016BA2E++; + if (D_8016BA2E >= 9) { + D_8016BA2E = 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800ED93C.s") + if (sOcarinaSongAppendPos == 8) { + for (i = 0; i < 7; i++) { + sCurOcarinaSong[i] = sCurOcarinaSong[i + 1]; + } + } else { + sOcarinaSongAppendPos++; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EDA3C.s") + if ((D_80130F2C < 0 ? -D_80130F2C : D_80130F2C) >= 0x15) { + sCurOcarinaSong[sOcarinaSongAppendPos - 1] = 0xFF; + } else { + sCurOcarinaSong[sOcarinaSongAppendPos - 1] = sCurOcarinaBtnVal; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EDD68.s") + for (i = gOcarinaSongNotestartIdx; i < sOcarinaSongCnt; i++) { + if (sOcarinaAvailSongs & (u16)(1 << i)) { + for (j = 0, k = 0; + j < gOcarinaSongNotes[i].len && k == 0 && sOcarinaSongAppendPos >= gOcarinaSongNotes[i].len;) { + temp_v0 = sCurOcarinaSong[(sOcarinaSongAppendPos - gOcarinaSongNotes[i].len) + j]; + if (temp_v0 == sOcarinaNoteValues[gOcarinaSongNotes[i].notesIdx[j]]) { + j++; + } else { + k++; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE170.s") + if (j == gOcarinaSongNotes[i].len) { + D_80131878 = i + 1; + sOcarinaInpEnabled = 0; + D_80130F3C = 0; + } + } + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE29C.s") +void func_800ED458(s32 arg0) { + u32 phi_v1_2; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE2D4.s") + if (D_80130F3C != 0 && D_80131880 != 0) { + D_80131880--; + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE318.s") + if ((D_8016BA10 == 0) || + ((sCurOcarinaBtnPress & sOcarinaAllowedBtnMask) != (0, D_8016BA10 & sOcarinaAllowedBtnMask))) { + D_8016BA10 = 0; + if (1) {} + sCurOcarinaBtnVal = 0xFF; + sCurOcarinaBtnIdx = 0xFF; + phi_v1_2 = (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask) & (sPrevOcarinaBtnPress & sOcarinaAllowedBtnMask); + if (!(D_8016BA18 & phi_v1_2) && (sCurOcarinaBtnPress != 0)) { + D_8016BA18 = sCurOcarinaBtnPress; + } else { + D_8016BA18 &= phi_v1_2; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE3C8.s") + if (D_8016BA18 & sOcarinaABtnMap) { + osSyncPrintf("Presss NA_KEY_D4 %08x\n", sOcarinaABtnMap); + sCurOcarinaBtnVal = 2; + sCurOcarinaBtnIdx = 0; + } else if (D_8016BA18 & sOcarinaCDownBtnMap) { + osSyncPrintf("Presss NA_KEY_F4 %08x\n", sOcarinaCDownBtnMap); + sCurOcarinaBtnVal = 5; + sCurOcarinaBtnIdx = 1; + } else if (D_8016BA18 & 1) { + osSyncPrintf("Presss NA_KEY_A4 %08x\n", 1); + sCurOcarinaBtnVal = 9; + sCurOcarinaBtnIdx = 2; + } else if (D_8016BA18 & 2) { + osSyncPrintf("Presss NA_KEY_B4 %08x\n", 2); + sCurOcarinaBtnVal = 0xB; + sCurOcarinaBtnIdx = 3; + } else if (D_8016BA18 & sOcarinaCUPBtnMap) { + osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaCUPBtnMap); + sCurOcarinaBtnVal = 0xE; + sCurOcarinaBtnIdx = 4; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE3D4.s") + if (sCurOcarinaBtnVal != 0xFF && sCurOcarinaBtnPress & 0x10 && D_80131858 != 2) { + sCurOcarinaBtnIdx += 0x80; + sCurOcarinaBtnVal++; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE3F8.s") + if ((sCurOcarinaBtnVal != 0xFF) && (sCurOcarinaBtnPress & 0x2000) && (D_80131858 != 2)) { + sCurOcarinaBtnIdx += 0x40; + sCurOcarinaBtnVal--; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE404.s") + if (D_80131858 != 2) { + D_80130F2C = sCurOcaStick.y; + D_80130F24 = Audio_OcaAdjStick(D_80130F2C); -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE57C.s") + D_80130F34 = (sCurOcaStick.x < 0 ? -sCurOcaStick.x : sCurOcaStick.x) >> 2; + Audio_QueueCmdS8(0x6020D06, D_80130F34); + } else { + D_80130F2C = 0; + D_80130F24 = 1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE5EC.s") + if ((sCurOcarinaBtnVal != 0xFF) && (sPrevOcarinaNoteVal != sCurOcarinaBtnVal)) { + Audio_QueueCmdS8(0x6020D07, D_80130F10 - 1); + Audio_QueueCmdS8(0x6020D05, sCurOcarinaBtnVal); + Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &D_801333D4, 4, &D_80130F24, &D_80130F28, &D_801333E8); + } else if ((sPrevOcarinaNoteVal != 0xFF) && (sCurOcarinaBtnVal == 0xFF)) { + Audio_StopSfx(NA_SE_OC_OCARINA); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE6F4.s") +void func_800ED848(u8 inputEnabled) { + sOcarinaInpEnabled = inputEnabled; +} +void func_800ED858(u8 arg0) { + if (D_80130F10 == arg0) { + return; + } + + Audio_SeqCmd8(2, 1, 0xD, arg0); + D_80130F10 = arg0; + if (arg0 == 0) { + sCurOcarinaBtnPress = 0; + sPrevOcarinaBtnPress = 0; + D_8016BA18 = 0; + D_8016BA10 = 0xFFFF; + func_800ED458(0); + Audio_StopSfx(NA_SE_OC_OCARINA); + func_800F7260(0); + sPlaybackState = 0; + sStaffPlaybackPos = 0; + sOcarinaInpEnabled = 0; + D_80130F3C = 0; + Audio_ClearBGMMute(0xD); + } else { + sCurOcarinaBtnPress = 0; + Audio_GetOcaInput(); + D_8016BA10 = sCurOcarinaBtnPress; + Audio_QueueSeqCmdMute(0xD); + } +} + +void func_800ED93C(s8 songIdx, s8 arg1) { + s32 temp_a0; + s32 temp_a0_2; + u16 temp_t5; + u16 temp_v0; + u16 temp_v0_2; + u16 phi_v0; + + if (songIdx == 0) { + sPlaybackState = 0; + Audio_StopSfx(NA_SE_OC_OCARINA); + return; + } + + if (songIdx < 0xF) { + sPlaybackSong = &sOcarinaSongs[songIdx - 1]; + } else { + sPlaybackSong = &sPierresSong; + } + + sPlaybackState = arg1; + sNotePlaybackTimer = 0; + sDisplayedNoteValue = 0xFF; + sPlaybackNotePos = 0; + sStaffPlaybackPos = 0; + while (sPlaybackSong->notes[sPlaybackNotePos].noteIdx == 0xFF) { + sPlaybackNotePos++; + } +} + +extern u8 sNotePlaybackVolume; +extern f32 sNormalizedNotePlaybackVolume; +extern u8 sNotePlaybackVibrato; +extern s8 sNotePlaybackTone; +extern f32 sNormalizedNotePlaybackTone; + +void Audio_OcaPlayback(void) { + s32 noteTimerStep; + s32 nextNoteTimerStep; + + if (sPlaybackState != 0) { + if (sStaffPlaybackPos == 0) { + noteTimerStep = 3; + } else { + noteTimerStep = D_8016BA04 - D_80130F68; + } + + if (noteTimerStep < sNotePlaybackTimer) { + sNotePlaybackTimer -= noteTimerStep; + } else { + nextNoteTimerStep = noteTimerStep - sNotePlaybackTimer; + sNotePlaybackTimer = 0; + } + + if (sNotePlaybackTimer == 0) { + + sNotePlaybackTimer = sPlaybackSong->notes[sPlaybackNotePos].unk_02; + + if (sPlaybackNotePos == 1) { + sNotePlaybackTimer++; + } + + if (sNotePlaybackTimer == 0) { + sPlaybackState--; + if (sPlaybackState != 0) { + sPlaybackNotePos = 0; + sStaffPlaybackPos = 0; + sDisplayedNoteValue = 0xFF; + } else { + Audio_StopSfx(NA_SE_OC_OCARINA); + } + return; + } else { + sNotePlaybackTimer -= nextNoteTimerStep; + } + + if (sNotePlaybackVolume != sPlaybackSong->notes[sPlaybackNotePos].volume) { + sNotePlaybackVolume = sPlaybackSong->notes[sPlaybackNotePos].volume; + sNormalizedNotePlaybackVolume = sNotePlaybackVolume / 127.0f; + } + + if (sNotePlaybackVibrato != sPlaybackSong->notes[sPlaybackNotePos].vibrato) { + sNotePlaybackVibrato = sPlaybackSong->notes[sPlaybackNotePos].vibrato; + Audio_QueueCmdS8(0x06020D06, sNotePlaybackVibrato); + } + + if (sNotePlaybackTone != sPlaybackSong->notes[sPlaybackNotePos].tone) { + sNotePlaybackTone = sPlaybackSong->notes[sPlaybackNotePos].tone; + sNormalizedNotePlaybackTone = Audio_OcaAdjStick(sNotePlaybackTone); + } + + if ((sPlaybackSong->notes[sPlaybackNotePos].volume == sPlaybackSong->notes[sPlaybackNotePos - 1].volume && + (sPlaybackSong->notes[sPlaybackNotePos].vibrato == + sPlaybackSong->notes[sPlaybackNotePos - 1].vibrato) && + (sPlaybackSong->notes[sPlaybackNotePos].tone == sPlaybackSong->notes[sPlaybackNotePos - 1].tone))) { + sDisplayedNoteValue = 0xFE; + } + + if (sDisplayedNoteValue != sPlaybackSong->notes[sPlaybackNotePos].noteIdx) { + u8 tmp = sPlaybackSong->notes[sPlaybackNotePos].noteIdx; + if (tmp == 0xA) { + sDisplayedNoteValue = tmp + sPlaybackSong->notes[sPlaybackNotePos].semitone; + } else { + sDisplayedNoteValue = tmp; + } + + if (sDisplayedNoteValue != 0xFF) { + sStaffPlaybackPos++; + Audio_QueueCmdS8(0x6020D07, D_80130F10 - 1); + Audio_QueueCmdS8(0x6020D05, sDisplayedNoteValue & 0x3F); + Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &D_801333D4, 4, &sNormalizedNotePlaybackTone, + &sNormalizedNotePlaybackVolume, &D_801333E8); + } else { + Audio_StopSfx(NA_SE_OC_OCARINA); + } + } + sPlaybackNotePos++; + } + } +} + +void func_800EDD68(u8 arg0) { + u16 i; + u16 i2; + u16 mad2; + u8 mad; + OcarinaNote* note; + u8 j; + u8 k; + s32 t; + OcarinaSong* song; + + if (D_80131858 == 1) { + song = gScarecrowCustomSongPtr; + } else { + song = D_80131BEC; + } + song->notes[sRecordSongPos].noteIdx = D_80131864; + song->notes[sRecordSongPos].unk_02 = D_8016BA04 - D_80131860; + song->notes[sRecordSongPos].volume = D_80131868; + song->notes[sRecordSongPos].vibrato = D_8013186C; + song->notes[sRecordSongPos].tone = D_80131870; + song->notes[sRecordSongPos].semitone = D_80131874 & 0xC0; + D_80131864 = sCurOcarinaBtnVal; + D_80131868 = D_80130F30; + D_8013186C = D_80130F34; + D_80131870 = D_80130F2C; + D_80131874 = sCurOcarinaBtnIdx; + sRecordSongPos++; + + if ((sRecordSongPos != 107) && (arg0 == 0)) { + return; + } + + i = sRecordSongPos; + mad = 0xFF; + while (i != 0 && mad == 0xFF) { + i--; + mad = song->notes[i].noteIdx; + } + + if (1) {} + + if (sRecordSongPos != (i + 1)) { + sRecordSongPos = i + 2; + song->notes[sRecordSongPos - 1].unk_02 = 0; + } + + song->notes[sRecordSongPos].unk_02 = 0; + + if (D_80131858 == 2) { + if (D_8016BA2E >= 8) { + for (i = 0; i < sRecordSongPos; i++) { + song->notes[i] = song->notes[i + 1]; + } + + func_800ECB7C(0xD); + + for (i = 0; i < 0xC; i++) { + for (j = 0; j < 9 - gOcarinaSongNotes[i].len; j++) { + for (k = 0; k < gOcarinaSongNotes[i].len && k + j < 8 && + gOcarinaSongNotes[i].notesIdx[k] == gOcarinaSongNotes[0xC].notesIdx[k + j]; + k++) + ; + + if (k == gOcarinaSongNotes[i].len) { + D_80131858 = 0xFF; + sOcarinaSongs[0xC].notes[1].volume = 0xFF; + return; + } + } + } + + i = 1; + while (i < 8) { + if (gOcarinaSongNotes[0xC].notesIdx[0] != gOcarinaSongNotes[0xC].notesIdx[i]) { + i = 9; + } else { + i++; + } + } + + if (i == 8) { + D_80131858 = 0xFF; + sOcarinaSongs[0xC].notes[1].volume = 0xFF; + return; + } + + for (i = 0; i < sRecordSongPos; i++) { + sOcarinaSongs[0xC].notes[i] = sOcarinaSongs[0xD].notes[i]; + } + + sOcarinaInpEnabled = 0; + } else { + sOcarinaSongs[0xC].notes[1].volume = 0xFF; + } + } + D_80131858 = 0; +} + +// start custom song? +/** + * arg0 = 1, start + * arg0 = 0, finish + * arg0 = 2, also start? + */ +void func_800EE170(u8 arg0) { + if ((u32)arg0 == D_80131858) { + return; + } + + if (arg0 != 0) { + D_80131860 = D_8016BA04; + D_80131864 = 0xFF; + D_80131868 = 0x57; + D_8013186C = 0; + D_80131870 = 0; + D_80131874 = 0; + sRecordSongPos = 0; + sOcarinaInpEnabled = 1; + D_8016BA2E = 0; + D_8016BAA0 = sPierresSong.notes[1]; + } else { + if (sRecordSongPos == 0) { + sPierresSong.notes[1] = D_8016BAA0; + } else { + if (D_80131858 == 2) { + D_8016BA2E = 1; + } + + func_800EDD68(1); + } + + sOcarinaInpEnabled = 0; + D_8016BA2E = 0; + } + + D_80131858 = arg0; +} + +void func_800EE29C(void) { + D_8016BA00.state = D_80131858; + D_8016BA00.pos = D_8016BA2E; + if (D_80131858 == 0xFF) { + D_80131858 = 0; + } +} + +void func_800EE2D4(void) { + D_8016B9F8.noteIdx = sCurOcarinaBtnIdx & 0x3F; + D_8016B9F8.state = func_800ECAF0(); + D_8016B9F8.pos = D_8016BA2E; +} + +void func_800EE318(void) { + if ((sDisplayedNoteValue & 0x3F) < 0x10) { + sDisplayedStaff.noteIdx = Audio_OcaMapNoteValue(sDisplayedNoteValue); + } + + sDisplayedStaff.state = sPlaybackState; + + if (sPlaybackSong != &sPierresSong) { + sDisplayedStaff.pos = sStaffPlaybackPos; + } else if (sStaffPlaybackPos == 0) { + sDisplayedStaff.pos = 0; + } else { + sDisplayedStaff.pos = ((sStaffPlaybackPos - 1) % 8) + 1; + } +} + +OcarinaStaff* func_800EE3C8(void) { + return &D_8016BA00; +} + +OcarinaStaff* func_800EE3D4(void) { + if (D_8016B9F8.state < 0xFE) { + D_80130F3C = 0; + } + return &D_8016B9F8; +} + +OcarinaStaff* Audio_OcaGetDisplayStaff(void) { + return &sDisplayedStaff; +} + +void func_800EE404(void) { + s32 noteChanged; + + if ((D_80131858 != 0) && ((D_8016BA04 - D_80131860) >= 3)) { + noteChanged = false; + if (D_80131864 != sCurOcarinaBtnVal) { + if (sCurOcarinaBtnVal != 0xFF) { + D_8016BA00.noteIdx = sCurOcarinaBtnIdx & 0x3F; + D_8016BA2E++; + } else if ((D_80131858 == 2) && (D_8016BA2E == 8)) { + func_800EDD68(1); + return; + } + + if (D_8016BA2E > 8) { + if (D_80131858 == 2) { + // notes played are over 8 and in recording mode. + func_800EDD68(1); + return; + } + D_8016BA2E = true; + } + + noteChanged = true; + } else if (D_80131868 != D_80130F30) { + noteChanged = true; + } else if (D_8013186C != D_80130F34) { + noteChanged = true; + } else if (D_80131870 != D_80130F2C) { + noteChanged = true; + } + + if (noteChanged) { + func_800EDD68(0); + D_80131860 = D_8016BA04; + } + } +} + +s32 func_800EE5EC(void); + +void func_800EE57C(u8 minigameIdx) { + u8 i; + + if (minigameIdx > 2) { + minigameIdx = 2; + } + + sOcaMinigameApndPos = 0; + sOcaMinigameEndPos = sOcaMinigameNoteCnts[minigameIdx]; + + for (i = 0; i < 3; i++) { + func_800EE5EC(); + } +} + +#define OCA_MEMORYGAME_IDX 0xD +s32 func_800EE5EC(void) { + u32 rnd; + u8 rndNote; + + if (sOcaMinigameApndPos == sOcaMinigameEndPos) { + return 1; + } + + rnd = Audio_NextRandom(); + rndNote = sOcarinaNoteValues[rnd % 5]; + + if (sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos - 1].noteIdx == rndNote) { + rndNote = sOcarinaNoteValues[(rnd + 1) % 5]; + } + + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].noteIdx = rndNote; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].unk_02 = 0x2D; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].volume = 0x50; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].vibrato = 0; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].tone = 0; + + sOcaMinigameApndPos++; + + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].noteIdx = 0xFF; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos].unk_02 = 0; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos + 1].noteIdx = 0xFF; + sOcarinaSongs[OCA_MEMORYGAME_IDX].notes[sOcaMinigameApndPos + 1].unk_02 = 0; + if (1) {} + return 0; +} + +// input update? +void func_800EE6F4(void) { + D_8016BA04 = gAudioContext.totalTaskCnt; + if (D_80130F10 != 0) { + if (sOcarinaInpEnabled == 1) { + Audio_GetOcaInput(); + } + if ((sPlaybackState == 0) && (sOcarinaInpEnabled == 1)) { + func_800ED458(0); + } + if (D_80130F3C != 0) { + if (D_80130F3C & 0x4000) { + func_800ED200(); + } else { + func_800ECDF8(); + } + } + + Audio_OcaPlayback(); + D_80130F68 = D_8016BA04; + + if (sPlaybackState == 0) { + func_800EE404(); + } + + if ((D_80130F3C != 0) && (sPrevOcarinaNoteVal != sCurOcarinaBtnVal)) { + D_80131880 = 1; + } + + sPrevOcarinaNoteVal = sCurOcarinaBtnVal; + } + + func_800EE2D4(); + func_800EE318(); + func_800EE29C(); +} + +#ifdef NON_MATCHING +// matches, but data needs to be migrated. +void func_800EE824(void) { + static u8 D_80131C80 = 0; + static u8 D_80131C84 = 1; + static u16 D_80131C88 = 0x4B0; + + switch (D_80131C80) { + case 0: + if (D_80131C88-- == 0) { + if (D_80131C84 < 7) { + D_80131C80++; + } else { + D_80131C80 = 3; + func_800ED858(0); + } + D_80131C88 = 0x4B0; + } + break; + case 1: + func_800F7260(0); + func_800ED858(D_80131C84); + func_800ED93C(0xF, 1); + D_80131C84++; + D_80131C80++; + break; + case 2: + if (Audio_OcaGetDisplayStaff()->state == 0) { + D_80131C80 = 0; + } + break; + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE824.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE930.s") +void func_800EE930(void) { + D_8016B9F8.noteIdx = 0xFF; + D_8016B9F8.state = 0xFF; + D_8016B9F8.pos = 0; + sDisplayedStaff.noteIdx = 0xFF; + sDisplayedStaff.state = 0; + sDisplayedStaff.pos = 0; + D_8016BA00.noteIdx = 0xFF; + D_8016BA00.state = 0xFF; + D_8016BA00.pos = 0; + D_80131880 = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE97C.s") +// DebugAudio_GetOcaInput +void func_800EE97C(void) { + Input inputs[4]; + u32 btn; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EE9D0.s") + PadMgr_RequestPadData(&gPadMgr, &inputs, 0); + btn = inputs[3].cur.button; + D_8016BAB0 = btn & 0xFFFF; + sDebugPadPress = (btn ^ sDebugPadPressRaw) & btn; + sDebugPadPressRaw = btn; +} +u8* func_800EE9D0(s32 arg0, u8 arg1) { + s32 temp_a1; + s32 temp_v1; + u8* temp_a3; + s32 phi_v0; + s32 phi_t0; + s32 phi_v1; + u8 i; + u32 flg = 1; + + for (i = 0; i < arg1; flg *= 2, i++) { + if (arg0 & flg) { + D_8016B9B8[arg1 - i - 1] = 0x31; + } else { + D_8016B9B8[arg1 - i - 1] = 0x30; + } + } + + D_8016B9B8[arg1] = 0; + return D_8016B9B8; +} + +extern char D_80131CAC[][0x17]; +extern char D_80131F54[][5]; +extern char D_80131E38[7][0xB]; +extern char D_80131E88[][0xA]; +extern u8 D_80131F68; + +// Debug Print #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EEA50.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F1BDC.s") +extern u16 D_80131E14; +void func_800F1BDC(void) { + u16 phi_t1 = 1; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F2150.s") + if (D_8016BAB0 & 4) { + if (D_80131E20[D_80131CA4] >= 0x10) { + phi_t1 = 0x10; + } + } else if (D_8016BAB0 & 2) { + if (D_80131E20[D_80131CA4] >= 0x10) { + phi_t1 = 8; + } + } else { + if (D_8016BAB0 & 8) { + D_80131E08[D_80131CA4] = 0; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F227C.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + if (D_80131CA4 > 0) { + D_80131CA4--; + } else { + D_80131CA4 = 0xA; + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (D_80131CA4 < 0xA) { + D_80131CA4++; + } else { + D_80131CA4 = 0; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { + if (D_80131E08[D_80131CA4] >= phi_t1) { + if (1) { + D_80131E08[D_80131CA4] -= phi_t1; + } + } else { + D_80131E08[D_80131CA4] += D_80131E20[D_80131CA4] - phi_t1; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { + if (D_80131E08[D_80131CA4] + phi_t1 < D_80131E20[D_80131CA4]) { + D_80131E08[D_80131CA4] += phi_t1; + } else { + D_80131E08[D_80131CA4] += phi_t1 - D_80131E20[D_80131CA4]; + } + } + + if (D_80131CA4 == 8) { + if (D_80131E08[D_80131CA4] != 0) { + func_800F6828(0x20); + } else { + func_800F6828(0); + } + } + + if (D_80131CA4 == 9) { + if (D_80131E08[D_80131CA4] != 0) { + func_800F67A0(0x20); + } else { + func_800F67A0(0); + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + switch (D_80131CA4) { + case 0: + case 1: + Audio_StartSeq(D_80131CA4, 0, D_80131E08[D_80131CA4]); + break; + case 2: + case 3: + Audio_PlaySoundGeneral(((D_80131E08[2] << 0xC) & 0xFFFF) + D_80131E08[3] + SFX_FLAG, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); + break; + case 4: + func_800F6700(D_80131E08[D_80131CA4]); + break; + case 5: + Audio_SeqCmdE01(0, D_80131E08[D_80131CA4]); + break; + case 6: + Audio_SeqCmdF(0, D_80131E08[D_80131CA4]); + D_80131EFC = D_80131E14; + if (gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1 < D_80131F28) { + D_80131F28 = gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1; + } + break; + case 7: + func_800F6FB4(D_80131E08[D_80131CA4]); + break; + case 8: + case 9: + break; + case 10: + func_800F7260(D_80131E08[D_80131CA4] * 127); + break; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + switch (D_80131CA4) { + case 0: + case 1: + Audio_SeqCmd1(D_80131CA4, 0); + break; + case 7: + Audio_SeqCmd1(0, 0); + break; + case 2: + case 3: + func_800F87A0(D_80131E08[2]); + break; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { + if (D_80131CA4 == 0) { + if (1) {} + func_800F595C(D_80131E08[D_80131CA4]); + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { + if (D_80131CA4 == 0) { + if (1) {} + func_800F5ACC(D_80131E08[D_80131CA4]); + } + } +} + +void func_800F2150(void) { + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CUP)) { + D_80131EC0--; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { + D_80131EC0++; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CLEFT)) { + D_80131EBC--; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { + D_80131EBC++; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + D_80131EBC = 0; + D_80131EC0 = 0; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP) && D_80131EC4 > 0) { + D_80131EC4--; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN) && D_80131EC4 < 6) { + D_80131EC4++; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT) && D_80131EC8[D_80131EC4] > 0) { + D_80131EC8[D_80131EC4]--; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT) && D_80131EC8[D_80131EC4] < 4) { + D_80131EC8[D_80131EC4]++; + } +} + +extern u8 D_80131ED0; +extern u8 D_80131ED4; +extern u8 D_80131ED8; +extern s8 D_80131EDC; +extern s8 D_80131EE0; +extern u8 D_80131EE4[]; +extern u8 D_80131EF0[]; +extern u8 D_801333F0; + +void func_800F227C(void) { + + if (D_80131EE4[0] != 0) { + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CUP)) { + D_80131EE0--; + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { + D_80131EE0++; + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CLEFT)) { + D_80131EDC--; + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { + D_80131EDC++; + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + D_80131EDC = 0x1A; + D_80131EE0 = 1; + D_80131EE4[2] = 6; + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + D_80131ED4 = 0; + D_80131ED8 = 0; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + if (D_80131ED0 > 0) { + D_80131ED0--; + } else { + D_80131ED0 = 10; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (D_80131ED0 < 0xA) { + D_80131ED0++; + } else { + D_80131ED0 = 0; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { + if (D_80131EE4[D_80131ED0] > 0) { + D_80131EE4[D_80131ED0]--; + } else { + D_80131EE4[D_80131ED0] = D_80131EF0[D_80131ED0] - 1; + } + } + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { + if (D_80131EE4[D_80131ED0] < D_80131EF0[D_80131ED0] - 1) { + D_80131EE4[D_80131ED0]++; + } else { + D_80131EE4[D_80131ED0] = 0; + } + } + + D_801333F0 = D_80131EE4[3] + (D_80131EE4[4] * 2) + (D_80131EE4[5] * 4) + (D_80131EE4[6] * 8) + + (D_80131EE4[7] * 0x10) + (D_80131EE4[8] * 32); +} + +extern u8 D_80131F00; +extern u8 D_80131F04; +extern u8 D_80131F08; +extern u16 D_8016E2E0[]; +extern u16 D_8016E2F8[]; +extern u8 D_801333F4; +extern u8 D_8016E310[]; +#ifdef NON_MATCHING +void func_800F2464(void) { + s16 phi_t1; + u16 new_var; + u8 phi_v1; + + if (D_80131F00 == 0) { + if ((sDebugPadPress & 0x800) != 0) { + if (D_80131F04 > 0) { + D_80131F04--; + } else { + D_80131F04 = 9; + } + } + if ((sDebugPadPress & 0x400) != 0) { + if (D_80131F04 < 9) { + D_80131F04++; + } else { + D_80131F04 = 0; + } + } + + phi_v1 = 9; + phi_t1 = phi_t1; + if ((sDebugPadPress & 0x8000) != 0) { + D_80131F00 = 1; + } + + if ((sDebugPadPress & 0x4000) != 0) { + D_8016E2E0[D_80131F04] = 0; + D_8016E2F8[D_80131F04] = 0; + } + if ((sDebugPadPress & 0x1000) != 0) { + phi_v1 = D_80131F04; + if (phi_v1 != 0) { + phi_v1--; + } else { + phi_v1 = 9; + } + D_8016E2E0[D_80131F04] = D_8016E2E0[phi_v1]; + if (!D_80131F08) + ; + D_8016E2F8[D_80131F04] = D_8016E2F8[phi_v1]; + } + } else { + if ((sDebugPadPress & 0x200) != 0) { + if (D_80131F08 > 0) { + D_80131F08--; + } else { + D_80131F08 = 7; + } + } + if ((sDebugPadPress & 0x100) != 0) { + if (D_80131F08 < 7) { + D_80131F08++; + } else { + D_80131F08 = 0; + } + } + + if (((sDebugPadPress & 0x800) != 0) || ((sDebugPadPress & 0x400) != 0)) { + if ((sDebugPadPress & 0x800) != 0) { + phi_t1 = (D_8016BAB0 & 8) != 0 ? 8 : 1; + } + + if ((sDebugPadPress & 0x400) != 0) { + phi_t1 = (D_8016BAB0 & 8) != 0 ? -8 : -1; + } + + if (D_80131F08 < 4) { + new_var = (u16)(((D_8016E2E0[D_80131F04] >> (((-D_80131F08) * 4) + 0xC)) + phi_t1) & 0xF); + D_8016E2E0[D_80131F04] = + (u16)((D_8016E2E0[D_80131F04] & ((0xF << (((-D_80131F08) * 4) + 0xC)) ^ 0xFFFF)) + + (new_var << (((-D_80131F08) * 4) + 0xC))); + } else { + new_var = (u16)(((D_8016E2F8[D_80131F04] >> (((-D_80131F08) * 4) + 0x1C)) + phi_t1) & 0xF); + D_8016E2F8[D_80131F04] = + (u16)((D_8016E2F8[D_80131F04] & ((0xF << (((-D_80131F08) * 4) + 0x1C)) ^ 0xFFFF)) + + (new_var << (((-D_80131F08) * 4) + 0x1C))); + } + } + + if ((sDebugPadPress & 0x8000) != 0) { + D_80131F00 = 0; + } + + if ((sDebugPadPress & 0x4000) != 0) { + if (D_80131F08 < 4) { + D_8016E2E0[D_80131F04] = 0; + } else { + D_8016E2F8[D_80131F04] = 0; + } + } + } + if ((sDebugPadPress & 2) != 0) { + D_801333F4 ^= 1; + } + if ((sDebugPadPress & 4) != 0) { + D_8016E310[D_80131F04] ^= 1; + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F2464.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F27A0.s") +void func_800F27A0(void) { + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (D_80131F28 != 0) { + D_80131F28--; + } else { + D_80131F28 = gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1; + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + if (D_80131F28 < gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1) { + D_80131F28++; + } else { + D_80131F28 = 0; + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { + D_80131F2C = (D_80131F2C - 1) & 0xF; + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { + D_80131F2C = (D_80131F2C + 1) & 0xF; + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_START)) { + D_80131F30[D_80131F28] = 0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F28AC.s") +void func_800F28AC(void) { +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F28B4.s") +void func_800F28B4(void) { + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + if (D_80131F50 > 0) { + D_80131F50--; + } else { + D_80131F50 = 1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F29FC.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (D_80131F50 <= 0) { + D_80131F50++; + } else { + D_80131F50 = 0; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F2A04.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { + D_80131F4C[D_80131F50]--; + if (D_80131F50 == 1) { + func_800F5E90(D_80131F4C[1]); + ; // might be a fake match? + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F2D6C.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { + D_80131F4C[D_80131F50]++; + if (D_80131F50 == 1) { + func_800F5E90(D_80131F4C[1]); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F2E28.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + Audio_QueueCmdS8(MK_CMD(0x46, 0x00, 0x00, 0x00), D_80131F4C[1]); + Audio_QueueSeqCmd(D_80131F4C[0] | 0x10000); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3054.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + Audio_QueueSeqCmd(0x100100FF); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3138.s") +void func_800F29FC(void) { +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3140.s") +extern u8 D_80131F18; +extern u16 D_80131F20[]; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F314C.s") +extern u16 D_80131E24; +extern u8 D_80131F1C; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3188.s") +void func_800F2A04(void) { + s32 phi_a2; + u16 sfx; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F32F0.s") + if (D_8016BAB0 & 2) { + phi_a2 = 8; + } else { + phi_a2 = 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3468.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + if (D_80131F18 > 0) { + D_80131F18--; + } else { + D_80131F18 = 3; + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (D_80131F18 < 3) { + D_80131F18++; + } else { + D_80131F18 = 0; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F35EC.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { + if (D_80131F18 < 2) { + if (D_80131F18 == 0) { + if (D_80131F20[D_80131F18] > 0) { + D_80131F20[D_80131F18]--; + } else { + D_80131F20[D_80131F18] = D_80131E24 - 1; + } + } else { + D_80131F20[D_80131F18] -= phi_a2; + D_80131F20[D_80131F18] &= 0x1FF; + } + } else if (D_80131F18 == 3) { + D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_0 -= phi_a2; + } else { + D_80131F1C = (D_80131F1C - 1) & 0xF; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F37B8.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { + if (D_80131F18 < 2) { + if (D_80131F18 == 0) { + if (D_80131F20[D_80131F18] < (D_80131E24 - 1)) { + D_80131F20[D_80131F18]++; + } else { + D_80131F20[D_80131F18] = 0; + } + } else { + D_80131F20[D_80131F18] += phi_a2; + D_80131F20[D_80131F18] &= 0x1FF; + } + } else if (D_80131F18 == 3) { + D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_0 += phi_a2; + } else { + D_80131F1C = (D_80131F1C + 1) & 0xF; + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + sfx = (u16)(D_80131F20[0] << 0xC) + D_80131F20[1] + SFX_FLAG; + Audio_PlaySoundGeneral(sfx, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3990.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + func_800F87A0(D_80131F20[0]); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3A08.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { + if (D_80131F18 == 2) { + D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_2 ^= (1 << (0xF - D_80131F1C)); + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CUP)) { + if (D_80131F18 < 2) { + D_80131F20[D_80131F18] = 0; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3ED4.s") +void func_800F2D6C(s8* arg0, u16 arg1) { + u8 i = 0; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3F3C.s") + D_8016B7E8[D_80131ED4].unk_06 = arg1; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F3F84.s") + while (arg0[i] != 0) { + D_8016B7E8[D_80131ED4].unk_00[i] = arg0[i]; + i++; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4010.s") + while (i < 5) { + D_8016B7E8[D_80131ED4].unk_00[i] = 0; + i++; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4138.s") + if (D_80131ED4 < 0x18) { + D_80131ED4++; + } else { + D_80131ED4 = 0; + D_80131ED8 = 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4190.s") +void func_800F1BDC(void); +void func_800F2150(void); +void func_800F227C(void); +void func_800F2464(void); +void func_800F27A0(void); +void func_800F28AC(void); +void func_800F2A04(void); -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F41E0.s") +void func_800F2E28(void) { + if (D_80131C98 != 0) { + if (D_80131C9C != 0) { + func_800F7260(0x6F); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4254.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_L)) { + // goto next page. + if (D_80131CA0 < 0xE) { + D_80131CA0++; + } else { + D_80131CA0 = 0; + } + } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_R)) { + // goto previous page + if (D_80131CA0 > 0) { + D_80131CA0--; + } else { + D_80131CA0 = 0xE; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F436C.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_Z)) { + // change text color + D_80131CA8 = (u32)(++D_80131CA8) % 8; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4414.s") + switch (D_80131CA0) { + case 0: + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + D_80131E08[5] ^= 0x1; + Audio_SeqCmdE01(0, D_80131E08[5]); + if (func_800FA0B4(0) != 1) { + Audio_SeqCmd1(0, 0); + } + Audio_SeqCmd1(1, 0); + Audio_SeqCmd1(3, 0); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F44EC.s") + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + D_80131C9C ^= 0x1; + if (D_80131C9C == 0) { + func_800F7260(0); + } + } + break; + case 1: + func_800F1BDC(); + break; + case 7: + func_800F2150(); + break; + case 13: + func_800F227C(); + break; + case 8: + func_800F2464(); + break; + case 5: + func_800F27A0(); + break; + case 3: + func_800F28AC(); + break; + case 9: + func_800F28B4(); + break; + case 11: + func_800F29FC(); + break; + case 12: + func_800F2A04(); + break; + case 14: + default: + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4524.s") + D_8013340C = D_80131EEE; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4578.s") +void func_800F50CC(void); +void func_800F4A70(void); +void func_800F5CF8(void); -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F45D0.s") +void func_800F30534(void) { + if (func_800FAD34() == 0) { + sAudioUpdateTaskStart = gAudioContext.totalTaskCnt; + sAudioUpdateStartTime = osGetTime(); + func_800EE6F4(); + func_800F4784(&D_8016B7B8); + func_800F4784(&D_8016B7C8); + func_800F4A70(); + func_800F56A8(); + func_800F5CF8(); + if (D_80133414 == 7) { + func_800F50CC(); + } + func_800F8E3C(); + Audio_ProcessSeqCmds(); + func_800F8F88(); + func_800FA3DC(); + func_800EE97C(); + func_800F2E28(); + Audio_ScheduleProcessCmds(); + sAudioUpdateTaskEnd = gAudioContext.totalTaskCnt; + sAudioUpdateEndTime = osGetTime(); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4634.s") +void func_800F3138(UNK_TYPE arg0) { +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F46E0.s") +void func_800F3140(UNK_TYPE arg0, UNK_TYPE arg1) { +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4784.s") +void func_800F314C(s8 arg0) { + Audio_QueueCmdS32(0x82000000 | (((u8)arg0 & 0xFF) << 8), 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F47BC.s") +f32 func_800F3188(u8 bankIdx, u8 entryIdx) { + SoundBankEntry* bankEntry; + f32 temp_f14; + f32 temp_f2; + f32 phi_f0; + f32 ret; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F47FC.s") + bankEntry = &gSoundBanks[bankIdx][entryIdx]; + if (bankEntry->unk_26 & 0x2000) { + return 1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F483C.s") + if (bankEntry->unk_1C > 10000.0f) { + ret = 0.0f; + } else { + switch (bankEntry->unk_26 & 3) { + case 1: + phi_f0 = 666.6667f; + break; + case 2: + phi_f0 = 952.381f; + break; + case 3: + phi_f0 = 3846.154f; + break; + default: + phi_f0 = 500.0f; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4870.s") + temp_f14 = phi_f0 / 5.0f; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F491C.s") + if (bankEntry->unk_1C < temp_f14) { + ret = 1.0f; + } else if (bankEntry->unk_1C < phi_f0) { + ret = ((((phi_f0 - temp_f14) - (bankEntry->unk_1C - temp_f14)) / (phi_f0 - temp_f14)) * 0.19f) + 0.81f; + } else { + ret = (1.0f - ((bankEntry->unk_1C - phi_f0) / (10000.0f - phi_f0))) * 0.81f; + } + ret = SQ(ret); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4A54.s") + return ret; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4A70.s") +s8 func_800F32F0(u8 arg0, u8 arg1, u8 arg2) { + SoundBankEntry* temp_a3; + SequenceChannel* temp_a1; + s32 phi_a1; + s8 phi_v0 = 0; + s32 phi_v1 = 0; + SequenceChannel* none = &gAudioContext.sequenceChannelNone; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4B58.s") + temp_a3 = &gSoundBanks[arg0][arg1]; + if (!(temp_a3->unk_26 & 0x1000)) { + if (temp_a3->unk_1C < 2500.0f) { + phi_v0 = *temp_a3->posZ > 0.0f ? (temp_a3->unk_1C / 2500.0f) * 70.0f : (temp_a3->unk_1C / 2500.0f) * 91.0f; + } else { + phi_v0 = 0x46; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4BE8.s") + temp_a1 = gAudioContext.seqPlayers[2].channels[arg2]; + if (none != temp_a1) { + phi_v1 = temp_a1->soundScriptIO[1]; + if (temp_a1->soundScriptIO[1] < 0) { + phi_v1 = 0; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4BF4.s") + phi_a1 = *temp_a3->unk_18 + phi_v0 + phi_v1; + if ((arg0 != 5) || !((temp_a3->unk_28 & 0x1FF) < 2)) { + phi_a1 += D_80130614 + D_80130618 + D_80130610; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4C58.s") + if (phi_a1 >= 0x80) { + phi_a1 = 0x7F; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F4E30.s") + return phi_a1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F50CC.s") +s8 func_800F3468(f32 arg0, f32 arg1, u8 arg2) { + f32 temp_f14; + f32 temp_f2; + f32 phi_f12; + f32 phi_f2; + f32 phi_f2_2; + f32 phi_f12_2; + f32 phi_f0; + f32 phi_f0_2; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F50EC.s") + if (arg0 < 0) { + phi_f12 = -arg0; + } else { + phi_f12 = arg0; + } + if (arg1 < 0) { + phi_f2 = -arg1; + } else { + phi_f2 = arg1; + } + if (phi_f12 > 8000.0f) { + phi_f12 = 8000.0f; + } + + if (phi_f2 > 8000.0f) { + phi_f2 = 8000.0f; + } + + if ((arg0 == 0.0f) && (arg1 == 0.0f)) { + phi_f0 = 0.5f; + } else if (phi_f2 <= phi_f12) { + phi_f0 = (16000.0f - phi_f12) / (3.3f * (16000.0f - phi_f2)); + if (arg0 >= 0.0f) { + phi_f0 = 1.0f - phi_f0; + } + } else { + phi_f0 = (arg0 / (5.0769234f * phi_f2)) + 0.5f; + } + + if (phi_f2 < 50.0f) { + if (phi_f12 < 50.0f) { + phi_f0 = ((phi_f0 - 0.5f) * SQ(phi_f12 / 50.0f)) + 0.5f; + } + } + return (phi_f0 * 127.0f) + 0.5f; +} + +f32 func_800F35EC(u8 bankIdx, u8 entryIdx) { + s32 phi_v0 = 0; + SoundBankEntry* entry = &gSoundBanks[bankIdx][entryIdx]; + f32 unk1C; + f32 freq = 1.0f; + + if (entry->unk_26 & 0x4000) { + freq = 1.0f - ((gAudioContext.audioRandom & 0xF) / 192.0f); + } + + switch (bankIdx) { + case BANK_PLAYER: + case BANK_ITEM: + case BANK_VOICE: + if (D_80130644 != 0) { + phi_v0 = 1; + } + break; + case BANK_ENV: + case BANK_ENEMY: + if (D_80130648 != 0) { + phi_v0 = 1; + } + break; + case BANK_SYSTEM: + case BANK_OCARINA: + break; + } + + if (phi_v0 == 1) { + if (!(entry->unk_26 & 0x800)) { + freq *= (1.0293 - ((gAudioContext.audioRandom & 0xF) / 144.0f)); + } + } + + unk1C = entry->unk_1C; + if (!(entry->unk_26 & 0x2000)) { + if (!(entry->unk_26 & 0x8000)) { + if (unk1C >= 10000.0f) { + freq += 0.2f; + } else { + freq += (0.2f * (unk1C / 10000.0f)); + } + } + } + + if (entry->unk_26 & 0xC0) { + freq += (entry->unk_2F / 192.0f); + } + + return freq; +} + +u8 func_800F37B8(f32 arg0, SoundBankEntry* arg1, s8 arg2) { + s8 phi_v0; + u8 phi_v1; + f32 phi_f0; + f32 phi_f12; + + if (*arg1->posZ < arg0) { + phi_v0 = arg2 < 0x41 ? arg2 : 0x7F - arg2; + + if (phi_v0 < 0x1E) { + phi_v1 = 0; + } else { + phi_v1 = (((phi_v0 & 0xFFFF) * 0xA) - 0x12C) / 0x22; + if (phi_v1 != 0) { + phi_v1 = 0x10 - phi_v1; + } + } + } else { + phi_v1 = 0; + } + + if (phi_v1 == 0) { + if (arg1->unk_26 & 0x200) { + phi_v1 = 0xF; + } + } + + switch (arg1->unk_26 & 3) { + case 1: + phi_f0 = 12.0f; + break; + case 2: + phi_f0 = 9.0f; + break; + case 3: + phi_f0 = 6.0f; + break; + default: + phi_f0 = 15.0f; + break; + } + + if (arg1->unk_1C > 1923.077f) { + phi_f12 = 1923.077f; + } else { + phi_f12 = arg1->unk_1C; + } + + return (phi_v1 * 0x10) + (u8)((phi_f0 * phi_f12) / 1923.077f); +} + +s8 func_800F3990(f32 arg0, u16 arg1) { + s8 ret = 0; + + if (arg0 >= 0.0f) { + if (arg0 > 625.0f) { + ret = 0x7F; + } else { + ret = (arg0 / 625.0f) * 126.0f; + } + } + return ret | 1; +} + +extern f32 D_801305C4[]; +void func_800F3A08(u8 bankIdx, u8 entryIdx, u8 channelIdx) { + f32 sp44; + s8 phi_a1; + s8 sp42; + f32 sp3C; + s8 sp3B; + u8 sp3A; + u8 sp39; + s8 sp38; + f32 sp34; + u8 sp33; + SoundBankEntry* temp_a3; + + sp42 = 0; + sp3B = 0x40; + sp3A = 0; + sp39 = 0; + sp38 = 0; + sp33 = 0; + sp3C = 1.0f; + sp44 = 1.0f; + temp_a3 = &gSoundBanks[bankIdx][entryIdx]; + switch (bankIdx) { + case BANK_PLAYER: + case BANK_ITEM: + case BANK_ENV: + case BANK_ENEMY: + case BANK_VOICE: + if (D_80130604 == 2) { + sp38 = func_800F3990(*temp_a3->posY, temp_a3->unk_26); + } + case BANK_OCARINA: + temp_a3->unk_1C = sqrtf(temp_a3->unk_1C); + sp44 = func_800F3188(bankIdx, entryIdx) * *temp_a3->unk_14; + sp42 = func_800F32F0(bankIdx, entryIdx, channelIdx); + sp3B = func_800F3468(*temp_a3->posX, *temp_a3->posZ, temp_a3->unk_C); + sp3C = func_800F35EC(bankIdx, entryIdx) * *temp_a3->unk_10; + if (D_80130604 == 2) { + sp34 = D_801305C4[(temp_a3->unk_26 & 0x400) >> 0xA]; + if (!(temp_a3->unk_26 & 0x800)) { + if (*temp_a3->posZ < sp34) { + sp3A = 0x10; + } + + if ((D_8016B8B8[channelIdx].unk_0A ^ sp3A) & 0x10) { + if (sp3B < 0x40) { + sp3A = D_8016B8B8[channelIdx].unk_0A ^ 0x14; + } else { + sp3A = D_8016B8B8[channelIdx].unk_0A ^ 0x18; + } + } else { + sp3A = D_8016B8B8[channelIdx].unk_0A; + } + } + } + if (D_8013063C != 0) { + if ((bankIdx == 1) || (bankIdx == 0) || (bankIdx == 6)) { + sp33 = D_8013063C; + } + } + + if ((sp33 | D_80130640) != 0) { + sp39 = (sp33 | D_80130640); + } else if (D_80130604 != 2) { + } else if (temp_a3->unk_26 & 0x2000) { + } else { + sp39 = func_800F37B8(sp34, temp_a3, sp3B); + } + break; + case BANK_SYSTEM: + break; + } + + if (D_8016B8B8[channelIdx].unk_00 != sp44) { + phi_a1 = (u8)(sp44 * 127.0f); + D_8016B8B8[channelIdx].unk_00 = sp44; + } else { + phi_a1 = -1; + } + + Audio_QueueCmdS8(0x6020000 | (channelIdx << 8) | 2, phi_a1); + if (sp42 != D_8016B8B8[channelIdx].unk_08) { + Audio_QueueCmdS8(0x5020000 | (channelIdx << 8), sp42); + D_8016B8B8[channelIdx].unk_08 = sp42; + } + if (sp3C != D_8016B8B8[channelIdx].unk_04) { + Audio_QueueCmdF32(0x4020000 | (channelIdx << 8), sp3C); + D_8016B8B8[channelIdx].unk_04 = sp3C; + } + if (sp3A != D_8016B8B8[channelIdx].unk_0A) { + Audio_QueueCmdS8(0xE020000 | (channelIdx << 8), sp3A | 0x10); + D_8016B8B8[channelIdx].unk_0A = sp3A; + } + if (sp39 != D_8016B8B8[channelIdx].unk_0B) { + Audio_QueueCmdS8(0x6020000 | (channelIdx << 8) | 3, sp39); + D_8016B8B8[channelIdx].unk_0B = sp39; + } + if (sp38 != D_8016B8B8[channelIdx].unk_0C) { + Audio_QueueCmdS8(0xC020000 | (channelIdx << 8), 0x10); + Audio_QueueCmdU16(0xD020000 | (channelIdx << 8), ((u16)(sp38) << 8) + 0xFF); + D_8016B8B8[channelIdx].unk_0C = sp38; + } + if (sp3B != D_8016B8B8[channelIdx].unk_09) { + Audio_QueueCmdS8(0x3020000 | (channelIdx << 8), sp3B); + D_8016B8B8[channelIdx].unk_09 = sp3B; + } +} + +void func_800F3ED4(void) { + u8 i; + unk_s1* t; + + for (i = 0; i < 16; i++) { + t = &D_8016B8B8[i]; + t->unk_00 = 1.0f; + t->unk_04 = 1.0f; + t->unk_08 = 0; + t->unk_09 = 0x40; + t->unk_0A = 0; + t->unk_0B = 0xFF; + t->unk_0C = 0xFF; + } + + D_8016B8B8[0xD].unk_0C = 0; + D_8013061C = 0; + D_80130618 = 0; +} + +void func_800F3F3C(u8 arg0) { + if (D_8016E264[0] != 1) { + Audio_StartSeq(3, 0, 0x6D); + Audio_SeqCmd8(3, 0, 0, arg0); + } +} + +f32 func_800F3F84(f32 arg0) { + f32 ret = 1.0f; + + if (arg0 > 6.0f) { + D_8016B7A8 = 1.0f; + D_8016B7B0 = 1.1f; + } else { + ret = arg0 / 6.0f; + D_8016B7A8 = (ret * 0.22500002f) + 0.775f; + D_8016B7B0 = (ret * 0.2f) + 0.9f; + } + return ret; +} + +void func_800F4010(Vec3f* arg0, u16 arg1, f32 arg2) { + f32 sp24; + f32 phi_f0; + u8 phi_v0; + u16 phi_a0; + + D_80131C8C = arg2; + sp24 = func_800F3F84(arg2); + Audio_PlaySoundGeneral(arg1, arg0, 4, &D_8016B7B0, &D_8016B7A8, &D_801333E8); + + if ((arg1 & 0xF0) == 0xB0) { + phi_f0 = 0.3f; + phi_v0 = 1; + sp24 = 1.0f; + } else { + phi_f0 = 1.1f; + phi_v0 = gAudioContext.audioRandom % 2; + } + + if ((phi_f0 < arg2) && (phi_v0 != 0)) { + if ((arg1 & 0x80) != 0) { + phi_a0 = 0x867; + } else { + phi_a0 = 0x866; + } + D_8016B7AC = (sp24 * 0.7) + 0.3; + Audio_PlaySoundGeneral(phi_a0, arg0, 4U, &D_8016B7B0, &D_8016B7AC, &D_801333E8); + } +} + +void func_800F4138(Vec3f* pos, u16 sfxId, f32 arg2) { + func_800F3F84(arg2); + Audio_PlaySoundGeneral(sfxId, pos, 4U, &D_8016B7B0, &D_8016B7A8, &D_801333E8); +} + +void func_800F4190(Vec3f* pos, u16 sfxId) { + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801305B0, &D_801333E0, &D_801305B4); +} +void func_800F41E0(Vec3f* pos, u16 baseSfx, u8 arg2) { + u8 offset = Audio_NextRandom() % arg2; + Audio_PlaySoundGeneral(baseSfx + offset, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} + +void func_800F4254(Vec3f* pos, u8 level) { + level &= 3; + if (level != sPrevChargeLevel) { + D_801305F4 = D_801305E4[level]; + switch (level) { + case 1: + Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &D_801333E0, &D_801333E8); + break; + case 2: + Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &D_801333E0, &D_801333E8); + break; + } + + sPrevChargeLevel = level; + } + + if (level != 0) { + Audio_PlaySoundGeneral(NA_SE_IT_SWORD_CHARGE - SFX_FLAG, pos, 4, &D_801305F4, &D_801333E0, &D_801333E8); + } +} + +void func_800F436C(Vec3f* pos, u16 sfxId, f32 arg2) { + if (arg2 < 0.75f) { + D_8016B7D8 = ((arg2 / 0.75f) * 0.25f) + 0.5f; + } else { + D_8016B7D8 = arg2; + } + + if (D_8016B7D8 > 0.5f) { + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7D8, &D_801333E0, &D_801333E8); + } +} + +void func_800F4414(Vec3f* pos, u16 sfxId, f32 arg2) { + D_801305B8--; + if (D_801305B8 == 0) { + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7D8, &D_801333E0, &D_801333E8); + + if (arg2 > 2.0f) { + arg2 = 2.0f; + } + D_801305B8 = (s8)((D_801305C0 - D_801305BC) * (1.0f - arg2)) + D_801305C0; + } +} + +void func_800F44EC(s8 arg0, s8 arg1) { + D_801305B8 = 1; + D_801305BC = arg1; + D_801305C0 = arg0; +} + +void func_800F4524(Vec3f* arg0, u16 arg1, s8 arg2) { + D_8016B7DC = arg2; + Audio_PlaySoundGeneral(arg1, arg0, 4, &D_801333E0, &D_801333E0, &D_8016B7DC); +} + +void func_800F4578(Vec3f* arg0, u16 arg1, f32 arg2) { + D_8016B7E0 = arg2; + Audio_PlaySoundGeneral(arg1, arg0, 4, &D_801333E0, &D_8016B7E0, &D_801333E8); +} + +void func_800F45D0(f32 arg0) { + func_800F4414(&D_801333D4, NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG, arg0); + func_800F436C(&D_801333D4, 0, (0.15f * arg0) + 1.4f); +} + +void func_800F4634(Vec3f* pos, f32 arg1) { + if (func_800F8FF4(0x2006) == 0) { + D_8016B7B8.unk_00 = arg1; + } else if (arg1 != D_8016B7B8.unk_00) { + D_8016B7B8.unk_04 = arg1; + D_8016B7B8.unk_0C = 0x28; + D_8016B7B8.unk_08 = (D_8016B7B8.unk_04 - D_8016B7B8.unk_00) / 40.0f; + } + Audio_PlaySoundGeneral(0x2006, pos, 4, &D_8016B7B8, &D_801333E0, &D_801333E8); +} + +void func_800F46E0(Vec3f* pos, f32 arg0) { + if (func_800F8FF4(0x2007) == 0) { + D_8016B7C8.unk_00 = arg0; + } else if (arg0 != D_8016B7C8.unk_00) { + D_8016B7C8.unk_04 = arg0; + D_8016B7C8.unk_0C = 0x28; + D_8016B7C8.unk_08 = (D_8016B7C8.unk_04 - D_8016B7C8.unk_00) / 40.0f; + } + Audio_PlaySoundGeneral(0x2007, pos, 4, &D_8016B7C8, &D_8016B7C8, &D_801333E8); +} + +void func_800F4784(unk_s2* arg0) { + if (arg0->unk_0C != 0) { + arg0->unk_0C--; + if (arg0->unk_0C != 0) { + arg0->unk_00 = arg0->unk_00 + arg0->unk_08; + } else { + arg0->unk_00 = arg0->unk_04; + } + } +} + +void func_800F47BC(void) { + Audio_SetVolScale(0, 1, 0, 0xA); + Audio_SetVolScale(3, 1, 0, 0xA); +} + +void func_800F47FC(void) { + Audio_SetVolScale(0, 1, 0x7F, 3); + Audio_SetVolScale(3, 1, 0x7F, 3); +} + +void func_800F483C(u8 arg0, u8 arg1) { + Audio_SetVolScale(0, 0, arg0, arg1); +} + +void func_800F4870(u8 arg0) { + s8 phi_s1; + u8 i; + + phi_s1 = 0; + if (arg0 == 0) { + phi_s1 = 0x7F; + } + + for (i = 0; i < 16; i++) { + Audio_QueueCmdS8(_SHIFTL(0x07, 24, 8) | _SHIFTL(0x00, 16, 8) | _SHIFTL(i, 8, 8) | _SHIFTL(0, 0, 8), phi_s1); + } + + if (arg0 == 7) { + D_80130600 = 2; + } else { + func_800F491C(D_801305F8[arg0 & 7]); + } +} + +s32 func_800F491C(u8 arg0) { + u8 phi_v0; + u16 phi_v0_2; + + SequenceChannel* none = &gAudioContext.sequenceChannelNone; + u8 i; + + if (D_8016B8B4 != arg0) { + Audio_SetVolScale(0, 0, arg0, 2); + if (arg0 < 0x40) { + phi_v0 = 0x10; + } else { + phi_v0 = ((((arg0 - 0x40) >> 2) + 1) << 4); + } + + Audio_SeqCmd8(0, 4, 15, phi_v0); + for (i = 0; i < 0x10; i++) { + if (none != gAudioContext.seqPlayers[0].channels[i]) { + if ((u8)gAudioContext.seqPlayers[0].channels[i]->soundScriptIO[5] != 0xFF) { + // this looks like some kind of macro? + phi_v0_2 = ((u16)gAudioContext.seqPlayers[0].channels[i]->soundScriptIO[5] - arg0) + 0x7F; + if (phi_v0_2 >= 0x80) { + phi_v0_2 = 0x7F; + } + Audio_QueueCmdS8(_SHIFTL(5, 24, 8) | _SHIFTL(0, 16, 8) | _SHIFTL(i, 8, 8) | _SHIFTL(0, 0, 8), + (u8)phi_v0_2); + } + } + } + D_8016B8B4 = arg0; + } + return -1; +} + +void func_800F4A54(u8 arg0) { + D_8016B8B0 = arg0; + D_8016B8B2 = 1; +} + +void func_800F4A70(void) { + if (D_8016B8B2 == 1) { + if (D_8016B8B1 != D_8016B8B0) { + Audio_SetVolScale(0, 0, D_8016B8B0, 0xA); + D_8016B8B1 = D_8016B8B0; + D_8016B8B3 = 1; + } + D_8016B8B2 = 0; + } else if (D_8016B8B3 == 1 && D_80130608 == 0) { + Audio_SetVolScale(0, 0, 0x7F, 0xA); + D_8016B8B1 = 0x7F; + D_8016B8B3 = 0; + } + + if (D_80130600 != 0) { + D_80130600--; + if (D_80130600 == 0) { + func_800F491C(D_801305FF); + } + } +} + +void func_800F4B58(Vec3f* arg0, u16 arg1, u8* arg2) { + Audio_PlaySoundGeneral(arg1, arg0, 4, &gNoteFrequencies[arg2[D_801305CC] + 39], &D_801333E0, &D_801333E8); + + if (D_801305CC < 15) { + D_801305CC++; + } +} + +void func_800F4BE8(void) { + D_801305CC = 0; +} + +void func_800F4BF4(Vec3f* arg0, u16 arg1, s8 arg2) { + Audio_PlaySoundGeneral(arg1, arg0, 4, &gNoteFrequencies[arg2 + 39], &D_801333E0, &D_801333E8); +} + +void func_800F4C58(Vec3f* arg0, u16 sfxId, u8 arg2) { + u8 phi_s1 = 0; + u8 i; + u8 bank; + + bank = SFX_BANK_SHIFT(sfxId); + for (i = 0; i < bank; i++) { + phi_s1 += D_80130578[D_801333CC][i]; + } + + for (i = 0; i < D_80130578[D_801333CC][bank]; i++) { + if ((D_8016E1B8[bank][i].unk_4 != 0xFF) && (sfxId == gSoundBanks[bank][D_8016E1B8[bank][i].unk_4].unk_28)) { + Audio_QueueCmdS8(_SHIFTL(6, 24, 8) | _SHIFTL(2, 16, 8) | _SHIFTL(phi_s1, 8, 8) | _SHIFTL(6, 0, 8), arg2); + } + phi_s1++; + } + Audio_PlaySoundGeneral(sfxId, arg0, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} + +void func_800F4E30(Vec3f* arg0, f32 arg1) { + Vec3f* temp_v0; + f32 temp_f0; + f32 temp_f2; + s32 temp_s0; + Vec3f* phi_v0; + f32 phi_f0; + s32 phi_v0_2; + f32 phi_f22; + s32 phi_s0; + s8 phi_s4; + u8 i; + + if (D_8013064C == NULL) { + D_8013064C = arg0; + D_80130650 = arg1; + } else if (arg0 != D_8013064C) { + if (arg1 < D_80130650) { + D_8013064C = arg0; + D_80130650 = arg1; + } + } else { + D_80130650 = arg1; + } + + if (D_8013064C->x > 100.0f) { + phi_s4 = 0x7F; + } else if (D_8013064C->x < -100.0f) { + phi_s4 = 0; + } else { + phi_s4 = ((D_8013064C->x / 100.0f) * 64.0f) + 64.0f; + } + + if (D_80130650 > 400.0f) { + phi_f22 = 0.1f; + } else if (D_80130650 < 120.0f) { + phi_f22 = 1.0f; + } else { + phi_f22 = ((1.0f - ((D_80130650 - 120.0f) / 280.0f)) * 0.9f) + 0.1f; + } + + for (i = 0; i < 0x10; i++) { + if (i != 9) { + Audio_SeqCmd6(0, 2, i, (127.0f * phi_f22)); + Audio_QueueCmdS8(0x03000000 | ((u8)((u32)i) << 8), phi_s4); + } + } +} + +void func_800F50CC(void) { + if (D_8013064C != NULL) { + D_8013064C = NULL; + } +} + +void* func_800F50EC(Vec3f* arg0) { + if (D_8013064C == arg0) { + D_8013064C = NULL; + } +} + +#ifdef NON_MATCHING +// matches, but need to migrate data. +void func_800F510C(s8 arg0) { + u8 phi_v1; + u8 phi_a2; + u16 phi_a1; + u8 sp40[2] = { 0, 3 }; + u8 i; + u8 j; + + if ((func_800FA0B4(1) == 0xFFFF) && (func_800FA0B4(3) != 0x2F)) { + for (i = 0; i < 2; i++) { + if (i == 0) { + phi_v1 = arg0; + } else { + phi_v1 = 0x7F - arg0; + } + + if (phi_v1 >= 0x65) { + phi_a2 = 0xB; + } else if (phi_v1 < 0x14) { + phi_a2 = 2; + } else { + phi_a2 = ((phi_v1 - 0x14) / 0xA) + 2; + } + + phi_a1 = 0; + for (j = 0; j < 0x10; j++) { + if (gAudioContext.seqPlayers[sp40[i]].channels[j]->notePriority < phi_a2) { + phi_a1 += (1 << j); + } + } + + Audio_SeqCmdA(sp40[i], phi_a1); + } + } +} +#else +void func_800F510C(s8); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F510C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F52A0.s") +void func_800F52A0(Vec3f* arg0, u16 arg1, u16 arg2) { + f32 phi_f2; + f32 phi_f14; + u8 phi_a2; + f32 temp_f0; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5504.s") + if (D_8016B9F3 != 0) { + D_8016B9F3--; + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5510.s") + phi_f14 = sqrtf(SQ(arg0->z) + SQ(arg0->x)); + if (D_8013064C == NULL) { + D_8013064C = arg0; + func_800F5E18(3, arg1, 0, 7, 2); + } else { + temp_f0 = sqrtf(SQ(D_8013064C->z) + SQ(D_8013064C->x)); + if (phi_f14 < temp_f0) { + D_8013064C = arg0; + } else { + phi_f14 = temp_f0; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5550.s") + if (arg0->y < 0.0f) { + phi_f2 = -arg0->y; + } else { + phi_f2 = arg0->y; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F56A8.s") + if ((arg2 / 15.0f) < phi_f2) { + phi_a2 = 0; + } else if (phi_f14 < arg2) { + phi_a2 = (1.0f - (phi_f14 / arg2)) * 127.0f; + } else { + phi_a2 = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5718.s") + if (arg1 != 0x28) { + func_800F510C(phi_a2); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F574C.s") + Audio_SetVolScale(3, 3, phi_a2, 0); + Audio_SetVolScale(0, 3, (0x7F - phi_a2), 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5918.s") +void func_800F5504(void) { + D_8013064C = NULL; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F595C.s") +void func_800F5510(u16 arg0) { + func_800F5550(arg0); + func_800F5E18(0, arg0, 0, 0, 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F59E8.s") +void func_800F5550(u16 arg0) { + u8 sp27 = 0; + u16 nv; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5A58.s") + if (func_800FA0B4(0) != 0x4C) { + if (func_800FA0B4(3) == 0x2F) { + func_800F9474(3, 0); + Audio_QueueCmdS32(0xF8000000, 0); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5ACC.s") + if ((D_80130658[D_80130630] & 0x20) && D_80130658[(arg0 & 0xFF) & 0xFF] & 0x10) { -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5B58.s") + if ((D_8013062C & 0x3F) != 0) { + sp27 = 0x1E; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5BF0.s") + func_800F5E18(0, arg0, sp27, 7, D_8013062C); -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5C2C.s") + D_8013062C = 0; + } else { + nv = (D_80130658[(arg0 & 0xFF) & 0xFF] & 0x40) ? 1 : 0xFF; + func_800F5E18(0, arg0, 0, 7, nv); + if (!(D_80130658[arg0] & 0x20)) { + D_8013062C = 0xC0; + } + } + D_80130630 = arg0 & 0xFF; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5C64.s") +void func_800F56A8(void) { + u16 temp_v0; + u8 bvar; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5CF8.s") + temp_v0 = func_800FA0B4(0); + bvar = temp_v0 & 0xFF; + if ((temp_v0 != 0xFFFF) && ((D_80130658[bvar] & 0x10) != 0)) { + if (D_8013062C != 0xC0) { + D_8013062C = gAudioContext.seqPlayers->unk_158[3]; + } else { + D_8013062C = 0; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5E18.s") +void func_800F5718(void) { + if (func_800FA0B4(0) != 0x4C) { + Audio_StartSeq(0, 0, 0x4C); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F5E90.s") +void func_800F574C(f32 arg0, u8 arg2) { + if (arg0 == 1.0f) { + Audio_SeqCmdB40(0, arg2, 0); + } else { + Audio_SeqCmdC(1, 0x30, arg2, arg0 * 100.0f); + } + Audio_SeqCmdC(1, 0xA0, arg2, arg0 * 100.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6114.s") +void func_800F5918(void) { + if (func_800FA0B4(0) == 0x6C && func_800FA11C(0, 0xF0000000)) { + Audio_SeqCmdB(0, 5, 0, 0xD2); + } +} +void func_800F595C(u16 arg0) { + u8 arg0b = arg0 & 0xFF; + + if (D_80130658[arg0b] & 2) { + func_800F5C64(arg0); + } else if (D_80130658[arg0b] & 4) { + Audio_StartSeq(1, 0, arg0); + + } else { + func_800F5E18(0, arg0, 0, 7, -1); + Audio_SeqCmd1(1, 0); + } +} + +void func_800F59E8(u16 arg0) { + u8 arg0b = arg0 & 0xFF; + + if (D_80130658[arg0b] & 2) { + Audio_SeqCmd1(1, 0); + } else if (D_80130658[arg0b] & 4) { + Audio_SeqCmd1(1, 0); + } else { + Audio_SeqCmd1(0, 0); + } +} + +s32 func_800F5A58(u8 arg0) { + u8 phi_a1 = 0; + + if (D_80130658[arg0 & 0xFF] & 2) { + phi_a1 = 1; + } else if (D_80130658[arg0 & 0xFF] & 4) { + phi_a1 = 1; + } + + if (arg0 == (u8)func_800FA0B4(phi_a1)) { + return 1; + } else { + return 0; + } +} + +void func_800F5ACC(u16 arg0) { + u16 temp_v0; + + temp_v0 = func_800FA0B4(0); + if ((temp_v0 & 0xFF) != 0x2E && (temp_v0 & 0xFF) != 0x62 && temp_v0 != arg0) { + func_800F5E90(3); + if (temp_v0 != 0xFFFF) { + D_80130628 = temp_v0; + } else { + osSyncPrintf("Middle Boss BGM Start not stack \n"); + } + Audio_StartSeq(0, 0, arg0); + } +} + +void func_800F5B58(void) { + if ((func_800FA0B4(0) != 0xFFFF) && (D_80130628 != 0xFFFF) && (D_80130658[func_800FA0B4(0) & 0xFF] & 8)) { + if (D_80130628 == 0xFFFF) { + Audio_SeqCmd1(0, 0); + } else { + Audio_StartSeq(0, 0, D_80130628); + } + D_80130628 = 0xFFFF; + } +} + +void func_800F5BF0(u8 arg0) { + u16 temp_v0; + + temp_v0 = func_800FA0B4(0); + if (temp_v0 != 1) { + D_80130628 = temp_v0; + } + func_800F6FB4(arg0); +} + +void func_800F5C2C(void) { + if (D_80130628 != 0xFFFF) { + Audio_StartSeq(0, 0, D_80130628); + } + D_80130628 = 0xFFFF; +} + +void func_800F5C64(u16 arg0) { + u16 sp26; + s32 sp20; + u8* sp1C; + u8* sp18; + + sp26 = func_800FA0B4(1); + sp1C = func_800E5E84(sp26 & 0xFF, &sp20); + sp18 = func_800E5E84(arg0 & 0xFF, &sp20); + if ((sp26 == 0xFFFF) || (*sp1C == *sp18)) { + D_8016B9F4 = 1; + } else { + D_8016B9F4 = 5; + Audio_SeqCmd1(1, 0); + } + D_8016B9F6 = arg0; +} + +void func_800F5CF8(void) { + u16 sp26; + u16 sp24; + u16 sp22; + + if (D_8016B9F4 != 0) { + D_8016B9F4--; + if (D_8016B9F4 == 0) { + Audio_QueueCmdS32(0xE3000000, 0); + Audio_QueueCmdS32(0xE3000000, 1); + func_800FA0B4(0); + sp26 = func_800FA0B4(1); + sp22 = func_800FA0B4(3); + if (sp26 == 0xFFFF) { + Audio_SetVolScale(0, 1, 0, 5); + Audio_SetVolScale(3, 1, 0, 5); + Audio_SeqCmdC(1, 0x80, 1, 0xA); + Audio_SeqCmdC(1, 0x83, 1, 0xA); + Audio_SeqCmdC(1, 0x90, 0, 0); + if (sp22 != 0x2F) { + Audio_SeqCmdC(1, 0x93, 0, 0); + } + } + Audio_StartSeq(1, 1, D_8016B9F6); + Audio_SeqCmdA(0, 0xFFFF); + if (sp22 != 0x2F) { + Audio_SeqCmdA(3, 0xFFFF); + } + } + } +} + +void func_800F5E18(u8 seqIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4) { + Audio_SeqCmd7(seqIdx, arg3, arg4); + Audio_StartSeq(seqIdx, fadeTimer, seqId); +} + +extern u8 D_80130654; +extern u32 D_80130634; +extern u32 D_80130638; +void func_800F5E90(u8 arg0) { + s32 phi_t0; + u16 phi_t1; + u8 phi_a3; + + D_80130654 = arg0; + if (D_80130628 == 0xFFFF) { + if (D_8013060C != 0) { + arg0 = 3; + } + phi_t1 = D_8016E750[0].unk_254; + if (phi_t1 == 2 && func_800FA0B4(3) == 0x81A) { + arg0 = 3; + } + + phi_a3 = phi_t1 & 0xFF; + if ((phi_t1 == 0xFFFF) || ((D_80130658[phi_a3] & 1) != 0) || ((D_8013061C & 0x7F) == 1)) { + if (arg0 != (D_8013061C & 0x7F)) { + if (arg0 == 1) { + if (D_8016E750[3].volScales[1] - D_80130624 < 0) { + phi_t0 = -(D_8016E750[3].volScales[1] - D_80130624); + } else { + phi_t0 = D_8016E750[3].volScales[1] - D_80130624; + } + Audio_SetVolScale(3, 3, D_80130624, phi_t0); + Audio_StartSeq(3, 10, 0x81A); + if (phi_t1 != 1) { + Audio_SetVolScale(0, 3, (0x7F - D_80130624) & 0xFF, 0xA); + func_800F510C(D_80130624); + } + } else { + if ((D_8013061C & 0x7F) == 1) { + Audio_SeqCmd1(3, 10); + if (arg0 == 3) { + phi_a3 = 0; + } else { + phi_a3 = 10; + } + + Audio_SetVolScale(0, 3, 0x7F, phi_a3); + func_800F510C(0); + } + } + + D_8013061C = arg0 + 0x80; + } + } else { + if (arg0 == 0) { + if (D_8013061C == 2) { + D_80130638 = 0; + } + D_80130634 = 0; + D_80130638++; + } else { + D_80130634++; + } + + if (arg0 == 2 && D_80130634 < 0x1E && D_80130638 >= 0x15) { + arg0 = 0; + } + + D_8013061C = arg0; + Audio_SeqCmd7(0, 2, arg0); + } + } +} + +void func_800F6114(f32 arg0) { + f32 phi_f0; + + if (D_8013061C == 0x81) { + if (arg0 != D_80130620) { + if (arg0 < 150.0f) { + phi_f0 = 0.0f; + } else if (arg0 > 500.0f) { + phi_f0 = 350.0f; + } else { + phi_f0 = arg0 - 150.0f; + } + + D_80130624 = ((350.0f - phi_f0) * 127.0f) / 350.0f; + Audio_SetVolScale(3, 3, D_80130624, 0xA); + if (D_8016E750[0].unk_254 != 1) { + Audio_SetVolScale(0, 3, (0x7F - D_80130624), 0xA); + } + } + if (D_8016E750[0].unk_254 != 1) { + func_800F510C(D_80130624); + } + } + D_80130620 = arg0; +} + +#ifdef NON_MATCHING +void func_800F6268(f32 arg0, u16 arg1) { + s8 temp_a0; + s8 phi_v1; + + D_8016BAA8 = 1; + D_8016BAAC = arg0; + if (D_8016B9F2 == 0) { + temp_a0 = func_800FA0B4(0); + if (temp_a0 == (arg1 & 0xFF)) { + if ((arg1 & 0xFF) == 0x2F) { + + if (arg0 > 2000.0f) { + phi_v1 = 0x7F; + } else if (arg0 < 200.0f) { + phi_v1 = 0; + } else { + phi_v1 = ((arg0 - 200.0f) * 127.0f) / 1800.0f; + } + Audio_SeqCmd6(0, 3, 0, 0x7F - phi_v1); + Audio_SeqCmd6(0, 3, 1, 0x7F - phi_v1); + Audio_SeqCmd6(0, 3, 13, phi_v1); + if (D_8016B9D8[0] == 0) { + D_8016B9D8[0]++; + } + } + } else if ((temp_a0 == 1) && ((arg1 & 0xFF) == 0x2F)) { + temp_a0 = func_800FA0B4(3); + if ((temp_a0 != (arg1 & 0xFF)) && (D_8016B9D8[0] < 0xA)) { + func_800F5E18(3, 0x2F, 0, 0, 0); + Audio_SeqCmdA(3, 0xFFFC); + D_8016B9D8[0] = 0xA; + } + + if (arg0 > 2000.0f) { + phi_v1 = 127; + } else if (arg0 < 200.0f) { + phi_v1 = 0; + } else { + phi_v1 = ((arg0 - 200.0f) * 127.0f) / 1800.0f; + } + Audio_SeqCmd6(3, 3, 0, 127 - phi_v1); + Audio_SeqCmd6(3, 3, 1, 127 - phi_v1); + } + + if (D_8016B9D8[0] < 0xA) { + D_8016B9D8[0]++; + } + } +} +#else +void func_800F6268(f32 arg0, u16 arg1); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6268.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F64E0.s") +void func_800F64E0(u8 arg0) { + D_80130608 = arg0; + if (arg0 != 0) { + Audio_PlaySoundGeneral(0x4800, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_QueueCmdS32(0xF1000000, 0); + } else { + Audio_PlaySoundGeneral(0x4801, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_QueueCmdS32(0xF2000000, 0); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6584.s") +void func_800F6584(u8 arg0) { + u8 seqIdx; + u16 sp34; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F66C0.s") + D_8016B9F2 = arg0; + if ((func_800FA0B4(0) & 0xFF) == 0x2F) { + seqIdx = 0; + sp34 = 0; + } else if ((func_800FA0B4(3) & 0xFF) == 0x2F) { + seqIdx = 3; + sp34 = 0xFFFC; + } else { + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F66DC.s") + if (arg0 != 0) { + Audio_SeqCmd6(seqIdx, 1, 0, 0); + Audio_SeqCmd6(seqIdx, 1, 1, 0); + if (seqIdx == 3) { + Audio_SeqCmdA(seqIdx, sp34 | 3); + } + } else { + if (seqIdx == 3) { + func_800F5E18(3, 0x2F, 0, 0, 0); + } + Audio_SeqCmd6(seqIdx, 1, 0, 0x7F); + Audio_SeqCmd6(seqIdx, 1, 1, 0x7F); + if (seqIdx == 3) { + Audio_SeqCmdA(seqIdx, sp34); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6700.s") +void func_800F66C0(s8 arg0) { + D_80130614 = arg0 & 0x7F; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F67A0.s") +void func_800F66DC(s8 arg0) { + if (arg0 != 0) { + D_80130618 = arg0 & 0x7F; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6828.s") +void func_800F6700(s8 arg0) { + s8 sp1F; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F68BC.s") + switch (arg0) { + case 0: + sp1F = 0; + D_80130604 = 0; + break; + case 1: + sp1F = 3; + D_80130604 = 3; + break; + case 2: + sp1F = 1; + D_80130604 = 1; + break; + case 3: + sp1F = 0; + D_80130604 = 2; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F68D4.s") + Audio_SeqCmdE0(0, sp1F); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F691C.s") +void func_800F67A0(u8 arg0) { + if (D_8013063C != arg0) { + if (arg0 == 0) { + Audio_StopSfx(0x86B); + } else if (D_8013063C == 0) { + Audio_PlaySoundGeneral(0x86B, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + } + D_8013063C = arg0; + D_80130644 = arg0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6964.s") +void func_800F6828(u8 arg0) { + u32 t; + u8 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6AB0.s") + D_80130648 = arg0; + D_80130640 = arg0; + if (D_8016E750[0].unk_254 == 1) { + for (i = 0; i < 16; i++) { + t = i; + Audio_QueueCmdS8(((t & 0xFF) << 8) | 0x6000000 | 6, arg0); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6B3C.s") +void func_800F68BC(s8 arg0) { + D_8013060C = arg0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6B68.s") +void func_800F68D4(u16 arg0, Vec3f* arg1, u8 arg2, u32* arg3, u32* arg4, u32* arg5) { + if (D_8013060C == 0) { + Audio_PlaySoundGeneral(arg0, arg1, arg2, arg3, arg4, arg5); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6BB8.s") +void func_800F691C(u16 arg0) { + func_800F68D4(arg0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6BDC.s") +void func_800F6964(u16 arg0) { + s32 phi_v1; + u8 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6C14.s") + Audio_SeqCmd1(0, (arg0 * 3) / 2); + Audio_SeqCmd1(1, (arg0 * 3) / 2); + for (i = 0; i < 0x10; i++) { + phi_v1 = 0; + switch (i) { + case 0xB: + case 0xC: + if (D_80133414 == 0xA) { + phi_v1 = 1; + } + break; + case 0xD: + phi_v1 = 1; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6C34.s") + if (!phi_v1) { + Audio_SeqCmd6(2, arg0 >> 1, i, 0); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6D58.s") + Audio_SeqCmd1(3, (arg0 * 3) / 2); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6E7C.s") +void func_800F6AB0(u16 arg0) { + Audio_SeqCmd1(0, arg0); + Audio_SeqCmd1(1, arg0); + Audio_SeqCmd1(3, arg0); + Audio_SetVolScale(0, 3, 0x7F, 0); + Audio_SetVolScale(0, 1, 0x7F, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F6FB4.s") +void func_800F6B3C(void) { + func_800F9280(2, 0, 0xFF, 5); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F70F8.s") +void Audio_DisableAllSeq(void) { + Audio_DisableSeq(0, 0); + Audio_DisableSeq(1, 0); + Audio_DisableSeq(2, 0); + Audio_DisableSeq(3, 0); + Audio_ScheduleProcessCmds(); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F711C.s") +s8 func_800F6BB8(void) { + return func_800E6680(); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F7170.s") +void func_800F6BDC(void) { + Audio_DisableAllSeq(); + Audio_ScheduleProcessCmds(); + while (true) { + if (!func_800F6BB8()) { + return; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F71BC.s") +void Audio_PreNMI(void) { + Audio_PreNMIInternal(); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F7208.s") +void func_800F6C34(void) { + D_8013061C = 0; + D_8016B7A8 = 1.0f; + D_8016B7B0 = 1.0f; + D_8013063C = 0; + D_80130640 = 0; + D_80130644 = 0; + D_80130648 = 0; + func_800ED858(0); + D_8016B7B8.unk_0C = 0; + D_8016B7C8.unk_0C = 0; + D_8016B7B8.unk_00 = 1.0f; + D_8016B7C8.unk_00 = 1.0f; + D_8016B7D8 = 1.0f; + D_8016B8B0 = 0x7F; + D_8016B8B1 = 0x7F; + D_8016B8B2 = 0; + D_8016B8B3 = 0; + D_8016B8B4 = 0xFF; + D_8016B9D8[0] = 0; + D_80130610 = D_801306C8[D_80133414]; + D_80130608 = 0; + D_80130628 = 0xFFFF; + Audio_QueueCmdS8(0x46000000, -1); + D_8013064C = NULL; + D_8016B9F4 = 0; + D_8016B9F3 = 1; + D_8016B9F2 = 0; +} + +typedef struct { + u16 unk_00; + u16 unk_02; + u8 unk_04[0x64]; +} D_801306DC_s; + +extern D_801306DC_s D_801306DC[]; + +void func_800F6D58(u8 arg0, u8 arg1, u8 arg2) { + u8 t; + u8 temp_a0; + u8 i; + + if ((D_8016E750[0].unk_254 != 1) && func_800FA11C(1, 0xF00000FF)) { + D_80131F64 = 1; + return; + } + + if (((arg0 << 8) + arg1) == 0x101) { + if (func_800FA0B4(3) != 0x2F) { + *D_8016B9D8 = 0; + } + } + + t = arg0 >> 4; + temp_a0 = arg0 & 0xF; + if (t == 0) { + t = arg0 & 0xF; + } + + for (i = t; i <= temp_a0; i++) { + Audio_SeqCmd8(0, arg1, i, arg2); + } +} + +void func_800F6E7C(u16 arg0, u16 arg1) { + u8 i; + u32 t; + + if (func_800FA0B4(0) == 0x4C) { + func_800F3F3C(0xF); + return; + } + Audio_SeqCmd7(0, 0, 1); + Audio_SeqCmd7(0, 4, arg0 >> 8); + Audio_SeqCmd7(0, 5, arg0 & 0xFF); + Audio_SetVolScale(0, 0, 0x7F, 1); + + i = 0; + if (D_80133408 != 0) { + i = 1; + Audio_SeqCmdE01(0, 0); + } + + Audio_StartSeq(0, 0, 1); + + if (i != 0) { + Audio_SeqCmdE01(0, 1); + } + + for (i = 0; i < 0x10; i++) { + if (!(arg1 & (1 << i)) && (arg0 & (1 << i))) { + Audio_SeqCmd8(0, 1, i, 1); + } + } +} + +void func_800F6FB4(u8 arg0) { + u8 i = 0; + u8 b0; + u8 b1; + u8 b2; + + if ((D_8016E750[0].unk_254 == 0xFFFF) || ((D_80130658[((u8)D_8016E750[0].unk_254) & 0xFFFF] & 0x80) == 0)) { + func_800F6E7C(D_801306DC[arg0].unk_00, D_801306DC[arg0].unk_02); + while ((D_801306DC[arg0].unk_04[i] != 0xFF) && (i < 0x64)) { + // Probably a fake match, using Audio_SeqCmd8 deosn't work. + b0 = D_801306DC[arg0].unk_04[i++]; + b1 = D_801306DC[arg0].unk_04[i++]; + b2 = D_801306DC[arg0].unk_04[i++]; + Audio_QueueSeqCmd(0x80000000 | (b1 << 0x10) | (b0 << 8) | b2); + } + + Audio_SeqCmd8(0, 0x07, 0xD, D_80130604); + } +} + +void func_800F70F8(void) { + Audio_ContextInit(0, 0); +} + +void func_800F711C(void) { + func_800F6C34(); + func_800EE930(); + func_800F3ED4(); + func_800FAEB4(); + func_800F905C(); + func_800F9280(2, 0, 0x70, 0xA); +} + +void func_800F7170(void) { + func_800F9280(2, 0, 0x70, 1); + Audio_QueueCmdS32(0xF2000000, 1); + Audio_ScheduleProcessCmds(); + Audio_QueueCmdS32(0xF8000000, 0); +} + +void func_800F71BC(s32 arg0) { + D_80133418 = 1; + func_800F6C34(); + func_800EE930(); + func_800F3ED4(); + func_800FADF8(); + func_800F905C(); +} + +void func_800F7208(void) { + func_800FADF8(); + Audio_QueueCmdS32(0xF2000000, 1); + func_800F6C34(); + func_800F3ED4(); + func_800F9280(2, 0, 0x70, 1); +} diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index 92689791e0..aed3f4cb82 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -8,7 +8,7 @@ typedef struct { /* 0x08 */ u8 unk_8; /* 0x0C */ f32* unk_C; /* 0x10 */ f32* unk_10; - /* 0x14 */ f32* unk_14; + /* 0x14 */ s8* unk_14; } Struct_800F738C; // size = 0x18 typedef struct { @@ -18,16 +18,6 @@ typedef struct { /* 0x0C */ u16 unk_C; } Struct_800F8EA0; // size = 0x10 -typedef struct { - u32 unk_0; - u8 unk_4; -} Struct_800F7CEC; - -typedef struct { - u8 unk_0; - u16 unk_2; -} Struct_8013331C; - u8 D_80133340[4] = { 0x53, 0x45, @@ -83,7 +73,7 @@ f32 D_801333E0 = 1.0f; UNK_TYPE D_801333E4 = 0; -f32 D_801333E8 = 0.0f; +s8 D_801333E8 = 0; UNK_TYPE D_801333EC = 0; @@ -94,7 +84,6 @@ u8 D_801333F4 = 0; u8 D_801333F8 = 0; extern Struct_800F738C D_8016C9A0[]; -extern Struct_800F7CEC D_8016E1B8[7][3]; // total size = 0xA8 extern Struct_800F8EA0 D_8016E270[]; extern Struct_8013331C* D_8013331C[9]; @@ -111,21 +100,21 @@ void func_800F7260(u16 arg0) { } } -void func_800F72B8(u8 arg0) { +void Audio_QueueSeqCmdMute(u8 arg0) { D_801333D0 |= (1 << arg0); - func_800FA240(0, 2, 0x40, 0xF); - func_800FA240(3, 2, 0x40, 0xF); + Audio_SetVolScale(0, 2, 0x40, 0xF); + Audio_SetVolScale(3, 2, 0x40, 0xF); } -void func_800F731C(u8 arg0) { +void Audio_ClearBGMMute(u8 arg0) { D_801333D0 &= ((1 << arg0) ^ 0xFFFF); if (D_801333D0 == 0) { - func_800FA240(0, 2, 0x7F, 0xF); - func_800FA240(3, 2, 0x7F, 0xF); + Audio_SetVolScale(0, 2, 0x7F, 0xF); + Audio_SetVolScale(3, 2, 0x7F, 0xF); } } -void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, f32* a5) { +void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, s8* a5) { u8 i; Struct_800F738C* phi_v0; @@ -264,7 +253,7 @@ void func_800F7680(void) { if ((flag2) || (D_8013331C[SFX_BANK_SHIFT(sp50->sfxId)][SFX_INDEX(sp50->sfxId)].unk_2 & 4) || (phi_a1 == phi_s1)) { if ((gSoundBanks[phi_s5][phi_a1].unk_26 & 8) && gSoundBanks[phi_s5][phi_a1].unk_2A != 1) { - func_800F731C(gSoundBanks[phi_s5][phi_a1].unk_2E); + Audio_ClearBGMMute(gSoundBanks[phi_s5][phi_a1].unk_2E); } gSoundBanks[phi_s5][phi_a1].unk_C = sp50->unk_8; gSoundBanks[phi_s5][phi_a1].unk_28 = sp50->sfxId; @@ -320,7 +309,7 @@ void func_800F7B54(u8 bankId, u8 bankIndex) { u8 i; if (entry->unk_26 & 8) { - func_800F731C(entry->unk_2E); + Audio_ClearBGMMute(entry->unk_2E); } if (bankIndex == D_8016E1A0[bankId]) { D_8016E1A0[bankId] = entry->prev; @@ -371,7 +360,7 @@ void func_800F7CEC(u8 arg0) { if ((1 == gSoundBanks[arg0][phi_s4].unk_2A) && (gSoundBanks[arg0][phi_s4].unk_28 & 0xC00)) { gSoundBanks[arg0][phi_s4].unk_2B--; } else if (!(gSoundBanks[arg0][phi_s4].unk_28 & 0xC00) && (gSoundBanks[arg0][phi_s4].unk_2A == 5)) { - func_800E5B20((gSoundBanks[arg0][phi_s4].unk_2E << 8) | 0x6020000, 0); + Audio_QueueCmdS8((gSoundBanks[arg0][phi_s4].unk_2E << 8) | 0x6020000, 0); func_800F7B54(arg0, phi_s4); } if (gSoundBanks[arg0][phi_s4].unk_2B == 0) { @@ -402,7 +391,7 @@ void func_800F7CEC(u8 arg0) { } if (temp_s2->unk_1C > 1.0e10f) { if (temp_s2->unk_2A == 4) { - func_800E5B20((temp_s2->unk_2E << 8) | 0x6020000, 0); + Audio_QueueCmdS8((temp_s2->unk_2E << 8) | 0x6020000, 0); if (temp_s2->unk_28 & 0xC00) { func_800F7B54(arg0, phi_s4); phi_s4 = phi_s0; @@ -506,11 +495,11 @@ void func_800F8480(u8 bankId) { bankIndex = D_8016E1B8[bankId][i].unk_4; if (bankIndex != 0xFF) { entry = &gSoundBanks[bankId][bankIndex]; - seqChannel = gAudioContext.gSequencePlayers[2].channels[D_8016E260]; + seqChannel = gAudioContext.seqPlayers[2].channels[D_8016E260]; if (entry->unk_2A == 2) { entry->unk_2E = D_8016E260; if (entry->unk_26 & 8) { - func_800F72B8(D_8016E260); + Audio_QueueSeqCmdMute(D_8016E260); } if (entry->unk_26 & 0xC0) { switch (entry->unk_26 & 0xC0) { @@ -529,10 +518,10 @@ void func_800F8480(u8 bankId) { } } func_800F3A08(bankId, bankIndex, D_8016E260); - func_800E5B20(0x06020000 | ((D_8016E260 & 0xFF) << 8), 1); - func_800E5B20(0x06020000 | ((D_8016E260 & 0xFF) << 8) | 4, entry->unk_28 & 0xFF); + Audio_QueueCmdS8(0x06020000 | ((D_8016E260 & 0xFF) << 8), 1); + Audio_QueueCmdS8(0x06020000 | ((D_8016E260 & 0xFF) << 8) | 4, entry->unk_28 & 0xFF); if (D_80130570[bankId] != 0) { - func_800E5B20(0x06020000 | ((D_8016E260 & 0xFF) << 8) | 5, (entry->unk_28 & 0x100) >> 8); + Audio_QueueCmdS8(0x06020000 | ((D_8016E260 & 0xFF) << 8) | 5, (entry->unk_28 & 0x100) >> 8); } if (entry->unk_28 & 0xC00) { entry->unk_2A = 4; @@ -563,7 +552,7 @@ void func_800F87A0(u8 bankId) { while (bankIndex != 0xFF) { entry = &gSoundBanks[bankId][bankIndex]; if (entry->unk_2A >= 3) { - func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + Audio_QueueCmdS8(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); } if (entry->unk_2A != 0) { func_800F7B54(bankId, bankIndex); @@ -583,7 +572,7 @@ void func_800F8884(u8 bankId, Vec3f* pos) { entry = &gSoundBanks[bankId][bankIndex]; if (entry->posX == &pos->x) { if (entry->unk_2A >= 3) { - func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + Audio_QueueCmdS8(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); } if (entry->unk_2A != 0) { func_800F7B54(bankId, bankIndex); @@ -625,7 +614,7 @@ void func_800F8A44(Vec3f* pos, u16 sfxId) { entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; if (entry->posX == &pos->x && entry->unk_28 == sfxId) { if (entry->unk_2A >= 3) { - func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + Audio_QueueCmdS8(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); } if (entry->unk_2A != 0) { func_800F7B54(SFX_BANK(sfxId), bankIndex); @@ -653,7 +642,7 @@ void func_800F8BA0(u8 arg0, u16 sfxId) { entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; if (entry->unk_C == arg0 && entry->unk_28 == sfxId) { if (entry->unk_2A >= 3) { - func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + Audio_QueueCmdS8(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); } if (entry->unk_2A != 0) { func_800F7B54(SFX_BANK(sfxId), bankIndex); @@ -670,7 +659,7 @@ void func_800F8BA0(u8 arg0, u16 sfxId) { func_800F74E0(4, &sp58); } -void func_800F8D04(u32 sfxId) { +void Audio_StopSfx(u32 sfxId) { SoundBankEntry* entry; u8 bankIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; u8 bankIndex2 = 0; @@ -680,7 +669,7 @@ void func_800F8D04(u32 sfxId) { entry = &gSoundBanks[SFX_BANK(sfxId)][bankIndex]; if (entry->unk_28 == sfxId) { if (entry->unk_2A >= 3) { - func_800E5B20(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); + Audio_QueueCmdS8(0x06020000 | ((entry->unk_2E & 0xFF) << 8), 0); } if (entry->unk_2A != 0) { func_800F7B54(SFX_BANK(sfxId), bankIndex); @@ -724,7 +713,7 @@ void func_800F8F34(u8 arg0) { void func_800F8F88(void) { u8 i; - if (IS_SEQUENCE_CHANNEL_VALID(gAudioContext.gSequencePlayers[2].channels[0])) { + if (IS_SEQUENCE_CHANNEL_VALID(gAudioContext.seqPlayers[2].channels[0])) { D_8016E260 = 0; for (i = 0; i < ARRAY_COUNT(gSoundBanks); i++) { func_800F7CEC(i); diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index 347d8270d6..1b3d0fe25e 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -1,30 +1,472 @@ #include "ultra64.h" #include "global.h" +#include "ultra64/abi.h" +extern unk_D_8016E750 D_8016E750[4]; +extern u8 D_8016E348[4]; +extern u32 sAudioSeqCmds[0x100]; +extern u8 sSeqCmdRdPos; +extern u8 sSeqCmdWrPos; +extern u8 D_80133408; +void Audio_ProcessSeqCmd(u32 cmd); + +#ifdef NON_MATCHING +void func_800F9280(u8 seqIdx, u8 seqId, u8 arg2, u16 fadeTimer) { + u8 temp_s0; + u8 i; + + temp_s0 = seqIdx; + if (D_80133408 == 0 || temp_s0 == 2) { + arg2 &= 0x7F; + if (arg2 == 0x7F) { + Audio_QueueCmdS32(0x85000000 | ((u8)seqIdx << 16) | (seqId << 8), + ((fadeTimer >> 3) * 0x3C * gAudioContext.audioBufferParameters.updatesPerFrame) & + 0xFFFF); + } else { + Audio_QueueCmdS32(0x82000000 | ((u8)seqIdx << 16) | (seqId << 8), + (fadeTimer * (u16)gAudioContext.audioBufferParameters.updatesPerFrame) / 4); + } + + D_8016E750[temp_s0].unk_256 = D_8016E750[temp_s0].unk_254 = (arg2 << 8) | seqId; + + if (D_8016E750[temp_s0].volCur != 1.0f) { + Audio_QueueCmdF32(0x41000000 | ((u8)seqIdx << 16), D_8016E750[temp_s0].volCur); + } + + D_8016E750[temp_s0].unk_28 = 0; + D_8016E750[temp_s0].unk_18 = 0; + D_8016E750[temp_s0].unk_14 = 0; + + for (i = 0; i < 0x10; i++) { + D_8016E750[temp_s0].unk_50[i].unk_00 = 1.0f; + D_8016E750[temp_s0].unk_50[i].unk_0C = 0; + D_8016E750[temp_s0].unk_50[i].unk_10 = 1.0f; + D_8016E750[temp_s0].unk_50[i].unk_1C = 0; + } + + D_8016E750[temp_s0].unk_250 = 0; + D_8016E750[temp_s0].unk_252 = 0; + } +} +#else +void func_800F9280(u8 seqIdx, u8 seqId, u8 arg2, u16 fadeTimer); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800F9280.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800F9474.s") +void func_800F9474(u8 arg0, u16 arg1) { + Audio_QueueCmdS32(0x83000000 | ((u8)arg0 << 16), + (arg1 * (u16)gAudioContext.audioBufferParameters.updatesPerFrame) / 4); + D_8016E750[arg0].unk_254 = 0xFFFF; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800F94FC.s") +typedef enum { + SEQ_START, + CMD1, + CMD2, + CMD3, + SEQ_VOL_UPD, + CMD5, + CMD6, + CMD7, + CMD8, + CMD9, + CMDA, + CMDB, + CMDC, + CMDD, + CMDE, + CMDF +} SeqCmdType; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/Audio_SetBGM.s") +extern u32 D_8013340C; +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/Audio_ProcessSeqCmd.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA034.s") +void Audio_QueueSeqCmd(u32 cmd) { + sAudioSeqCmds[sSeqCmdWrPos++] = cmd; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA0B4.s") +void Audio_ProcessSeqCmds(void) { + while (sSeqCmdWrPos != sSeqCmdRdPos) { + Audio_ProcessSeqCmd(sAudioSeqCmds[sSeqCmdRdPos++]); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA11C.s") +u16 func_800FA0B4(u8 playerIdx) { + if (!gAudioContext.seqPlayers[playerIdx].enabled) { + return 0xFFFF; + } + return D_8016E750[playerIdx].unk_254; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA174.s") +s32 func_800FA11C(u32 arg0, u32 arg1) { + u8 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA18C.s") + for (i = sSeqCmdRdPos; i != sSeqCmdWrPos; i++) { + if (arg0 == (sAudioSeqCmds[i] & arg1)) { + return false; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA240.s") + return true; +} +void func_800FA174(u8 arg0) { + D_8016E348[arg0] = 0; +} + +void func_800FA18C(u8 arg0, u8 arg1) { + u8 i; + + for (i = 0; i < D_8016E750[arg0].unk_4D; i++) { + u8 unkb = (D_8016E750[arg0].unk_2C[i] & 0xF00000) >> 0x14; + + if (unkb == arg1) { + D_8016E750[arg0].unk_2C[i] = 0xFF000000; + } + } +} +#define Audio_SetVolScaleNow(seqIdx, volFadeTimer, volScale) \ + Audio_ProcessSeqCmd(0x40000000 | ((u8)seqIdx << 0x18) | ((u8)volFadeTimer << 0x10) | ((u8)(volScale * 127.0f))); + +void Audio_SetVolScale(u8 seqIdx, u8 scaleIdx, u8 targetVol, u8 volFadeTimer) { + f32 volScale; + u8 i; + + D_8016E750[seqIdx].volScales[scaleIdx] = targetVol & 0x7F; + + if (volFadeTimer != 0) { + D_8016E750[seqIdx].fadeVolUpdate = 1; + D_8016E750[seqIdx].volFadeTimer = volFadeTimer; + } else { + for (i = 0, volScale = 1.0f; i < 4; i++) { + volScale *= D_8016E750[seqIdx].volScales[i] / 127.0f; + } + + Audio_SetVolScaleNow(seqIdx, volFadeTimer, volScale); + } +} + +#ifdef NON_MATCHING +void func_800FA3DC(void) { + u32 sp70; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f16; + f32 temp_f2; + f32 temp_f6; + f32 temp_f8; + s32 temp_a0_2; + s32 temp_a2; + s32 temp_a3; + u16 temp_lo; + s32 temp_s0; + s32 temp_s0_2; + u8 temp_s1; + s32 temp_s3; + s32 temp_s3_2; + s32 temp_s5; + s32 temp_v0_10; + u8 temp_v0_4; + s32 temp_v1; + u16 temp_t4; + u16 temp_t5; + u16 temp_t5_2; + u16 temp_t8; + u16 temp_v0_2; + u16 temp_v0_5; + u16 temp_v0_6; + u16 temp_v1_2; + u16 temp_v1_3; + u8 temp_a0; + u32 temp_v0; + u8 temp_a3_3; + u8 temp_s0_3; + u8 temp_t3; + u8 temp_v0_9; + u8 temp_v1_4; + unk_D_8016E750* temp_s0_4; + unk_D_8016E750* temp_s0_5; + unk_D_8016E750* temp_s2; + void* temp_v0_7; + void* temp_v0_8; + s32 phi_s3; + f32 phi_f0; + f32 phi_f6; + u16 phi_a2; + s32 phi_a2_2; + f32 phi_f0_2; + u8 phi_t0; + f32 phi_f8; + s32 phi_s0; + s32 phi_s0_2; + s32 phi_s3_2; + s32 phi_v1; + f32 phi_f16; + u8 i; + u8 j; + u8 k; + + for (i = 0; i < 4; i++) { + temp_s2 = &D_8016E750[i]; + if (temp_s2->unk_260 != 0) { + switch (func_800E5E20(&sp70)) { + case 1: + case 2: + case 3: + case 4: + temp_s2->unk_260 = 0; + Audio_ProcessSeqCmd(temp_s2->unk_25C); + break; + } + } + + if (temp_s2->fadeVolUpdate) { + for (j = 0, phi_f0 = 1.0f; j < 4; j++) { + phi_f0 *= (D_8016E750[i].volScales[j] / 127.0f); + } + + Audio_SeqCmd4(i, temp_s2->volFadeTimer, phi_f0 * 127.0f); + temp_s2->fadeVolUpdate = 0; + } + + if (temp_s2->unk_0C != 0) { + temp_s2->unk_0C--; + + if (temp_s2->unk_0C != 0) { + temp_s2->volCur = temp_s2->volCur - temp_s2->unk_08; + } else { + temp_s2->volCur = temp_s2->volTarget; + } + + Audio_QueueCmdF32(0x41000000 | _SHIFTL(i, 16, 8), temp_s2->volCur); + } + + if (temp_s2->unk_14 != 0) { + phi_a2 = temp_s2->unk_14 & 0xFFF; + phi_t0 = (temp_s2->unk_14 & 0xFF0000) >> 0xF; + if (phi_t0 == 0) { + phi_t0++; + } + + if (gAudioContext.seqPlayers[i].enabled) { + temp_v0_4 = (temp_s2->unk_14 & 0xF000) >> 0xC; + temp_lo = gAudioContext.seqPlayers[i].tempo / 0x30; + switch (temp_v0_4) { + case 1: + phi_a2 += temp_lo; + break; + case 2: + phi_a2 = temp_a2; + if (temp_v1 < temp_lo) { + phi_a2 = temp_lo - temp_v1; + } + break; + case 3: + phi_a2 = temp_lo * (phi_a2 / 100.0f); + break; + case 4: + temp_v0_5 = temp_s2->unk_18; + phi_a2 = temp_lo; + if (temp_v0_5 != 0) { + phi_a2 = temp_v0_5 & 0xFFFF; + } + break; + } + + if (phi_a2 >= 0x12D) { + phi_a2 = 0x12C; + } + + if (temp_s2->unk_18 == 0) { + temp_s2->unk_18 = temp_lo; + } + + temp_s2->unk_20 = phi_a2; + temp_s2->unk_1C = temp_lo; + temp_s2->unk_28 = phi_t0; + temp_s2->unk_14 = 0; + temp_s2->unk_24 = (temp_s2->unk_1C - temp_s2->unk_20) / temp_s2->unk_28; + } + } + + if (temp_s2->unk_28 != 0) { + temp_s2->unk_28--; + if (temp_s2->unk_28 != 0) { + temp_s2->unk_1C = temp_s2->unk_1C - temp_s2->unk_24; + } else { + temp_s2->unk_1C = temp_s2->unk_20; + } + Audio_QueueCmdS32(0x47000000 | _SHIFTL(i, 16, 8), temp_s2->unk_1C); + } + + if (temp_s2->unk_252 != 0) { + for (k = 0; k < 0x10; k++) { + if (D_8016E750[i].unk_50[k].unk_0C != 0) { + D_8016E750[i].unk_50[k].unk_0C--; + if (D_8016E750[i].unk_50[k].unk_0C != 0) { + D_8016E750[i].unk_50[k].unk_00 -= D_8016E750[i].unk_50[k].unk_08; + } else { + D_8016E750[i].unk_50[k].unk_00 = D_8016E750[i].unk_50[k].unk_04; + temp_s2->unk_252 ^= (1 << k); + } + Audio_QueueCmdF32(0x01000000 | _SHIFTL(i, 16, 8) | (k, 8, 8), D_8016E750[i].unk_50[k].unk_00); + } + } + } + if (temp_s2->unk_250 != 0) { + for (k = 0; k < 0x10; k++) { + if (D_8016E750[i].unk_50[k].unk_1C != 0) { + D_8016E750[i].unk_50[k].unk_1C--; + if (D_8016E750[i].unk_50[k].unk_1C != 0) { + D_8016E750[i].unk_50[k].unk_10 -= D_8016E750[i].unk_50[k].unk_18; + } else { + D_8016E750[i].unk_50[k].unk_10 = D_8016E750[i].unk_50[k].unk_14; + temp_s2->unk_250 ^= (1 << k); + } + Audio_QueueCmdF32(0x04000000 | _SHIFTL(i, 16, 8) | _SHIFTL(k, 8, 8), + D_8016E750[i].unk_50[k].unk_10); + } + } + } + + if (temp_s2->unk_4D != 0) { + if (func_800FA11C(0xF0000000, 0xF0000000) == 0) { + temp_s2->unk_4D = 0; + return; + } + + if (temp_s2->unk_4C != 0) { + temp_s2->unk_4C--; + } else if (!gAudioContext.seqPlayers[i].enabled) { + for (j = 0; j < temp_s2->unk_4D; j++) { + // temp_a0 = (temp_v0_10 & 0x00F00000) >> 20; + // temp_s1 = (temp_v0_10 & 0x000F0000) >> 16; + // temp_s0_3 = (temp_v0_10 & 0xFF00) >> 8; + // temp_a3_3 = (temp_v0_10 & 0xFF) >> 0; + temp_v0_10 = D_8016E750[i].unk_2C[j]; + temp_a0 = Unk2C_B8(temp_v0_10); + temp_s1 = Unk2C_B12(temp_v0_10); + temp_s0_3 = Unk2C_B16(temp_v0_10); + temp_a3_3 = Unk2C_B24(temp_v0_10); + switch (temp_a0) { + case 0: + Audio_SetVolScale(temp_s1, 1, 0x7F, temp_a3_3); + break; + case 7: + if (temp_a3_3 == D_8016E348[i]) { + Audio_SetVolScale(temp_s1, 1, 0x7F, temp_s0_3); + } + break; + case 1: + Audio_SeqCmd3(i, temp_s2->unk_254); + break; + case 2: + Audio_StartSeq(temp_s1, 0, D_8016E750[temp_s1].unk_254); + D_8016E750[temp_s1].fadeVolUpdate = 1; + D_8016E750[temp_s1].volScales[1] = 0x7F; + break; + case 3: + Audio_SeqCmdB30(temp_s1, temp_s0_3, temp_a3_3); + break; + case 4: + Audio_SeqCmdB40(temp_s1, temp_a3_3, 0); + break; + case 5: + Audio_StartSeq(temp_s1, D_8016E750[temp_s1].unk_4E, temp_v0_10); + Audio_SetVolScale(temp_s1, 1, 0x7F, 0); + D_8016E750[temp_s1].unk_4E = 0; + break; + case 6: + temp_s2->unk_4E = temp_s0_3; + break; + case 8: + Audio_SetVolScale(temp_s1, temp_s0_3, 0x7F, temp_a3_3); + break; + case 14: + if (temp_a3_3 & 1) { + Audio_QueueCmdS32(0xE3000000, 0); + } + if (temp_a3_3 & 2) { + Audio_QueueCmdS32(0xE3000000U, 1); + } + if (temp_a3_3 & 4) { + Audio_QueueCmdS32(0xE3000000U, 2); + } + break; + case 9: + Audio_SeqCmdA(temp_s1, temp_v0_10); + break; + case 10: + Audio_SeqCmd5(temp_s1, temp_s0_3, (temp_a3_3 * 0xA)); + break; + } + } + + temp_s2->unk_4D = 0; + } + } + } +} +#else +void func_800FA3DC(void); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA3DC.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FAD34.s") +extern u8 D_80133418; +extern u8 D_801333CC; +#define CMD46(a) (_SHIFTL(0x46, 24, 8) | _SHIFTL(a, 16, 8)) +u8 func_800FAD34(void) { + if (D_80133418 != 0) { + if (D_80133418 == 1) { + if (func_800E5EDC() == 1) { + D_80133418 = 0; + Audio_QueueCmdS8(CMD46(2), D_801333CC); + func_800F7170(); + } + } else if (D_80133418 == 2) { + while (func_800E5EDC() != 1) {} + D_80133418 = 0; + Audio_QueueCmdS8(CMD46(2), D_801333CC); + func_800F7170(); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FADF8.s") + return D_80133418; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FAEB4.s") +void func_800FADF8(void) { + u8 i, j; + + for (i = 0; i < 4; i++) { + D_8016E348[i] = 0; + D_8016E750[i].unk_254 = 0xFFFF; + D_8016E750[i].unk_256 = 0xFFFF; + D_8016E750[i].unk_28 = 0; + D_8016E750[i].unk_18 = 0; + D_8016E750[i].unk_14 = 0; + D_8016E750[i].unk_258 = 0; + D_8016E750[i].unk_4D = 0; + D_8016E750[i].unk_4E = 0; + D_8016E750[i].unk_250 = 0; + D_8016E750[i].unk_252 = 0; + for (j = 0; j < 4; j++) { + D_8016E750[i].volScales[j] = 0x7F; + } + D_8016E750[i].volFadeTimer = 1; + D_8016E750[i].fadeVolUpdate = 1; + } +} + +void func_800FAEB4(void) { + u8 i, j; + + for (i = 0; i < 4; i++) { + D_8016E750[i].volCur = 1.0f; + D_8016E750[i].unk_0C = 0; + D_8016E750[i].fadeVolUpdate = 0; + for (j = 0; j < 4; j++) { + D_8016E750[i].volScales[j] = 0x7F; + } + } + func_800FADF8(); +} diff --git a/src/code/game.c b/src/code/game.c index ce71375f1e..3f4f063f79 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -262,22 +262,22 @@ void GameState_Update(GameState* gameState) { gfxCtx->viFeatures = gViConfigFeatures; gfxCtx->xScale = gViConfigXScale; gfxCtx->yScale = gViConfigYScale; - if (SREG(63) == 6 || (SREG(63) == 2u && osTvType == 1)) { + if (SREG(63) == 6 || (SREG(63) == 2u && osTvType == OS_TV_NTSC)) { gfxCtx->viMode = &osViModeNtscLan1; gfxCtx->yScale = 1.0f; } - if (SREG(63) == 5 || (SREG(63) == 2u && osTvType == 2)) { + if (SREG(63) == 5 || (SREG(63) == 2u && osTvType == OS_TV_MPAL)) { gfxCtx->viMode = &osViModeMpalLan1; gfxCtx->yScale = 1.0f; } - if (SREG(63) == 4 || (SREG(63) == 2u && osTvType == 0)) { + if (SREG(63) == 4 || (SREG(63) == 2u && osTvType == OS_TV_PAL)) { gfxCtx->viMode = &osViModePalLan1; gfxCtx->yScale = 1.0f; } - if (SREG(63) == 3 || (SREG(63) == 2u && osTvType == 0)) { + if (SREG(63) == 3 || (SREG(63) == 2u && osTvType == OS_TV_PAL)) { gfxCtx->viMode = &osViModeFpalLan1; gfxCtx->yScale = 0.833f; } @@ -436,7 +436,7 @@ void GameState_Destroy(GameState* gameState) { // game destructor start osSyncPrintf("game デストラクタ開始\n"); func_800C3C20(); - func_800F3054(); + func_800F30534(); osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK); LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1139); if (gameState->destroy != NULL) { diff --git a/src/code/graph.c b/src/code/graph.c index 2ad106782c..725cbaaa78 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -362,7 +362,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { gfxCtx->fbIdx++; } - func_800F3054(); + func_800F30534(); { OSTime time = osGetTime(); diff --git a/src/code/sched.c b/src/code/sched.c index a28e78a2f7..cce050822c 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -249,7 +249,7 @@ u32 Sched_IsComplete(SchedContext* sc, OSScTask* task) { void Sched_RunTask(SchedContext* sc, OSScTask* spTask, OSScTask* dpTask) { ASSERT(sc->curRSPTask == NULL, "sc->curRSPTask == NULL", "../sched.c", 663); if (spTask != NULL) { - if (spTask->list.t.type == 0) { + if (spTask->list.t.type == M_NULTASK) { if (spTask->flags & OS_SC_NEEDS_RSP) { spTask->state &= ~OS_SC_SP; sc->curRSPTask = NULL; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 2a2229f272..71bc52ea51 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -410,9 +410,9 @@ void Cutscene_Command_FadeBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, var1 = cmd->endFrame - cmd->startFrame; if (cmd->type == 3) { - Audio_SetBGM(var1 << 0x10 | 0x110000FF); + Audio_QueueSeqCmd(var1 << 0x10 | 0x110000FF); } else { - Audio_SetBGM(var1 << 0x10 | 0x100000FF); + Audio_QueueSeqCmd(var1 << 0x10 | 0x100000FF); } } } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 8e3ab67a26..64135c47b0 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -422,7 +422,7 @@ void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->soundCtx.nightSeqIndex = cmd->soundSettings.nightSeqIndex; if (gSaveContext.seqIndex == 0xFF) { - Audio_SetBGM(cmd->soundSettings.bgmId | 0xF0000000); + Audio_QueueSeqCmd(cmd->soundSettings.bgmId | 0xF0000000); } } diff --git a/src/libultra_boot_O1/initialize.c b/src/libultra_boot_O1/initialize.c index 2cbf35e256..4827b8af1b 100644 --- a/src/libultra_boot_O1/initialize.c +++ b/src/libultra_boot_O1/initialize.c @@ -61,9 +61,9 @@ void __osInitialize_common(void) { bzero(osAppNmiBuffer, 0x40); } - if (osTvType == 0) { + if (osTvType == OS_TV_PAL) { osViClock = VI_PAL_CLOCK; - } else if (osTvType == 2) { + } else if (osTvType == OS_TV_MPAL) { osViClock = VI_MPAL_CLOCK; } else { osViClock = VI_NTSC_CLOCK; diff --git a/src/libultra_boot_O2/__osViInit.c b/src/libultra_boot_O2/__osViInit.c index 91d5759b78..12905742e1 100644 --- a/src/libultra_boot_O2/__osViInit.c +++ b/src/libultra_boot_O2/__osViInit.c @@ -14,9 +14,9 @@ void __osViInit(void) { __osViNext->buffer = (void*)0x80000000; __osViCurr->buffer = (void*)0x80000000; - if (osTvType == 0) { + if (osTvType == OS_TV_PAL) { __osViNext->modep = &osViModePalLan1; - } else if (osTvType == 2) { + } else if (osTvType == OS_TV_MPAL) { __osViNext->modep = &osViModeMpalLan1; } else { __osViNext->modep = &osViModeNtscLan1; diff --git a/src/libultra_code_O2/code_800E6840.c b/src/libultra_code_O2/code_800E6840.c index b5099ce9f8..b24163f702 100644 --- a/src/libultra_code_O2/code_800E6840.c +++ b/src/libultra_code_O2/code_800E6840.c @@ -1,12 +1,12 @@ #include "global.h" -void func_800E6840(void* buf, s32 size) { +void Audio_osInvalDCache(void* buf, s32 size) { OSIntMask prevMask = osSetIntMask(1); osInvalDCache(buf, size); osSetIntMask(prevMask); } -void func_800E6880(void* buf, s32 size) { +void Audio_osWritebackDCache(void* buf, s32 size) { OSIntMask prevMask = osSetIntMask(1); osWritebackDCache(buf, size); osSetIntMask(prevMask); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index e8611db6c8..7965fd88b9 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -110,8 +110,8 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { } else { globalCtx->csCtx.segment = D_808BB7A0; } - Audio_SetBGM(NA_BGM_STOP); - Audio_SetBGM(0x53); + Audio_QueueSeqCmd(NA_BGM_STOP); + Audio_QueueSeqCmd(0x53); gSaveContext.cutsceneTrigger = 1; this->actor.parent = NULL; BgTokiSwd_SetupAction(this, func_808BB0AC); diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 94cd824397..e61e7f5aea 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -335,7 +335,7 @@ void BgYdanSp_FloorWebIdle(BgYdanSp* this, GlobalContext* globalCtx) { if (this->unk16C > 3.0f) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_WEB_VIBRATION); } else { - func_800F8D04(NA_SE_EV_WEB_VIBRATION); + Audio_StopSfx(NA_SE_EV_WEB_VIBRATION); } } BgYdanSp_UpdateFloorWebCollision(this); diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 02ebf5a8b9..a87af5adf2 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -348,7 +348,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { BossDodongo_Walk(this, globalCtx); if (this->unk_196 == 1) { - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); } if (this->unk_196 == 0) { @@ -435,7 +435,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(&D_06017410), 0xA0, 0xB4, 0x80, 0x28); } - Audio_SetBGM(0x6B); + Audio_QueueSeqCmd(0x6B); } if (this->unk_198 == 0) { @@ -1307,7 +1307,7 @@ void BossDodongo_SetupDeathCutscene(BossDodongo* this) { this->csState = 0; this->actor.flags &= ~5; this->unk_1BC = 1; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); } void BossDodongo_DeathCutscene(BossDodongo* this, GlobalContext* globalCtx) { @@ -1621,7 +1621,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, GlobalContext* globalCtx) { } if (this->unk_1DA == 820) { - Audio_SetBGM(0x21); + Audio_QueueSeqCmd(0x21); Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_B_HEART, Math_SinS(this->actor.shape.rot.y) * -50.0f + this->actor.world.pos.x, this->actor.world.pos.y, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 7cf1cfd0fa..eab799ba2c 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -189,7 +189,7 @@ void BossFd_Init(Actor* thisx, GlobalContext* globalCtx) { 0); this->introState = BFD_CS_WAIT; if (this->introState == BFD_CS_NONE) { - Audio_SetBGM(0x6B); + Audio_QueueSeqCmd(0x6B); } this->actor.world.pos.x = this->actor.world.pos.z = 0.0f; @@ -489,7 +489,7 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) { this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake; } if (this->timers[3] == 160) { - Audio_SetBGM(0x6B); + Audio_QueueSeqCmd(0x6B); } if ((this->timers[3] == 130) && !(gSaveContext.eventChkInf[7] & 8)) { TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, @@ -744,7 +744,7 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) { if (this->skinSegments != 0) { this->skinSegments--; if (this->skinSegments == 0) { - Audio_SetBGM(0x21); + Audio_QueueSeqCmd(0x21); } } else { this->work[BFD_ACTION_STATE] = BOSSFD_BONES_FALL; diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index c99b9e09a0..bd081034e3 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -687,7 +687,7 @@ void BossFd2_Death(BossFd2* this, GlobalContext* globalCtx) { if ((this->work[FD2_HOLE_COUNTER] == 1) || (this->work[FD2_HOLE_COUNTER] == 40)) { this->work[FD2_SCREAM_TIMER] = 20; if (this->work[FD2_HOLE_COUNTER] == 40) { - func_800F8D04(NA_SE_EN_VALVAISA_DEAD); + Audio_StopSfx(NA_SE_EN_VALVAISA_DEAD); } Audio_PlayActorSound2(&this->actor, NA_SE_EN_VALVAISA_DAMAGE2); @@ -884,7 +884,7 @@ void BossFd2_CollisionCheck(BossFd2* this, GlobalContext* globalCtx) { BossFd2_SetupDeath(this, globalCtx); this->work[FD2_DAMAGE_FLASH_TIMER] = 10; this->work[FD2_INVINC_TIMER] = 30000; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); Audio_PlayActorSound2(&this->actor, NA_SE_EN_VALVAISA_DEAD); Enemy_StartFinishingBlow(globalCtx, &this->actor); } else if (damage) { diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 1854716474..d591ed497b 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -929,7 +929,7 @@ void BossGanondrof_SetupDeath(BossGanondrof* this, GlobalContext* globalCtx) { Animation_PlayOnce(&this->skelAnime, &gPhantomGanonDeathBlowAnim); this->fwork[GND_END_FRAME] = Animation_GetLastFrame(&gPhantomGanonDeathBlowAnim); this->actionFunc = BossGanondrof_Death; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_DEAD); this->deathState = DEATH_START; this->actor.flags &= ~1; @@ -1100,7 +1100,7 @@ void BossGanondrof_Death(BossGanondrof* this, GlobalContext* globalCtx) { holdCamera = true; bodyDecayLevel = 10; if (this->timers[0] == 150) { - Audio_SetBGM(0x21); + Audio_QueueSeqCmd(0x21); Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y, GND_BOSSROOM_CENTER_Z, 0, 0, 0, -1); } diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 742e95bf7b..d6f3458361 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -406,7 +406,7 @@ void BossGoma_SetupDefeated(BossGoma* this, GlobalContext* globalCtx) { this->actor.flags &= ~5; this->actor.speedXZ = 0.0f; this->actor.shape.shadowScale = 0.0f; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_DEAD); } @@ -659,7 +659,7 @@ void BossGoma_SetupEncounterState4(BossGoma* this, GlobalContext* globalCtx) { this->subCameraAt.y = this->actor.world.pos.y; this->subCameraAt.z = this->actor.world.pos.z; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); } /** @@ -921,7 +921,7 @@ void BossGoma_Encounter(BossGoma* this, GlobalContext* globalCtx) { SEGMENTED_TO_VIRTUAL(gGohmaTitleCardTex), 0xA0, 0xB4, 0x80, 0x28); } - Audio_SetBGM(0x1B); + Audio_QueueSeqCmd(0x1B); gSaveContext.eventChkInf[7] |= 1; } @@ -1106,7 +1106,7 @@ void BossGoma_Defeated(BossGoma* this, GlobalContext* globalCtx) { Math_SmoothStepToF(&this->subCameraAt.z, this->firstTailLimbWorldPos.z, 0.2f, 50.0f, 0.1f); if (this->timer == 80) { - Audio_SetBGM(0x21); + Audio_QueueSeqCmd(0x21); } if (this->timer == 0) { @@ -1828,7 +1828,7 @@ void BossGoma_UpdateHit(BossGoma* this, GlobalContext* globalCtx) { } else if (this->actionFunc != BossGoma_FloorStunned && this->patienceTimer != 0 && (acHitInfo->toucher.dmgFlags & 0x00000005)) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_DAM2); - func_800F8D04(NA_SE_EN_GOMA_CRY1); + Audio_StopSfx(NA_SE_EN_GOMA_CRY1); this->invincibilityFrames = 10; BossGoma_SetupFloorStunned(this); this->sfxFaintTimer = 100; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index e47d5f3db8..bdca1fa490 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -384,7 +384,7 @@ void BossSst_HeadSetupIntro(BossSst* this, GlobalContext* globalCtx) { } Gameplay_CameraSetAtEye(globalCtx, sCutsceneCamera, &sCameraAt, &sCameraEye); - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); this->actionFunc = BossSst_HeadIntro; } @@ -598,7 +598,7 @@ void BossSst_HeadIntro(BossSst* this, GlobalContext* globalCtx) { TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(&gBongoTitleCardTex), 160, 180, 128, 40); } - Audio_SetBGM(0x1B); + Audio_QueueSeqCmd(0x1B); Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadEyeCloseAnim, -5.0f); BossSst_HeadSfx(this, NA_SE_EN_SHADEST_DISAPPEAR); } @@ -1011,7 +1011,7 @@ void BossSst_HeadSetupDeath(BossSst* this, GlobalContext* globalCtx) { this->colliderJntSph.base.ocFlags1 &= ~OC1_ON; sHands[LEFT]->colliderJntSph.base.ocFlags1 &= ~OC1_ON; sHands[RIGHT]->colliderJntSph.base.ocFlags1 &= ~OC1_ON; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); sCutsceneCamera = Gameplay_CreateSubCamera(globalCtx); Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT); Gameplay_ChangeCameraStatus(globalCtx, sCutsceneCamera, CAM_STAT_ACTIVE); @@ -1156,7 +1156,7 @@ void BossSst_HeadMelt(BossSst* this, GlobalContext* globalCtx) { void BossSst_HeadSetupFinish(BossSst* this) { this->actor.draw = BossSst_DrawEffect; this->timer = 40; - Audio_SetBGM(0x21); + Audio_QueueSeqCmd(0x21); BossSst_SetCameraTargets(1.0 / 40, 6); this->actionFunc = BossSst_HeadFinish; } diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index b4f498a47b..c55d859c7b 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -161,7 +161,7 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) { if (!(gSaveContext.itemGetInf[1] & 0x4000)) { reaction = DNT_SIGNAL_CELEBRATE; this->prize = DNT_PRIZE_STICK; - Audio_SetBGM(0x3E); + Audio_QueueSeqCmd(0x3E); break; } case PLAYER_MASK_TRUTH: @@ -208,17 +208,17 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) { this->action = sResultValues[resultIdx][1]; switch (this->action) { case DNT_ACTION_LOW_RUPEES: - Audio_SetBGM(0x2D); + Audio_QueueSeqCmd(0x2D); break; case DNT_ACTION_ATTACK: if (this->subCamera != SUBCAM_FREE) { this->subCamera = SUBCAM_FREE; OnePointCutscene_Init(globalCtx, 2350, -99, &this->scrubs[3]->actor, MAIN_CAM); } - Audio_SetBGM(0x81A); + Audio_QueueSeqCmd(0x81A); break; case DNT_ACTION_DANCE: - Audio_SetBGM(0x55); + Audio_QueueSeqCmd(0x55); break; } osSyncPrintf("\n\n"); diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index a696fc501b..2d0b841b82 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -361,7 +361,7 @@ void EnDntJiji_Return(EnDntJiji* this, GlobalContext* globalCtx) { if ((this->stage->actor.update != NULL) && (this->stage->leaderSignal == DNT_SIGNAL_NONE)) { this->stage->leaderSignal = DNT_SIGNAL_HIDE; this->stage->action = DNT_ACTION_ATTACK; - Audio_SetBGM(0x81A); + Audio_QueueSeqCmd(0x81A); } } this->actor.speedXZ = 0.0f; diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 16a5a02459..fed63f4d84 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -244,7 +244,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, GlobalContext* globalCtx) { scorePos.y = this->actor.world.pos.y + 20.0f; scorePos.z = this->actor.world.pos.z; EffectSsExtra_Spawn(globalCtx, &scorePos, &scoreVel, &scoreAccel, 4, 2); - func_800F8D04(NA_SE_SY_TRE_BOX_APPEAR); + Audio_StopSfx(NA_SE_SY_TRE_BOX_APPEAR); func_80078884(NA_SE_SY_TRE_BOX_APPEAR); // Big hit osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter); diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 6e8a3df7eb..fd973e7093 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -54,7 +54,7 @@ void func_809FFDC8(EnEg* this, GlobalContext* globalCtx) { // Void the player out Gameplay_TriggerRespawn(globalCtx); gSaveContext.respawnFlag = -2; - Audio_SetBGM(NA_BGM_STOP); + Audio_QueueSeqCmd(NA_BGM_STOP); globalCtx->fadeTransition = 2; EnEg_PlayVoidOutSFX(); voided = true; diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 6a33e363e7..7346475662 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -506,12 +506,12 @@ s16 EnGo2_GetStateGoronCityLink(GlobalContext* globalCtx, EnGo2* this) { if (globalCtx->msgCtx.choiceIndex == 0) { this->actor.textId = gSaveContext.infTable[16] & 0x800 ? 0x3033 : 0x3035; if (this->actor.textId == 0x3035) { - func_800F8D04(0x39EB); + Audio_StopSfx(0x39EB); } } else { this->actor.textId = gSaveContext.infTable[16] & 0x800 ? 0x3036 : 0x3033; if (this->actor.textId == 0x3036) { - func_800F8D04(0x39EB); + Audio_StopSfx(0x39EB); } } func_8010B720(globalCtx, this->actor.textId); diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 442c3de5fc..0852d009df 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -2502,7 +2502,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) { this->hbaTimer++; } - sp20 = func_800F5A58(65, globalCtx); + sp20 = func_800F5A58(65); EnHorse_UpdateHbaRaceInfo(this, globalCtx, &sHbaInfo); if (this->hbaFlags & 1 || this->hbaTimer >= 46) { if (sp20 != 1 && gSaveContext.minigameState != 3) { @@ -2530,7 +2530,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) { if ((globalCtx->interfaceCtx.hbaAmmo == 0) || (this->hbaFlags & 2)) { if (this->hbaFlags & 4) { this->hbaFlags &= ~4; - Audio_SetBGM(65); + Audio_QueueSeqCmd(65); } } diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 18d0240075..3287b26d3f 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -183,7 +183,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g if (this->playerFinish > 0) { this->result = INGORACE_PLAYER_WIN; this->finishTimer = 55; - Audio_SetBGM(0x41); + Audio_QueueSeqCmd(0x41); Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } for (i = 0; i < 3; i++) { @@ -198,7 +198,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g this->result = INGORACE_INGO_WIN; this->finishTimer = 70; ingoHorse->stateFlags |= ENHORSE_INGO_WON; - Audio_SetBGM(0x41); + Audio_QueueSeqCmd(0x41); Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } for (i = 0; i < 3; i++) { @@ -206,12 +206,12 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g } } if (((player2->rideActor != NULL) && AT_RANCH_EXIT(player2->rideActor)) || AT_RANCH_EXIT(&player2->actor)) { - Audio_SetBGM(0x41); + Audio_QueueSeqCmd(0x41); this->result = INGORACE_INGO_WIN; this->finishTimer = 20; } if ((gSaveContext.timer1Value >= 180) && (this->startFlags & 2)) { - Audio_SetBGM(0x41); + Audio_QueueSeqCmd(0x41); this->result = INGORACE_TIME_UP; this->finishTimer = 20; } @@ -376,7 +376,7 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext* this->finishTimer = 30; } else if (this->fenceCheck[15] == 1) { this->lapCount = 2; - Audio_SetBGM(0x41); + Audio_QueueSeqCmd(0x41); Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); this->result = MALONRACE_SUCCESS; this->finishTimer = 70; diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 54251205f8..cf198d0149 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -349,7 +349,7 @@ void func_80ACA76C(EnOwl* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, &this->actor, 8); if (func_8002F334(&this->actor, globalCtx)) { - Audio_SetBGM(0x110000FF); + Audio_QueueSeqCmd(0x110000FF); func_80ACA62C(this, globalCtx); this->actor.flags &= ~0x10000; } @@ -359,7 +359,7 @@ void func_80ACA7E0(EnOwl* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, &this->actor, 8); if (func_8002F334(&this->actor, globalCtx)) { - Audio_SetBGM(0x110000FF); + Audio_QueueSeqCmd(0x110000FF); if ((this->unk_3EE & 0x3F) == 0) { func_80ACA62C(this, globalCtx); } else { @@ -559,7 +559,7 @@ void func_80ACB03C(EnOwl* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, &this->actor, 8); if (func_8002F334(&this->actor, globalCtx)) { - Audio_SetBGM(0x110000FF); + Audio_QueueSeqCmd(0x110000FF); func_80ACA62C(this, globalCtx); this->actor.flags &= ~0x10000; } @@ -588,7 +588,7 @@ void EnOwl_WaitZoraRiver(EnOwl* this, GlobalContext* globalCtx) { void func_80ACB148(EnOwl* this, GlobalContext* globalCtx) { if (func_8002F334(&this->actor, globalCtx)) { - Audio_SetBGM(0x110000FF); + Audio_QueueSeqCmd(0x110000FF); func_80ACA5C8(this); this->actionFunc = func_80ACC30C; Flags_SetSwitch(globalCtx, 0x23); @@ -608,7 +608,7 @@ void EnOwl_WaitHyliaShortcut(EnOwl* this, GlobalContext* globalCtx) { void func_80ACB22C(EnOwl* this, GlobalContext* globalCtx) { if (func_8002F334(&this->actor, globalCtx)) { - Audio_SetBGM(0x110000FF); + Audio_QueueSeqCmd(0x110000FF); func_80ACA5C8(this); this->actionFunc = func_80ACC30C; } @@ -616,7 +616,7 @@ void func_80ACB22C(EnOwl* this, GlobalContext* globalCtx) { void func_80ACB274(EnOwl* this, GlobalContext* globalCtx) { if (func_8002F334(&this->actor, globalCtx)) { - Audio_SetBGM(0x110000FF); + Audio_QueueSeqCmd(0x110000FF); this->actionFunc = EnOwl_WaitDeathMountainShortcut; } } diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index f851342575..2cc9838ec5 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -425,6 +425,6 @@ void EnSyatekiMan_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnSyatekiMan_SetBgm(void) { if (BREG(80)) { BREG(80) = false; - Audio_SetBGM(sBgmList[BREG(81)]); + Audio_QueueSeqCmd(sBgmList[BREG(81)]); } } diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index b1ad985715..35e444fac3 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -728,7 +728,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) { this->unk_2E0 &= ~0x10; this->unk_2E0 &= ~0x100; gSaveContext.eventInf[0] |= 0x100; - Audio_SetBGM(NA_BGM_STOP); + Audio_QueueSeqCmd(NA_BGM_STOP); this->unk_2E0 &= ~0x200; func_800F5C64(0x39); return; @@ -757,7 +757,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) { } if (gSaveContext.timer1Value == 0 && !Gameplay_InCsMode(globalCtx)) { - Audio_SetBGM(NA_BGM_STOP); + Audio_QueueSeqCmd(NA_BGM_STOP); this->unk_2E0 &= ~0x200; func_80078884(NA_SE_SY_FOUND); gSaveContext.timer1State = 0; diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index f035f48283..5be4c3d607 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -269,7 +269,7 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { } } if (globalCtx->csCtx.frames == 1020) { - Audio_SetBGM(0x1000023); + Audio_QueueSeqCmd(0x1000023); } if (globalCtx->csCtx.frames == 960) { Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index a6d5c9c5a9..362583aa95 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -307,7 +307,7 @@ void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { if ((player->stateFlags1 & 0x100000) || (player->stateFlags1 & 0x8000000) || !(player->actor.bgCheckFlags & 1) || ((this->actor.params == 1) && (320.0f < Math_Vec3f_DistXZ(&this->actor.home.pos, playerPos)))) { - func_800F8D04(NA_SE_EN_FALL_AIM); + Audio_StopSfx(NA_SE_EN_FALL_AIM); this->timer = 0x82; } diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index dcc60b70e1..8723f968db 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -183,7 +183,7 @@ void func_80B42F74(EnYabusameMark* this, GlobalContext* globalCtx) { func_800F5C64(0x922); } if (scoreIndex == 1) { - func_800F8D04(NA_SE_SY_TRE_BOX_APPEAR); + Audio_StopSfx(NA_SE_SY_TRE_BOX_APPEAR); func_80078884(NA_SE_SY_TRE_BOX_APPEAR); } if (scoreIndex == 0) { diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 4edee2c97b..9d5d9ad03c 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -88,7 +88,7 @@ void EnZl3_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80B53468(void) { - Audio_SetBGM(0x62); + Audio_QueueSeqCmd(0x62); } BossGanon2* func_80B53488(EnZl3* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 20a3271c0e..1b73e66fcc 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -147,7 +147,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) { } if (this->timers[0] == 51) { Audio_PlayActorSound2(this->actor.child, NA_SE_EV_SPEAR_FENCE); - Audio_SetBGM(0x1B); + Audio_QueueSeqCmd(0x1B); } if (this->timers[0] == 0) { EnfHG_SetupApproach(this, globalCtx, Rand_ZeroOne() * 5.99f); @@ -163,7 +163,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) { this->cutsceneState = INTRO_FENCE; this->timers[0] = 60; this->actor.world.pos.y = GND_BOSSROOM_CENTER_Y - 7.0f; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); gSaveContext.eventChkInf[7] |= 4; Flags_SetSwitch(globalCtx, 0x23); case INTRO_FENCE: @@ -199,7 +199,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, &this->actor, 9); } if (this->timers[0] == 1) { - Audio_SetBGM(0x23); + Audio_QueueSeqCmd(0x23); } Math_ApproachF(&this->cameraEye.x, GND_BOSSROOM_CENTER_X + 40.0f, 0.05f, this->cameraSpeedMod * 20.0f); Math_ApproachF(&this->cameraEye.y, GND_BOSSROOM_CENTER_Y + 37.0f, 0.05f, this->cameraSpeedMod * 20.0f); @@ -287,7 +287,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) { this->bossGndSignal = FHG_RIDE; } if (this->timers[0] == 130) { - Audio_SetBGM(0x105000FF); + Audio_QueueSeqCmd(0x105000FF); } if (this->timers[0] == 30) { bossGnd->work[GND_EYE_STATE] = GND_EYESTATE_BRIGHTEN; @@ -300,7 +300,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) { func_80078914(&audioVec, NA_SE_EN_FANTOM_ST_LAUGH); } if (this->timers[0] == 20) { - Audio_SetBGM(0x1B); + Audio_QueueSeqCmd(0x1B); } if (this->timers[0] == 2) { this->cameraSpeedMod = 0.0f; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 849e486dae..3612a1b8c7 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -869,7 +869,7 @@ void Fishing_Init(Actor* thisx, GlobalContext* globalCtx2) { D_80B7E0AC = 0; D_80B7E0A6 = 10; - Audio_SetBGM(0x100100FF); + Audio_QueueSeqCmd(0x100100FF); if (sLinkAge == 1) { if ((HIGH_SCORE(HS_FISHING) & 0x7F) != 0) { @@ -3586,7 +3586,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { this->unk_198 = 1.7f; this->unk_19C = 7000.0f; D_80B7E124 = 1; - Audio_SetBGM(0x81A); + Audio_QueueSeqCmd(0x81A); D_80B7E0A6 = 0; if (this->unk_150 == 1) { @@ -3791,7 +3791,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { } else { D_80B7E086 = 0x4082; func_800A9F6C(0.0f, 1, 3, 1); - Audio_SetBGM(0x100A00FF); + Audio_QueueSeqCmd(0x100A00FF); } this->unk_158 = this->unk_15A = 0; @@ -3859,7 +3859,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { } if (this->unk_17A[0] == 90) { - Audio_SetBGM(0x924); + Audio_QueueSeqCmd(0x924); D_80B7A67C = 40; if (this->unk_150 == 0) { @@ -3969,7 +3969,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { D_80B7E148 = 520.0f; D_80B7E144 = 195.0f; - Audio_SetBGM(0x100A00FF); + Audio_QueueSeqCmd(0x100A00FF); D_80B7E0A6 = 20; D_80B7A6CC = 3; } @@ -5204,7 +5204,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) { D_80B7A6CC = 20; func_800A9F6C(0.0f, 150, 10, 10); func_80078884(NA_SE_SY_TRE_BOX_APPEAR); - Audio_SetBGM(0x101400FF); + Audio_QueueSeqCmd(0x101400FF); } if (KREG(0) != 0) { @@ -5213,7 +5213,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) { D_80B7A6CC = 20; func_800A9F6C(0.0f, 150, 10, 10); func_80078884(NA_SE_SY_TRE_BOX_APPEAR); - Audio_SetBGM(0x101400FF); + Audio_QueueSeqCmd(0x101400FF); } if (D_80B7A6D0 != 0) { @@ -5429,7 +5429,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) { case 22: if (D_80B7A6D0 == 30) { - Audio_SetBGM(0x922); + Audio_QueueSeqCmd(0x922); } D_80B7A6D4 = 1; @@ -5739,15 +5739,15 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) { if (D_80B7E0A6 == 0) { if (sLinkAge != 1) { - Audio_SetBGM(0x19); + Audio_QueueSeqCmd(0x19); } else { - Audio_SetBGM(0x27); + Audio_QueueSeqCmd(0x27); } if (sLinkAge != 1) { - Audio_SetBGM(0x19); + Audio_QueueSeqCmd(0x19); } else { - Audio_SetBGM(0x27); + Audio_QueueSeqCmd(0x27); } } } diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c index f8f606d84e..a9c28c2782 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c @@ -190,9 +190,9 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx D_8082A11C = 0; func_800ED858(1); func_800ECC04((1 << pauseCtx->unk_264) + 0x8000); - pauseCtx->unk_194 = func_800EE3F8(); - pauseCtx->unk_194->unk_02 = 0; - pauseCtx->unk_194->unk_01 = 0xFF; + pauseCtx->unk_194 = Audio_OcaGetDisplayStaff(); + pauseCtx->unk_194->pos = 0; + pauseCtx->unk_194->state = 0xFF; VREG(21) = -62; VREG(22) = -56; VREG(23) = -49; @@ -278,8 +278,8 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx pauseCtx->unk_264 = D_80153960[phi_s6]; func_800ED93C(pauseCtx->unk_264 + 1, 1); pauseCtx->unk_1E4 = 2; - pauseCtx->unk_194 = func_800EE3F8(); - pauseCtx->unk_194->unk_02 = 0; + pauseCtx->unk_194 = Audio_OcaGetDisplayStaff(); + pauseCtx->unk_194->pos = 0; sp216 = pauseCtx->cursorSlot[PAUSE_QUEST]; KaleidoScope_SetCursorVtx(pauseCtx, sp216 * 4, pauseCtx->questVtx); } @@ -471,11 +471,11 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx } if (pauseCtx->unk_1E4 == 2) { - pauseCtx->unk_194 = func_800EE3F8(); + pauseCtx->unk_194 = Audio_OcaGetDisplayStaff(); - if (pauseCtx->unk_194->unk_02 != 0) { - if (D_8082A11C == (pauseCtx->unk_194->unk_02 - 1)) { - D_8082A124[pauseCtx->unk_194->unk_02 - 1] = pauseCtx->unk_194->unk_00; + if (pauseCtx->unk_194->pos != 0) { + if (D_8082A11C == (pauseCtx->unk_194->pos - 1)) { + D_8082A124[pauseCtx->unk_194->pos - 1] = pauseCtx->unk_194->noteIdx; D_8082A11C++; } @@ -519,12 +519,12 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx } else if (((pauseCtx->unk_1E4 >= 4) && (pauseCtx->unk_1E4 <= 6)) || (pauseCtx->unk_1E4 == 8)) { phi_a2 = pauseCtx->unk_264; - sp226 = D_80131C00[phi_a2][0]; + sp226 = gOcarinaSongNotes[phi_a2].len; sp218 = sp21A; for (phi_s3 = 0; phi_s3 < sp226; phi_s3++, sp21A += 4) { pauseCtx->questVtx[sp21A + 0].v.ob[1] = pauseCtx->questVtx[sp21A + 1].v.ob[1] = - VREG(21 + D_80131C00[phi_a2][phi_s3 + 1]); + VREG(21 + gOcarinaSongNotes[phi_a2].notesIdx[phi_s3]); pauseCtx->questVtx[sp21A + 2].v.ob[1] = pauseCtx->questVtx[sp21A + 3].v.ob[1] = pauseCtx->questVtx[sp21A + 0].v.ob[1] - 12; @@ -532,7 +532,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx gDPPipeSync(POLY_OPA_DISP++); if (pauseCtx->unk_1E4 == 8) { - if (D_80131C00[phi_a2][phi_s3 + 1] == 0) { + if (gOcarinaSongNotes[phi_a2].notesIdx[phi_s3] == 0) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 80, 255, 150, 200); } else { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 50, 200); @@ -545,9 +545,9 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx gSPVertex(POLY_OPA_DISP++, &pauseCtx->questVtx[sp21A], 4, 0); - gDPLoadTextureBlock(POLY_OPA_DISP++, D_8082A130[D_80131C00[phi_a2][phi_s3 + 1]], G_IM_FMT_IA, - G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(POLY_OPA_DISP++, D_8082A130[gOcarinaSongNotes[phi_a2].notesIdx[phi_s3]], + G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); if (1) {} gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); @@ -556,11 +556,11 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx if (pauseCtx->unk_1E4 != 8) { pauseCtx->unk_194 = func_800EE3D4(); - if (pauseCtx->unk_194->unk_02 != 0) { - if (D_8082A11C == (pauseCtx->unk_194->unk_02 - 1)) { - if ((pauseCtx->unk_194->unk_00 >= 0) && (pauseCtx->unk_194->unk_00 < 5)) { - D_8082A124[pauseCtx->unk_194->unk_02 - 1] = pauseCtx->unk_194->unk_00; - D_8082A124[pauseCtx->unk_194->unk_02] = 0xFF; + if (pauseCtx->unk_194->pos != 0) { + if (D_8082A11C == (pauseCtx->unk_194->pos - 1)) { + if ((pauseCtx->unk_194->noteIdx >= 0) && (pauseCtx->unk_194->noteIdx < 5)) { + D_8082A124[pauseCtx->unk_194->pos - 1] = pauseCtx->unk_194->noteIdx; + D_8082A124[pauseCtx->unk_194->pos] = 0xFF; D_8082A11C++; } } @@ -612,9 +612,9 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx D_8082A11C = 0; func_800ED858(1); func_800ECC04((1 << pauseCtx->unk_264) + 0x8000); - pauseCtx->unk_194 = func_800EE3F8(); - pauseCtx->unk_194->unk_02 = 0; - pauseCtx->unk_194->unk_01 = 0xFE; + pauseCtx->unk_194 = Audio_OcaGetDisplayStaff(); + pauseCtx->unk_194->pos = 0; + pauseCtx->unk_194->state = 0xFE; pauseCtx->unk_1E4 = 5; } } diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c index e75448c03e..a3a9f0013b 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -2924,8 +2924,8 @@ void KaleidoScope_Update(GlobalContext* globalCtx) { break; case 2: - pauseCtx->unk_194 = func_800EE3F8(); - if (pauseCtx->unk_194->unk_01 == 0) { + pauseCtx->unk_194 = Audio_OcaGetDisplayStaff(); + if (pauseCtx->unk_194->state == 0) { pauseCtx->unk_1E4 = 4; func_800ED858(0); } @@ -2962,13 +2962,13 @@ void KaleidoScope_Update(GlobalContext* globalCtx) { Interface_ChangeAlpha(50); pauseCtx->unk_1EC = 0; pauseCtx->state = 7; - } else if (pauseCtx->unk_194->unk_01 == pauseCtx->unk_264) { + } else if (pauseCtx->unk_194->state == pauseCtx->unk_264) { Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); D_8082B258 = 0; D_8082B25C = 30; pauseCtx->unk_1E4 = 6; - } else if (pauseCtx->unk_194->unk_01 == 0xFF) { + } else if (pauseCtx->unk_194->state == 0xFF) { Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); D_8082B258 = 4; @@ -3383,7 +3383,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) { gSaveContext.respawnFlag = -2; gSaveContext.nextTransition = 2; gSaveContext.health = 0x30; - Audio_SetBGM(0xF000000A); + Audio_QueueSeqCmd(0xF000000A); gSaveContext.healthAccumulator = 0; gSaveContext.unk_13F0 = 0; gSaveContext.unk_13F2 = 0; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index cb9cca48d1..fa5cb6aa40 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -1292,7 +1292,7 @@ void func_808326F0(Player* this) { s32 i; for (i = 0; i < 4; i++) { - func_800F8D04((u16)(*entry + this->ageProperties->unk_92)); + Audio_StopSfx((u16)(*entry + this->ageProperties->unk_92)); entry++; } } diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index b8315e759e..d8c0e81e7e 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -31,7 +31,7 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) { gSaveContext.buttonStatus[1] = BTN_ENABLED; gSaveContext.buttonStatus[0] = BTN_ENABLED; gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0; - Audio_SetBGM(NA_BGM_STOP); + Audio_QueueSeqCmd(NA_BGM_STOP); gSaveContext.entranceIndex = entranceIndex; gSaveContext.respawnFlag = 0; gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = -1;